From nobody Sat Oct 21 19:07:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SCWDc0Xvdz4xQN4; Sat, 21 Oct 2023 19:07:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SCWDc02h4z3FxX; Sat, 21 Oct 2023 19:07:44 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697915264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+bNQWu2Dx/1h/gmdxiIFbRol9Sp5JWQGGSTTfrxJGx0=; b=xnM94k9evC1afxeqtiY5z7J26/TjeVlriC4akFPH5AS0vkvKk2sFo06Tlp9gkOGkUocbjF pKDKGrBJrFrzeSl6ocVCYpTIk4oFRhVMVLflKbg0ecjmPnkdWK6IXWJcM7IUDdrFkvzWY4 nsXfhdAxFD/EkUt4KMfZtWnmSLKEqnhPHIM4+7ygjMa2ezFq+a33+zNONZsYU+4jMmEgxz fOh2ix5THd+oXmg55ySdOaSV2vCx/ZHsfpCSyy3ko/HcCoNbUACVTFt2aHC9TUg79HVaAZ 7pPFkt7G2/lfI26Y+297zmCnKlKQ1XOylij3niE6OvEKBNL7xZDZhz7EJ2F53Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697915264; a=rsa-sha256; cv=none; b=dpiBLs/hqC21SHPESXirP8hKlk6kSvFJ0i6+EPHje43uC89KWpQoj/7U4xPEyO6JL0gGHD VPoDQfa4TjG4SxTpblF2N8+UJnL+dKD8+E0azdTvNHtfIfC/Z4tlyHd8anGHlOkM+ocX8Z 5/SBf2mfEQ2SUn3XG7aL3ZTUz+L8HyNNZf3zqLoXWBQnAn7W/f0ogOXrgdSqFy28Dyk7GR Tx0ODrNhs4zqKSOiv2ihr1UO2VDI85FnOzDeAHNUKEVaTf/WVT7FRexh8zZAhb8/bF8O56 iDkYsQfUVg8bYa0gXZhvhS1OsqspZY+2TzwXxYcZSOzPSdhM76x6ZHbYJ5kMlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697915264; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+bNQWu2Dx/1h/gmdxiIFbRol9Sp5JWQGGSTTfrxJGx0=; b=YJDqRuw555caOM30ozhVPgyc2NRhEyMQQjftkMRELsb5lxunOuSK+sdsBUGaLznOBVe2IW Bd2ZCHmxz9rm5q1hauF9/BXkNGrQ+4NB2laDXCTRQZCb1c1XIhEfSykQJV8AMiALS9EAz7 Mnnbp+S9NMOfnI+bdmVKIXRSgS/3qjnWntkXBJv4y1cfwRuczwcbTAliZuwUWqDZB8MXOY y4r2CdK+L7tQHpWAJ2XJkQ/gc06ssAFFKNK7AAxabwMfw/ktO/zrFFPAeQaRtLJie/PFZ2 7sO2CS/+0H+4/dfOgy2O8i3v8P6yY6FtndSKYHGa88K49ApN/75hTnq8Ea2Xow== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4SCWDb5TCYz16JC; Sat, 21 Oct 2023 19:07:43 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 858344B47A; Sat, 21 Oct 2023 21:07:42 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268"; protocol="application/pgp-signature"; micalg=pgp-sha1 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: 6120673f7566 - main - tests: fix ATF_TESTS_PYTEST no clean build From: Dimitry Andric In-Reply-To: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> Date: Sat, 21 Oct 2023 21:07:26 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202310201747.39KHlUgB005433@gitrepo.freebsd.org> To: Gleb Smirnoff X-Mailer: Apple Mail (2.3731.700.6) --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 20 Oct 2023, at 19:47, Gleb Smirnoff wrote: >=20 > The branch main has been updated by glebius: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6120673f7566c35023921540d2d68257= 2d1bf1ce >=20 > commit 6120673f7566c35023921540d2d682572d1bf1ce > Author: Gleb Smirnoff > AuthorDate: 2023-10-20 17:47:08 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-10-20 17:47:08 +0000 >=20 > tests: fix ATF_TESTS_PYTEST no clean build >=20 > 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. >=20 > 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? -Dimitry --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268 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----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCZTQhbgAKCRCwXqMKLiCW o9N8AKDKzBJQ+HXri5P5hyaghceDBEZHQwCg0gWmyB/rdY0ZoWPZe5X+piHLXY8= =G191 -----END PGP SIGNATURE----- --Apple-Mail=_E28B79DB-8046-400C-B45A-296D44A09268-- From nobody Sun Oct 22 01:34:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 14:59:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 17:04:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:49:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 Mon Oct 23 10:54:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 Tue Oct 24 09:34:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 18:57:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFLsW4G9Mz4yMwq; Tue, 24 Oct 2023 18: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 4SFLsW2hcwz4GBb; Tue, 24 Oct 2023 18:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698173855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci3vnsEI32+6E6kuKxFvBa6yxAucc3epa9aEJXMcLV8=; b=AqkCVDweI7F5TJyx4qneU+qaDmPTlhWO33sntoEc/g8kwsx7SZKwnv3yv4N/DJnirfmyUA aabi5NNbeX1yRvLwP7t5H7ckeLJqzwL8NO0u2Uz0lkGr62vXDheQnDNXnvdPtoYRuuGXw4 A9fWsuOqWq69FokM9vxnPaBFzOxI0zcdXvSAwydX0w+jTeSg94IRU2T92886H6KRcBUXnv r4SL8tYCIWXe4+MkY30BjoAyXkYq8LYhmVj6FP6w4ak+djSLXreFaNL7DFB3GUDVMZPOGo 3lQ6ImvAemtr41tRq9n9StaijwydVcOMHliucMtvhazQ2MDNjmpwSMe2gg5MMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698173855; a=rsa-sha256; cv=none; b=lEROVald68pJip+DsK1qaMhtxGnNrtbPvGrN2xMsdpts8Doj0Viavr7FFpjSAZMfv5QDNY EqEhp4rfuPrnoyTuwmx7lKVfHAigU8MHeh2Jp9PiJG0OOXgSapjpTQNKFa7R7ZynmU8884 cu1grNxD77gwBWw4taB/VmfF8HtS2KKwoSr+lwUt2xoSRemsg0n7H5HH+Ww4AZa+ZEKzL/ bnbvYlX9dzOO/TznQ8h7yYEzm8KZQ5Z8k4QsOvvkMq+RSgx4qW8GFxmiYIF3IZKAvuPfaD 31b32JlQCb8np3qjw8UR6BfL5GhOem1/QesjxXLPcpKmJGqM9Je2LIdhrWubCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698173855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ci3vnsEI32+6E6kuKxFvBa6yxAucc3epa9aEJXMcLV8=; b=Fe1FyTF41Q5hfJfghSTMD9+40DyMh/aYPjfW3feD/q1FcerK3GORKVcaHo69UqvoXN9w2E JxRXUX0UDVQ2uVzgMSaGf+u2wpxXBoTbYNVMGrO+dCNFtSltUAhVhNSXlCkd92WK+vswVa +kV6C7ADHB8V7nCufFNBJF1uGVawvNRpp32mRC3veSHqNcnteir+gPMxubIxttQsA67R5H 7Sr2+F2wXiqQFnvxRvZpMjBRDJCxmopoYUKDw9hyuCzdB7GCaTMXX8T5maWAWvKPhyqaM0 M/cZ3mlubJCu5GA/rN0TjaKKeEo57iEDfVzITgr5yMB8wpV4/W2yTEcJL+xFIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFLsW1mGHzZ7d; Tue, 24 Oct 2023 18: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 39OIvZSC022650; Tue, 24 Oct 2023 18: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 39OIvT7X022637; Tue, 24 Oct 2023 18:57:29 GMT (envelope-from git) Date: Tue, 24 Oct 2023 18:57:29 GMT Message-Id: <202310241857.39OIvT7X022637@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: ad991e4c142e - main - OpenSSL: update to 3.0.12 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ad991e4c142ebabad7aef488ad97b189ecabb270 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ad991e4c142ebabad7aef488ad97b189ecabb270 commit ad991e4c142ebabad7aef488ad97b189ecabb270 Merge: 6869f90bf5bb 825caf7e1244 Author: Ed Maste AuthorDate: 2023-10-24 18:55:56 +0000 Commit: Ed Maste CommitDate: 2023-10-24 18:55:56 +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 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 +- 88 files changed, 442 insertions(+), 247 deletions(-) diff --cc crypto/openssl/include/openssl/opensslv.h index 0bf61ce6a9d7,000000000000..73590b76ca70 mode 100644,000000..100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@@ -1,114 -1,0 +1,114 @@@ +/* + * WARNING: do not edit! + * Generated by Makefile from include/openssl/opensslv.h.in + * + * Copyright 1999-2020 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 + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef OPENSSL_OPENSSLV_H +# define OPENSSL_OPENSSLV_H +# pragma once + +# ifdef __cplusplus +extern "C" { +# endif + +/* + * SECTION 1: VERSION DATA. These will change for each release + */ + +/* + * Base version macros + * + * These macros express version number MAJOR.MINOR.PATCH exactly + */ +# define OPENSSL_VERSION_MAJOR 3 +# define OPENSSL_VERSION_MINOR 0 - # define OPENSSL_VERSION_PATCH 11 ++# define OPENSSL_VERSION_PATCH 12 + +/* + * Additional version information + * + * These are also part of the new version scheme, but aren't part + * of the version number itself. + */ + +/* Could be: #define OPENSSL_VERSION_PRE_RELEASE "-alpha.1" */ +# define OPENSSL_VERSION_PRE_RELEASE "" +/* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+fips" */ +/* Could be: #define OPENSSL_VERSION_BUILD_METADATA "+vendor.1" */ +# define OPENSSL_VERSION_BUILD_METADATA "" + +/* + * Note: The OpenSSL Project will never define OPENSSL_VERSION_BUILD_METADATA + * to be anything but the empty string. Its use is entirely reserved for + * others + */ + +/* + * Shared library version + * + * This is strictly to express ABI version, which may or may not + * be related to the API version expressed with the macros above. + * This is defined in free form. + */ +# define OPENSSL_SHLIB_VERSION 3 + +/* + * SECTION 2: USEFUL MACROS + */ + +/* For checking general API compatibility when preprocessing */ +# define OPENSSL_VERSION_PREREQ(maj,min) \ + ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min)) + +/* + * Macros to get the version in easily digested string form, both the short + * "MAJOR.MINOR.PATCH" variant (where MAJOR, MINOR and PATCH are replaced + * with the values from the corresponding OPENSSL_VERSION_ macros) and the + * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and + * OPENSSL_VERSION_BUILD_METADATA_STR appended. + */ - # define OPENSSL_VERSION_STR "3.0.11" - # define OPENSSL_FULL_VERSION_STR "3.0.11" ++# define OPENSSL_VERSION_STR "3.0.12" ++# define OPENSSL_FULL_VERSION_STR "3.0.12" + +/* + * SECTION 3: ADDITIONAL METADATA + * + * These strings are defined separately to allow them to be parsable. + */ - # define OPENSSL_RELEASE_DATE "19 Sep 2023" ++# define OPENSSL_RELEASE_DATE "24 Oct 2023" + +/* + * SECTION 4: BACKWARD COMPATIBILITY + */ + - # define OPENSSL_VERSION_TEXT "OpenSSL 3.0.11 19 Sep 2023" ++# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.12 24 Oct 2023" + +/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ +# ifdef OPENSSL_VERSION_PRE_RELEASE +# define _OPENSSL_VERSION_PRE_RELEASE 0x0L +# else +# define _OPENSSL_VERSION_PRE_RELEASE 0xfL +# endif +# define OPENSSL_VERSION_NUMBER \ + ( (OPENSSL_VERSION_MAJOR<<28) \ + |(OPENSSL_VERSION_MINOR<<20) \ + |(OPENSSL_VERSION_PATCH<<4) \ + |_OPENSSL_VERSION_PRE_RELEASE ) + +# ifdef __cplusplus +} +# endif + +# include +# ifndef OPENSSL_NO_DEPRECATED_3_0 +# define HEADER_OPENSSLV_H +# endif + +#endif /* OPENSSL_OPENSSLV_H */ diff --cc secure/lib/libcrypto/Makefile.inc index 7b016d988a34,000000000000..65925f972ba7 mode 100644,000000..100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@@ -1,22 -1,0 +1,22 @@@ + +.include + +# OpenSSL version used for manual page generation - OPENSSL_VER= 3.0.11 - OPENSSL_DATE= 2023-09-19 ++OPENSSL_VER= 3.0.12 ++OPENSSL_DATE= 2023-10-24 + +LCRYPTO_SRC= ${SRCTOP}/crypto/openssl +LCRYPTO_DOC= ${LCRYPTO_SRC}/doc + +CFLAGS+= -I${LCRYPTO_SRC} +CFLAGS+= -I${LCRYPTO_SRC}/include +CFLAGS+= -I${LCRYPTO_SRC}/providers/common/include +CFLAGS+= -I${LCRYPTO_SRC}/providers/implementations/include + +.include "Makefile.common" + +.for pcfile in ${PCFILES} +${pcfile}: ${pcfile}.in + sed -e 's,@openssl_ver@,${OPENSSL_VER},g' ${.ALLSRC} > ${.TARGET} +.endfor +CLEANFILES+= ${PCFILES} From nobody Tue Oct 24 22:07:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFR49394kz4xZh3; Tue, 24 Oct 2023 22:07: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 4SFR492KWCz3DRx; Tue, 24 Oct 2023 22:07:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698185225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqLZIkCvPDU4hTeEFwzK5uU7AxVUkSD05P6oXnNsCQg=; b=rhM/h/8AxLZR10RnL5Kp3MrvPcH0qaSSuLXTH1o4hRvNYKJak6CF/IblnDuh0+8Jp/5g82 zgHz2iSx3kA36wGXQU4jLQLI0HHsgpr5JvRxuwbgTFCjvDfYndhsOV4upo+ijfHMAGo6EU dPjvpBPYzUS5cAiilaB2m6Csv146bw+QjUghTbpbqVsh9rQpvryPzToWZi4wLVJ1lR4AJD Ow6QAJcl/Zijx67uWc1jqr5RIOsjL2WzPsi6ucKpU7colVwmA6YR1Uq8sb+IBDo5zlSgJJ nl1snkJFdOUqDJM70LKxL1P7/DXTzyeyV71avdhNlfrntrVYqjaQMAJ0noDKWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698185225; a=rsa-sha256; cv=none; b=PXHEKflfyKF5xr4Wpw/po4KztEzMca25rNbczZ7P+GnvYxBVbev1kiuIaEpyqU+cOME+sc x9QCCTWJSjrKx0wTLfXwQWF6c478DJwNEhNpdiywBQIDWB/SfnJTDqqXM437lW/DJNBdmr X46kFAntxk1NdLgVCx4QT1fUw+AjbY9SM+fi0gc+nw6UKcJBGKJzkqWS3QY3H9X85hWrE5 brKWjZYrEQCl05i4RNZ0vx0cN+i4F2opToRCLasyVeUMlYITtlO6fOB0O3tAyCAZ+5G2Wt THuwqfhBbtPFPFECODUwqZy3mUAS9jKxDQK3jr/xMrYGbliwHy9OBRBbTJHl8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698185225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bqLZIkCvPDU4hTeEFwzK5uU7AxVUkSD05P6oXnNsCQg=; b=oMSGE9UIlmWMCIy5JPWzc+7CFL14vWKr0ItwqtMDEHM/cM5eW3nY9mcR9C5JwZqqgkcrPi m1Dn5rVQWdqEKCvpSVQ1BCiIwy04Sr7iRtooce84qnBA4KM/Tr6u8sHkWamW6Id217BAMG 5tgN/GpqnnnavKEVv6d3+DikzEiEXc+brexY6/Uujs2oBkaaBRBoH3K6mqkMlwvDv+96ZT Hm8mzorQlMp0agMlP3awIXXGS0YhPLkG6FAtKTnt5/7zL5i8P/CguBx4GBcngfGAR8raTn gSWa0LpdVy+hFXAekUQnKXAHqOmmrE2KXKrhgkIUbIQI/31qVRMgcE0Xjy+OKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFR490s69zflr; Tue, 24 Oct 2023 22:07: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 39OM75eq041757; Tue, 24 Oct 2023 22:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OM75v9041754; Tue, 24 Oct 2023 22:07:05 GMT (envelope-from git) Date: Tue, 24 Oct 2023 22:07:05 GMT Message-Id: <202310242207.39OM75v9041754@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: 1798b44fda38 - main - user stack randomization: only enable by default for 64bit processes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1798b44fda382c473c9fc7762e162613a39dc23c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1798b44fda382c473c9fc7762e162613a39dc23c commit 1798b44fda382c473c9fc7762e162613a39dc23c Author: Konstantin Belousov AuthorDate: 2023-10-24 21:44:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-24 22:06:48 +0000 user stack randomization: only enable by default for 64bit processes All aslr knobs are disabled by default for 32bit processes, except stack. This results in weird stack location, typically making around 1G of user address space hard to use. Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42356 --- sys/kern/imgact_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e01bccc93cb0..4ebd08082545 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -200,7 +200,7 @@ SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, honor_sbrk, CTLFLAG_RW, &__elfN(aslr_honor_sbrk), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": assume sbrk is used"); -static int __elfN(aslr_stack) = 1; +static int __elfN(aslr_stack) = __ELF_WORD_SIZE == 64; SYSCTL_INT(ASLR_NODE_OID, OID_AUTO, stack, CTLFLAG_RWTUN, &__elfN(aslr_stack), 0, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) From nobody Tue Oct 24 22:32:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFRd60Zjrz4xcWG; Tue, 24 Oct 2023 22:32: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 4SFRd607dyz3Hdk; Tue, 24 Oct 2023 22:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698186730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ineFqTnXuIcN0pELr2F1mosxBWbvb9IblWVdKdGdblY=; b=FZxt95HBahYLXCiPo6m763X/6xVo6OgS71vtTBSvCqIl5K3QFUZ/tWHGmiXF+nyqjDdCAQ 7qxs78Z3fuv3kNihcGU+EH2EpCg6Mjc/puawLt/WWUuMpPhUD90cQOX/FocZxJsm3Uvrrq +x/ZI7O9olUR/IkCrGCDVp0hbSU7aUyACnYH6E4lm3ac5iTzNcNVASOeZvuh0mXbZ3bBzj fvrBPsta2Tgs6+TdwNM14HK448r82FQMOc0PIeIm2FjJ7ztidKbnQOSOW9Cdx+vrTkba4j A9NlaumfW7escb9zTIFnlCBC+9JUcqk5pIrZmFDqwumsWxKsA4BbyNRvhAJg8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698186730; a=rsa-sha256; cv=none; b=MtvMmru8v7rQZ6Cl5FfrGCiN644yZ2JuwbQuu4il4mOVdLYhVwabCa5aWbaORiE/gvQL6M jc3pi37fDkp+5G4LeRtjEqyGRLHgll3yqnljgNhj/a/7MeY+WHXvmVSHvbllUqP3zKYiZ1 gwiE0U5H5FVOC7yooU1X9gJVVVIolMKUvNnEmPIIUDoq0wiw1GRrSIi1F+BHMRseAEYRA3 Jl7jaGcPBwXU9hepEpEYyWhvNt8vN62j8pkQB3K/uBBl6vpEmLV1BCPGVFkoE5AhTlnaG+ lqmmFEc+KXXc4cbh24tTK+5mWFRyU5VdzrSS5q4Jh4RmB06Qz/E4CSP96XMcCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698186730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ineFqTnXuIcN0pELr2F1mosxBWbvb9IblWVdKdGdblY=; b=aMH8z3Vxwm83jvzzLbQ88VxY2VVNNXMorN2PREkfht6Ynb7/+dLYaSR4+xSxPn0qwMnCEC wXbG91X9CkFYaZNpwv1PSZIIbsIexdvKoiB9TSuzZeOy41oHgTiXw45x3Wumg40PNBbN1K Ym/zIM6eUTO3lS5FxwwGoPN6enwRj5wQbNzMGZjfEUZqArHGERGsKB/SHWzrqsvJY/QsGb M2rSxryovZcO2kyrXNJ4OBKszHIHW6jM0/BoXoRFkBHEYzNytIUnKU4zMEnJhPqUwMEvQg xh/r3bjV06gHBPZZ3C60w+D4iWwe3VIgVYitNOQlk5qoE2fd2r2WiAGST8DwSQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFRd56J7yzg44; Tue, 24 Oct 2023 22:32: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 39OMW9IH089887; Tue, 24 Oct 2023 22:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OMW9a1089884; Tue, 24 Oct 2023 22:32:09 GMT (envelope-from git) Date: Tue, 24 Oct 2023 22:32:09 GMT Message-Id: <202310242232.39OMW9a1089884@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: d521abdff236 - main - Update ASLR stack sysctl description in security.7 and mitigations.7 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: d521abdff2367a5c72a773a815fc3d99403274f5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d521abdff2367a5c72a773a815fc3d99403274f5 commit d521abdff2367a5c72a773a815fc3d99403274f5 Author: Ed Maste AuthorDate: 2023-10-24 22:06:59 +0000 Commit: Ed Maste CommitDate: 2023-10-24 22:29:25 +0000 Update ASLR stack sysctl description in security.7 and mitigations.7 In an earlier implementation the stack (gap) was randomized when the enable sysctl was set and ASLR was also enabled (in general) for the binary. In the current implementation the sysctl operates independently. Reviewed by: kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42357 --- share/man/man7/mitigations.7 | 4 ++-- share/man/man7/security.7 | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/share/man/man7/mitigations.7 b/share/man/man7/mitigations.7 index fed16d7b325f..950d84042c71 100644 --- a/share/man/man7/mitigations.7 +++ b/share/man/man7/mitigations.7 @@ -120,7 +120,7 @@ Reserve the legacy .Xr sbrk 2 region for compatibility with older binaries. .It Va kern.elf32.aslr.stack -If ASLR is enabled for a process, also randomize the stack location. +Randomize the stack location for 32-bit ELF binaries. .El .Pp Global controls for 64-bit processes: @@ -135,7 +135,7 @@ Reserve the legacy .Xr sbrk 2 region for compatibility with older binaries. .It Va kern.elf64.aslr.stack -If ASLR is enabled for a process, also randomize the stack location. +Randomize the stack location for 64-bit ELF binaries. .El .Pp To execute a command with ASLR enabled or disabled: diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index a48e3607f0e5..71107b29ba11 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -1065,8 +1065,7 @@ position-independent (PIE) 32-bit binaries. Makes ASLR less aggressive and more compatible with old binaries relying on the sbrk area. .It Dv kern.elf32.aslr.stack -If ASLR is enabled for a binary, a non-zero value enables randomization -of the stack. +Enable randomization of the stack for 32-bit binaries. Otherwise, the stack is mapped at a fixed location determined by the process ABI. .It Dv kern.elf64.aslr.enable From nobody Wed Oct 25 12:35:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFpLc0rfZz4xSWK; Wed, 25 Oct 2023 12:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SFpLb5w4Dz3gpg; Wed, 25 Oct 2023 12:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698237351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVYOzSztLfoM5wy+UjReBH3BC/BFPjWsX6HcCOqfhYY=; b=IvuEtBdb8XuqXvh346JM7dVqt6Qvmllr1uRN9D2k6ChvzTyNoGjCkO78MueEN4E8CHImVU WEzO+9/8dC2Bd/WQAgR9JESkato1QtWzDN2zklUNURiuApA65uZk7zQsDKo6WgBUbEHgSN fGLoPfWJp+MYjcXiRmvSVbvEj+mfzClYzwnmR+53cFQuroLETY6U/CdGXZCEc9ZrsqVuhf w9FhOBz7MBwZTVZCl6uYtTJR80dXOlZwIv3Lo2f+P58RnyXrIUIbDIw0JbKBPMx1CYspA8 IzkS1TCP0kdqfnA/HYVqBPw9uGDsq/e/Lly7SjTocL59jkM/WPhMksm5cPJvfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698237351; a=rsa-sha256; cv=none; b=whA/rho4ubdY53YfjcjRh/X7Ttp8fi7z2d33SdWmKpL0i/GGsLq0OJJnsZLj8F4/FJPmwz 4RxN44+6G5d852TRlksj0zQv28CgEVALh91NfsdL0w4CO1kPQ79FX5cQOI2fCtgjcTKFkm n9M5xxZpsyNC6QmT792rgJOi8r6TS6uqLrBNjgRvisjuqzikfxPOvkk70F2CYcrcIXuptl fkE03bb3i1aacKuw1lwiui/97eSSpZZ4hOk3KDM40/J1ag/H/ETZiGnJgGCIudRkfMjzDw 3mEfl7PsF4hCuaPj3uc6enDzGm4bGHamxja46/27SeIPQZ8LPmCWQoCazpZLbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698237351; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wVYOzSztLfoM5wy+UjReBH3BC/BFPjWsX6HcCOqfhYY=; b=OEeWYdnf1YBfVgMboh9ryF6IDbaKPp5WGhIFp7zeSXD7G+37m4pwBehd45s9oRYiMgHnYI tkyTssbaEAbcAyVo9COvrRiQsU7FoSEQFgg8qUi8FpX7LhafsWce34iBrGayTIRDZVcD2S OZuyhXUFWPNwmOZH+AKVANqH3AN7z5toviqiG43eDcKRwJ/4RhgPntwQdGBJM6GrDpthGd RnHqxsQnHTBJXqPKmD2S/VHCunKDRaCya1F8QDpbow53I1Jo6yTeWv2oFcIOz/wkbAkyRn Z9pyExtDvAiTO00s/tRf7AV8gRccfjcgqd9ojqHDpfSEqy7b/TKzutAeLiUMwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFpLb4yPZz14WV; Wed, 25 Oct 2023 12:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39PCZp1r089107; Wed, 25 Oct 2023 12:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PCZpGm089104; Wed, 25 Oct 2023 12:35:51 GMT (envelope-from git) Date: Wed, 25 Oct 2023 12:35:51 GMT Message-Id: <202310251235.39PCZpGm089104@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: 1e05cf5f97de - main - arm64: Add a missing MRS_HWCAP_END List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 1e05cf5f97dee6d7139aa64f14264fb4c2333455 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=1e05cf5f97dee6d7139aa64f14264fb4c2333455 commit 1e05cf5f97dee6d7139aa64f14264fb4c2333455 Author: Andrew Turner AuthorDate: 2023-10-25 12:32:04 +0000 Commit: Andrew Turner CommitDate: 2023-10-25 12:33:16 +0000 arm64: Add a missing MRS_HWCAP_END Add a missing end marker to stop the arm64 CPU ID code reading past the end of an array. Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 5d23e1495dea..0dc23286ec9d 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1723,6 +1723,7 @@ static const struct mrs_field_value mvfr0_fpdp[] = { static const struct mrs_field_hwcap mvfr0_fpdp_caps[] = { MRS_HWCAP(&elf32_hwcap, HWCAP32_VFP, MVFR0_FPDP_VFP_v2), MRS_HWCAP(&elf32_hwcap, HWCAP32_VFPv3, MVFR0_FPDP_VFP_v3_v4), + MRS_HWCAP_END }; static const struct mrs_field_value mvfr0_fpsp[] = { From nobody Wed Oct 25 14:04:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFrKG6PDpz4xYLV; Wed, 25 Oct 2023 14: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 4SFrKG5lmbz4K7m; Wed, 25 Oct 2023 14:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698242690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UmhnX27HbpbBQGXgoH5mTvcTj0Bk5wX95Gi2WAxq0oY=; b=GZQ/IMFFPh8+N1isWqNY2/+kdio97LHt11ohUL9Q0tYSRRD4yPCMoxPcUHLxpUxEf9v3Qf FPdF6GfmZ70iY+i4LFndRcX/wcev52hmM2WAx47DhaeJZdn2/dd6rmJGudB55hDB/5Tsbl b7svO7Kq32TCMb9GuJIhwVSuwW1EW/9LslS7iiJfvSthh1GleARO2Kv3RSApDrFXbuuvtJ CInO3OntpZR9uDfx88M8TGdU+/iQP0C8PIvxwDG5NjjP785vuez8OTMKyI4dDVe4fYfrtP MwIaelYthCoG2XfjjI9vX+O8JJX/1BK7cj6Dkh0/2lHZJ0VqV72X7FwWkVygDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698242690; a=rsa-sha256; cv=none; b=uOAjY3x1RfarLwpxWJSQP1jsQd0qx7ZnOUzMxzMDNOEzJvI4SlAIPJ5IlXfmS0hHvQLvrq bnqXrNSXCWcdnDRH87DiEswkcLZRFAumDvtjy7Tevlqel3bm999/c+iW/X2Gjp7CFuWWur 7uP3DkN+i/jBZDnc4KIIHkWtht1bT6a0xxv69yOGg1amil7cwWZOAv7N+rdJBKQcg2CoCl hQ9HJ29iBIy7aFFFEorsmwXiYFk9Mv9BLr8Amh/ei5hW3q9+DhSLIlspwkvaXlmhH9qK3p no2Dh990fBp9rFMy3d2cwzi/DHX3D2o9EaP4uHi2DmD62OaK2vTU1vR/3Wj4Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698242690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UmhnX27HbpbBQGXgoH5mTvcTj0Bk5wX95Gi2WAxq0oY=; b=WP5TaHRt5SGQXc76zCx4BDpq4kfTSJAJ4FGzwpWa1JqerJo1h00yGqzgQq2NC4CPJveOtv 1/L7n7QkDXtJPujnJIXPE0ouqCsvUf5FTmpWyWbSJLg1JtatKddWZh1GBgD7hrjFD4Fy/7 bPOydzkPB5GjJX0pgjJAKu4bf8sK4vakegpa169Tpsz3qBW6oziXqLBA8hUIX/AVvMSVwY lqVwCFSvQ2NsxJ0bPlJDXfx6T/WAn89T1ylMEXRq+Pq2XHqXx80RACHq05rQ2ooCrzjzMO dDfpbR3OW84ZtmlM7UNT9BiwNXeSNcHEXjrj7yvWw3Grayt2cobxDNSscBu05Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFrKG4VYkz16Tb; Wed, 25 Oct 2023 14:04: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 39PE4o3X039484; Wed, 25 Oct 2023 14:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PE4oVK039481; Wed, 25 Oct 2023 14:04:50 GMT (envelope-from git) Date: Wed, 25 Oct 2023 14:04:50 GMT Message-Id: <202310251404.39PE4oVK039481@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: 876fddc88698 - main - tcp: Silence a -Wunused-function warning in tcp_ratelimit.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 876fddc886987ddbc89c412b15874749764167ac Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=876fddc886987ddbc89c412b15874749764167ac commit 876fddc886987ddbc89c412b15874749764167ac Author: Mark Johnston AuthorDate: 2023-10-25 14:03:58 +0000 Commit: Mark Johnston CommitDate: 2023-10-25 14:03:58 +0000 tcp: Silence a -Wunused-function warning in tcp_ratelimit.h No functional change intended. --- sys/netinet/tcp_ratelimit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_ratelimit.h b/sys/netinet/tcp_ratelimit.h index e33e9d47ff5a..cd540d1164e1 100644 --- a/sys/netinet/tcp_ratelimit.h +++ b/sys/netinet/tcp_ratelimit.h @@ -213,7 +213,7 @@ tcp_get_pacing_burst_size_w_divisor(struct tcpcb *tp, uint64_t bw, uint32_t segs } /* Do nothing if RATELIMIT is not defined */ -static void +static inline void tcp_rl_log_enobuf(const struct tcp_hwrate_limit_table *rte) { } From nobody Wed Oct 25 17:30:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SFwtP6HvMz4xnYd; Wed, 25 Oct 2023 17:30: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 4SFwtP5gMZz3Dj5; Wed, 25 Oct 2023 17:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698255021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FmPbS3dAeykV+xTJaUgyKyqkqc6U+mN4XtgpXmKgIsE=; b=hHTD4/JWqmv5VAkcRw8amqS922Qwl8EZHgnn7iMcMtHlI5xRK8IhiEeDmT7lIQcZX3x2gf avncemd4BuRovecjIeZ4Q+I5kA8C3xwM6tH2d6+oWPOp3GOZs/kJTjZyie8VWPn9VLA2e/ nUahHAeb5U+azX4UVqvpsElk9jfAKm7XSNyV7fTGRtxRvzgkJZC73lQ45MXqxqvuoqnMFa YTb0kMI94x3lIoPsh5Zw0NRH3G2xtrKXFUtRWt2ubeVpNCPYYd13FlXGP2k1c9dZwfC3Vh vpT0mhC9dQico7KMPdIjR1CQu+cJs+ykpZoqDtZTmqutrhtMIj/4vHmCQURuWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698255021; a=rsa-sha256; cv=none; b=lvmi4Q6Ktkbqb2xnn54fwVivAyglmsH10HUDBOKDQjZRvenSEb9DYKnSog6LXnCjqpujmh 1Nu7mwS2JJxduoh+KLJCBMtdmabadE5xOKso9RkcG/Nxdt+i+qpWdw0e/FPKWWPa4PS5VD 8VPm60A5E1qAdQrc3VO0sGg3qkUFEL14SWGqQ0szkTW/vHvEiL6Sv62praIPaSQ8X6Ydgw IcFD3FvYjSKKkl8YsMPkrns67RnKYZ2rqhOrksYsahYCg3RWLnLLx9/zgHTm+zyNtK1rLz JWziiIO+hdFWRr9ntw+6v0CzJn2Da/wn8baH34+jMXTPSdXckSbT3m4ebb17ZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698255021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FmPbS3dAeykV+xTJaUgyKyqkqc6U+mN4XtgpXmKgIsE=; b=I5sAP7cl2R84MiMBTZapi88JLZQNSJs/W5s0zXg/q1/ZJEoQpGSoxQwvVTZirYRmC5lQV8 fYiLNYLeYkWsuNVM5zigXiPK7DRpyIF4NzWLWRLHg6Sp7VBSB6CYcao4sWQN28F4i5rQyG omXtHULsCA4eJ4z9OkYzQ2yTgbXIiQwgc/FmJ+BhmFMO51hNxEhL9Q2hyDpzE+EKuy/uTO 5cmdKStVuu0YcQZ2JoYGl/puzOhxUoYkT49JehcJ48BW1FP0iyQ4np/Y6Qdl0ySQnakLi7 7toXGXWmu2TRNzoOBmA9BDQjMung9AAb0W5LhED78yfNufYDMkig9xsLUV4VUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SFwtP4dh9z1C9Q; Wed, 25 Oct 2023 17:30: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 39PHULJC081886; Wed, 25 Oct 2023 17:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39PHULPn081883; Wed, 25 Oct 2023 17:30:21 GMT (envelope-from git) Date: Wed, 25 Oct 2023 17:30:21 GMT Message-Id: <202310251730.39PHULPn081883@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: 575878a53382 - main - OpenSSL: regenerate asm files for 3.0.12 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 575878a533823aa3e5bab715928d9cdffbc4dcbc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=575878a533823aa3e5bab715928d9cdffbc4dcbc commit 575878a533823aa3e5bab715928d9cdffbc4dcbc Author: Ed Maste AuthorDate: 2023-10-25 17:28:47 +0000 Commit: Ed Maste CommitDate: 2023-10-25 17:29:35 +0000 OpenSSL: regenerate asm files for 3.0.12 Fixes: ad991e4c142e ("OpenSSL: update to 3.0.12") Sponsored by: The FreeBSD Foundation --- 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 ++++++++++++------------ 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/sys/crypto/openssl/aarch64/aesv8-armx.S b/sys/crypto/openssl/aarch64/aesv8-armx.S index 6c6dd095fb84..015c2eea6dbb 100644 --- a/sys/crypto/openssl/aarch64/aesv8-armx.S +++ b/sys/crypto/openssl/aarch64/aesv8-armx.S @@ -106,7 +106,7 @@ aes_v8_set_encrypt_key: .Loop192: tbl v6.16b,{v4.16b},v2.16b ext v5.16b,v0.16b,v3.16b,#12 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ st1 {v4.4s},[x2],#16 sub x2,x2,#8 #else @@ -1520,7 +1520,7 @@ aes_v8_ctr32_encrypt_blocks: ldr w5,[x3,#240] ldr w8, [x4, #12] -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ ld1 {v0.16b},[x4] #else ld1 {v0.4s},[x4] @@ -1537,7 +1537,7 @@ aes_v8_ctr32_encrypt_blocks: add x7,x3,#32 mov w6,w5 csel x12,xzr,x12,lo -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev w8, w8 #endif orr v1.16b,v0.16b,v0.16b diff --git a/sys/crypto/openssl/aarch64/arm_arch.h b/sys/crypto/openssl/aarch64/arm_arch.h index a815a5c72b7f..7bedb385d971 100644 --- a/sys/crypto/openssl/aarch64/arm_arch.h +++ b/sys/crypto/openssl/aarch64/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/sys/crypto/openssl/aarch64/ghashv8-armx.S b/sys/crypto/openssl/aarch64/ghashv8-armx.S index 9dec85cd4679..42f053d664ef 100644 --- a/sys/crypto/openssl/aarch64/ghashv8-armx.S +++ b/sys/crypto/openssl/aarch64/ghashv8-armx.S @@ -104,7 +104,7 @@ gcm_gmult_v8: movi v19.16b,#0xe1 ld1 {v20.2d,v21.2d},[x1] //load twisted H, ... shl v19.2d,v19.2d,#57 -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v17.16b,v17.16b #endif ext v3.16b,v17.16b,v17.16b,#8 @@ -129,7 +129,7 @@ gcm_gmult_v8: eor v18.16b,v18.16b,v2.16b eor v0.16b,v0.16b,v18.16b -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -167,14 +167,14 @@ gcm_ghash_v8: ext v0.16b,v0.16b,v0.16b,#8 //rotate Xi ld1 {v16.2d},[x2],#16 //load [rotated] I[0] shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v16.16b,v16.16b rev64 v0.16b,v0.16b #endif ext v3.16b,v16.16b,v16.16b,#8 //rotate I[0] b.lo .Lodd_tail_v8 //x3 was less than 32 ld1 {v17.2d},[x2],x12 //load [rotated] I[1] -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v17.16b,v17.16b #endif ext v7.16b,v17.16b,v17.16b,#8 @@ -206,13 +206,13 @@ gcm_ghash_v8: eor v18.16b,v0.16b,v2.16b eor v1.16b,v1.16b,v17.16b ld1 {v17.2d},[x2],x12 //load [rotated] I[i+3] -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v16.16b,v16.16b #endif eor v1.16b,v1.16b,v18.16b pmull v18.1q,v0.1d,v19.1d //1st phase of reduction -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v17.16b,v17.16b #endif ins v2.d[0],v1.d[1] @@ -262,7 +262,7 @@ gcm_ghash_v8: eor v0.16b,v0.16b,v18.16b .Ldone_v8: -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v0.16b,v0.16b #endif ext v0.16b,v0.16b,v0.16b,#8 @@ -281,7 +281,7 @@ gcm_ghash_v8_4x: shl v19.2d,v19.2d,#57 //compose 0xc2.0 constant ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v0.16b,v0.16b rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b @@ -325,7 +325,7 @@ gcm_ghash_v8_4x: eor v16.16b,v4.16b,v0.16b ld1 {v4.2d,v5.2d,v6.2d,v7.2d},[x2],#64 ext v3.16b,v16.16b,v16.16b,#8 -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v7.16b,v7.16b @@ -408,7 +408,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d,v6.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v5.16b,v5.16b rev64 v6.16b,v6.16b rev64 v4.16b,v4.16b @@ -460,7 +460,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d,v5.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v5.16b,v5.16b rev64 v4.16b,v4.16b #endif @@ -503,7 +503,7 @@ gcm_ghash_v8_4x: eor v1.16b,v1.16b,v17.16b ld1 {v4.2d},[x2] eor v1.16b,v1.16b,v18.16b -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v4.16b,v4.16b #endif @@ -543,7 +543,7 @@ gcm_ghash_v8_4x: eor v0.16b,v0.16b,v18.16b ext v0.16b,v0.16b,v0.16b,#8 -#ifndef __ARMEB__ +#ifndef __AARCH64EB__ rev64 v0.16b,v0.16b #endif st1 {v0.2d},[x0] //write out Xi diff --git a/sys/crypto/openssl/aarch64/poly1305-armv8.S b/sys/crypto/openssl/aarch64/poly1305-armv8.S index 35de669f7398..8925984c3ee0 100644 --- a/sys/crypto/openssl/aarch64/poly1305-armv8.S +++ b/sys/crypto/openssl/aarch64/poly1305-armv8.S @@ -30,7 +30,7 @@ poly1305_init: ldp x7,x8,[x1] // load key mov x9,#0xfffffffc0fffffff movk x9,#0x0fff,lsl#48 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x7,x7 // flip bytes rev x8,x8 #endif @@ -80,7 +80,7 @@ poly1305_blocks: .Loop: ldp x10,x11,[x1],#16 // load input sub x2,x2,#16 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x10,x10 rev x11,x11 #endif @@ -148,13 +148,13 @@ poly1305_emit: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x4,x4 // flip output bytes rev x5,x5 #endif @@ -277,7 +277,7 @@ poly1305_blocks_neon: adcs x5,x5,xzr adc x6,x6,xzr -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x12,x12 rev x13,x13 #endif @@ -323,7 +323,7 @@ poly1305_blocks_neon: ldp x12,x13,[x1],#16 // load input sub x2,x2,#16 add x9,x8,x8,lsr#2 // s1 = r1 + (r1 >> 2) -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x12,x12 rev x13,x13 #endif @@ -408,7 +408,7 @@ poly1305_blocks_neon: lsl x3,x3,#24 add x15,x0,#48 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -444,7 +444,7 @@ poly1305_blocks_neon: ld1 {v4.4s,v5.4s,v6.4s,v7.4s},[x15],#64 ld1 {v8.4s},[x15] -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -505,7 +505,7 @@ poly1305_blocks_neon: umull v20.2d,v14.2s,v1.s[2] ldp x9,x13,[x16],#48 umull v19.2d,v14.2s,v0.s[2] -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -570,7 +570,7 @@ poly1305_blocks_neon: umlal v23.2d,v11.2s,v3.s[0] umlal v20.2d,v11.2s,v8.s[0] umlal v21.2d,v11.2s,v0.s[0] -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x8,x8 rev x12,x12 rev x9,x9 @@ -854,13 +854,13 @@ poly1305_emit_neon: csel x4,x4,x12,eq csel x5,x5,x13,eq -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ ror x10,x10,#32 // flip nonce words ror x11,x11,#32 #endif adds x4,x4,x10 // accumulate nonce adc x5,x5,x11 -#ifdef __ARMEB__ +#ifdef __AARCH64EB__ rev x4,x4 // flip output bytes rev x5,x5 #endif From nobody Wed Oct 25 22:38:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 10:01:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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:40:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 21:12:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 Fri Oct 27 03:18:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 09:43:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 20:19:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 20:32:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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-main@mlmmj.nyi.freebsd.org 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 the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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 };