From nobody Sat Aug 5 23:50:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJK8v6QGmz4TwVG; Sat, 5 Aug 2023 23:50: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 4RJK8v5jQMz3bg7; Sat, 5 Aug 2023 23:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691279455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aq4Q713bZjUDBweWlriR2OGfzMl6aE/htB6xVqVLIMg=; b=JazK9fn8LP10fwjq6e0Tx7jzMgj2xzUjd142o8xMY/SfCvsLpicSpZZRRcsjEDNmOg9Kuf T8b9L+P82++8z9/88CrYDEfvnFCGnM/r4/o/N9cB9d5tyBcan2PdhyeqOVgpcktrudqFrM kNKKQ6k2PfLB6UsMfsf9Id1aNJHUNAZt7cKDxea3OwDZgMz08wWoDHOWG1Ztnjm6eY+qo/ 5J/v9WGaTc5VEe9Kw7y5IBJrK547scWvuaevVwLipQ1UaPZwckhJQXFtSKkdIlcFpPgeLS fUCWsUyS+EXfdjcMrV4NXqlAm3/QWeAW6805yI1fqM7uuSD+vBjLvnGbk39oQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691279455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aq4Q713bZjUDBweWlriR2OGfzMl6aE/htB6xVqVLIMg=; b=k1ZocFbGGLnJbwV+NMQSK/3Wm2jWXzKTzj7rDszZgihtad9czXBa6sx9xE0nftrbEvGces XG2azBnDeMzj2+ak1vxM5oMOlPP3TZqQuiFNPOWbt5N9ogH9vCcyM70iALjaZloH03Rqfg f4G7GMGb71/QOmsMqLSNKfpHGZ7LatGXgCmlFcBUG8RliNA0ehIe2N/S8SsABviKwBWhMg twe07xOoqLxcYkpnnYX6wuhbEXKxr3P939oxjDAMtWmwCXZR/aCgC9OfTPFXDOcOPM1qOq Dsn7Hg78vrJh7LLu3rZfm4p4XjuklhKTSBYuusNxifiWVfj89Q8M1yS0LBQpcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691279455; a=rsa-sha256; cv=none; b=BSDvKTC4g+briNYyVIltsZ9F9l792cqXinxMJoLonvOf5sEQLTi+SgyE3Io5aLikwTpSve cEQ1G8eH6fAhnbjsDh3wjr+JNb6d5lbDWqXH6SKXEQuYxXelWLXGg6Ox+hr//9LvNmt1ZU tL7hQzM8P10ifepcxNWisX56KUmJABeFIaIspraF08b68P+G09ZDYIjesxQhH9eItIidwO NEFjVoBzQYxomVBND+jjUfOvexIqVKtaBwqUmRiwJA1DDb09KdAaudTUWrzcJCiE+/imIm jESNdcHqBhAynHH1yex4uhNOQQgtJ1GwJImIxTrFOnKCpkE1Va9F7mwYgrM7bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJK8v4nGDzpLL; Sat, 5 Aug 2023 23:50: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 375NotSi070353; Sat, 5 Aug 2023 23:50:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 375NotNw070352; Sat, 5 Aug 2023 23:50:55 GMT (envelope-from git) Date: Sat, 5 Aug 2023 23:50:55 GMT Message-Id: <202308052350.375NotNw070352@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: 1a6238d1ea2a - main - sigexit: add a break in default case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a6238d1ea2ae8768a7b088d2beca6b97dabe00c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1a6238d1ea2ae8768a7b088d2beca6b97dabe00c commit 1a6238d1ea2ae8768a7b088d2beca6b97dabe00c Author: Ed Maste AuthorDate: 2023-08-05 23:20:00 +0000 Commit: Ed Maste CommitDate: 2023-08-05 23:21:11 +0000 sigexit: add a break in default case Suggested by: markj Fixes: 6edbe5616c76 ("Provide some more information for...") Sponsored by: The FreeBSD Foundation --- sys/kern/kern_sig.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index df3ebc0103c4..d30526ca8251 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -3641,6 +3641,7 @@ sigexit(struct thread *td, int sig) break; default: coreinfo = " (no core dump - other error)"; + break; } if (kern_logsigexit) log(LOG_INFO, From nobody Sun Aug 6 04:31:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJRNX3DLrz4mMMv; Sun, 6 Aug 2023 04:31: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 4RJRNX30dgz4V5t; Sun, 6 Aug 2023 04:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691296284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DmNOcjQm4jM1rJ/W6UAip8NLvCkI3EW/YqZAHCMDM8s=; b=p4So8lKEh9Obdk9KCAXwUpSkDCYumrP1vICU/RGf9P3KFWuAY+llCGSTgx+G4jQ1ej15HK BtsAJAn9BsrkTW20RlxCKqItWziz/boCNv55XwO0ORWF0RXNFw4w+TunYERFpB8a2jZ3IO gXh0hsJtwilhwuNO48yy58zu+p8fAtayHpbGtqTuqkOzlev9Y4UGUHiqekJCZ/oXR7cHQD brgg8D0sKELUPHHJlxTUWpiCm+Zd+RpQCXzI9nb1iihlEoNBwGmFk9qVDm3I6QFDMyZllp KzOlYak8Hq5bb13vOkJ423+N/p3R8BwchQ2O5g/iJMmt5n5u2OzrdfKsFGVaNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691296284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DmNOcjQm4jM1rJ/W6UAip8NLvCkI3EW/YqZAHCMDM8s=; b=mXY38++z/DYik1KiHxmHJ+gUriJFcOzRinj8lxe+iVzjFFK5c/WtRF0Uohaa5fY5Q5Ktfy 81LUOVCRpZSw5dGTpIqPwjzhSD2ISWYpjO9Q2zfYdZwYKNm+Kn5+rb26lYTW0voe/QFohy UqoYGTsTZP3cFZo7Zb3Jki4WGC90otgU5tiGmxJ0le3MgQHn+7HPgtAb8G0jBXXqygqNaY UI0RgrCooDmEW73tT/Bz9x+foCvFtirUp3h/cNH3oRym9dxtPEZQInS5UJOx4iXEH3ZR3K ijG0Q1dai88noIBYsvFynh6EO/iRXbaY/Wa+Ozood+QPxiIaapSfNLDeCyzClw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691296284; a=rsa-sha256; cv=none; b=GO2cJTpn9ztiWosLI3wEQD3hfgjp8wncsK6k41HMthQP4AXh9BQaFdT/2XPzf8Ondh7gsP drJwOpW28yUDaQ4T/3kXAWF+u0JD0ty92LIgS71h2MtmwcU4dMaxEYevlXwYaSVyQ9aUFW 5w/pTENz0KiB/BWZpjaBeaKCyBJXxSiFQY1aHNhuH/QkZfVjbdV2zVDJZHILKi97j+++Yt gj8DMAGC2ruN3dAmECEkJKu8u0FnikxM1QVApA/0m+dNlIxIKbZsFmSP7WS4ezpjrTKgmj 9ie97i6e7+DpYRANmM84jfeBmIrAo//DHG6feKR+QJ581puD50KHSLfKeJy5/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJRNX264jzx7R; Sun, 6 Aug 2023 04:31: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 3764VOp5036144; Sun, 6 Aug 2023 04:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3764VO6R036143; Sun, 6 Aug 2023 04:31:24 GMT (envelope-from git) Date: Sun, 6 Aug 2023 04:31:24 GMT Message-Id: <202308060431.3764VO6R036143@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: d69d55f78b93 - stable/13 - UFS/FFS: Migrate to modern uintXX_t from u_intXX_t. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d69d55f78b93f1b639df61a7470b053614548fbb Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=d69d55f78b93f1b639df61a7470b053614548fbb commit d69d55f78b93f1b639df61a7470b053614548fbb Author: Kirk McKusick AuthorDate: 2023-07-27 22:26:01 +0000 Commit: Kirk McKusick CommitDate: 2023-08-06 04:28:53 +0000 UFS/FFS: Migrate to modern uintXX_t from u_intXX_t. As per https://lists.freebsd.org/archives/freebsd-scsi/2023-July/000257.html move to the modern uintXX_t. While here also migrate u_char to uint8_t. Where other kernel interfaces allow, migrate u_long to uint64_t. No functional changes intended. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 831b1ff7913fb0b317a258a43dce5abefee03a31) --- sys/ufs/ffs/ffs_alloc.c | 148 +++++++++++++++++++++++---------------------- sys/ufs/ffs/ffs_extern.h | 19 +++--- sys/ufs/ffs/ffs_inode.c | 10 +-- sys/ufs/ffs/ffs_rawread.c | 4 +- sys/ufs/ffs/ffs_snapshot.c | 10 +-- sys/ufs/ffs/ffs_softdep.c | 28 ++++----- sys/ufs/ffs/ffs_subr.c | 24 ++++---- sys/ufs/ffs/ffs_tables.c | 6 +- sys/ufs/ffs/ffs_vfsops.c | 25 ++++---- sys/ufs/ffs/ffs_vnops.c | 33 +++++----- sys/ufs/ffs/fs.h | 78 ++++++++++++------------ sys/ufs/ffs/softdep.h | 4 +- sys/ufs/ufs/dinode.h | 38 ++++++------ sys/ufs/ufs/dir.h | 28 ++++----- sys/ufs/ufs/dirhash.h | 2 +- sys/ufs/ufs/extattr.h | 2 +- sys/ufs/ufs/inode.h | 20 +++--- sys/ufs/ufs/quota.h | 46 +++++++------- sys/ufs/ufs/ufs_dirhash.c | 6 +- sys/ufs/ufs/ufs_gjournal.c | 6 +- sys/ufs/ufs/ufs_lookup.c | 19 +++--- sys/ufs/ufs/ufs_quota.c | 30 ++++----- sys/ufs/ufs/ufs_vfsops.c | 2 +- sys/ufs/ufs/ufs_vnops.c | 14 ++--- sys/ufs/ufs/ufsmount.h | 18 +++--- 25 files changed, 312 insertions(+), 308 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index c3e6fa3b093c..36181263876c 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -103,10 +103,11 @@ __FBSDID("$FreeBSD$"); #include #include -typedef ufs2_daddr_t allocfcn_t(struct inode *ip, u_int cg, ufs2_daddr_t bpref, - int size, int rsize); +typedef ufs2_daddr_t allocfcn_t(struct inode *ip, uint64_t cg, + ufs2_daddr_t bpref, int size, int rsize); -static ufs2_daddr_t ffs_alloccg(struct inode *, u_int, ufs2_daddr_t, int, int); +static ufs2_daddr_t ffs_alloccg(struct inode *, uint64_t, ufs2_daddr_t, int, + int); static ufs2_daddr_t ffs_alloccgblk(struct inode *, struct buf *, ufs2_daddr_t, int); static void ffs_blkfree_cg(struct ufsmount *, struct fs *, @@ -115,13 +116,14 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, #ifdef INVARIANTS static int ffs_checkblk(struct inode *, ufs2_daddr_t, long); #endif -static ufs2_daddr_t ffs_clusteralloc(struct inode *, u_int, ufs2_daddr_t, int); +static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, + int); static ino_t ffs_dirpref(struct inode *); -static ufs2_daddr_t ffs_fragextend(struct inode *, u_int, ufs2_daddr_t, +static ufs2_daddr_t ffs_fragextend(struct inode *, uint64_t, ufs2_daddr_t, int, int); -static ufs2_daddr_t ffs_hashalloc - (struct inode *, u_int, ufs2_daddr_t, int, int, allocfcn_t *); -static ufs2_daddr_t ffs_nodealloccg(struct inode *, u_int, ufs2_daddr_t, int, +static ufs2_daddr_t ffs_hashalloc(struct inode *, uint64_t, ufs2_daddr_t, + int, int, allocfcn_t *); +static ufs2_daddr_t ffs_nodealloccg(struct inode *, uint64_t, ufs2_daddr_t, int, int); static ufs1_daddr_t ffs_mapsearch(struct fs *, struct cg *, ufs2_daddr_t, int); static int ffs_reallocblks_ufs1(struct vop_reallocblks_args *); @@ -159,7 +161,7 @@ ffs_alloc(struct inode *ip, struct fs *fs; struct ufsmount *ump; ufs2_daddr_t bno; - u_int cg, reclaimed; + uint64_t cg, reclaimed; int64_t delta; #ifdef QUOTA int error; @@ -170,7 +172,7 @@ ffs_alloc(struct inode *ip, fs = ump->um_fs; mtx_assert(UFS_MTX(ump), MA_OWNED); #ifdef INVARIANTS - if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) { + if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("dev = %s, bsize = %ld, size = %d, fs = %s\n", devtoname(ump->um_dev), (long)fs->fs_bsize, size, fs->fs_fsmnt); @@ -263,7 +265,7 @@ ffs_realloccg(struct inode *ip, struct fs *fs; struct buf *bp; struct ufsmount *ump; - u_int cg, request, reclaimed; + uint64_t cg, request, reclaimed; int error, gbflags; ufs2_daddr_t bno; int64_t delta; @@ -281,8 +283,8 @@ ffs_realloccg(struct inode *ip, #ifdef INVARIANTS if (vp->v_mount->mnt_kern_flag & MNTK_SUSPENDED) panic("ffs_realloccg: allocation on suspended filesystem"); - if ((u_int)osize > fs->fs_bsize || fragoff(fs, osize) != 0 || - (u_int)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) { + if ((uint64_t)osize > fs->fs_bsize || fragoff(fs, osize) != 0 || + (uint64_t)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) { printf( "dev = %s, bsize = %ld, osize = %d, nsize = %d, fs = %s\n", devtoname(ump->um_dev), (long)fs->fs_bsize, osize, @@ -1117,7 +1119,7 @@ ffs_valloc(struct vnode *pvp, struct timespec ts; struct ufsmount *ump; ino_t ino, ipref; - u_int cg; + uint64_t cg; int error, reclaimed; *vpp = NULL; @@ -1173,8 +1175,8 @@ retry: panic("ffs_valloc: dup alloc"); } if (DIP(ip, i_blocks) && (fs->fs_flags & FS_UNCLEAN) == 0) { /* XXX */ - printf("free inode %s/%lu had %ld blocks\n", - fs->fs_fsmnt, (u_long)ino, (long)DIP(ip, i_blocks)); + printf("free inode %s/%ju had %ld blocks\n", + fs->fs_fsmnt, (intmax_t)ino, (long)DIP(ip, i_blocks)); DIP_SET(ip, i_blocks, 0); } ip->i_flags = 0; @@ -1242,9 +1244,9 @@ ffs_dirpref(struct inode *pip) struct fs *fs; int cg, prefcg, curcg, dirsize, cgsize; int depth, range, start, end, numdirs, power, numerator, denominator; - u_int avgifree, avgbfree, avgndir, curdirsize; - u_int minifree, minbfree, maxndir; - u_int maxcontigdirs; + uint64_t avgifree, avgbfree, avgndir, curdirsize; + uint64_t minifree, minbfree, maxndir; + uint64_t maxcontigdirs; mtx_assert(UFS_MTX(ITOUMP(pip)), MA_OWNED); fs = ITOFS(pip); @@ -1406,8 +1408,8 @@ ffs_blkpref_ufs1(struct inode *ip, ufs1_daddr_t *bap) { struct fs *fs; - u_int cg, inocg; - u_int avgbfree, startcg; + uint64_t cg, inocg; + uint64_t avgbfree, startcg; ufs2_daddr_t pref, prevbn; KASSERT(indx <= 0 || bap != NULL, ("need non-NULL bap")); @@ -1518,8 +1520,8 @@ ffs_blkpref_ufs2(struct inode *ip, ufs2_daddr_t *bap) { struct fs *fs; - u_int cg, inocg; - u_int avgbfree, startcg; + uint64_t cg, inocg; + uint64_t avgbfree, startcg; ufs2_daddr_t pref, prevbn; KASSERT(indx <= 0 || bap != NULL, ("need non-NULL bap")); @@ -1634,7 +1636,7 @@ ffs_blkpref_ufs2(struct inode *ip, /*VARARGS5*/ static ufs2_daddr_t ffs_hashalloc(struct inode *ip, - u_int cg, + uint64_t cg, ufs2_daddr_t pref, int size, /* Search size for data blocks, mode for inodes */ int rsize, /* Real allocated size. */ @@ -1642,7 +1644,7 @@ ffs_hashalloc(struct inode *ip, { struct fs *fs; ufs2_daddr_t result; - u_int i, icg = cg; + uint64_t i, icg = cg; mtx_assert(UFS_MTX(ITOUMP(ip)), MA_OWNED); #ifdef INVARIANTS @@ -1692,7 +1694,7 @@ ffs_hashalloc(struct inode *ip, */ static ufs2_daddr_t ffs_fragextend(struct inode *ip, - u_int cg, + uint64_t cg, ufs2_daddr_t bprev, int osize, int nsize) @@ -1705,7 +1707,7 @@ ffs_fragextend(struct inode *ip, long bno; int frags, bbase; int i, error; - u_int8_t *blksfree; + uint8_t *blksfree; ump = ITOUMP(ip); fs = ump->um_fs; @@ -1769,7 +1771,7 @@ fail: */ static ufs2_daddr_t ffs_alloccg(struct inode *ip, - u_int cg, + uint64_t cg, ufs2_daddr_t bpref, int size, int rsize) @@ -1781,7 +1783,7 @@ ffs_alloccg(struct inode *ip, ufs1_daddr_t bno; ufs2_daddr_t blkno; int i, allocsiz, error, frags; - u_int8_t *blksfree; + uint8_t *blksfree; ump = ITOUMP(ip); fs = ump->um_fs; @@ -1874,7 +1876,7 @@ ffs_alloccgblk(struct inode *ip, struct ufsmount *ump; ufs1_daddr_t bno; ufs2_daddr_t blkno; - u_int8_t *blksfree; + uint8_t *blksfree; int i, cgbpref; ump = ITOUMP(ip); @@ -1947,7 +1949,7 @@ gotit: */ static ufs2_daddr_t ffs_clusteralloc(struct inode *ip, - u_int cg, + uint64_t cg, ufs2_daddr_t bpref, int len) { @@ -1957,9 +1959,9 @@ ffs_clusteralloc(struct inode *ip, struct ufsmount *ump; int i, run, bit, map, got, error; ufs2_daddr_t bno; - u_char *mapp; + uint8_t *mapp; int32_t *lp; - u_int8_t *blksfree; + uint8_t *blksfree; ump = ITOUMP(ip); fs = ump->um_fs; @@ -2057,8 +2059,8 @@ ffs_clusteralloc(struct inode *ip, static inline struct buf * getinobuf(struct inode *ip, - u_int cg, - u_int32_t cginoblk, + uint64_t cg, + uint32_t cginoblk, int gbflags) { struct fs *fs; @@ -2090,7 +2092,7 @@ SYSCTL_INT(_vfs_ffs, OID_AUTO, doasyncinodeinit, CTLFLAG_RWTUN, */ static ufs2_daddr_t ffs_nodealloccg(struct inode *ip, - u_int cg, + uint64_t cg, ufs2_daddr_t ipref, int mode, int unused) @@ -2099,10 +2101,10 @@ ffs_nodealloccg(struct inode *ip, struct cg *cgp; struct buf *bp, *ibp; struct ufsmount *ump; - u_int8_t *inosused, *loc; + uint8_t *inosused, *loc; struct ufs2_dinode *dp2; int error, start, len, i; - u_int32_t old_initediblk; + uint32_t old_initediblk; ump = ITOUMP(ip); fs = ump->um_fs; @@ -2134,8 +2136,8 @@ restart: start = 0; loc = memcchr(&inosused[start], 0xff, len); if (loc == NULL) { - printf("cg = %d, irotor = %ld, fs = %s\n", - cg, (long)cgp->cg_irotor, fs->fs_fsmnt); + printf("cg = %ju, irotor = %ld, fs = %s\n", + (intmax_t)cg, (long)cgp->cg_irotor, fs->fs_fsmnt); panic("ffs_nodealloccg: map corrupted"); /* NOTREACHED */ } @@ -2259,8 +2261,8 @@ ffs_blkfree_cg(struct ufsmount *ump, daddr_t dbn; ufs1_daddr_t fragno, cgbno; int i, blk, frags, bbase, error; - u_int cg; - u_int8_t *blksfree; + uint64_t cg; + uint8_t *blksfree; struct cdev *dev; cg = dtog(fs, bno); @@ -2278,7 +2280,7 @@ ffs_blkfree_cg(struct ufsmount *ump, } else return; #ifdef INVARIANTS - if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0 || + if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0 || fragnum(fs, bno) + numfrags(fs, size) > fs->fs_frag) { printf("dev=%s, bno = %jd, bsize = %ld, size = %ld, fs = %s\n", devtoname(dev), (intmax_t)bno, (long)fs->fs_bsize, @@ -2286,9 +2288,9 @@ ffs_blkfree_cg(struct ufsmount *ump, panic("ffs_blkfree_cg: bad size"); } #endif - if ((u_int)bno >= fs->fs_size) { - printf("bad block %jd, ino %lu\n", (intmax_t)bno, - (u_long)inum); + if ((uint64_t)bno >= fs->fs_size) { + printf("bad block %jd, ino %ju\n", (intmax_t)bno, + (intmax_t)inum); ffs_fserr(fs, inum, "bad block"); return; } @@ -2429,7 +2431,7 @@ struct ffs_blkfree_trim_params { static void ffs_blkfree_trim_completed(struct buf *); static void ffs_blkfree_trim_task(void *ctx, int pending __unused); static struct ffs_blkfree_trim_params *trim_lookup(struct ufsmount *, - struct vnode *, ufs2_daddr_t, long, ino_t, u_long, int); + struct vnode *, ufs2_daddr_t, long, ino_t, uint64_t, int); static void ffs_blkfree_sendtrim(struct ffs_blkfree_trim_params *); /* @@ -2482,7 +2484,7 @@ trim_lookup(struct ufsmount *ump, ufs2_daddr_t bno, long size, ino_t inum, - u_long key, + uint64_t key, int alloctype) { struct trimlist_hashhead *tphashhead; @@ -2571,13 +2573,13 @@ ffs_blkfree_sendtrim(struct ffs_blkfree_trim_params *tp) /* * Allocate a new key to use to identify a range of blocks. */ -u_long +uint64_t ffs_blkrelease_start(struct ufsmount *ump, struct vnode *devvp, ino_t inum) { static u_long masterkey; - u_long key; + uint64_t key; if (((ump->um_flags & UM_CANDELETE) == 0) || dotrimcons == 0) return (SINGLETON_KEY); @@ -2592,7 +2594,7 @@ ffs_blkrelease_start(struct ufsmount *ump, * Deallocate a key that has been used to identify a range of blocks. */ void -ffs_blkrelease_finish(struct ufsmount *ump, u_long key) +ffs_blkrelease_finish(struct ufsmount *ump, uint64_t key) { struct ffs_blkfree_trim_params *tp; @@ -2646,7 +2648,7 @@ ffs_blkfree(struct ufsmount *ump, ino_t inum, enum vtype vtype, struct workhead *dephd, - u_long key) + uint64_t key) { struct ffs_blkfree_trim_params *tp, *ntp; struct trim_blkreq *blkelm; @@ -2754,15 +2756,15 @@ ffs_checkblk(struct inode *ip, struct buf *bp; ufs1_daddr_t cgbno; int i, error, frags, free; - u_int8_t *blksfree; + uint8_t *blksfree; fs = ITOFS(ip); - if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0) { + if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("bsize = %ld, size = %ld, fs = %s\n", (long)fs->fs_bsize, size, fs->fs_fsmnt); panic("ffs_checkblk: bad size"); } - if ((u_int)bno >= fs->fs_size) + if ((uint64_t)bno >= fs->fs_size) panic("ffs_checkblk: bad block %jd", (intmax_t)bno); error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); if (error) @@ -2818,8 +2820,8 @@ ffs_freefile(struct ufsmount *ump, struct buf *bp; daddr_t dbn; int error; - u_int cg; - u_int8_t *inosused; + uint64_t cg; + uint8_t *inosused; struct cdev *dev; ino_t cgino; @@ -2895,8 +2897,8 @@ ffs_checkfreefile(struct fs *fs, struct cg *cgp; struct buf *bp; int ret, error; - u_int cg; - u_int8_t *inosused; + uint64_t cg; + uint8_t *inosused; cg = ino_to_cg(fs, ino); if ((devvp->v_type != VREG) && (devvp->v_type != VCHR)) @@ -2927,7 +2929,7 @@ ffs_mapsearch(struct fs *fs, ufs1_daddr_t bno; int start, len, loc, i; int blk, field, subfield, pos; - u_int8_t *blksfree; + uint8_t *blksfree; /* * find the fragment by searching through the free block @@ -2939,15 +2941,15 @@ ffs_mapsearch(struct fs *fs, start = cgp->cg_frotor / NBBY; blksfree = cg_blksfree(cgp); len = howmany(fs->fs_fpg, NBBY) - start; - loc = scanc((u_int)len, (u_char *)&blksfree[start], + loc = scanc((uint64_t)len, (uint8_t *)&blksfree[start], fragtbl[fs->fs_frag], - (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); + (uint8_t)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); if (loc == 0) { len = start + 1; start = 0; - loc = scanc((u_int)len, (u_char *)&blksfree[0], + loc = scanc((uint64_t)len, (uint8_t *)&blksfree[0], fragtbl[fs->fs_frag], - (u_char)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); + (uint8_t)(1 << (allocsiz - 1 + (fs->fs_frag % NBBY)))); if (loc == 0) { printf("start = %d, len = %d, fs = %s\n", start, len, fs->fs_fsmnt); @@ -2973,7 +2975,7 @@ ffs_mapsearch(struct fs *fs, subfield <<= 1; } } - printf("bno = %lu, fs = %s\n", (u_long)bno, fs->fs_fsmnt); + printf("bno = %ju, fs = %s\n", (intmax_t)bno, fs->fs_fsmnt); panic("ffs_alloccg: block not in map"); return (-1); } @@ -2993,7 +2995,7 @@ ffs_getmntstat(struct vnode *devvp) int ffs_getcg(struct fs *fs, struct vnode *devvp, - u_int cg, + uint64_t cg, int flags, struct buf **bpp, struct cg **cgpp) @@ -3021,11 +3023,11 @@ ffs_getcg(struct fs *fs, (bp->b_flags & B_CKHASH) != 0 && cgp->cg_ckhash != bp->b_ckhash) { sfs = ffs_getmntstat(devvp); - printf("UFS %s%s (%s) cylinder checksum failed: cg %u, cgp: " + printf("UFS %s%s (%s) cylinder checksum failed: cg %ju, cgp: " "0x%x != bp: 0x%jx\n", devvp->v_type == VCHR ? "" : "snapshot of ", sfs->f_mntfromname, sfs->f_mntonname, - cg, cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); + (intmax_t)cg, cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); @@ -3037,11 +3039,11 @@ ffs_getcg(struct fs *fs, devvp->v_type == VCHR ? "" : "snapshot of ", sfs->f_mntfromname, sfs->f_mntonname); if (!cg_chkmagic(cgp)) - printf(" cg %u: bad magic number 0x%x should be 0x%x\n", - cg, cgp->cg_magic, CG_MAGIC); + printf(" cg %ju: bad magic number 0x%x should be " + "0x%x\n", (intmax_t)cg, cgp->cg_magic, CG_MAGIC); else - printf(": wrong cylinder group cg %u != cgx %u\n", cg, - cgp->cg_cgx); + printf(": wrong cylinder group cg %ju != cgx %u\n", + (intmax_t)cg, cgp->cg_cgx); bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); @@ -3219,7 +3221,7 @@ sysctl_ffs_fsck(SYSCTL_HANDLER_ARGS) struct pwd *pwd; ufs2_daddr_t blkno; long blkcnt, blksize; - u_long key; + uint64_t key; struct file *fp; cap_rights_t rights; int filetype, error; diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 1ea473e69f52..fb448abe4e5e 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -62,14 +62,15 @@ int ffs_balloc_ufs1(struct vnode *a_vp, off_t a_startoffset, int a_size, int ffs_balloc_ufs2(struct vnode *a_vp, off_t a_startoffset, int a_size, struct ucred *a_cred, int a_flags, struct buf **a_bpp); void ffs_blkfree(struct ufsmount *, struct fs *, struct vnode *, - ufs2_daddr_t, long, ino_t, enum vtype, struct workhead *, u_long); + ufs2_daddr_t, long, ino_t, enum vtype, struct workhead *, + uint64_t); ufs2_daddr_t ffs_blkpref_ufs1(struct inode *, ufs_lbn_t, int, ufs1_daddr_t *); ufs2_daddr_t ffs_blkpref_ufs2(struct inode *, ufs_lbn_t, int, ufs2_daddr_t *); -void ffs_blkrelease_finish(struct ufsmount *, u_long); -u_long ffs_blkrelease_start(struct ufsmount *, struct vnode *, ino_t); +void ffs_blkrelease_finish(struct ufsmount *, uint64_t); +uint64_t ffs_blkrelease_start(struct ufsmount *, struct vnode *, ino_t); uint32_t ffs_calc_sbhash(struct fs *); int ffs_checkfreefile(struct fs *, struct vnode *, ino_t); -void ffs_clrblock(struct fs *, u_char *, ufs1_daddr_t); +void ffs_clrblock(struct fs *, uint8_t *, ufs1_daddr_t); void ffs_clusteracct(struct fs *, struct cg *, ufs1_daddr_t, int); void ffs_bdflush(struct bufobj *, struct buf *); int ffs_copyonwrite(struct vnode *, struct buf *); @@ -78,12 +79,12 @@ void ffs_fragacct(struct fs *, int, int32_t [], int); int ffs_freefile(struct ufsmount *, struct fs *, struct vnode *, ino_t, int, struct workhead *); void ffs_fserr(struct fs *, ino_t, char *); -int ffs_getcg(struct fs *, struct vnode *, u_int, int, struct buf **, +int ffs_getcg(struct fs *, struct vnode *, uint64_t, int, struct buf **, struct cg **); -int ffs_inotovp(struct mount *, ino_t, u_int64_t, int, struct vnode **, +int ffs_inotovp(struct mount *, ino_t, uint64_t, int, struct vnode **, int); -int ffs_isblock(struct fs *, u_char *, ufs1_daddr_t); -int ffs_isfreeblock(struct fs *, u_char *, ufs1_daddr_t); +int ffs_isblock(struct fs *, uint8_t *, ufs1_daddr_t); +int ffs_isfreeblock(struct fs *, uint8_t *, ufs1_daddr_t); void ffs_oldfscompat_write(struct fs *, struct ufsmount *); int ffs_own_mount(const struct mount *mp); int ffs_reallocblks(struct vop_reallocblks_args *); @@ -95,7 +96,7 @@ int ffs_sbget(void *, struct fs **, off_t, struct malloc_type *, int ffs_sbput(void *, struct fs *, off_t, int (*)(void *, off_t, void *, int)); int ffs_sbupdate(struct ufsmount *, int, int); -void ffs_setblock(struct fs *, u_char *, ufs1_daddr_t); +void ffs_setblock(struct fs *, uint8_t *, ufs1_daddr_t); int ffs_snapblkfree(struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t, enum vtype, struct workhead *); void ffs_snapremove(struct vnode *vp); diff --git a/sys/ufs/ffs/ffs_inode.c b/sys/ufs/ffs/ffs_inode.c index d9d4f3c4a155..f54c1d57152e 100644 --- a/sys/ufs/ffs/ffs_inode.c +++ b/sys/ufs/ffs/ffs_inode.c @@ -250,7 +250,7 @@ ffs_truncate(struct vnode *vp, int needextclean, extblocks; int offset, size, level, nblocks; int i, error, allerror, indiroff, waitforupdate; - u_long key; + uint64_t key; off_t osize; ip = VTOI(vp); @@ -339,7 +339,7 @@ ffs_truncate(struct vnode *vp, if (length != 0) panic("ffs_truncate: partial truncate of symlink"); #endif - bzero(DIP(ip, i_shortlink), (u_int)ip->i_size); + bzero(DIP(ip, i_shortlink), (uint64_t)ip->i_size); ip->i_size = 0; DIP_SET(ip, i_size, 0); UFS_INODE_SET_FLAG(ip, IN_SIZEMOD | IN_CHANGE | IN_UPDATE); @@ -501,7 +501,7 @@ ffs_truncate(struct vnode *vp, size = blksize(fs, ip, lbn); if (vp->v_type != VDIR && offset != 0) bzero((char *)bp->b_data + offset, - (u_int)(size - offset)); + (uint64_t)(size - offset)); /* Kirk's code has reallocbuf(bp, size, 1) here */ allocbuf(bp, size); if (bp->b_bufsize == fs->fs_bsize) @@ -704,7 +704,7 @@ ffs_indirtrunc(struct inode *ip, struct ufsmount *ump; struct vnode *vp; caddr_t copy = NULL; - u_long key; + uint64_t key; int i, nblocks, error = 0, allerror = 0; ufs2_daddr_t nb, nlbn, last; ufs2_daddr_t blkcount, factor, blocksreleased = 0; @@ -747,7 +747,7 @@ ffs_indirtrunc(struct inode *ip, bap2 = (ufs2_daddr_t *)bp->b_data; if (lastbn != -1) { copy = malloc(fs->fs_bsize, M_TEMP, M_WAITOK); - bcopy((caddr_t)bp->b_data, copy, (u_int)fs->fs_bsize); + bcopy((caddr_t)bp->b_data, copy, (uint64_t)fs->fs_bsize); for (i = last + 1; i < NINDIR(fs); i++) if (I_IS_UFS1(ip)) bap1[i] = 0; diff --git a/sys/ufs/ffs/ffs_rawread.c b/sys/ufs/ffs/ffs_rawread.c index 2c1e6bf2b8d2..3def0784a15e 100644 --- a/sys/ufs/ffs/ffs_rawread.c +++ b/sys/ufs/ffs/ffs_rawread.c @@ -192,7 +192,7 @@ ffs_rawread_readahead(struct vnode *vp, struct buf *bp) { int error; - u_int iolen; + uint64_t iolen; off_t blockno; int blockoff; int bsize; @@ -264,7 +264,7 @@ ffs_rawread_main(struct vnode *vp, { int error, nerror; struct buf *bp, *nbp, *tbp; - u_int iolen; + uint64_t iolen; caddr_t udata; long resid; off_t offset; diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 907ccb9558be..b606c64241e3 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -376,7 +376,7 @@ restart: * touch up the few cylinder groups that changed during * the suspension period. */ - len = roundup2(howmany(fs->fs_ncg, NBBY), sizeof(int)); + len = roundup2(howmany(fs->fs_ncg, NBBY), sizeof(uint64_t)); space = malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); UFS_LOCK(ump); fs->fs_active = space; @@ -467,7 +467,7 @@ restart: * Grab a copy of the superblock and its summary information. * We delay writing it until the suspension is released below. */ - copy_fs = malloc((u_long)fs->fs_bsize, M_UFSMNT, M_WAITOK); + copy_fs = malloc((uint64_t)fs->fs_bsize, M_UFSMNT, M_WAITOK); bcopy(fs, copy_fs, fs->fs_sbsize); copy_fs->fs_si = malloc(sizeof(struct fs_summary_info), M_UFSMNT, M_ZERO | M_WAITOK); @@ -480,7 +480,7 @@ restart: size = blkroundup(fs, fs->fs_cssize); if (fs->fs_contigsumsize > 0) size += fs->fs_ncg * sizeof(int32_t); - space = malloc((u_long)size, M_UFSMNT, M_WAITOK); + space = malloc((uint64_t)size, M_UFSMNT, M_WAITOK); copy_fs->fs_csp = space; bcopy(fs->fs_csp, copy_fs->fs_csp, fs->fs_cssize); space = (char *)space + fs->fs_cssize; @@ -493,7 +493,7 @@ restart: brelse(bp); goto resumefs; } - bcopy(bp->b_data, space, (u_int)len); + bcopy(bp->b_data, space, (uint64_t)len); space = (char *)space + len; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); @@ -829,7 +829,7 @@ resumefs: loc = blkoff(fs, fs->fs_sblockloc); copy_fs->fs_fmod = 0; bpfs = (struct fs *)&nbp->b_data[loc]; - bcopy((caddr_t)copy_fs, (caddr_t)bpfs, (u_int)fs->fs_sbsize); + bcopy((caddr_t)copy_fs, (caddr_t)bpfs, (uint64_t)fs->fs_sbsize); ffs_oldfscompat_write(bpfs, ump); bpfs->fs_ckhash = ffs_calc_sbhash(bpfs); bawrite(nbp); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 75dd5d7e5a5a..6ac3f92fb330 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -831,7 +831,7 @@ static void cancel_allocdirect(struct allocdirectlst *, struct allocdirect *, struct freeblks *); static int check_inode_unwritten(struct inodedep *); static int free_inodedep(struct inodedep *); -static void freework_freeblock(struct freework *, u_long); +static void freework_freeblock(struct freework *, uint64_t); static void freework_enqueue(struct freework *); static int handle_workitem_freeblocks(struct freeblks *, int); static int handle_complete_freeblocks(struct freeblks *, int); @@ -846,7 +846,7 @@ static struct allocindir *newallocindir(struct inode *, int, ufs2_daddr_t, ufs2_daddr_t, ufs_lbn_t); static void handle_workitem_freefrag(struct freefrag *); static struct freefrag *newfreefrag(struct inode *, ufs2_daddr_t, long, - ufs_lbn_t, u_long); + ufs_lbn_t, uint64_t); static void allocdirect_merge(struct allocdirectlst *, struct allocdirect *, struct allocdirect *); static struct freefrag *allocindir_merge(struct allocindir *, @@ -1568,7 +1568,7 @@ worklist_speedup(struct mount *mp) static void softdep_send_speedup(struct ufsmount *ump, off_t shortage, - u_int flags) + uint64_t flags) { struct buf *bp; @@ -2585,7 +2585,7 @@ softdep_mount(struct vnode *devvp, struct ufsmount *ump; struct cg *cgp; struct buf *bp; - u_int cyl, i; + uint64_t cyl, i; int error; ump = VFSTOUFS(mp); @@ -2750,8 +2750,8 @@ softdep_unmount(struct mount *mp) #ifdef INVARIANTS for (int i = 0; i <= D_LAST; i++) { KASSERT(ums->sd_curdeps[i] == 0, - ("Unmount %s: Dep type %s != 0 (%ld)", ump->um_fs->fs_fsmnt, - TYPENAME(i), ums->sd_curdeps[i])); + ("Unmount %s: Dep type %s != 0 (%jd)", ump->um_fs->fs_fsmnt, + TYPENAME(i), (intmax_t)ums->sd_curdeps[i])); KASSERT(LIST_EMPTY(&ums->sd_alldeps[i]), ("Unmount %s: Dep type %s not empty (%p)", ump->um_fs->fs_fsmnt, @@ -5795,7 +5795,7 @@ newfreefrag(struct inode *ip, ufs2_daddr_t blkno, long size, ufs_lbn_t lbn, - u_long key) + uint64_t key) { struct freefrag *freefrag; struct ufsmount *ump; @@ -7954,7 +7954,7 @@ free_inodedep(struct inodedep *inodedep) * in memory immediately. */ static void -freework_freeblock(struct freework *freework, u_long key) +freework_freeblock(struct freework *freework, uint64_t key) { struct freeblks *freeblks; struct jnewblk *jnewblk; @@ -8118,7 +8118,7 @@ handle_workitem_freeblocks(struct freeblks *freeblks, int flags) struct allocindir *aip; struct ufsmount *ump; struct worklist *wk; - u_long key; + uint64_t key; KASSERT(LIST_EMPTY(&freeblks->fb_jblkdephd), ("handle_workitem_freeblocks: Journal entries not written.")); @@ -8306,7 +8306,7 @@ indir_trunc(struct freework *freework, ufs1_daddr_t *bap1; ufs2_daddr_t nb, nnb, *bap2; ufs_lbn_t lbnadd, nlbn; - u_long key; + uint64_t key; int nblocks, ufs1fmt, freedblocks; int goingaway, freedeps, needj, level, cnt, i, error; @@ -9924,7 +9924,7 @@ clear_unlinked_inodedep( struct inodedep *inodedep) * that is in the list. */ if (pino == 0) { - bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize); + bcopy((caddr_t)fs, bp->b_data, (uint64_t)fs->fs_sbsize); bpfs = (struct fs *)bp->b_data; ffs_oldfscompat_write(bpfs, ump); softdep_setup_sbupdate(ump, bpfs, bp); @@ -9956,7 +9956,7 @@ clear_unlinked_inodedep( struct inodedep *inodedep) FREE_LOCK(ump); bp = getblk(ump->um_devvp, btodb(fs->fs_sblockloc), (int)fs->fs_sbsize, 0, 0, 0); - bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize); + bcopy((caddr_t)fs, bp->b_data, (uint64_t)fs->fs_sbsize); bpfs = (struct fs *)bp->b_data; ffs_oldfscompat_write(bpfs, ump); softdep_setup_sbupdate(ump, bpfs, bp); @@ -14781,11 +14781,11 @@ worklist_print(struct worklist *wk, int verbose) if (!verbose) { db_printf("%s: %p state 0x%b\n", TYPENAME(wk->wk_type), wk, - (u_int)wk->wk_state, PRINT_SOFTDEP_FLAGS); + wk->wk_state, PRINT_SOFTDEP_FLAGS); return; } db_printf("worklist: %p type %s state 0x%b next %p\n ", wk, - TYPENAME(wk->wk_type), (u_int)wk->wk_state, PRINT_SOFTDEP_FLAGS, + TYPENAME(wk->wk_type), wk->wk_state, PRINT_SOFTDEP_FLAGS, LIST_NEXT(wk, wk_list)); db_print_ffs(VFSTOUFS(wk->wk_mp)); } diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 813736c9d070..ca90f915c9e4 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -201,7 +201,7 @@ ffs_sbget(void *devfd, struct fs **fsp, off_t altsblock, blks = howmany(size, fs->fs_fsize); if (fs->fs_contigsumsize > 0) size += fs->fs_ncg * sizeof(int32_t); - size += fs->fs_ncg * sizeof(u_int8_t); + size += fs->fs_ncg * sizeof(uint8_t); /* When running in libufs or libsa, UFS_MALLOC may fail */ if ((fs_si = UFS_MALLOC(sizeof(*fs_si), filltype, M_WAITOK)) == NULL) { UFS_FREE(fs, filltype); @@ -240,8 +240,8 @@ ffs_sbget(void *devfd, struct fs **fsp, off_t altsblock, *lp++ = fs->fs_contigsumsize; space = (uint8_t *)lp; } - size = fs->fs_ncg * sizeof(u_int8_t); - fs->fs_contigdirs = (u_int8_t *)space; + size = fs->fs_ncg * sizeof(uint8_t); + fs->fs_contigdirs = (uint8_t *)space; bzero(fs->fs_contigdirs, size); *fsp = fs; return (0); @@ -362,8 +362,8 @@ SYSCTL_INT(_vfs_ffs, OID_AUTO, prtsberrmsg, CTLFLAG_RWTUN, &prtmsg, 0, static int validate_sblock(struct fs *fs, int isaltsblk) { - u_long i, sectorsize; - u_int64_t maxfilesize, sizepb; + uint64_t i, sectorsize; + uint64_t maxfilesize, sizepb; int error; error = 0; @@ -421,14 +421,14 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_fpg, <, 3 * fs->fs_frag, %jd); CHK(fs->fs_ncg, <, 1, %jd); CHK(fs->fs_ipg, <, fs->fs_inopb, %jd); - CHK((u_int64_t)fs->fs_ipg * fs->fs_ncg, >, + CHK((uint64_t)fs->fs_ipg * fs->fs_ncg, >, (((int64_t)(1)) << 32) - INOPB(fs), %jd); CHK(fs->fs_cstotal.cs_nifree, <, 0, %jd); - CHK(fs->fs_cstotal.cs_nifree, >, (u_int64_t)fs->fs_ipg * fs->fs_ncg, + CHK(fs->fs_cstotal.cs_nifree, >, (uint64_t)fs->fs_ipg * fs->fs_ncg, %jd); CHK(fs->fs_cstotal.cs_ndir, <, 0, %jd); CHK(fs->fs_cstotal.cs_ndir, >, - ((u_int64_t)fs->fs_ipg * fs->fs_ncg) - fs->fs_cstotal.cs_nifree, + ((uint64_t)fs->fs_ipg * fs->fs_ncg) - fs->fs_cstotal.cs_nifree, %jd); CHK(fs->fs_sbsize, >, SBLOCKSIZE, %jd); CHK(fs->fs_sbsize, <, (unsigned)sizeof(struct fs), %jd); @@ -694,7 +694,7 @@ ffs_isblock(struct fs *fs, unsigned char *cp, ufs1_daddr_t h) * check if a block is free */ int -ffs_isfreeblock(struct fs *fs, u_char *cp, ufs1_daddr_t h) +ffs_isfreeblock(struct fs *fs, uint8_t *cp, ufs1_daddr_t h) { switch ((int)fs->fs_frag) { @@ -719,7 +719,7 @@ ffs_isfreeblock(struct fs *fs, u_char *cp, ufs1_daddr_t h) * take a block out of the map */ void -ffs_clrblock(struct fs *fs, u_char *cp, ufs1_daddr_t h) +ffs_clrblock(struct fs *fs, uint8_t *cp, ufs1_daddr_t h) { switch ((int)fs->fs_frag) { @@ -781,9 +781,9 @@ ffs_clusteracct(struct fs *fs, struct cg *cgp, ufs1_daddr_t blkno, int cnt) { int32_t *sump; int32_t *lp; - u_char *freemapp, *mapp; + uint8_t *freemapp, *mapp; int i, start, end, forw, back, map; - u_int bit; + uint64_t bit; if (fs->fs_contigsumsize <= 0) return; diff --git a/sys/ufs/ffs/ffs_tables.c b/sys/ufs/ffs/ffs_tables.c index cb00db256e9b..2a91e292b461 100644 --- a/sys/ufs/ffs/ffs_tables.c +++ b/sys/ufs/ffs/ffs_tables.c @@ -62,7 +62,7 @@ int inside[9] = { * These tables are used by the scanc instruction on the VAX to * quickly find an appropriate fragment. */ -static u_char fragtbl124[256] = { +static uint8_t fragtbl124[256] = { 0x00, 0x16, 0x16, 0x2a, 0x16, 0x16, 0x26, 0x4e, 0x16, 0x16, 0x16, 0x3e, 0x2a, 0x3e, 0x4e, 0x8a, 0x16, 0x16, 0x16, 0x3e, 0x16, 0x16, 0x36, 0x5e, @@ -97,7 +97,7 @@ static u_char fragtbl124[256] = { 0x9e, 0x9e, 0x9e, 0xbe, 0xaa, 0xbe, 0xce, 0x8a, }; -static u_char fragtbl8[256] = { +static uint8_t fragtbl8[256] = { 0x00, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x03, 0x04, 0x08, 0x01, 0x01, 0x01, 0x03, 0x01, 0x01, 0x03, 0x05, @@ -135,6 +135,6 @@ static u_char fragtbl8[256] = { /* * The actual fragtbl array. */ -u_char *fragtbl[MAXFRAG + 1] = { +uint8_t *fragtbl[MAXFRAG + 1] = { 0, fragtbl124, fragtbl124, 0, fragtbl124, 0, 0, 0, fragtbl8, }; diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 8e719516b9ce..e77d5e336bf1 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -786,7 +786,7 @@ ffs_reload(struct mount *mp, int flags) struct ufsmount *ump; ufs2_daddr_t sblockloc; int i, blks, error; - u_long size; + uint64_t size; int32_t *lp; ump = VFSTOUFS(mp); @@ -830,7 +830,7 @@ ffs_reload(struct mount *mp, int flags) newfs->fs_si = fs->fs_si; newfs->fs_ronly = fs->fs_ronly; sblockloc = fs->fs_sblockloc; - bcopy(newfs, fs, (u_int)fs->fs_sbsize); + bcopy(newfs, fs, (uint64_t)fs->fs_sbsize); brelse(bp); ump->um_maxsymlinklen = fs->fs_maxsymlinklen; ffs_oldfscompat_read(fs, VFSTOUFS(mp), sblockloc); @@ -851,7 +851,7 @@ ffs_reload(struct mount *mp, int flags) blks = howmany(size, fs->fs_fsize); if (fs->fs_contigsumsize > 0) size += fs->fs_ncg * sizeof(int32_t); - size += fs->fs_ncg * sizeof(u_int8_t); + size += fs->fs_ncg * sizeof(uint8_t); free(fs->fs_csp, M_UFSMNT); space = malloc(size, M_UFSMNT, M_WAITOK); fs->fs_csp = space; @@ -863,7 +863,7 @@ ffs_reload(struct mount *mp, int flags) NOCRED, &bp); if (error) return (error); - bcopy(bp->b_data, space, (u_int)size); + bcopy(bp->b_data, space, (uint64_t)size); space = (char *)space + size; brelse(bp); } @@ -876,8 +876,8 @@ ffs_reload(struct mount *mp, int flags) *lp++ = fs->fs_contigsumsize; space = lp; } - size = fs->fs_ncg * sizeof(u_int8_t); - fs->fs_contigdirs = (u_int8_t *)space; + size = fs->fs_ncg * sizeof(uint8_t); + fs->fs_contigdirs = (uint8_t *)space; bzero(fs->fs_contigdirs, size); if ((flags & FFSR_UNSUSPEND) != 0) { MNT_ILOCK(mp); @@ -1034,7 +1034,7 @@ ffs_mountfs(struct vnode *odevvp, struct mount *mp, struct thread *td) * Get journal provider name. */ len = 1024; - mp->mnt_gjprovider = malloc((u_long)len, M_UFSMNT, M_WAITOK); + mp->mnt_gjprovider = malloc((uint64_t)len, M_UFSMNT, M_WAITOK); if (g_io_getattr("GJOURNAL::provider", cp, &len, mp->mnt_gjprovider) == 0) { mp->mnt_gjprovider = realloc(mp->mnt_gjprovider, len, @@ -2070,7 +2070,7 @@ ffs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) int ffs_inotovp(struct mount *mp, ino_t ino, - u_int64_t gen, *** 1043 LINES SKIPPED *** From nobody Sun Aug 6 06:10:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJTbQ4pvNz4mTVs; Sun, 6 Aug 2023 06:10: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 4RJTbQ4Dlfz4crB; Sun, 6 Aug 2023 06:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691302258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ws1hV432CGvrtgI80ORrwyAt0ktd6tmY8Eu3rQjr98=; b=mp6eGK/rIScJ8IbRnFVIOiv7y9p4jL4lMrEOx8qORexh1ATqUwHnhB/oUEDOuvIp6KHNsC WMyLqWTBGX5rYhufHs2/HSXgTCcNu+PIoNQ5Wbg0GwFIRTtM55pALinHkqqzm/yReuTA9i g98t6gqCo0lXPHLWLigucPtInULF8MJztYm65IdrU5sJe4SKMRxUk4K82UD/ZQuwbTcNX9 6ndOJdpQ0CCC8Y8caR26efpLR84bSk+YeaPUIfBEoMb006uW1XT/kOFtkYpWib3zlMs9X6 9i9yqt2gicY74ozFfyd/DYm0lSd7zR8newBfnrWfBjcZbjO1Ca6B/PuooFAWQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691302258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ws1hV432CGvrtgI80ORrwyAt0ktd6tmY8Eu3rQjr98=; b=O1Ajce3fn2BIi/yuCZuqr0VTQWl6s6XgQp7z6br07bP8sTHk7cDatXmMYnBls0/Kd9ZXQJ vCAes/r0b47kPRC83ZGTU1Q3VUGwlDaT/n5AKqWeOehv7AKrBIDrzcYA2ShjvkFRQ/QqgU zj9WmgNPQkcJjPDPooZ44aZHxC32uOPhCYN7jaW/sIWgxYzf9m2bUsaLORF4XkqOn1KE0l eFFeQEJvS64dV/v0HVOGUP0Q1V5+hIxqzZ9LaB8kPJiR4xX2OyGSzxqRhuLlhDLYGiWRf8 nhe1/cDhar3w/KhZgBiYPpuVkn6A/wINUHFNcCQ4UQZG9de72AgmSYhzxIw1cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691302258; a=rsa-sha256; cv=none; b=Qo5TCTzOd8yBAiInburZmlaV9CEpFSoA2wBn8ZzKvZg5yL8JuMQfdPjY7HSotRUhjv6VzE J6GyYtxbqh7fyKWjSntfrBMfinQE5wxtd6b3QvcE9dcarffk+Ua0dYqzIJBjCrPUApIWqR XE43oc78DDCVoEbvST7nZMdO35tEIlbsdmvibZut/HUAg1RLzXZR2560W9OevwXPhK6Oqf k+zZtFt1C9ikyy0vz88+iuRGD2Qil6rbD+zQNa0kBEW0Er/geEioEHf+ihizQs6be+OSj5 qu5jpbbjGqbUzVs3aYmLiZGB7vgaveGcj6d46F1hC0PhYayS+FqGmGSeV60+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJTbQ3J4mz10Yx; Sun, 6 Aug 2023 06:10: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 3766Awme003310; Sun, 6 Aug 2023 06:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3766AwNn003309; Sun, 6 Aug 2023 06:10:58 GMT (envelope-from git) Date: Sun, 6 Aug 2023 06:10:58 GMT Message-Id: <202308060610.3766AwNn003309@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: 02b7bf07c5d2 - main - Improve dumpfs(8) error messages when a cylinder group read fails. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02b7bf07c5d2ec578fc044b60229c6e951f26087 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=02b7bf07c5d2ec578fc044b60229c6e951f26087 commit 02b7bf07c5d2ec578fc044b60229c6e951f26087 Author: Kirk McKusick AuthorDate: 2023-08-06 06:09:18 +0000 Commit: Kirk McKusick CommitDate: 2023-08-06 06:10:15 +0000 Improve dumpfs(8) error messages when a cylinder group read fails. Previously dumpfs(8) exited when a cylinder group read failed (such as a cylinder-group check-hash failure). Now an error message indicating the cylinder group number and the type of failure is printed and the output continues for the remaining cylinder groups. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sbin/dumpfs/dumpfs.c | 58 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index a0767c39e6bf..739f281feb7f 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -74,6 +74,7 @@ static const char rcsid[] = #include #include #include +#include #include #define afs disk.d_fs @@ -89,7 +90,7 @@ static void dumpfreespacecg(int); static int marshal(const char *); static void pbits(void *, int); static void pblklist(void *, int, off_t, int); -static void ufserr(const char *); +static const char *ufserr(void); static void usage(void) __dead2; int @@ -132,7 +133,7 @@ main(int argc, char *argv[]) while ((name = *argv++) != NULL) { if (ufs_disk_fillout_blank(&disk, name) == -1 || sbfind(&disk, 0) == -1) { - ufserr(name); + printf("\n%s: %s\n", name, ufserr()); eval |= 1; continue; } @@ -163,7 +164,7 @@ dumpfs(const char *name, int dosb) time_t fstime, fsmtime; int64_t fssize; int32_t fsflags; - int i; + int i, ret; switch (disk.d_ufs) { case 2: @@ -188,7 +189,8 @@ dumpfs(const char *name, int dosb) afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n", afs.fs_bsize, afs.fs_bshift, afs.fs_bmask); @@ -243,7 +245,8 @@ dumpfs(const char *name, int dosb) afs.fs_old_nsect, afs.fs_old_npsect, afs.fs_old_spc); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("old_cpg\t%d\tsize_cg\t%zu\tCGSIZE\t%zu\n", afs.fs_old_cpg, sizeof(struct cg), CGSIZE(&afs)); @@ -329,14 +332,15 @@ dumpfs(const char *name, int dosb) } if (dosb) return (0); + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1 || dumpcg()) - goto err; + if (i == -1) { + ret = 1; + printf("\ncg %d: %s\n", disk.d_lcg, ufserr()); + } else if (dumpcg()) + ret = 1; } - return (0); - -err: ufserr(name); - return (1); + return (ret); } static int @@ -402,17 +406,22 @@ dumpcg(void) static int dumpfreespace(const char *name, int fflag) { - int i; + intmax_t startblkno; + int i, ret; + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1) - goto err; - dumpfreespacecg(fflag); + if (i != -1) { + dumpfreespacecg(fflag); + } else { + startblkno = disk.d_lcg * afs.fs_fpg; + printf("\nBlocks %jd-%jd of cg %d skipped: %s\n", + startblkno, startblkno + afs.fs_fpg - 1, + disk.d_lcg, ufserr()); + ret = 1; + } } - return (0); -err: - ufserr(name); - return (1); + return (ret); } static void @@ -521,13 +530,14 @@ pblklist(void *vp, int max, off_t offset, int fflag) } } -static void -ufserr(const char *name) +static const char * +ufserr(void) { if (disk.d_error != NULL) - warnx("%s: %s", name, disk.d_error); - else if (errno) - warn("%s", name); + return(disk.d_error); + if (errno) + return (strerror(errno)); + return ("unknown error"); } static void From nobody Sun Aug 6 06:40:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJVG048Fzz4mWWJ; Sun, 6 Aug 2023 06:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJVG02mQ6z3Cp5; Sun, 6 Aug 2023 06:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691304056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8TnBm5SYV04BhdhzOrpBCNxHliFKc0W3KbOqATeFaos=; b=fb6IGaZWBfFzzEqggFheLN2I1spAl+T9VH+P5GnyQjsFWp82xIE9Ls/zvRhImZp9DkxoOu CRGkl8W7cfW0Z6Z+9eZvcCKEPc7BD+Z0yrxacH/SF65QiBYd3DyIvw+DNeA2AyNbaLI1JX Q94Z0k6PeiN7+e+xsQtTopOE7FOe+my/xJLGOe4tXJQOMehtioN7QyCPCsire22zMIO2Na 6GyLI11Ca8J4CPkh2HNNtrNNm7SfWSt6yelKWhB//52H1He1DksjsnUViaXFanRK1V0g5u g80P6oDfLGMaiUNLzvFFCZGpLgicLbQ4DaSpjGJrM1zHfw44nXJ15k8yhppamA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691304056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8TnBm5SYV04BhdhzOrpBCNxHliFKc0W3KbOqATeFaos=; b=cuZEghta89TWMt/TNW3WAIscPopf5VGOg69lJQbF2NNhtELxesCecL8CaHOF2sMEDTuZI9 v6Drm5K0wSL8TZdz+TeDymhcO4jioaCogIQWds8U/9xuhFAx3r7iYSVrzU88Nv4BWyfDjd u+CvQKKq+IYyRSZNPVprCq+X6lPRmrnPi7bV5sIiZb/lFwFMN+0gdaSm5+IxforllbD7P1 NAZshMuZRXdk9nweqHXA3I1v8L12C6qSbA2mghzLa9fvwM3K5p+RTRijwa3YzTkEki0PDC oSVMpjCaLjimu+urbyPRbWTBOyg8C6YBfN+9TfAuxft1IS3Wa3jzXsgFODAQzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691304056; a=rsa-sha256; cv=none; b=hu0SPMIaUtbFCJVV1i3pS5PxI6L563qrdOwoJM7vQH2UWvnYZRLnTjxwH+Lry6xZBhDtnw NJOiW0uDOnepMGnlUmEmBqim4aMdwXYNSEExVIxfs1IqDpkpVZqh1uwllDRdbcXABQRZkK Dd5AhSX6d/cEvyr8jjkAGTqI+FCC9r1V1CxfdhmLz89dDSjeHp4Gni4c56Ss7y+9qSdA25 64FmO4rYtk4e9z5QlTJMZ4Z5wRgmyWKPTL/DewVY/XRwuY5xx9RxCKHJz2zdmpbqPL9Cq3 TxvkaWdtj3vkjeLDYJcYfLnDtsBzwN/GpJg577XcFY4z0LXZAloNxOPwBBmOVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJVG01sY9z118k; Sun, 6 Aug 2023 06:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3766eugo051828; Sun, 6 Aug 2023 06:40:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3766euFA051827; Sun, 6 Aug 2023 06:40:56 GMT (envelope-from git) Date: Sun, 6 Aug 2023 06:40:56 GMT Message-Id: <202308060640.3766euFA051827@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: 4ce2a2db41f9 - main - Update newfs(8) and tunefs(8) manual pages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ce2a2db41f9a18cdcec088b330899a8d830c2be Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=4ce2a2db41f9a18cdcec088b330899a8d830c2be commit 4ce2a2db41f9a18cdcec088b330899a8d830c2be Author: Kirk McKusick AuthorDate: 2023-08-06 06:40:26 +0000 Commit: Kirk McKusick CommitDate: 2023-08-06 06:40:26 +0000 Update newfs(8) and tunefs(8) manual pages. Delete note that UFS/FFS filesystems running with journaled soft updates cannot run background fsck as 344b5bf made it possible to do so. MFC-with: 344b5bf Sponsored-by: The FreeBSD Foundation --- sbin/newfs/newfs.8 | 3 --- sbin/tunefs/tunefs.8 | 3 --- 2 files changed, 6 deletions(-) diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8 index 9421971a74f5..21d5a64d3b26 100644 --- a/sbin/newfs/newfs.8 +++ b/sbin/newfs/newfs.8 @@ -204,9 +204,6 @@ will be about half of normal during the time that the background is running. Running a full fsck on a UFS filesystem is the equivalent of running a scrub on a ZFS filesystem. -.Pp -Presently it is not possible -to run background fsck on filesystems enabled for journaling. .It Fl k Ar held-for-metadata-blocks Set the amount of space to be held for metadata blocks in each cylinder group. When set, the file system preference routines will try to save diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8 index 0264c3e5f772..95adac48b8b2 100644 --- a/sbin/tunefs/tunefs.8 +++ b/sbin/tunefs/tunefs.8 @@ -130,9 +130,6 @@ will be about half of normal during the time that the background is running. Running a full fsck on a UFS filesystem is the equivalent of running a scrub on a ZFS filesystem. -.Pp -Presently it is not possible -to run background fsck on filesystems enabled for journaling. .It Fl J Cm enable | disable Turn on/off gjournal flag. .It Fl k Ar held-for-metadata-blocks From nobody Sun Aug 6 11:51:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJd8Z3vbsz4pvcW; Sun, 6 Aug 2023 11:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJd8Z3SKvz4KMy; Sun, 6 Aug 2023 11:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691322702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S84WP+xYkYbICvG/s+AI+z8S4f8EWPh82v2qeCeGnBE=; b=ve0yzKkaP2dneeiYxjDHtxT212tSJNQTeR9mMNKYQ2FrmFQZy6nBL550bt8FGmDhpWOivL m+5eaMG6LQWIRJxuKE6Q2ou8vFIvgitW8dC4U3m0VYJKdBdvn5J6rgGvjL+P/UJyJVrAPk 1udyqb6VfsLHU640fLUJstZrMPhxldwK0kQrb3zVTJQ+Fp3+MQIs8Wbr4a5d9ZWpzK8P1Y ALnF8oyLwEWNy529tfie+JtRCjh3kHl9xz2MdvlrS8v0T82qTzKylYwW4/Yk8DdC/EEPO8 2prLMfwVLkidVKb3LoQhHz1s7t4Ds40qVeCmK596u396qJy39/xoK4MR9Rd9Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691322702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S84WP+xYkYbICvG/s+AI+z8S4f8EWPh82v2qeCeGnBE=; b=UNfhRESTS5KaXNO1lQ858FXzIokAttMfPtMVPOjfQ8WVttpe7NGiWQ76K8Ely9g9vp1lm8 RazOv5Be+bBZY9RZPFUHBZQmMU3WWgjnqSwGV8LGssvEeGtye6qEbVXQjDhzy/0aNEtFZZ apo40Q3sqmuAsSJcTx3z4qa31/ZnOdhm4JLWLZo6/4p11t5JDT8YASBvsg40F+jv24hALN JfpJ33+WfQJKJ4G+gF4aSM1GKWZv0L0VZqm2YO+bVZv9k0yROy9qe/dg6RkhKjUZOC76qV iLdrMlOXH6KmCxDvLOysortZQybTjZufofyEXcssK2v/Z2PvhPCmnuRtqLwJ9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691322702; a=rsa-sha256; cv=none; b=aHJaFZCa+wdh6CsJejrPipoyT7aqMFqJd1toEh9dTxsn3ZmrQRyV9o6dzc1YvdHCkRxaNY UG+czpvrTgMJe4dkP6NwQRMkIvL2WKqei/ttbi1mRSMF0IXT7WpSaEf1THx5BUJnSgUdpj rb3T/uj5vTO1Y+O/B7z59sWxHkQiFWJQryo+DmmHaGooOYc4VUA2gfJnly02incFwAwrq/ nCewWHLThdc+2aGmCxaQv5cWvHZJ5YFE2SzemCfjy/LyPm+LY6rwu3GNw83htNUAVy/FFL K+XDq9SJA1nAzyG96+kLd8RhOezg9lvInONwmGO8OJ4rkF2NUYzDrll+3r+aNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJd8Z2Vt8z188h; Sun, 6 Aug 2023 11:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376Bpg4B072297; Sun, 6 Aug 2023 11:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Bpgah072296; Sun, 6 Aug 2023 11:51:42 GMT (envelope-from git) Date: Sun, 6 Aug 2023 11:51:42 GMT Message-Id: <202308061151.376Bpgah072296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 12f5f1147781 - main - hidraw(4): Fix ioctl names in man page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12f5f1147781686dda8b50058ba6219d19839895 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=12f5f1147781686dda8b50058ba6219d19839895 commit 12f5f1147781686dda8b50058ba6219d19839895 Author: Vladimir Kondratyev AuthorDate: 2023-08-06 11:51:08 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-06 11:51:08 +0000 hidraw(4): Fix ioctl names in man page. --- share/man/man4/hidraw.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man4/hidraw.4 b/share/man/man4/hidraw.4 index c01b961e738d..60398c234fb2 100644 --- a/share/man/man4/hidraw.4 +++ b/share/man/man4/hidraw.4 @@ -65,9 +65,9 @@ calls: .Xr uhid 4 \-compatible calls: .Bl -tag -width indent -.It Dv HID_GET_REPORT_ID Pq Vt int +.It Dv HIDRAW_GET_REPORT_ID Pq Vt int Get the report identifier used by this HID report. -.It Dv HID_GET_REPORT_DESC Pq Vt "struct hidraw_gen_descriptor" +.It Dv HIDRAW_GET_REPORT_DESC Pq Vt "struct hidraw_gen_descriptor" Get the HID report descriptor. Copies a maximum of .Va hgd_maxlen @@ -91,7 +91,7 @@ struct hidraw_gen_descriptor { ... }; .Ed -.It Dv HID_SET_IMMED Pq Vt int +.It Dv HIDRAW_SET_IMMED Pq Vt int Sets the device in a mode where each .Xr read 2 will return the current value of the input report. @@ -102,7 +102,7 @@ will only return the data that the device reports on its interrupt pipe. This call may fail if the device does not support this feature. -.It Dv HID_GET_REPORT Pq Vt "struct hidraw_gen_descriptor" +.It Dv HIDRAW_GET_REPORT Pq Vt "struct hidraw_gen_descriptor" Get a report from the device without waiting for data on the interrupt pipe. Copies a maximum of @@ -126,7 +126,7 @@ The report data begins from the second byte. For devices which do not use numbered reports, the report data begins at the first byte. This call may fail if the device does not support this feature. -.It Dv HID_SET_REPORT Pq Vt "struct hidraw_gen_descriptor" +.It Dv HIDRAW_SET_REPORT Pq Vt "struct hidraw_gen_descriptor" Set a report in the device. The .Va hgd_report_type From nobody Sun Aug 6 11:51:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJd8b5ZSrz4pvZq; Sun, 6 Aug 2023 11:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJd8b4yn6z4KYH; Sun, 6 Aug 2023 11:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691322703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t96WrtvMoyNR/p5PfjjemV6ehR8sNUD0YJXQjo1yS1s=; b=bQ8VEpd9I9ZegZ/xm1qK8Lh6Rc/PTqvYzcHbqV89KSNJi47h/kYr2H9OBoYeii01a6gr+5 eoqzSC68L3DNInVe7itWRb6sldA4mpJuUfsKDdkzH/EAcZ5lK9O/8BM1COGk6rOyyhiHvF QGSvAl5VqIFEZO5OVSuvVnIn8KXYnkd+YaDNCT0W+/F8sFsGqlnQk+oBp9I8Inl9zzu5p+ XkCp7R8HljZEtzLIGmMoxGMhCoWlECzGqIsQOcJvHm8TDKyKcLIn4xxkxXer2BKtKoHJjH wO/c55AkH8YHnXVSW1NnpcKN46VSirt3xky/Et03iUqS23Yo2ZeTtYeTkXQWCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691322703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t96WrtvMoyNR/p5PfjjemV6ehR8sNUD0YJXQjo1yS1s=; b=p9/XLsvC1qGLCKnqgbh3RtEwUqGJiptOLCPbBJ8xKGffiKpY0aZYyzDNvSqJLPU3VASdD6 ZbdrQRHIcoszzOVDiToo4EzL1i2/9FFDZgOZ9vB4Bu5mw5x6kX/Ec1UFlopLF6fgLsxK+s TwnKP6HghVYIUKUE36kMZuIPKf1ba7B8t6sCEMoxR+YjDvdfCHaapzI04Dy9JgFdmx8RjH w4wMpaJTL5kgJVyWMOMIIYIsmJpupAjCpgJvJ0gwDFM/GEGP7dMmT7iwi0KK1UF4wJc9E0 KahVMRaaQGvUVZUEI1AKDb9gM85cQ3PbUed9b5LS/BopQbwKJrVjOgCpWG8jOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691322703; a=rsa-sha256; cv=none; b=xf9oimZGjyIoGV+uzdMigKZ+vTwcj+NIjfCiDa78kzAWSYq76SV+bRSxja1hD57YwQTvvb GY950t/Q7li9l8XzoWyJ4fBWNn/Q75PR2qe0zub8Xa8+vhF6FT7WSTKJMZ+E5Ws2WgUWT+ 7TDy0YU+HZ/mKh7om043UxLrBvfvoZ2/JekDj/x1jTr5C9PDki3wnuqxAJxvtslSm24AWN RpXcbnuyLmlQb2IHps9+OSXtEnmcZ/TEJHjB/ohyg8cRKmHmIigGeWx+dpeODim9eo6WcK 419u/FXy30/+nyoqlpMbrFOhBixULbjhaQ+uOUV7SkSujE6d2R16wJcDRJ5mUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJd8b3hl1z18KH; Sun, 6 Aug 2023 11:51:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376BphDk072318; Sun, 6 Aug 2023 11:51:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376BphrN072317; Sun, 6 Aug 2023 11:51:43 GMT (envelope-from git) Date: Sun, 6 Aug 2023 11:51:43 GMT Message-Id: <202308061151.376BphrN072317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f1d955be2a73 - main - hidraw(4): Implement HIDRAW_GET_DEVICEINFO ioctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1d955be2a7367ef755d70257c381f83b8367288 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f1d955be2a7367ef755d70257c381f83b8367288 commit f1d955be2a7367ef755d70257c381f83b8367288 Author: Vladimir Kondratyev AuthorDate: 2023-08-06 11:51:08 +0000 Commit: Vladimir Kondratyev CommitDate: 2023-08-06 11:51:08 +0000 hidraw(4): Implement HIDRAW_GET_DEVICEINFO ioctl In commit c77bfaa75051 uhid(4) gained support for ioctl from USB_GET_DEVICEINFO. This is used in libraries like libfido2 to retrieve information about a device. This commit adds binary compatible version to hidraw(4). PR: 264843 MFC after: 1 month Requested by: grembo --- share/man/man4/hidraw.4 | 5 ++++- sys/dev/hid/hidraw.c | 28 +++++++++++++++++++++++----- sys/dev/hid/hidraw.h | 15 +++++++++++++++ sys/dev/usb/usb_ioctl.h | 3 ++- 4 files changed, 44 insertions(+), 7 deletions(-) diff --git a/share/man/man4/hidraw.4 b/share/man/man4/hidraw.4 index 60398c234fb2..09c4ed7f8f7b 100644 --- a/share/man/man4/hidraw.4 +++ b/share/man/man4/hidraw.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 1, 2018 +.Dd August 6, 2023 .Dt HIDRAW 4 .Os .Sh NAME @@ -147,6 +147,9 @@ The report data begins from the second byte. For devices which do not use numbered reports, the report data begins at the first byte. This call may fail if the device does not support this feature. +.It Dv HIDRAW_GET_DEVICEINFO Pq Vt "struct hidraw_device_info" +Returns information about the device, like vendor ID and product ID. +This call will not issue any hardware transfers. .El .Pp Linux diff --git a/sys/dev/hid/hidraw.c b/sys/dev/hid/hidraw.c index c18d039286ee..fb1b0231d2cd 100644 --- a/sys/dev/hid/hidraw.c +++ b/sys/dev/hid/hidraw.c @@ -566,9 +566,10 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, #endif void *buf; struct hidraw_softc *sc; + struct hidraw_device_info *hdi; struct hidraw_gen_descriptor *hgd; struct hidraw_report_descriptor *hrd; - struct hidraw_devinfo *hdi; + struct hidraw_devinfo *hd; const char *devname; uint32_t size; int id, len; @@ -788,6 +789,23 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, *(int *)addr = 0; /* XXX: we only support reportid 0? */ return (0); + case HIDRAW_GET_DEVICEINFO: + hdi = (struct hidraw_device_info *)addr; + bzero(hdi, sizeof(struct hidraw_device_info)); + hdi->hdi_product = sc->sc_hw->idProduct; + hdi->hdi_vendor = sc->sc_hw->idVendor; + hdi->hdi_version = sc->sc_hw->idVersion; + hdi->hdi_bustype = sc->sc_hw->idBus; + strlcpy(hdi->hdi_name, sc->sc_hw->name, + sizeof(hdi->hdi_name)); + strlcpy(hdi->hdi_phys, device_get_nameunit(sc->sc_dev), + sizeof(hdi->hdi_phys)); + strlcpy(hdi->hdi_uniq, sc->sc_hw->serial, + sizeof(hdi->hdi_uniq)); + snprintf(hdi->hdi_release, sizeof(hdi->hdi_release), "%x.%02x", + sc->sc_hw->idVersion >> 8, sc->sc_hw->idVersion & 0xff); + return(0); + case HIDIOCGRDESCSIZE: *(int *)addr = sc->sc_hw->rdescsize; return (0); @@ -813,10 +831,10 @@ hidraw_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, return (error); case HIDIOCGRAWINFO: - hdi = (struct hidraw_devinfo *)addr; - hdi->bustype = sc->sc_hw->idBus; - hdi->vendor = sc->sc_hw->idVendor; - hdi->product = sc->sc_hw->idProduct; + hd = (struct hidraw_devinfo *)addr; + hd->bustype = sc->sc_hw->idBus; + hd->vendor = sc->sc_hw->idVendor; + hd->product = sc->sc_hw->idProduct; return (0); } diff --git a/sys/dev/hid/hidraw.h b/sys/dev/hid/hidraw.h index 9aaaa42d2a7c..acaaa67f3ae7 100644 --- a/sys/dev/hid/hidraw.h +++ b/sys/dev/hid/hidraw.h @@ -51,6 +51,20 @@ struct hidraw_gen_descriptor { uint8_t reserved[8]; }; +/* Compatible with usb_device_info structure */ +struct hidraw_device_info { + uint16_t hdi_product; + uint16_t hdi_vendor; + uint16_t hdi_version; + uint8_t occupied[18]; /* by usb_device_info */ + uint16_t hdi_bustype; + uint8_t reserved[14]; /* leave space for the future */ + char hdi_name[128]; + char hdi_phys[128]; + char hdi_uniq[64]; + char hdi_release[8]; /* decrypted USB bcdDevice */ +}; + struct hidraw_report_descriptor { uint32_t size; uint8_t value[HID_MAX_DESCRIPTOR_SIZE]; @@ -69,6 +83,7 @@ struct hidraw_devinfo { #define HIDRAW_SET_REPORT _IOW ('U', 24, struct hidraw_gen_descriptor) #define HIDRAW_GET_REPORT_ID _IOR ('U', 25, int) #define HIDRAW_SET_REPORT_DESC _IOW ('U', 26, struct hidraw_gen_descriptor) +#define HIDRAW_GET_DEVICEINFO _IOR ('U', 112, struct hidraw_device_info) /* Linux hidraw-compatible ioctl interface */ #define HIDIOCGRDESCSIZE _IOR('U', 30, int) diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h index 01cbef6205a1..f80d951ffba7 100644 --- a/sys/dev/usb/usb_ioctl.h +++ b/sys/dev/usb/usb_ioctl.h @@ -120,7 +120,8 @@ struct usb_device_info { uint8_t udi_hubport; /* parent HUB port */ uint8_t udi_power_mode; /* see "USB_POWER_MODE_XXX" */ uint8_t udi_suspended; /* set if device is suspended */ - uint8_t udi_reserved[16]; /* leave space for the future */ + uint16_t udi_bustypeNo; + uint8_t udi_reserved[14]; /* leave space for the future */ char udi_product[128]; char udi_vendor[128]; char udi_serial[64]; From nobody Sun Aug 6 14:10:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJhDG5gbHz4Tp1Z; Sun, 6 Aug 2023 14:10: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 4RJhDG55tWz4fyY; Sun, 6 Aug 2023 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691331006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkmCla4Hg8RvbovWH35YI28trC5SEzQzq0V6zc9Xi2Q=; b=cGqkYYMYITaFpqr8nK5XnLaL2adiilhdz2XdaqY08FPW7f4qEANqT82Gz1xlOenr7CMb6P GLbnzgEce4fnglSKjuq0uUrUmv2y8VG+m6PV040q3g/IXtUJyehbqMLhe9qhq4rueA9ffh Y9oyhlm4aguelOUuD7cfH1Z5FCsxu9eXMQhcTVM8w7zeTL59lLGBhX65pr+ctDu+YYjzzk M9vwBQqfImBXpbUMC8l8z342OF6uDDEN2dSqS3lTyY2zM19fHbQoR9E89bvXCrNQDL7Itj Jmoq8VpUpfqJmuzTAjanCeNFEBqUrsivG/sJpnHq8S7ZQuq6PaujluO0QKxhjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691331006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gkmCla4Hg8RvbovWH35YI28trC5SEzQzq0V6zc9Xi2Q=; b=M0lz7aS52IbXC65uJzHyDd18bXHevjGPzS0cZgM2MgKMo0OFrFFlWI0tvZCspifWkI7Dor oMFmP971C4/wJqdY9JnCFbQvNctIozDo/wyAr4fWVVA7i4gy81vV+7kYfcJJip9YAUaJ6w P+TBFAPMfEKlg557QbEVavNzXL8CQfYpu5G5fWOT6kUuObnkpClqySLycWqkTxByH9PgCO y/hYf5BB9kDS2D0kpTn99JRHZtVYcHYYSjp2nW316VreI9JBK7qKFGmcjgBokppurhhoIb C82ygUvcl2YlFjyvVbLD/4pPiMtL0snuQl56P+rRmuEdQqUYGN0garho9ecpNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691331006; a=rsa-sha256; cv=none; b=Q7GUcGokRLpYulJvTZGZnB6+GDfEJyup/SATfldlLtPPEGiJVyizoI7vo9FrfwNbgCuNGW AEyS84B9XcLjvGI4BXma+sMOfL038tRHPRA6k9AkEZMnsxfu9R4MCzAKLthj2wJ8bW0xFM /PbEYZunY5qa0q0q0IoXl1O8l2Cc3R6wA4KaKMO+N6/n5+GHoBcBwpJEDR4KelvlukwjQj QVzb9lhekWuh+/50nMyTkQXeA3Aw63d82LpG3r5Uc4GAFxj3d0Rqg53MGj4Vv+NdFQ9sjA CsGLE9IbxGZwPEBknja0sZNpaLbQ9V3PeQl4h8ilw3Ao4RLpdLDMwZAc7ilu8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJhDG49LWz1Bk6; Sun, 6 Aug 2023 14:10: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 376EA6ih096470; Sun, 6 Aug 2023 14:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376EA6WM096467; Sun, 6 Aug 2023 14:10:06 GMT (envelope-from git) Date: Sun, 6 Aug 2023 14:10:06 GMT Message-Id: <202308061410.376EA6WM096467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 61f4c4d3dd38 - main - lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 commit 61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 Author: Robert Clausecker AuthorDate: 2023-06-30 14:45:11 +0000 Commit: Robert Clausecker CommitDate: 2023-08-06 13:58:27 +0000 lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) A lot better than the generic (pre) implementaion. We do not beat glibc for long strings, likely due to glibc switching to AVX once the input is sufficiently long. X86-64-v3 and v4 implementations may be added at a future time. os: FreeBSD arch: amd64 cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz │ strchrnul_pre.out │ strchrnul_scalar.out │ strchrnul_baseline.out │ │ sec/op │ sec/op vs base │ sec/op vs base │ Short 129.68µ ± 3% 59.91µ ± 1% -53.80% (p=0.000 n=20) 44.37µ ± 1% -65.79% (p=0.000 n=20) Mid 21.15µ ± 0% 19.30µ ± 0% -8.76% (p=0.000 n=20) 12.30µ ± 0% -41.85% (p=0.000 n=20) Long 13.772µ ± 0% 11.028µ ± 0% -19.92% (p=0.000 n=20) 3.285µ ± 0% -76.15% (p=0.000 n=20) geomean 33.55µ 23.36µ -30.37% 12.15µ -63.80% │ strchrnul_pre.out │ strchrnul_scalar.out │ strchrnul_baseline.out │ │ B/s │ B/s vs base │ B/s vs base │ Short 919.3Mi ± 3% 1989.7Mi ± 1% +116.45% (p=0.000 n=20) 2686.8Mi ± 1% +192.28% (p=0.000 n=20) Mid 5.505Gi ± 0% 6.033Gi ± 0% +9.60% (p=0.000 n=20) 9.466Gi ± 0% +71.97% (p=0.000 n=20) Long 8.453Gi ± 0% 10.557Gi ± 0% +24.88% (p=0.000 n=20) 35.441Gi ± 0% +319.26% (p=0.000 n=20) geomean 3.470Gi 4.983Gi +43.62% 9.584Gi +176.22% For comparison, glibc on the same machine: │ strchrnul_glibc.out │ │ sec/op │ Short 49.73µ ± 0% Mid 14.60µ ± 0% Long 1.237µ ± 0% geomean 9.646µ │ strchrnul_glibc.out │ │ B/s │ Short 2.341Gi ± 0% Mid 7.976Gi ± 0% Long 94.14Gi ± 0% geomean 12.07Gi Sponsored by: The FreeBSD Foundation Approved by: mjg Differential Revision: https://reviews.freebsd.org/D41333 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strchrnul.S | 167 +++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 1bfefa7be98c..b5260cfd78d1 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -8,6 +8,7 @@ MDSRCS+= \ memmove.S \ memset.S \ strcat.S \ + strchrnul.S \ strcmp.S \ strlen.S \ stpcpy.S diff --git a/lib/libc/amd64/string/strchrnul.S b/lib/libc/amd64/string/strchrnul.S new file mode 100644 index 000000000000..6d22f31850f8 --- /dev/null +++ b/lib/libc/amd64/string/strchrnul.S @@ -0,0 +1,167 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 # 16-byte alignment, nop-filled + + .weak strchrnul + .set strchrnul, __strchrnul + +ARCHFUNCS(__strchrnul) + ARCHFUNC(__strchrnul, scalar) + ARCHFUNC(__strchrnul, baseline) +ENDARCHFUNCS(__strchrnul) + +/* + * strchrnul(str, c) + * This is implemented like strlen(str), but we check for the + * presence of both NUL and c in each iteration. + */ +ARCHENTRY(__strchrnul, scalar) + mov %edi, %ecx + and $~7, %rdi # align to 8 byte + movzbl %sil, %esi # clear stray high bits + movabs $0x0101010101010101, %r8 + mov (%rdi), %rax # load first word + imul %r8, %rsi # replicate char 8 times + movabs $0x8080808080808080, %r9 + + /* + * Unaligned input: align to 8 bytes. Then proceed the same + * way as with aligned input, but ignore matches before the + * beginning of the string. This is achieved by shifting r9 + * into r10 to have 0x00 bytes before the string begins. + */ + shl $3, %ecx + mov %r9, %r10 + add $8, %rdi + shl %cl, %r10 # 0x80 where the string is + neg %r8 # negate 01..01 so we can use lea + + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + lea (%rcx, %r8, 1), %r11 # (str ^ c) - 0x01..01 + not %rax # ~str + not %rcx # ~(str ^ c) + and %rdx, %rax # (str - 0x01..01) & ~str + and %r11, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + or %rcx, %rax # matches for both + and %r10, %rax # not including junk bytes or bytes before the string + jnz 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: mov (%rdi), %rax # str + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + lea (%rcx, %r8, 1), %r11 # (str ^ c) - 0x01..01 + not %rax # ~str + not %rcx # ~(str ^ c) + and %rdx, %rax # (str - 0x01..01) & ~str + and %r11, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + or %rcx, %rax # matches for both + and %r9, %rax # not including junk bits + jnz 2f + + mov 8(%rdi), %rax # str + add $16, %rdi + mov %rsi, %rcx + xor %rax, %rcx # str ^ c + lea (%rax, %r8, 1), %rdx # str - 0x01..01 + lea (%rcx, %r8, 1), %r11 # (str ^ c) - 0x01..01 + not %rax # ~str + not %rcx # ~(str ^ c) + and %rdx, %rax # (str - 0x01..01) & ~str + and %r11, %rcx # ((str ^ c - 0x01..01) & ~(str ^ c) + or %rcx, %rax # matches for both + and %r9, %rax # not including junk bits + jz 0b + + /* NUL or c found */ +1: sub $8, %rdi # undo advance past buffer +2: tzcnt %rax, %rax # first NUL or c byte match + shr $3, %eax # scale from bit to byte index + add %rdi, %rax # pointer to found c or NUL + ret +ARCHEND(__strchrnul, scalar) + +ARCHENTRY(__strchrnul, baseline) + mov %edi, %ecx + and $~0xf, %rdi # align to 16 byte + movdqa (%rdi), %xmm1 + movd %esi, %xmm0 + and $0xf, %ecx # distance from (%rdi) to start of string + pxor %xmm2, %xmm2 + mov $-1, %edx + punpcklbw %xmm0, %xmm0 # c -> cc + shl %cl, %edx # bits corresponding to bytes in the string + punpcklwd %xmm0, %xmm0 # cc -> cccc + add $16, %rdi + + /* check for match in head */ + pcmpeqb %xmm1, %xmm2 # NUL bytes present? + pshufd $0, %xmm0, %xmm0 # cccc -> cccccccccccccccc + pcmpeqb %xmm0, %xmm1 # c present? + por %xmm2, %xmm1 # either present? + pmovmskb %xmm1, %eax + and %edx, %eax # match in the string? + jnz 1f + + /* main loop unrolled twice */ + ALIGN_TEXT +0: movdqa (%rdi), %xmm1 + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL bytes present? + pcmpeqb %xmm0, %xmm1 # c present? + por %xmm2, %xmm1 # either present? + pmovmskb %xmm1, %eax + test %eax, %eax # match in the string? + jnz 2f + + movdqa 16(%rdi), %xmm1 + add $32, %rdi + pxor %xmm2, %xmm2 + pcmpeqb %xmm1, %xmm2 # NUL bytes present? + pcmpeqb %xmm0, %xmm1 # c present? + por %xmm2, %xmm1 # either present? + pmovmskb %xmm1, %eax + test %eax, %eax # match in the string? + jz 0b + +1: sub $16, %rdi # undo advance past buffer +2: tzcnt %eax, %eax # where is the match? + add %rdi, %rax # pointer to found c or NUL + ret +ARCHEND(__strchrnul, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Sun Aug 6 14:10:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJhDH6w7qz4TnlJ; Sun, 6 Aug 2023 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJhDH5ncCz4g2G; Sun, 6 Aug 2023 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691331007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIF1q74tWHvFvSY/lEuyCJ+9/mLwyqQRHoi20paFyXQ=; b=QO+e9VTXuysGbJUP3gqompLCBPI1DzB6HZevYnKkOmSwPYZUksqOIpqrOE6zxZY1WKt+zl fmUa7oT3w0LGl0xlwNHIqdAUTQBvOTD4QyJ2f1cudiQezfCQIgAyrfoFikoM780a0bCiWL prG9oaofaobdFUVnaWMBLe6d/1CqHfXJALvRSA/Xorujo8BdpeYCvVUFHNb51hNuzUmjoj usJcYY7ghT85G2dN9JZMXyLVZB7xwr3gSKpeEvGOTbTJW/OQfOrbmY2fX6zARHuR/IvAeJ YsgYCb3mAaSXXcikkGyfH5GBx1vrxXzxSAEJRanHUct3XywNTzLRaMiZNaCcCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691331007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIF1q74tWHvFvSY/lEuyCJ+9/mLwyqQRHoi20paFyXQ=; b=THKOP2UmvFrRrMliNQkUpedsdBC1nEFpO6CyHXoaqPcitnDUZQ7n6mpCWPwG2acvu3c40K gKXLRUUaQLMqQjAyKgw+WuDWz197BN+2M4KoJ+4r2LfTPJaojwy987ifihR1n6+eZHrGJi RVE/AxkNWM6k5xCeYeXwxEifUUmDBpcs5+udBRsi+lMRaz6Q+uMfVpH/lf6YqqNUK+pGDU hUnAIgRhl8gwTxDPZu9pZZB1cCaPIHh4064Uzr9eG0jVAjzm22S1sCsl9DP/z6c17dhIxd y77Nddm/RalxyI/jiokMg+xl6TLONcJoOkLsFMpy6o3980OIgj0DBuEt0AZh3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691331007; a=rsa-sha256; cv=none; b=bP2vyPxJECoClNBgfmpL5q5kGzKJv8PYSLyoYrqZvWYT9fUdnKcj74fZf6iJZhoCZuhtzf tiJlSKyaKkjo6spmUM1s1mDHUIsscLbs81Gc4RfXnMdFoMEOzQQ+QO7IAOx4lRtEQ8mM6N SVTkRrqUL5pNEFgY+azr1GAJP6DJBDjGWsk5VgA8M+tzxEj4he7Y8XIMbjv4EWRvCp2vq2 XyC5q3QTdu9D/f+s9h9O8Eq5uN0YVifuF8m8erWLeOG3CZGIw6f8FvnpyEz8bicxDJRWJy aw/+HNRVLjdgIlgRu+r7TxUrHR04Y0AyBgxwTHSqYKdsqkQnEoDNV1/XPisvcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJhDH4s6Zz1Cb3; Sun, 6 Aug 2023 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376EA7VD096721; Sun, 6 Aug 2023 14:10:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376EA7Mu096719; Sun, 6 Aug 2023 14:10:07 GMT (envelope-from git) Date: Sun, 6 Aug 2023 14:10:07 GMT Message-Id: <202308061410.376EA7Mu096719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 66f5f4bffed9 - main - share/man/man7/simd.7: document amd64/strchrnul SIMD implementaionts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66f5f4bffed92c2b65d00690b01c817faf477613 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=66f5f4bffed92c2b65d00690b01c817faf477613 commit 66f5f4bffed92c2b65d00690b01c817faf477613 Author: Robert Clausecker AuthorDate: 2023-07-02 10:23:02 +0000 Commit: Robert Clausecker CommitDate: 2023-08-06 14:05:09 +0000 share/man/man7/simd.7: document amd64/strchrnul SIMD implementaionts While we are at it, remove mention of x86-64-v3 and v4 variants of strlen(3) which were omitted when D40693 landed. Sponsored by: The FreeBSD Foundation Approved by: mjg Differential Revision: https://reviews.freebsd.org/D41333 --- share/man/man7/simd.7 | 59 ++++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index c8e17cb9e0ef..9df1b47a8866 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd July 3, 2023 +.Dd August 5, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -49,34 +49,35 @@ the environment variable can be used to override this mechanism. .Pp Enhanced functions are present in the following architectures: -.Bl -column FUNCTION_ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent -.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 -.It bcmp Ta Ta Ta S Ta S -.It bcopy Ta Ta S Ta S Ta S Ta SV -.It bzero Ta Ta S Ta S Ta S -.It div Ta Ta Ta S Ta S -.It index Ta S -.It ldiv Ta Ta Ta S Ta S -.It lldiv Ta Ta Ta S -.It memcmp Ta Ta S Ta S Ta S -.It memcpy Ta S Ta S Ta S Ta S Ta SV -.It memmove Ta S Ta S Ta S Ta S Ta SV -.It memset Ta Ta S Ta S Ta S -.It rindex Ta S -.It stpcpy Ta Ta Ta S -.It strcat Ta Ta Ta S Ta S -.It strchr Ta S Ta Ta Ta S -.It strcmp Ta Ta S Ta S Ta S -.It strcpy Ta Ta Ta S Ta S Ta S2 -.It strlen Ta Ta S Ta S134 -.It strncmp Ta Ta S Ta Ta S -.It strncpy Ta Ta Ta Ta Ta S2 -.It strrchr Ta S Ta Ta Ta S -.It swab Ta Ta Ta Ta S -.It wcschr Ta Ta Ta Ta S -.It wcscmp Ta Ta Ta Ta S -.It wcslen Ta Ta Ta Ta S -.It wmemchr Ta Ta Ta Ta S +.Bl -column FUNCTION__ aarch64_ arm_ amd64_ i386_ ppc64_ -offset indent +.It Em FUNCTION Ta Em AARCH64 Ta Em ARM Ta Em AMD64 Ta Em I386 Ta Em PPC64 +.It bcmp Ta Ta Ta S Ta S +.It bcopy Ta Ta S Ta S Ta S Ta SV +.It bzero Ta Ta S Ta S Ta S +.It div Ta Ta Ta S Ta S +.It index Ta S Ta Ta S1 +.It ldiv Ta Ta Ta S Ta S +.It lldiv Ta Ta Ta S +.It memcmp Ta Ta S Ta S Ta S +.It memcpy Ta S Ta S Ta S Ta S Ta SV +.It memmove Ta S Ta S Ta S Ta S Ta SV +.It memset Ta Ta S Ta S Ta S +.It rindex Ta S +.It stpcpy Ta Ta Ta S +.It strcat Ta Ta Ta S Ta S +.It strchr Ta S Ta Ta S1 Ta S +.It strchrnul Ta Ta Ta S1 +.It strcmp Ta Ta S Ta S Ta S +.It strcpy Ta Ta Ta S Ta S Ta S2 +.It strlen Ta Ta S Ta S1 +.It strncmp Ta Ta S Ta Ta S +.It strncpy Ta Ta Ta Ta Ta S2 +.It strrchr Ta S Ta Ta Ta S +.It swab Ta Ta Ta Ta S +.It wcschr Ta Ta Ta Ta S +.It wcscmp Ta Ta Ta Ta S +.It wcslen Ta Ta Ta Ta S +.It wmemchr Ta Ta Ta Ta S .El .Pp .Sy S Ns :\ scalar (non-SIMD), From nobody Sun Aug 6 20:29:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrfX2jQhz4mMqt; Sun, 6 Aug 2023 20:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrfX1yf0z4Xg2; Sun, 6 Aug 2023 20:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=okKzIVtY2PAlOJ2rYfUSFm17q5A59FEAPpa8DmQGDAU=; b=QG8f/zleaMtNCv8kux4o5O85TK3dOqkgqmhnzc0uZzpdcQu0sLm1q0qYr4cKTWaO66GugF duwpsK3UPOxXHTSE7nES9MKcPMWFwOngz3/txbo4GF5ENlkSd/322d//LkKdmbAl3PBoAx iCcwmsSzAZlL5eWpSPnGD/DWrTjWwPxO61yrZlCc27iJDhEPvWGmkdhFzhVnAl9rgYoC2h su7moyVsIZPCktCACE4rd5VkpJnVFznHxGNusTb48adKNnhC3aoRjIHbOwi9qKV4+EbNww /DFimSMs5C6J6ZpIkntCpgvM5LXyTKdwAub0bkarmlNMgvV3B0t5AxN1YiVdxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=okKzIVtY2PAlOJ2rYfUSFm17q5A59FEAPpa8DmQGDAU=; b=p3Hl2CwSQO7FSxF44e11UV9jT0nRt6ftJ3hqEjwiIhT4uYmocw18prtkZXwzXyu8+zwmuC 1y6qxV+MF+e4d898Unzv5YIDnIWDbwUAUoQTgB+zSjEvYEEi5jKvaBw8rtl0kBaRpwrCck o4AJFjPtXyODXnSXqomlwOUJa7icT1zZjobzcS1K/usJ5p9SSIa5jl0656ZCJU1ZmswG8F GfMMqQUsvrNMoO1/YFCfdwGcCCTVuULEA512JqC6CDZt+0csmlBMVOEgThv3XNL5jOZTkd rp1UMyxWcNzgFa6YaWRV3Qa5bec/HD5M4yG5H2rK4mSaT3TiimDY57fhrHuo9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691353796; a=rsa-sha256; cv=none; b=T+UQg+sgoqDYkrp4SwfN+xLfJtxDsfyfolH37Mbub7a1FK5BzdXSCbVuthG0sXdPEaeNxH elRNZdb0ZjbcdfpwSsAvgfSaIq3jQgoeXiKaaePllOHqgwUZIRwm62efD1NQ8DK2iHLh+L LfJ9GrzKxaZVjxNvjXim+r+TOs5oWMWsZFyTmyxtzpSup0LJb8YQIOD/CmDhb4sYFf9fU7 b6T16OZ+EJXR7GxjG5YTNNqnXSNY7dtn7imnblLP8jXGuxiSiPcl1GyAh72L12EyzZ6/s0 Yp1YOYZf0GBE72mDF2hkifjqLqcYYDyKq9E3m2uG6Q4pa3gdqqQoMepfWnPbGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrfX0vVMz90R; Sun, 6 Aug 2023 20:29: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 376KTuPo025786; Sun, 6 Aug 2023 20:29:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KTusv025785; Sun, 6 Aug 2023 20:29:56 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:29:56 GMT Message-Id: <202308062029.376KTusv025785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: ba3c1f5972d7 - main - targets: Catch up with the removals of mips and sparc64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba3c1f5972d7b90feb6e6da47905ff2757e0fe57 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=ba3c1f5972d7b90feb6e6da47905ff2757e0fe57 commit ba3c1f5972d7b90feb6e6da47905ff2757e0fe57 Author: Marius Strobl AuthorDate: 2023-08-06 19:51:01 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 20:25:37 +0000 targets: Catch up with the removals of mips and sparc64 --- targets/pseudo/userland/Makefile.depend | 11 ----------- targets/pseudo/userland/misc/Makefile.depend | 1 - 2 files changed, 12 deletions(-) diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index b933b54dd26c..b32beff634a1 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -801,17 +801,6 @@ DIRDEPS.arm64= \ usr.sbin/acpi \ usr.sbin/ofwdump -DIRDEPS.mips= \ - sbin/bsdlabel \ - sbin/fdisk - -DIRDEPS.sparc64= \ - sbin/bsdlabel \ - sbin/sunlabel \ - usr.sbin/eeprom \ - usr.sbin/ofwdump \ - usr.sbin/sade - DIRDEPS.powerpc= \ usr.sbin/nvram \ usr.sbin/ofwdump diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend index 6ec3ad6c4a6d..4fb82d171369 100644 --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/targets/pseudo/userland/misc/Makefile.depend @@ -87,7 +87,6 @@ DIRDEPS.arm= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.arm64= ${_sys_boot_fdt} ${_sys_boot_efi} DIRDEPS.i386= ${DIRDEPS.x86sys} ${_sys_boot_efi} DIRDEPS.powerpc= ${_sys_boot_fdt} stand/libsa32 stand/ofw stand/uboot -DIRDEPS.sparc64= stand/ofw ${_sys_boot_zfs} .endif DIRDEPS+= ${DIRDEPS.${DEP_MACHINE}:U} From nobody Sun Aug 6 20:29:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrfY3Bl0z4mMpJ; Sun, 6 Aug 2023 20:29: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 4RJrfY2Wtfz4XpJ; Sun, 6 Aug 2023 20:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0K8Wik3iHLfamsJWjMKUet0qd87Rlg/Y3RTtIO1tULM=; b=LGelKWwd7isJdRRWVI/evcw8aboLzY9Unda2asvdIJmPU7dkW74wR4cWpgw1UKXNMBXXxt HAisUoAgAUtDycyja5EIuc953z8sUehVjSphcmx+4aIH6ou6PHVIKx+kcBXUwUqBU0mqlW D/BuZuNVrYk+s98/QImDPXGfjam2Lx8SWkkDop+IiK5CqdreKeMfjQ8rnQbpePI2pXu88L 25d9Q64SKUOyVgf88OU2G8e/UbEY6CXdzILtMFbD0eGOohLgMXWOA23R/bmtCQZ8FROION QgTWbp2Y5XNz7bSZ5nM7m46OYxa7/xfr5A1EXjAJMpDfnwKRB+oy41TKuaEEvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0K8Wik3iHLfamsJWjMKUet0qd87Rlg/Y3RTtIO1tULM=; b=qSqpZiDhLFDWtC6FeYLTCrd1/fHva1VPZk18tvb263wRiad+f241qHvAivo7GbrSXQ/9FL fK183hbN+UgsQKk4OzO+5eUkBpPLQs4FAroWI3BqeakjPObk47D7z36XSf2ezhjchneLFR hn9yldpvQBbU5SW0VW2QRPmHVfTlT/L+6CPl6RZHFZYF8ZraHpbnu+1HUGQkie8UDV4vET IKlpBIq+c7rujm4slIsKCzJsdtXnoTcz+ikTC2fI+RRAmodLJXJr64TjkRNvmvITNcG9l5 WJC63jlF0BV0cV6RQOVwcgN2HlVeWK4x5yDXG51tmVa6x/WEN4CLf3eKSndmSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691353797; a=rsa-sha256; cv=none; b=BFktU1h1UVQSp7MpwGDdoLeX4x+mxCCQ3VWSU1zl58ZQUEqsvXUZNdldRORW+dIVWVQC7S bv3LAj26nw1QjTUsQnswtmRfqJp/k8zNBY3gGxNNiHwFUwjB5d2WXu0Pl/5LvoWmD0ESZ3 LeBjs5l5m7O5KtLye+TwhEWlb1JYXEwn4VKaN8l83ZRbjg+PW8EGNaFeTbpzizWI2bMZ0e qIFxvM/yo0rStmqXnt0mHRZNUxmFmp5ImN4Uj4wm5PqkVxoI8BgaF741hvCCk6f25JKU8F CSnKeL68NkcHghzIhtN21CT8Rpbz+5BXScZi/G54xvY0N/xFE/iPBNKU4wkGEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrfY1LwSz8np; Sun, 6 Aug 2023 20:29: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 376KTv9D025812; Sun, 6 Aug 2023 20:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KTvj6025811; Sun, 6 Aug 2023 20:29:57 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:29:57 GMT Message-Id: <202308062029.376KTvj6025811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 96c76d930656 - main - exit1(): Revert sparc64 workaround List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a commit 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a Author: Marius Strobl AuthorDate: 2023-08-06 19:54:57 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 20:26:01 +0000 exit1(): Revert sparc64 workaround If this still is a problem on other architectures, it should be fixed properly. This reverts commit 5486ffc898503a846ecaf3f5ef9f9269beb4540e. --- sys/kern/kern_exit.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index cb0939ded6e1..e3345c14df26 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -238,13 +238,7 @@ exit1(struct thread *td, int rval, int signo) TSPROCEXIT(td->td_proc->p_pid); p = td->td_proc; - /* - * XXX in case we're rebooting we just let init die in order to - * work around an unsolved stack overflow seen very late during - * shutdown on sparc64 when the gmirror worker process exists. - * XXX what to do now that sparc64 is gone... remove if? - */ - if (p == initproc && rebooting == 0) { + if (p == initproc) { printf("init died (signal %d, exit %d)\n", signo, rval); panic("Going nowhere without my init!"); } From nobody Sun Aug 6 20:29:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrfZ4dXvz4mMr0; Sun, 6 Aug 2023 20:29: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 4RJrfZ3TN7z4Xv4; Sun, 6 Aug 2023 20:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBccorPXoomHceqjj2Rqz673Btfgg1S+HUOB/fQeE8U=; b=KUbqWYhXdmOWcYd5qwKmzEnGi2cOzaMr9DXRR9YhH4CK6H/1n2geveD7M/9Y577ix0Enj0 500R11x/KvkChaE17yDLtZwAuU75I3LqZzhkqsV/O+refqQRbee/X/kocj5TwKOfemXga8 VLornY0gVdWCFdRLcuLE0sxEHP/sUazWeeIabh61+lQ5L033X3WgkkGInbHdLB7iobMN6e RFIWGa1W+BNfWGopVKOyJavC6yZEyjQ4yUDQwxe8Fk4gCjqyjlbdMVHvxGmrJnKEQSkyjm 6n0WpMr2rcfAzTIV3rONjxM8MhTLSCkYN+IHd1cp0jCmMh3rPE/x26LX0ppwHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBccorPXoomHceqjj2Rqz673Btfgg1S+HUOB/fQeE8U=; b=jZby4hhRkaIABVlwzucI3kKoDQkpQnqtroyQGbCRMh3/yjFGl5hp/zKOyNWkike9l4wx8C SSEIkN93c0iTEhaB+bZghDEqUrf3JyohmDwldi7wigfOkb+UunV/J+2AVS3qrQsBjp69uR qIlNix39qnlmzgo9PttPERfJguLrVUjz7pUgPPkQYhtAxDbjEiDxP6Z1XUiqjk+X31d+14 j+eY9ZTEYNNOpmQRL5BQzCTmXZjEaathsLZhgsXshtpaXMWe9JLXRwYLiUxHe/ZHAZ8Ams zDQldUn2wfjt+3O4Lt8Ap5LOF5Y3bOSZmYKgvQzz0AzQM685eVKaHycNNHzNZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691353798; a=rsa-sha256; cv=none; b=l2MwY7WXTQE89eruJ3TjJrM1KIPaja1CVJBpGQ5144tHEBkFzY4vkqzF9us6LlqcTf4X6v wh1SE3fB7vE+4GVPzu3L1c39CkZXE4EpsI5mQ5u/Imr9VTqHEyjlclInJEzqdtlAZ0vqzL 3VRm4XtO/1dg/bCJB4OvJ0N+ORenew2H/vO2FWRejpqe9TWh1u2ZHxjaH43DynpBa0C/w9 VvTrkryEVmLQx/mBbGNEj7rL3CeR0X9Gv+gHIlCQ2JD19+kUUdx+VQ/XM7gw4l//KDhUG5 ldmVEJ4CztxO4TmvrtazUJk2FZna0ul04kilSMSzO6Epq6/ZYG8JTWVjhoiIcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrfZ2XnLz8WW; Sun, 6 Aug 2023 20:29: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 376KTwKd025831; Sun, 6 Aug 2023 20:29:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KTwYn025830; Sun, 6 Aug 2023 20:29:58 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:29:58 GMT Message-Id: <202308062029.376KTwYn025830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 76e3b8f54f59 - main - nanobsd: Remove remainder of sparc64 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76e3b8f54f59e6bfc318dd99c8abcc5adabc10e0 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=76e3b8f54f59e6bfc318dd99c8abcc5adabc10e0 commit 76e3b8f54f59e6bfc318dd99c8abcc5adabc10e0 Author: Marius Strobl AuthorDate: 2023-08-06 20:01:17 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 20:28:13 +0000 nanobsd: Remove remainder of sparc64 support Fixes: 25a66f1fb177 nanobsd: remove sparc64 embedded example --- tools/tools/nanobsd/embedded/common | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 0e799be96e30..a2724f978e75 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -531,10 +531,6 @@ std_powerpc64 ( ) { NANO_ENDIAN=big } -std_sparc64 ( ) { - NANO_ENDIAN=big -} - # # QEMU settings for the standard environments # From nobody Sun Aug 6 20:29:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrfb4f8Rz4mMpR; Sun, 6 Aug 2023 20:29: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 4RJrfb44GHz4XsP; Sun, 6 Aug 2023 20:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jodfHncsINWXkntFBqZOL19AEKr/b4cwzjvDsfsX7aI=; b=l+iixkoD2oEugPY7JjJFSzpj/vgukPcu5dxU81Z3SKY3qAL6BEk0fZJLQ+oWVqQ09JbAkp /yP3t89P+sG0XgiEKYEGXSYvfwfsGDM5jDMFrnrw918ok4iiL+hhuTvVdA22wZljpM54I0 jrzns5oVn8rq9mClbFhFersb2wi6D/zQf16SP9GGB7yf2No+K34UV/hFTsi97rpcKzlR5l Gb06QPQfcautGI6m25btv1SAMLWLNIOtJjIB7WR6CNgPNuGMm7fdq5MrghntoZuhcGa/Mk hseRJsk8/Y2GHwyKsZqf2FL3R0GGDMaKdVrstx+QnzQw1Hwae2cUDmZluKB1PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691353799; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jodfHncsINWXkntFBqZOL19AEKr/b4cwzjvDsfsX7aI=; b=ncqtzg8bOsoo27RWvooFVz1RI5WvuPvEkhfveocaaEQV3lBnfPo6rfZlR2hvyxiJTDIdbD YUji5/c03LT8YwuLZE+oWQz0fD3BDNeXVD2N7PeevI97LLGnNl8oiqtunqAPHUqICkIrxI DJjyX9Xv3FR9T3mFwF5IfswLRzLJ6+VNfFCbSgjFqdh3Ijp8B5fM+4ajA/tpSoebn/QPlV 2Y/rBvFWA4BBqJVVRik+0Jl2Nla25O5Z8gPiS8tCej00lEC36hyMCgfcWNoVC04tzoaTqM YI4yi1iG90BFEmhC54vJdMaXgdR9RHZg0Nm0dY1C4smh7ewaoEmxNBEcUF8z+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691353799; a=rsa-sha256; cv=none; b=WR/eCMP8mvEIOpArDFFNRG1/GUBSn9AR9SE+D/8mdlsFAJIoaMYcpV0QE5q78QHpbkI0Bs hdrAP26aB+h9KBTmkFDM+cROrfFJAoWUO9N9jte8qckXCI7tBfwdAqBNifXZ09UAQV9WEH gyj4PVlPqOE77ao8TZaTYViQuPtKixpdLAWYIGyBK5zWu277PZ8eJiGCMvZtfQtTxBRhvq 1HA+7xdQmrRDmo8f2LY9IiPta0dTs5BVGwUNl7+DKoM/Szr5h84F8WGEmCnFolzXcj393P +3RdjeVrtdJnM5NeElovxG564DXeWmUTTG8fJap+A1BFkI58VkRBC5btkVctNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrfb36wKz8nq; Sun, 6 Aug 2023 20:29: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 376KTxjh025852; Sun, 6 Aug 2023 20:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KTxGw025851; Sun, 6 Aug 2023 20:29:59 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:29:59 GMT Message-Id: <202308062029.376KTxGw025851@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 9ec7a595ed2c - main - mergemaster(8): Remove support for sparc64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 commit 9ec7a595ed2c7631ef916d9f5818ccd5c5d327c8 Author: Marius Strobl AuthorDate: 2023-08-06 20:07:29 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 20:28:46 +0000 mergemaster(8): Remove support for sparc64 --- usr.sbin/mergemaster/mergemaster.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index edbf07d743ee..82a48b090d2e 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -782,7 +782,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022} # Warn users who still have old rc files # for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 sparc64; do + serial syscons sysctl alpha amd64 i386; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 break @@ -808,7 +808,7 @@ case "${OLD_RC_PRESENT}" in *) mkdir -p /var/tmp/mergemaster/old_rc for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 sparc64; do + serial syscons sysctl alpha amd64 i386; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ fi From nobody Sun Aug 6 20:36:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrns1h3sz4mNYg; Sun, 6 Aug 2023 20:36: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 4RJrns13Dlz4ZpF; Sun, 6 Aug 2023 20:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4mvt7WH10DeqeD9uVOcX3TcENMJyWq80RhguiGJcqg=; b=bx7lvvF8Ci2bmiSvvs5ZPXaMZbf248LUHOov4ekrA2zMr57ZYtz5iF4ukXsBGsf16g1YNX l6ARNDxCRKZIjVZMZw5Dpar3/IHdyhU2Q0mEhcYpSS2tClI56HRZpVh0JdeSkLelul2M0R r6FSCGtTouUGnDUuNUNqbEwAK6lZF9f7nUBj1Bv8PyX87FKCuGs78oOgbrnTy560x1Zpb7 ARdh/obqTjTYf6a1a5+qzrYpB2oLPPusN/QKa5Msj4k21LDeT1I8JWaK2jWJ/Y/kNIRuGl vbZbmkjyC2Isisnnm7mJA60stnx+5R3D/MFIN5xbN42Hd6s5Kggj+bOzneoJjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l4mvt7WH10DeqeD9uVOcX3TcENMJyWq80RhguiGJcqg=; b=PFI12P2vObDpYYL7UVHgd/IJwxDdsi1BN8sIvj3wGCrMqen2d3jH5V9EOGJlytH+F/ZhfY D10hrbFSj8BxlUQRKIPKLUnjdA8/rWs6GuPVU/MnD6RE9dg6Y6yBww9FV3ZFeMPuhFOkoH 7M5pM/LYLczSfMj07Mdmwh9ZbR2Dz7qBj1aP8+1nB1cwxJdpbSYARVoyatXgrekJ6aq9pH 5bwSuHmJp+HEtx/ZYlM8v9X8WYi054vDTLWSm+mSUVy70/OUTf2OYs8ivCFJZc4b4hbjv0 md4pi3Fu2tBGEJJVtmIZblMfgQ4jlcYM5FOAWR+pAxvZ+Qqj79u23diXT06Clw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354177; a=rsa-sha256; cv=none; b=q/eMjTrBigjuCXcz9k2+uV6AVQY83TIkuvT5VM0CUci45bg6ZuQBIM2HF6mT3tbTWzlEeC th/xLNm51oDsf8vd863rVfLQN6oaiceT/j8QZcrzM3C78lrpqkFEveJDl6r1Re+IDCAGTL lnxsL72CoPvyW2B2YcHg4m389VoV6ds79Hly5OPt7B8ny3wTzwO1Hk3buOkjO0RX4yuiRO rLWVV8X3+gVAriacX9iiNHBmmmEJCrbQuu9YmR4B3VtOvAN8IzYpjxjd5AiVDHiBicQbUR RpcPPX/tpPbi9XQh+8FDEBg8Tzy+a08j7V5hBrOc2JrvJI5bP8wWBfevl8lI7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrns05b9z8xc; Sun, 6 Aug 2023 20:36:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaGvv042490; Sun, 6 Aug 2023 20:36:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaGWk042489; Sun, 6 Aug 2023 20:36:16 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:16 GMT Message-Id: <202308062036.376KaGWk042489@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: a00be5afa7f7 - stable/13 - Remove bt.4 man page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a00be5afa7f7f8b68cc7db92d052343257fbfd76 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=a00be5afa7f7f8b68cc7db92d052343257fbfd76 commit a00be5afa7f7f8b68cc7db92d052343257fbfd76 Author: Cy Schubert AuthorDate: 2021-03-29 05:14:36 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 16:47:10 +0000 Remove bt.4 man page. r339568 (a1db7455b75d7557fd171a537e2d95aceb20846e) removed bt(4). This revision removes the man page (cherry picked from commit e2b247fac21e3b82f84cc56c7caf94f6ec3e78b0) --- ObsoleteFiles.inc | 3 + share/man/man4/Makefile | 1 - share/man/man4/bt.4 | 174 ------------------------------------------------ 3 files changed, 3 insertions(+), 175 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index ae28df9a3594..7f38ab9f543c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230806: remove bt(4) man page +OLD_FILES+=usr/share/man/man4/bt.4.gz + # 20230622: new clang import which bumps version from 15.0.7 to 16.0.1 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ae3d35d7f6fa..b3b14919aa02 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -84,7 +84,6 @@ MAN= aac.4 \ bnxt.4 \ bpf.4 \ bridge.4 \ - bt.4 \ bwi.4 \ bwn.4 \ ${_bytgpio.4} \ diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4 deleted file mode 100644 index ebdebae22837..000000000000 --- a/share/man/man4/bt.4 +++ /dev/null @@ -1,174 +0,0 @@ -.\" -.\" Copyright (c) 1994 Jordan Hubbard -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. -.\" -.\" $FreeBSD$ -.\" -.Dd August 18, 2020 -.Dt BT 4 -.Os -.Sh NAME -.Nm bt -.Nd Buslogic/Mylex MultiMaster SCSI host adapter driver -.Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device isa" -.Cd "device scbus" -.Cd "device bt" -.Pp -In -.Pa /boot/device.hints : -.Cd hint.bt.0.at="isa" -.Cd hint.bt.0.port="0x330" -.Ed -.Sh DEPRECATION NOTICE -This driver is scheduled for removal prior to the release of -.Fx 13.0 . -.Sh DESCRIPTION -This driver provides access to the -.Tn SCSI -bus connected to a Buslogic/Mylex MultiMaster or compatible controller: -.Bd -ragged -offset indent -MultiMaster "W" Series Host Adapters: -.Bl -column "BT-956CD " "ISA " "Commands " "Description" -.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" -BT-948 PCI 192 Ultra SCSI-3 -BT-958 PCI 192 Wide Ultra SCSI-3 -BT-958D PCI 192 Wide Differential Ultra SCSI-3 -.El -.Pp -MultiMaster "C" Series Host Adapters: -.Bl -column "BT-956CD " "ISA " "Commands " "Description" -.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" -BT-946C PCI 100 Fast SCSI-2 -BT-956C PCI 100 Wide Fast SCSI-2 -BT-956CD PCI 100 Wide Differential Fast SCSI-2 -BT-445C VLB 100 Fast SCSI-2 -BT-545C ISA 50 Fast SCSI-2 -BT-540CF ISA 50 Fast SCSI-2 -.El -.Pp -MultiMaster "S" Series Host Adapters: -.Bl -column "BT-956CD " "ISA " "Commands " "Description" -.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" -BT-445S VLB 30 Fast SCSI-2 -BT-545S ISA 30 Fast SCSI-2 -BT-542D ISA 30 Differential Fast SCSI-2 -BT-542B ISA 30 SCSI-2 (542B revision H) -.El -.Pp -MultiMaster "A" Series Host Adapters: -.Bl -column "BT-956CD " "ISA " "Commands " "Description" -.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" -BT-542B ISA 30 SCSI-2 (542B revisions A - G) -.El -.Ed -.Pp -Tagged queueing is supported on 'W' series adapters, 'C' series adapters -with firmware of rev 4.42 and higher, and 'S' series adapters with firmware -of rev 3.35 and higher. -.Pp -Boards with certain firmware revisions may lock up under heavy load to -certain devices, especially if tagged queueing is used. -Should you encounter -a problem with your adapter, contact Mylex technical support and ensure you -have the latest firmware for your controller. -.Sh HARDWARE -The -.Nm -driver supports the following BusLogic MultiMaster -.Dq W , -.Dq C , -.Dq S , -and -.Dq A -series and compatible SCSI host adapters: -.Pp -.Bl -bullet -compact -.It -BusLogic BT-445C -.It -BusLogic BT-445S -.It -BusLogic BT-540CF -.It -BusLogic BT-542B -.It -BusLogic BT-542B -.It -BusLogic BT-542D -.It -BusLogic BT-545C -.It -BusLogic BT-545S -.It -BusLogic/BusTek BT-640 -.It -BusLogic BT-946C -.It -BusLogic BT-948 -.It -BusLogic BT-956C -.It -BusLogic BT-956CD -.It -BusLogic BT-958 -.It -BusLogic BT-958D -.It -Storage Dimensions SDC3211B / SDC3211F -.El -.Sh SEE ALSO -.Xr cd 4 , -.Xr da 4 , -.Xr sa 4 , -.Xr scsi 4 -.Sh HISTORY -The -.Nm -driver first appeared in the -.Bx 386 -patch kit. -.Sh AUTHORS -.An -nosplit -.An Julian Elischer -wrote a driver for the Multimaster cards that appeared in the -.Bx 386 -patch kit. -The driver was rewritten by -.An Justin T. Gibbs -to take advantage of new board features and work with the CAM SCSI framework in -.Fx 3.0 . -.Pp -Special thanks to -.An Leonard N. Zubkoff -for writing such a complete and well documented Mylex/BusLogic MultiMaster -driver for Linux. -Support in this driver for the wide range of MultiMaster -controllers and firmware revisions, with their otherwise undocumented quirks, -would not have been possible without his efforts. From nobody Sun Aug 6 20:36:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrnt2MQWz4mNFR; Sun, 6 Aug 2023 20:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrnt28HCz4b9x; Sun, 6 Aug 2023 20:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFSdAfZVXViUoLRfwnlQD/Vm9EEhfLYluP0pWvFzEh0=; b=BAjbdkRGXlVK1wX+3umZ/iSU7/4vXugiE41hkVFyqLrtqIzWoNiKEJTSmvo9PDgXEom/O2 TTbNZgaS2AH+U6EG2LkYbUBJG0K2HFe4tMPYBDtl6HlaOOYiNobTBfLRGeERhxcomrPy60 aJ2eYR/tWNc0caJTVevyHF8Mo/FzWb24WAH1rX8KC4R4XBRgYyPnUUKouRG4tyqQdVZ8Wh Cg2l7WvdRfEjjO3ykCVlpAoZrdH/DenW7is3F/wVdacWG8aH0odbiEZ9YA0Phvb85f3hXV 6QxQmJRPpju0WTL0D3vIZhLZcjamU6l1LhmXDBAMHArX58NBuU8DhICD7kzQDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VFSdAfZVXViUoLRfwnlQD/Vm9EEhfLYluP0pWvFzEh0=; b=N8c7DXnSq7gzxXKOP4k8rUQrLY0y/g5WRsk4m4NRs8vzy6PVPOXya6nxR2ueZoJQkqwxo0 A2JVA1LWTzovsJnwloCmVfnnd7R6/KnJ8758+XFHK5ELjLyDTjInUeV3GG09im2CQtqCTU ThGZRN9iSnL1vhLEn410JbZ1mq4FSSnVPl9khOKCe4IxsEkDylRQfRqppvVhKi78KGM9/f PTfoMWMw1QezcBLElXKAg+XMUEvWRKtgmApM57uPQGHk/jqf2X1tc6vh46vkeGIo9HhtzS ivVWGz831B0Y9DOOfHBL3UYQT1WEJORqpDkWRh6AXpuQR6siDmIZ6vomSdsl6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354178; a=rsa-sha256; cv=none; b=aSFoPPggzshpi7cAljxnKahBxO6YKdKfibPyC5t9CJaH1Abw3PBISA0at12IdEgzQC8mrY UUi0omHASF/WpV6CGgbAejZHNcDHOm0q1caNfpvm50pg/HZdYyrp5U8FpPTpUymXvDceYr gmA7ESDI+hCvTyzuA1VOyaCJnM+kuIOcUiFyQZqcZqhRujQQBYgZqY46sbrPQL2UX/ilU4 /OahVSzPRBMGEw9cbVvVUbFd8bf3qY4Zyd0LEJP7FbkLWUB2p/avfyQ3IhIsucXE9rq6rO SmzqDEWqIfDn2/1z3JEEg+q7aQOllD5xnwV0nvOnVLhT9fAkBgsgzqxqM0gzCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrnt0m1Zz93b; Sun, 6 Aug 2023 20:36:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaIGe042509; Sun, 6 Aug 2023 20:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaIho042508; Sun, 6 Aug 2023 20:36:18 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:18 GMT Message-Id: <202308062036.376KaIho042508@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 5fb88aba6c9a - stable/13 - man: Remove obsolete meteor.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5fb88aba6c9aed4c105add652adc8b74b5ee977b Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=5fb88aba6c9aed4c105add652adc8b74b5ee977b commit 5fb88aba6c9aed4c105add652adc8b74b5ee977b Author: Marius Strobl AuthorDate: 2021-12-18 13:56:16 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 16:54:29 +0000 man: Remove obsolete meteor.4 The corresponding interface has been deorbited as part of daba5ace03e83a930c128ae644afd186e1fe4341. (cherry picked from commit 7ed5694dd9b9d91e6afd7442b04b602041650354) --- ObsoleteFiles.inc | 3 + share/man/man4/Makefile | 1 - share/man/man4/meteor.4 | 873 ------------------------------------------------ 3 files changed, 3 insertions(+), 874 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7f38ab9f543c..5848dc27a5cd 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230806 meteor.4 removed, see also 20200301 entry below +OLD_FILES+=usr/share/man/man4/meteor.4.gz + # 20230806: remove bt(4) man page OLD_FILES+=usr/share/man/man4/bt.4.gz diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b3b14919aa02..4fc01a6c4b1f 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -305,7 +305,6 @@ MAN= aac.4 \ mdio.4 \ me.4 \ mem.4 \ - meteor.4 \ mfi.4 \ ${_mgb.4} \ miibus.4 \ diff --git a/share/man/man4/meteor.4 b/share/man/man4/meteor.4 deleted file mode 100644 index c9381733a863..000000000000 --- a/share/man/man4/meteor.4 +++ /dev/null @@ -1,873 +0,0 @@ -.\" -.\" $FreeBSD$ -.\" -.Dd August 15, 1995 -.Dt METEOR 4 -.Os -.Sh NAME -.Nm meteor -.Nd "video capture driver interface" -.Sh DESCRIPTION -The -.Nm -driver defined a video capture interface. -The -.Nm -driver is no longer in the tree, but other devices support this interface -so the interface portion is documented here. -.Ss Meteor Capture Modes -The -.Nm -capture driver has three modes of capture operation. -.Bl -enum -.It -Conventional -.Xr read 2 -interface. -.Pp -This mode is the easiest and slowest to use. -This mode is great for -capturing a single field at little programming cost. -.Pp -In this mode, the user opens the device, sets the capture mode -and size (see: -.Dv METEORSETGEO -.Xr ioctl 2 -call), and uses the -.Xr read 2 -system -call to load the data into a buffer. -.Pp -.Pa meteor_read.c ; -read 400x300 RGB24 into a viewable PPM file -.Bd -literal -#include -#include - -extern int errno; -#define ROWS 300 -#define COLS 400 -#define SIZE (ROWS * COLS * 4) -main() -{ - struct meteor_geomet geo; - char buf[SIZE],b[4],header[16],*p; - int i,o,c; - - if ((i = open("/dev/meteor0", O_RDONLY)) < 0) { - printf("open failed: %d\\n", errno); - exit(1); - } - /* set up the capture type and size */ - geo.rows = ROWS; - geo.columns = COLS; - geo.frames = 1; - geo.oformat = METEOR_GEO_RGB24 ; - - if (ioctl(i, METEORSETGEO, &geo) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - c = METEOR_FMT_NTSC; - - if (ioctl(i, METEORSFMT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - c = METEOR_INPUT_DEV0; - - if (ioctl(i, METEORSINPUT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - if ((c=read(i, &buf[0], SIZE)) < SIZE) { - printf("read failed %d %d %d\\n", c, i, errno); - close(i); - exit(1); - } - close(i); - - if ((o = open("rgb24.ppm", O_WRONLY | O_CREAT, 0644)) < 0) { - printf("ppm open failed: %d\\n", errno); - exit(1); - } - - /* make PPM header and save to file */ - strcpy(&header[0], "P6 400 300 255 "); - header[2] = header[6] = header[10] = header[14] = '\\n'; - write (o, &header[0], 15); - /* save the RGB data to PPM file */ - for (p = &buf[0]; p < &buf[SIZE]; ) { - b[2] = *p++; /* blue */ - b[1] = *p++; /* green */ - b[0] = *p++; /* red */ - *p++; /* NULL byte */ - write(o,&b[0], 3); /* not very efficient */ - } - close(o); - exit(0); -} -.Ed -.It -Memory mapped single capture or unsynchronized continuous capture. -.Pp -The single capture mode is designed for conferencing tools such as -.Nm nv . -These tools need to control the starting of the image capture and also -need several frames a second. -The continuous capture mode is designed -for applications that want free-running data. -.Pp -In this mode, the user opens the device, sets the capture mode -and size (see: -.Dv METEORSETGEO -.Xr ioctl 2 -call), -.Xr mmap 2 Ns s -the frame buffer -memory into the user process space, and issues either the -single-capture or the continuous capture call (see: -.Dv METEORCAPTUR -.Xr ioctl 2 -call) to load the data into the memory mapped buffer. -.Pp -As explained in the -.Dv METEORCAPTUR -.Xr ioctl 2 -call, the single frame capture -.Xr ioctl 2 -will block until the capture is complete, the continuous capture -will return immediately. -.Pp -.Pa meteor_mmap_single_continuous.c -.Bd -literal -#include -#include -#include -#include - -extern int errno; -#define ROWS 480 -#define COLS 640 -#define SIZE (ROWS * COLS * 2) -main() -{ - struct meteor_geomet geo; - char buf[SIZE]; - char *mmbuf; - int i,c; - - if ((i = open("/dev/meteor0", O_RDONLY)) < 0) { - printf("open failed\\n"); - exit(1); - } - - geo.rows = ROWS; - geo.columns = COLS; - geo.frames = 1; - geo.oformat = METEOR_GEO_RGB16 ; - - if (ioctl(i, METEORSETGEO, &geo) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - c = METEOR_FMT_NTSC; - - if (ioctl(i, METEORSFMT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - c = METEOR_INPUT_DEV0; - - if (ioctl(i, METEORSINPUT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - mmbuf=(char *)mmap((caddr_t)0, SIZE, PROT_READ, - MAP_SHARED, i, (off_t)0); - -#ifdef SINGLE_MODE - /* single frame capture */ - c = METEOR_CAP_SINGLE ; - ioctl(i, METEORCAPTUR, &c); /* wait for the frame */ - - /* directly access the frame buffer array data in mmbuf */ -#else - /* continuous frame capture */ - c = METEOR_CAP_CONTINOUS ; - ioctl(i, METEORCAPTUR, &c); /* returns immediately */ - - /* directly access the frame buffer array data in mmbuf */ - - c = METEOR_CAP_STOP_CONT ; - ioctl(i, METEORCAPTUR, &c); /* close will also stop capture */ -#endif - - close(i); - exit(0); -} -.Ed -.It -Memory mapped, multi-frame ring buffer synchronize capture. -.Pp -This continuous capture mode is synchronized with the application that -processes up to 32 frames. -This gives the advantages of both single and -continuous capture modes. -.Pp -The kernel notifies the application of a new data by raising an -application defined signal. -The driver also shares a structure with -the application that allows them to communicate which frame has been -written by the kernel and which frame has been read by the application. -.Pp -The shared structure starts on the first page after your data. -The -structure address can be found by calculation: -.Pp -.Dl "(number_rows * number_columns * pixel_depth + 4095) & 0xfffff000" -or -.Dl "((number_rows * number_columns * pixel_depth + 4095)/4096) * 4096" -.Pp -The shared structure is of type -.Va struct meteor_mem . -The two most -important fields are called -.Va active -and -.Va num_active_buf . -.Va active -is a bitmap of frames written by the kernel. -.Va num_active_bufs -is -a count of frames marked in the -.Va active -field. -When a frame is read -in by the driver, the -.Va num_active_bufs -count is tested, if this -count is below the threshold of number of active frames (value -in -.Va meteor_mem Ns 's -.Va hiwat -variable), the bit representing frame -number in the buffer is stored in the -.Va active -variable, the -.Va num_active_bufs -is incremented, the kernel then raises the specified -signal to activate the user application. -The user application's -responsibility when getting the signal is to check the active bitmap -to determine the lowest active frame, use the data as the application -desires, clear the bitmap entry for that frame, and decrement the -.Va num_active_bufs . -If the threshold of number of active frames -.Pq Va hiwat -has been exceeded, no new frames or signal from the kernel will occur -until the -.Va num_active_bufs -is less than or equal to -.Va lowat . -.Pp -The driver loads the frames in a round-robin fashion. -It is expected -that the user removes them in the same order. -The driver does not -check to see if the frame is already active. -.Pp -The -.Va frame_size -and number of frames in the buffer are also provided -to the -.Va meteor_mem -structure, but changing these fields in the -application will not change the operation of the driver. -.Pp -In programming for this mode, the user opens the device, sets the -geometry, -.Xr mmap 2 Ns s -the data/common control structure, then starts the -continuous capture mode. -A special signal catcher is required to -process the frames as they are read by the kernel. -.Pp -When specifying the geometry (see: -.Dv METEORSETGEO -.Xr ioctl 2 -call), -it -is important that the number of frames is set greater than 1. -.Pp -.Pa skeleton_capture_n.c -.Bd -literal -#include -#include -#include -#include -#include - -int video; /* made global if you wish to stop capture in signal handler */ -caddr_t data_frames; -struct meteor_mem *common_mem; -extern int errno; - -#define FRAME_MAX - -void -usr2_catcher() -{ -#ifdef SIGNAL_STOP - struct meteor_capframe capframe; /* for ioctl */ -#endif - char *frame; - - /* find frame */ - frame = (char *) (data_frames + sig_cnt * common_mem->frame_size) ; - - /* add frame processing here */ - /* deactivate frame */ - common_mem->active &= ~(1 << (sig_cnt % 16)); - common_mem->num_active_bufs--; - - /* process next frame on next interrupt */ - sig_cnt = ((sig_cnt+1) % FRAME_MAX); - -#ifdef SIGNAL_STOP - if (some_condition_requiring_stopping) { - capframe.command=METEOR_CAP_STOP_FRAMES; - - if (ioctl(i, METEORCAPFRM, &capframe) < 0) { - printf("METEORCAPFRM failed %d\\n", errno); - exit(1); - } - } -#endif -} - -main() -{ - struct meteor_geomet geo; - int height, width, depth, frames, size; - struct meteor_capframe capframe; - - if ((i = open("/dev/meteor0", O_RDONLY)) < 0) { - printf("open failed\\n"); - exit(1); - } - printf("test %d %d\\n", errno, i); - - height = geo.rows = 120; - width= geo.columns = 320; - frames = geo.frames = FRAME_MAX; - depth = 2; /* 2 bytes per pixel for RGB*/ - - - geo.oformat = METEOR_GEO_RGB16; - - if (ioctl(i, METEORSETGEO, &geo) < 0) { - printf("METEORSETGEO failed %d\\n", errno); - exit(1); - } - - c = METEOR_FMT_NTSC; - - if (ioctl(i, METEORSFMT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - c = METEOR_INPUT_DEV0; - - if (ioctl(i, METEORSINPUT, &c) < 0) { - printf("ioctl failed: %d\\n", errno); - exit(1); - } - - size = ((width*height*depth*frames+4095)/4096)*4096; - /* add one page after data for meteor_mem */ - data_frames = mmap((caddr_t)0, size + 4096, PROT_READ | PROT_WRITE, - MAP_SHARED, i, (off_t)0); - - if (data_frames == (caddr_t) MAP_FAILED) return (0); - - /* common_mem is located at page following data */ - common_mem = (struct meteor_mem *) (y + size); - - signal(SIGUSR2, usr2_catcher); /* catch new frame message */ - - capframe.command=METEOR_CAP_N_FRAMES; - capframe.signal=SIGUSR2; - capframe.lowat=12; /* must be < hiwat */ - capframe.hiwat=14; /* must be < FRAME_MAX */ - - /* start the sync capture */ - if (ioctl(i, METEORCAPFRM, &capframe) < 0) { - printf("METEORCAPFRM failed %d\\n", errno); - exit(1); - } - - /* this is the background working area, or you can sleep */ - - - /* to stop capture */ - capframe.command=METEOR_CAP_STOP_FRAMES; - - if (ioctl(i, METEORCAPFRM, &capframe) < 0) { - printf("METEORCAPFRM failed %d\\n", errno); - exit(1); - } -} -.Ed -.El -.Ss Meteor IOCTL Call and Parameters -The -.Nm -capture driver has -.Xr ioctl 2 -requests for capturing, reading card -status, for setting and reading the geometry, and for setting and reading the -attributes. -.Pp -.Bf -symbolic -IT IS VERY IMPORTANT TO CHECK FOR ERRORS ON THESE RETURNING IOCTLs. -.Ef -Errors indicate that something is very wrong with the -.Xr ioctl 2 -and the -application should not attempt to proceed further with capturing. -The -.Nm -capture driver still makes attempts to stop the next capture step if -an error occurred in a previous step but was ignored by the application -programmer. -.Bl -enum -.It -.Xr ioctl 2 -requests -.Dv METEORSETGEO -and -.Dv METEORGETGEO -.Pp -.Dv METEORSETGEO -and -.Dv METEORGETGEO -are used to set and read the input -size, input device, and output format for frame capture. -.Pp -These -.Xr ioctl 2 -routines use the -.Va meteor_geomet -structure that has the -following entries: -.Bl -tag -width columns -.It Va rows -number of rows (lines high) in output image -.It Va columns -number of pixels in a row (width) in output image -.It Va frames -number of frames in buffer. -Should be 1, unless using -the multi-framed synchronous capture mode -.Pq Dv METEORCAPFRM -which REQUIRES frames to be larger than 1. -.Pp -Note: if -.Va rows , columns -or -.Va frames -is not changed, then -the existing values are used. -The system defaults -is 640x480x1. -.It Va oformat -you may choose one of the following output format: -.Bl -tag -width METEOR_GEO_YUV_PACKED -.It Dv METEOR_GEO_RGB16 -(RGB 16 bits xrrrrrgg gggbbbbb default) -.It Dv METEOR_GEO_RGB24 -(RGB 24 bits packed in 32 bits: -00000000 rrrrrrrr gggggggg bbbbbbbb) -.It Dv METEOR_GEO_YUV_PACKED -(4-2-2 YUV 16 bits packed byte format: -u0 y0 v0 y1 u1 y2 v1 y3 ...) -.It Dv METEOR_GEO_YUV_PLANER -(4-2-2 YUV 16 bits planer format: -rows * columns bytes of y -rows * column / 4 bytes of even u -rows * column / 4 bytes of even v -rows * column / 4 bytes of odd u -rows * column / 4 bytes of odd v) -.El -.El -.Pp -The -.Dv METEORSETGEO -.Xr ioctl 2 -will fail if more than one entry from a category -is selected. -It is highly recommended that a -.Dv METEORSETGEO -is done -before capturing data because you cannot guarantee the initial mode -the card. -.Pp -The -.Dv METEORSETGEO -will also attempt to reallocate a new contiguous -kernel buffer if the new geometry exceeds the old geometry. -On the -other hand, if the new geometry will fit in the existing buffer, -the existing buffer is used. -.Pp -If -.Dv METEORSETGEO -fails the -.Xr ioctl 2 -will return a value of -1 and the -external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid -.Va meteor_geomet -structure pointer, -.Va rows , columns , frames -were invalid. -.It Bq Er ENOMEM -could not allocate the contiguous block. -.El -.It -.Xr ioctl 2 -requests -.Dv METEORSFMT -and -.Dv METEORGFMT -.Pp -.Dv METEORSFMT -and -.Dv METEORGFMT -are used to set and read the camera input -standard format. -.Pp -Possible formats are: -.Pp -.Bl -tag -width METEOR_FMT_AUTOMODE -compact -.It Dv METEOR_FMT_NTSC -NTSC (default mode) -.It Dv METEOR_FMT_PAL -PAL -.It Dv METEOR_FMT_SECAM -SECAM -.It Dv METEOR_FMT_AUTOMODE -Autodetect. -.El -.It -.Xr ioctl 2 -requests -.Dv METEORSINPUT -and -.Dv METEORGINPUT -.Pp -.Dv METEORSINPUT -and -.Dv METEORGINPUT -are used to set and read the camera -input device. -Using the DB9 connector on the -.Tn Meteor -card, 4 input -devices can be connected and an input camera can be selected with this -.Xr ioctl 2 . -.Pp -Possible formats are: -.Pp -.Bl -tag -width METEOR_INPUT_DEV_SVIDEO -compact -.It Dv METEOR_INPUT_DEV0 -(default if none specified) -.It Dv METEOR_INPUT_DEV_RCA -(same as METEOR_INPUT_DEV0) -.It Dv METEOR_INPUT_DEV1 -.It Dv METEOR_INPUT_DEV2 -.It Dv METEOR_INPUT_DEV_SVIDEO -(same as METEOR_INPUT_DEV2) -.El -.It -.Xr ioctl 2 -request -.Dv METEORSTATUS -.Pp -.Dv METEORSTATUS -is used to read the status of the -.Tn Meteor -capture card -and returns the following information: -.Bl -column "METEOR_STATUS_ID_MASK" "\&" -.It Dv METEOR_STATUS_ID_MASK " 4 bit ID of the SAA7196 scaler chip." -.Pp -.It Dv METEOR_STATUS_DIR " 0 = scaler uses internal source." -.It " 1 = scaler uses external data of expansion bus." -.Pp -.It Dv METEOR_STATUS_OEF " 0 = even field detected." -.It " 1 = odd field detected." -.Pp -.It Dv METEOR_STATUS_SVP " VRAM Port state:" -.It " 0 = inputs HFL and INCADDR inactive." -.It " 1 = inputs HFL and INCADDR active." -.Pp -.It Dv METEOR_STATUS_STTC " 0 = TV horizontal time constant (slow)." -.It " 1 = VCR horizontal time constant (fast)." -.Pp -.It Dv METEOR_STATUS_HCLK " 0 = Horizontal Phase Lock Loop locked." -.It " 1 = Horizontal Phase Lock Loop unlocked." -.Pp -.It Dv METEOR_STATUS_FIDT " 0 = 50 Hz Field detected." -.It " 1 = 60 Hz Field detected." -.Pp -.It Dv METEOR_STATUS_ALTD " 0 = no line alternating color burst detected." -.It " 1 = line alternating color burst detected (PAL/SECAM)." -.Pp -.It Dv METEOR_STATUS_CODE " 0 = no color information detected." -.It " 1 = color information detected." -.El -.It -.Xr ioctl 2 -request -.Dv METEORCAPTUR -.Pp -.Dv METEORCAPTUR -is used to single frame capture or unsynchronized -continuous capture. -.Pp -The single frame capture -.Xr ioctl 2 -request will return only after a -frame has been captured and transferred to the frame buffer. -.Pp -The unsynchronized continuous capture will return immediately and -data is directly deposited into the buffer when it is available. -Since this is unsynchronized, it is possible the data is being -written by the kernel while being read by the application. -.Pp -These -.Xr ioctl 2 -routines use the following settings: -.Pp -.Bl -tag -width METEOR_CAP_CONTINOUS -compact -.It Dv METEOR_CAP_SINGLE -capture one frame -.It Dv METEOR_CAP_CONTINOUS -unsynchronized continuous capture -.It Dv METEOR_CAP_STOP_CONT -stop the unsynchronized continuous -capture -.El -.Pp -If -.Dv METEORCAPTUR -fails the -.Xr ioctl 2 -will return a value of -1 and the -external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid capture command value -.It Bq Er ENXIO -there is not internal buffer to hold the frame. -This indicates the previous set geometry -.Xr ioctl 2 -failed. -.It Bq Er EIO -card is already capturing. -.El -.It -.Xr ioctl 2 -request -.Dv METEORCAPFRM -.Pp -.Dv METEORCAPFRM -is used for synchronous capture of multiple frames. -.Pp -This -.Xr ioctl 2 -routine uses the -.Va meteor_capture -structure that has the -following entries: -.Bl -tag -width command -.It Va command -possible values for -.Va command -are: -.Bl -tag -width METEOR_CAP_STOP_FRAMES -.It Dv METEOR_CAP_STOP_FRAMES -stop the capture; does not use the -other variable in structure. -.It Dv METEOR_CAP_N_FRAMES -start the capture using the other -variables in the structure as inputs -.El -.It Va signal -signal to send to application when a new -frame has been captured. -This signal will -only be raised if the captured frame is saved. -.It Va lowat -see below -.It Va hiwat -see below -.El -.Pp -When a new frame is completed, the driver checks the current unread -frame count stored in shared variable (the shared variable is stored -in the -.Va meteor_mem -structure) -.Va num_active_buf ; -if the count is larger -than -.Va hiwat , -the driver will not store any new frames and will not -send capture signal to the user application until the -.Va num_active_buf -is lower than -.Va lowat . -.Pp -If -.Dv METEORCAPFRM -fails the -.Xr ioctl 2 -will return a value of -1 and the -external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid meteor_geomet structure pointer or bad command. -.It Bq Er ENXIO -there is not internal buffer to hold the frame. -This indicates the previous set geometry -.Xr ioctl 2 -failed. -.It Bq Er EIO -card is already capturing. -.El -.It -.Xr ioctl 2 -requests -.Dv METEORSCHCV -and -.Dv METEORGCHCV -.Pp -.Dv METEORSCHCV -and -.Dv METEORGCHCV -are used to set and get the chrominance -gain control and effects the UV output amplitude. -.Pp -If -.Dv METEORSCHCV -or -.Dv METEORGCHCV -fails the -.Xr ioctl 2 -will return a value -of -1 and the external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid unsigned char pointer. -.El -.It -.Xr ioctl 2 -requests -.Dv METEORGHUE -and -.Dv METEORSHUE -.Pp -.Dv METEORGHUE -and -.Dv METEORSHUE -are used to get and set the hue. -The -signed character has legal values are from +127 which represent -+178.6 degrees to -128 which represents -180 degrees. -.Pp -If -.Dv METEORGHUE -or -.Dv METEORSHUE -fails the -.Xr ioctl 2 -will return a value of --1 and the external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid signed char pointer. -.El -.It -.Xr ioctl 2 -requests -.Dv METEORSCOUNT -and -.Dv METEORGCOUNT -.Pp -.Dv METEORGCOUNT -is used to get the count of frame errors, DMA errors and -count of the number of frames captured that have occurred since -the device was opened. -.Dv METEORSCOUNT -can be used to reinitialize the -counters. -.Pp -This -.Xr ioctl 2 -routines use the -.Va meteor_counts -structure that has the -following entries: -.Bl -tag -width frame_count -.It Va fifo_errors -number of FIFO errors since device was opened. -.It Va dma_errors -number of DMA errors since device was opened. -.It Va frame_count -number of frames captured since device was opened. -.El -.Pp -If -.Dv METEORSCOUNT -or -.Dv METEORGCOUNT -fails the -.Xr ioctl 2 -will return a value -of -1 and the external variable -.Va errno -will be set to: -.Bl -tag -width Er -.It Bq Er EINVAL -invalid meteor_counts structure pointer. -.El -.El -.Sh AUTHORS -.An Jim Lowe Aq Mt james@miller.cs.uwm.edu -.An Mark Tinguely Aq Mt tinguely@plains.nodak.edu -.Sh BUGS -The -.Nm -driver no longer works at all. From nobody Sun Aug 6 20:36:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrnv3QMBz4mNFT; Sun, 6 Aug 2023 20:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrnv2sT3z4bBQ; Sun, 6 Aug 2023 20:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6TY10t1kdCB3p5PIxMGPBgrzfq8ApEhOV95eCrgHBg=; b=ac+P4s0C2OVyvB0vPaJQXKazlHdOEau0d4YyY9Sk4Sy35k9rOsHroQ6Wu9z/pprS5RiwX/ 8GQ8nKh//qNGQrnu4TweAU4HBAStrRrSwRCR0cWsSZO4P93lE8WBjJgzwC+36OS/nNoBsE Ngfn/BIOCE5wzfdlamlivjZdjHGS+jQLzXWkbMBJf4HVgH82GliesBLowwLoJleIo8TsMP PR5oOe4BpvGkW+/3afPiS53iQ2Am5dJ6r0Tux+TDeU3uJ11wy3D+nH6Cf90EF0wQcUD6/T EFxAkukvXLYP2eKcy3Lci+KUdQnd/Kqk9kraz+zYQ0a0sJtkXcWDZwOdtlrLIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6TY10t1kdCB3p5PIxMGPBgrzfq8ApEhOV95eCrgHBg=; b=LbYPK0HAOj1ipg2TpEaWOWehbCCGkS0aVgsoPurwvi7oqS6YvWmB7XB2Dz1DTZu/e6rxoW LfBTg/Ct/pRerfrP7yK385P9jEOomeLizKzVRot77sb3psjk/YQQxqwCL62oaKbSYkR2WD QD/LtcJ8MRFg5fD6D4V5pAlZqtNGoME5aZh5iczUEg9PZPP8fOKKkW+Fx9u0dt/2CCuyO7 4iDdnlSwDmmlp/GwzvK95fcb3METa0a0eM/OZ+7cQ2ybgKeb9OPXqhVM35/vVxvo0wv3iS WswIQ6kl4YolLOVS8aop97a2Wvc4+OHrTwIQOrrEh6Ti2zvx0lHpya3K8CwElA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354179; a=rsa-sha256; cv=none; b=X0ZB9YfF0S+tEYLUu0H49mFEu+IeotEmjvraOau+DahS8nCZlQBlFbvWJKcVLXafVGWdTQ onr+oSe4AGZNLzLzatDP35IqMOsr170Dlm2t/UgOjn7Vc1zBpYvqHnbljVcQkgnuHiTULG 3UQHegKO7ct/onBngd0vxwWK5rOHEqoDbdDr7/T3FoM+R6P4hAnIMgeTLd9aeh6u8irXRm gJ1Eru4NeOexiriuUj4qJMS+GnXU0h+jjkHyeiTVv50uYOQKX/KAMjb5+UJ3ovx4tVRsw6 owSPx19yeMJC/IFtBHmgKFbjZCAX8qTvfyNHw/0OUEveOBYpDqTDrApoxoRQsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrnv1hvBz8mW; Sun, 6 Aug 2023 20:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaJOw042528; Sun, 6 Aug 2023 20:36:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaJPc042527; Sun, 6 Aug 2023 20:36:19 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:19 GMT Message-Id: <202308062036.376KaJPc042527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: a6222e182c74 - stable/13 - mmc(4): Don't call bridge driver for timings not requiring tuning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6222e182c7464903f60f288b7784a31d702ce8c Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=a6222e182c7464903f60f288b7784a31d702ce8c commit a6222e182c7464903f60f288b7784a31d702ce8c Author: Marius Strobl AuthorDate: 2023-04-12 21:46:02 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:03:45 +0000 mmc(4): Don't call bridge driver for timings not requiring tuning The original idea behind calling into the bridge driver was to have the logic deciding whether tuning is actually required for a particular bus timing in a given slot as well as doing the sanity checking only on the controller layer which also generally is better suited for these due to say SDHCI_SDR50_NEEDS_TUNING. On another thought, not every such driver should need to check whether tuning is required at all, though, and not everything is SDHCI in the first place. Adjust sdhci(4) accordingly keeping sdhci_generic_tune() a bit cautious still. (cherry picked from commit bd15d31cef50060d90356384ba7b878d398fc9f3) --- sys/dev/mmc/mmc.c | 9 +++++++++ sys/dev/sdhci/sdhci.c | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/dev/mmc/mmc.c b/sys/dev/mmc/mmc.c index 4e4e3507a1f8..e725cd1c66cb 100644 --- a/sys/dev/mmc/mmc.c +++ b/sys/dev/mmc/mmc.c @@ -2243,6 +2243,15 @@ clock: mmcbr_set_clock(dev, max_dtr); mmcbr_update_ios(dev); + /* + * Don't call into the bridge driver for timings definitely + * not requiring tuning. Note that it's up to the upper + * layer to actually execute tuning otherwise. + */ + if (timing <= bus_timing_uhs_sdr25 || + timing == bus_timing_mmc_ddr52) + goto power_class; + if (mmcbr_tune(dev, hs400) != 0) { device_printf(dev, "Card at relative address %d " "failed to execute initial tuning\n", rca); diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 6094e49f2cfa..8ea016093686 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -1373,10 +1373,12 @@ sdhci_generic_tune(device_t brdev __unused, device_t reqdev, bool hs400) case bus_timing_uhs_sdr50: if (slot->opt & SDHCI_SDR50_NEEDS_TUNING) break; - /* FALLTHROUGH */ - default: SDHCI_UNLOCK(slot); return (0); + default: + slot_printf(slot, "Tuning requested but not required.\n"); + SDHCI_UNLOCK(slot); + return (EINVAL); } tune_cmd = slot->tune_cmd; From nobody Sun Aug 6 20:36:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrnw4F06z4mNYr; Sun, 6 Aug 2023 20:36: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 4RJrnw3g7hz4bMv; Sun, 6 Aug 2023 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgH9T53tYn1dwYML51eE3z5mPOgU06gee+dsidsilPM=; b=yHIh/+1Et5804Q1+hOyhtgGQBtVEmPTufJKSXXi3/UrEdBqItzXC918Ensv3aoo+eFGuf3 npo+ji7qDUANmfEB2gzUL43jHyqqQ27W/YPO8dfxRMjusC1d4Y+GY8sibF1os8tR0E+IcR qppaIuBq1C9x718nsIbDE6SLgUbNhK9WL/SJTnnPA5K71S0drs84WVm7FtrLBxO7NoWsOY 9pZYJmZZS1BGhym3fUTeCqhJdHUTMLkNtC+F8beaZnH7uy8g74ZxsOSmGBdmi5hzZXFihp VVz4aK2NWc4bPeDQGP4GavmbhdVZeSdmzvfns3LGvoyEy4wvds9pIoJRReGwSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354180; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DgH9T53tYn1dwYML51eE3z5mPOgU06gee+dsidsilPM=; b=fcawmrvWpDTJvmc6Xv+q/pYi3eK5ew1T4oi6tIqULFdmjasnIuuNqmGfWJlMbi1FjqRLzg jGT4ViG2kUChqlJ/6hwXt7s6GjT7Z4y+ga0pqwd0bxKkQvbeTdL5es2JB5Nd3nZHiXL9UG p4Z/3G5x+tUazb2Acg9NYpcJA/6LZQ9f9aGVzaEPSRH9QQ8YK8A2rWMvCtZtZyVMhSp9Au dWFDrMtN3VqB4tIysGRATzwzxGj0wIDU7ASTGgUuJLtP4xW+H4ZsVmPdKniKXsrv6qrtGw C31hx3TUgJObBx19Xy/aNCbaeyovApwIR1HSryTrqOJ17vSCGMCJ1JmeFtY7kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354180; a=rsa-sha256; cv=none; b=MRYWeuXUIuB7cD7leKOk7Nx/Li0FQzlyy7H3IyT15+tJCgAWsg2eVKRroSLB1qQT83mW9d IpFwM4O2eYXCnb7LMJLy4azWDzO+Ze2qUiV4mq/KTmEnJUoXY26pVN1Bo4MxTEQt9HkIUP LevD55qjeonRWQc7/6zARF5vIEHVoPqMyeJZY30QmjyuLDViiJ/yKf/VG6juVr6Z7fr9om Ffm0LLyOA/TQS8RPe4fmj4ZhGrjCA52+7pYiSuD+hn7PuYkdcTDv3k6+MF8DbguPYdOIAX 0cK+WkNcXBM5WSlEaGsUkpHxAiiEYdei2TqtlhBd0aPL90rEz7PJ+aqowZS6FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrnw2Fcgz91C; Sun, 6 Aug 2023 20:36:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaKWX042547; Sun, 6 Aug 2023 20:36:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaKxS042546; Sun, 6 Aug 2023 20:36:20 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:20 GMT Message-Id: <202308062036.376KaKxS042546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 4ebb0ab53543 - stable/13 - gem(4): Remove onboard-only Sun ERI and remnants of SBus support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4ebb0ab53543864a77d60eee27fde3f47e88693f Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=4ebb0ab53543864a77d60eee27fde3f47e88693f commit 4ebb0ab53543864a77d60eee27fde3f47e88693f Author: Marius Strobl AuthorDate: 2023-04-18 16:39:38 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:10:18 +0000 gem(4): Remove onboard-only Sun ERI and remnants of SBus support These bits are obsolete since 58aa35d42975c298ca0adba705c042596303c9f5. This change reverts part of 9ba2b298dfda78b6669281507b314a4c441cd706 as well as effectively bd3d9826d73b780d349c53ee373060bc7b8d0581, i. e. the SBus-related modifications. This also gets rid of a nasty hack required as bus_{read,write}_N(9) doesn't really fit bus_space_subregion(9). (cherry picked from commit 8defc88c1345f4c048a05e6f20f60ed59d204129) --- share/man/man4/gem.4 | 9 +- sys/dev/gem/if_gem.c | 451 ++++++++++++++++++++++------------------------- sys/dev/gem/if_gem_pci.c | 50 +----- sys/dev/gem/if_gemreg.h | 51 +----- sys/dev/gem/if_gemvar.h | 102 +++++------ 5 files changed, 266 insertions(+), 397 deletions(-) diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4 index 9224920c07dc..90667c19cc4f 100644 --- a/share/man/man4/gem.4 +++ b/share/man/man4/gem.4 @@ -26,12 +26,12 @@ .\" .\" $FreeBSD$ .\" -.Dd December 26, 2020 +.Dd April 18, 2023 .Dt GEM 4 .Os .Sh NAME .Nm gem -.Nd ERI/GEM/GMAC Ethernet device driver +.Nd GEM/GMAC Ethernet device driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -51,8 +51,7 @@ if_gem_load="YES" The .Nm driver provides support for the GMAC Ethernet hardware found mostly in -the last Apple PowerBooks G3s and most G4-based Apple hardware, as -well as Sun UltraSPARC machines. +the last Apple PowerBooks G3s and most G4-based Apple hardware. .Pp All controllers supported by the .Nm @@ -69,8 +68,6 @@ driver include: .It Apple GMAC .It -Sun ERI 10/100 Mbps Ethernet -.It Sun GEM Gigabit Ethernet .El .Pp diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c index c9a7ef04fbfa..02b14f0cca52 100644 --- a/sys/dev/gem/if_gem.c +++ b/sys/dev/gem/if_gem.c @@ -99,8 +99,8 @@ CTASSERT(powerof2(GEM_NTXDESC) && GEM_NTXDESC >= 32 && GEM_NTXDESC <= 8192); #define GEM_CSUM_FEATURES (CSUM_TCP) static int gem_add_rxbuf(struct gem_softc *sc, int idx); -static int gem_bitwait(struct gem_softc *sc, u_int bank, bus_addr_t r, - uint32_t clr, uint32_t set); +static int gem_bitwait(struct gem_softc *sc, bus_addr_t r, uint32_t clr, + uint32_t set); static void gem_cddma_callback(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); static int gem_disable_rx(struct gem_softc *sc); @@ -142,11 +142,6 @@ MODULE_DEPEND(gem, miibus, 1, 1, 1); #define KTR_GEM KTR_SPARE2 #endif -#define GEM_BANK1_BITWAIT(sc, r, clr, set) \ - gem_bitwait((sc), GEM_RES_BANK1, (r), (clr), (set)) -#define GEM_BANK2_BITWAIT(sc, r, clr, set) \ - gem_bitwait((sc), GEM_RES_BANK2, (r), (clr), (set)) - int gem_attach(struct gem_softc *sc) { @@ -275,13 +270,9 @@ gem_attach(struct gem_softc *sc) if ((sc->sc_flags & GEM_SERDES) != 0) goto serdes; - /* Bad things will happen when touching this register on ERI. */ - if (sc->sc_variant != GEM_SUN_ERI) { - GEM_BANK1_WRITE_4(sc, GEM_MII_DATAPATH_MODE, - GEM_MII_DATAPATH_MII); - GEM_BANK1_BARRIER(sc, GEM_MII_DATAPATH_MODE, 4, - BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - } + GEM_WRITE_4(sc, GEM_MII_DATAPATH_MODE, GEM_MII_DATAPATH_MII); + GEM_BARRIER(sc, GEM_MII_DATAPATH_MODE, 4, + BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); gem_mifinit(sc); @@ -289,23 +280,15 @@ gem_attach(struct gem_softc *sc) * Look for an external PHY. */ error = ENXIO; - v = GEM_BANK1_READ_4(sc, GEM_MIF_CONFIG); + v = GEM_READ_4(sc, GEM_MIF_CONFIG); if ((v & GEM_MIF_CONFIG_MDI1) != 0) { v |= GEM_MIF_CONFIG_PHY_SEL; - GEM_BANK1_WRITE_4(sc, GEM_MIF_CONFIG, v); - GEM_BANK1_BARRIER(sc, GEM_MIF_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MIF_CONFIG, v); + GEM_BARRIER(sc, GEM_MIF_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - switch (sc->sc_variant) { - case GEM_SUN_ERI: - phy = GEM_PHYAD_EXTERNAL; - break; - default: - phy = MII_PHY_ANY; - break; - } error = mii_attach(sc->sc_dev, &sc->sc_miibus, ifp, - gem_mediachange, gem_mediastatus, BMSR_DEFCAPMASK, phy, - MII_OFFSET_ANY, MIIF_DOPAUSE); + gem_mediachange, gem_mediastatus, BMSR_DEFCAPMASK, + MII_PHY_ANY, MII_OFFSET_ANY, MIIF_DOPAUSE); } /* @@ -316,11 +299,10 @@ gem_attach(struct gem_softc *sc) if (error != 0 && ((v & GEM_MIF_CONFIG_MDI0) != 0 || GEM_IS_APPLE(sc))) { v &= ~GEM_MIF_CONFIG_PHY_SEL; - GEM_BANK1_WRITE_4(sc, GEM_MIF_CONFIG, v); - GEM_BANK1_BARRIER(sc, GEM_MIF_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MIF_CONFIG, v); + GEM_BARRIER(sc, GEM_MIF_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); switch (sc->sc_variant) { - case GEM_SUN_ERI: case GEM_APPLE_K2_GMAC: phy = GEM_PHYAD_INTERNAL; break; @@ -341,16 +323,16 @@ gem_attach(struct gem_softc *sc) */ if (error != 0 && sc->sc_variant == GEM_SUN_GEM) { serdes: - GEM_BANK1_WRITE_4(sc, GEM_MII_DATAPATH_MODE, + GEM_WRITE_4(sc, GEM_MII_DATAPATH_MODE, GEM_MII_DATAPATH_SERDES); - GEM_BANK1_BARRIER(sc, GEM_MII_DATAPATH_MODE, 4, + GEM_BARRIER(sc, GEM_MII_DATAPATH_MODE, 4, BUS_SPACE_BARRIER_WRITE); - GEM_BANK1_WRITE_4(sc, GEM_MII_SLINK_CONTROL, + GEM_WRITE_4(sc, GEM_MII_SLINK_CONTROL, GEM_MII_SLINK_LOOPBACK | GEM_MII_SLINK_EN_SYNC_D); - GEM_BANK1_BARRIER(sc, GEM_MII_SLINK_CONTROL, 4, + GEM_BARRIER(sc, GEM_MII_SLINK_CONTROL, 4, BUS_SPACE_BARRIER_WRITE); - GEM_BANK1_WRITE_4(sc, GEM_MII_CONFIG, GEM_MII_CONFIG_ENABLE); - GEM_BANK1_BARRIER(sc, GEM_MII_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MII_CONFIG, GEM_MII_CONFIG_ENABLE); + GEM_BARRIER(sc, GEM_MII_CONFIG, 4, BUS_SPACE_BARRIER_WRITE); sc->sc_flags |= GEM_SERDES; error = mii_attach(sc->sc_dev, &sc->sc_miibus, ifp, @@ -371,10 +353,10 @@ gem_attach(struct gem_softc *sc) /* Get RX FIFO size. */ sc->sc_rxfifosize = 64 * - GEM_BANK1_READ_4(sc, GEM_RX_FIFO_SIZE); + GEM_READ_4(sc, GEM_RX_FIFO_SIZE); /* Get TX FIFO size. */ - v = GEM_BANK1_READ_4(sc, GEM_TX_FIFO_SIZE); + v = GEM_READ_4(sc, GEM_TX_FIFO_SIZE); device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n", sc->sc_rxfifosize / 1024, v / 16); @@ -571,29 +553,29 @@ gem_tick(void *arg) * Unload collision and error counters. */ if_inc_counter(ifp, IFCOUNTER_COLLISIONS, - GEM_BANK1_READ_4(sc, GEM_MAC_NORM_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_FIRST_COLL_CNT)); - v = GEM_BANK1_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_LATE_COLL_CNT); + GEM_READ_4(sc, GEM_MAC_NORM_COLL_CNT) + + GEM_READ_4(sc, GEM_MAC_FIRST_COLL_CNT)); + v = GEM_READ_4(sc, GEM_MAC_EXCESS_COLL_CNT) + + GEM_READ_4(sc, GEM_MAC_LATE_COLL_CNT); if_inc_counter(ifp, IFCOUNTER_COLLISIONS, v); if_inc_counter(ifp, IFCOUNTER_OERRORS, v); if_inc_counter(ifp, IFCOUNTER_IERRORS, - GEM_BANK1_READ_4(sc, GEM_MAC_RX_LEN_ERR_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_RX_ALIGN_ERR) + - GEM_BANK1_READ_4(sc, GEM_MAC_RX_CRC_ERR_CNT) + - GEM_BANK1_READ_4(sc, GEM_MAC_RX_CODE_VIOL)); + GEM_READ_4(sc, GEM_MAC_RX_LEN_ERR_CNT) + + GEM_READ_4(sc, GEM_MAC_RX_ALIGN_ERR) + + GEM_READ_4(sc, GEM_MAC_RX_CRC_ERR_CNT) + + GEM_READ_4(sc, GEM_MAC_RX_CODE_VIOL)); /* * Then clear the hardware counters. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_NORM_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); + GEM_WRITE_4(sc, GEM_MAC_NORM_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); mii_tick(sc->sc_mii); @@ -604,14 +586,13 @@ gem_tick(void *arg) } static int -gem_bitwait(struct gem_softc *sc, u_int bank, bus_addr_t r, uint32_t clr, - uint32_t set) +gem_bitwait(struct gem_softc *sc, bus_addr_t r, uint32_t clr, uint32_t set) { int i; uint32_t reg; for (i = GEM_TRIES; i--; DELAY(100)) { - reg = GEM_BANKN_READ_M(bank, 4, sc, r); + reg = GEM_READ_4(sc, r); if ((reg & clr) == 0 && (reg & set) == set) return (1); } @@ -629,12 +610,10 @@ gem_reset(struct gem_softc *sc) gem_reset_tx(sc); /* Do a full reset. */ - GEM_BANK2_WRITE_4(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX | - (sc->sc_variant == GEM_SUN_ERI ? GEM_ERI_CACHE_LINE_SIZE << - GEM_RESET_CLSZ_SHFT : 0)); - GEM_BANK2_BARRIER(sc, GEM_RESET, 4, + GEM_WRITE_4(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX); + GEM_BARRIER(sc, GEM_RESET, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK2_BITWAIT(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0)) + if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0)) device_printf(sc->sc_dev, "cannot reset device\n"); } @@ -711,31 +690,29 @@ gem_reset_rx(struct gem_softc *sc) * disable DMA first. */ (void)gem_disable_rx(sc); - GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG, 0); - GEM_BANK1_BARRIER(sc, GEM_RX_CONFIG, 4, + GEM_WRITE_4(sc, GEM_RX_CONFIG, 0); + GEM_BARRIER(sc, GEM_RX_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK1_BITWAIT(sc, GEM_RX_CONFIG, GEM_RX_CONFIG_RXDMA_EN, 0)) + if (!gem_bitwait(sc, GEM_RX_CONFIG, GEM_RX_CONFIG_RXDMA_EN, 0)) device_printf(sc->sc_dev, "cannot disable RX DMA\n"); /* Wait 5ms extra. */ DELAY(5000); /* Reset the ERX. */ - GEM_BANK2_WRITE_4(sc, GEM_RESET, GEM_RESET_RX | - (sc->sc_variant == GEM_SUN_ERI ? GEM_ERI_CACHE_LINE_SIZE << - GEM_RESET_CLSZ_SHFT : 0)); - GEM_BANK2_BARRIER(sc, GEM_RESET, 4, + GEM_WRITE_4(sc, GEM_RESET, GEM_RESET_RX); + GEM_BARRIER(sc, GEM_RESET, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK2_BITWAIT(sc, GEM_RESET, GEM_RESET_RX, 0)) { + if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_RX, 0)) { device_printf(sc->sc_dev, "cannot reset receiver\n"); return (1); } /* Finally, reset RX MAC. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_RXRESET, 1); - GEM_BANK1_BARRIER(sc, GEM_MAC_RXRESET, 4, + GEM_WRITE_4(sc, GEM_MAC_RXRESET, 1); + GEM_BARRIER(sc, GEM_MAC_RXRESET, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK1_BITWAIT(sc, GEM_MAC_RXRESET, 1, 0)) { + if (!gem_bitwait(sc, GEM_MAC_RXRESET, 1, 0)) { device_printf(sc->sc_dev, "cannot reset RX MAC\n"); return (1); } @@ -766,25 +743,24 @@ gem_reset_rxdma(struct gem_softc *sc) GEM_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); /* NOTE: we use only 32-bit DMA addresses here. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_RING_PTR_HI, 0); - GEM_BANK1_WRITE_4(sc, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0)); - GEM_BANK1_WRITE_4(sc, GEM_RX_KICK, GEM_NRXDESC - 4); - GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG, + GEM_WRITE_4(sc, GEM_RX_RING_PTR_HI, 0); + GEM_WRITE_4(sc, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0)); + GEM_WRITE_4(sc, GEM_RX_KICK, GEM_NRXDESC - 4); + GEM_WRITE_4(sc, GEM_RX_CONFIG, gem_ringsize(GEM_NRXDESC /* XXX */) | ((ETHER_HDR_LEN + sizeof(struct ip)) << GEM_RX_CONFIG_CXM_START_SHFT) | (GEM_THRSH_1024 << GEM_RX_CONFIG_FIFO_THRS_SHIFT) | (ETHER_ALIGN << GEM_RX_CONFIG_FBOFF_SHFT)); - /* Adjusting for the SBus clock probably isn't worth the fuzz. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_BLANKING, + GEM_WRITE_4(sc, GEM_RX_BLANKING, ((6 * (sc->sc_flags & GEM_PCI66) != 0 ? 2 : 1) << GEM_RX_BLANKING_TIME_SHIFT) | 6); - GEM_BANK1_WRITE_4(sc, GEM_RX_PAUSE_THRESH, + GEM_WRITE_4(sc, GEM_RX_PAUSE_THRESH, (3 * sc->sc_rxfifosize / 256) | ((sc->sc_rxfifosize / 256) << 12)); - GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG, - GEM_BANK1_READ_4(sc, GEM_RX_CONFIG) | GEM_RX_CONFIG_RXDMA_EN); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_MASK, + GEM_WRITE_4(sc, GEM_RX_CONFIG, + GEM_READ_4(sc, GEM_RX_CONFIG) | GEM_RX_CONFIG_RXDMA_EN); + GEM_WRITE_4(sc, GEM_MAC_RX_MASK, GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT); /* * Clear the RX filter and reprogram it. This will also set the @@ -802,22 +778,20 @@ gem_reset_tx(struct gem_softc *sc) * disable DMA first. */ (void)gem_disable_tx(sc); - GEM_BANK1_WRITE_4(sc, GEM_TX_CONFIG, 0); - GEM_BANK1_BARRIER(sc, GEM_TX_CONFIG, 4, + GEM_WRITE_4(sc, GEM_TX_CONFIG, 0); + GEM_BARRIER(sc, GEM_TX_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK1_BITWAIT(sc, GEM_TX_CONFIG, GEM_TX_CONFIG_TXDMA_EN, 0)) + if (!gem_bitwait(sc, GEM_TX_CONFIG, GEM_TX_CONFIG_TXDMA_EN, 0)) device_printf(sc->sc_dev, "cannot disable TX DMA\n"); /* Wait 5ms extra. */ DELAY(5000); /* Finally, reset the ETX. */ - GEM_BANK2_WRITE_4(sc, GEM_RESET, GEM_RESET_TX | - (sc->sc_variant == GEM_SUN_ERI ? GEM_ERI_CACHE_LINE_SIZE << - GEM_RESET_CLSZ_SHFT : 0)); - GEM_BANK2_BARRIER(sc, GEM_RESET, 4, + GEM_WRITE_4(sc, GEM_RESET, GEM_RESET_TX); + GEM_BARRIER(sc, GEM_RESET, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK2_BITWAIT(sc, GEM_RESET, GEM_RESET_TX, 0)) { + if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_TX, 0)) { device_printf(sc->sc_dev, "cannot reset transmitter\n"); return (1); } @@ -828,11 +802,11 @@ static int gem_disable_rx(struct gem_softc *sc) { - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CONFIG, - GEM_BANK1_READ_4(sc, GEM_MAC_RX_CONFIG) & ~GEM_MAC_RX_ENABLE); - GEM_BANK1_BARRIER(sc, GEM_MAC_RX_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MAC_RX_CONFIG, + GEM_READ_4(sc, GEM_MAC_RX_CONFIG) & ~GEM_MAC_RX_ENABLE); + GEM_BARRIER(sc, GEM_MAC_RX_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (GEM_BANK1_BITWAIT(sc, GEM_MAC_RX_CONFIG, GEM_MAC_RX_ENABLE, 0)) + if (gem_bitwait(sc, GEM_MAC_RX_CONFIG, GEM_MAC_RX_ENABLE, 0)) return (1); device_printf(sc->sc_dev, "cannot disable RX MAC\n"); return (0); @@ -842,11 +816,11 @@ static int gem_disable_tx(struct gem_softc *sc) { - GEM_BANK1_WRITE_4(sc, GEM_MAC_TX_CONFIG, - GEM_BANK1_READ_4(sc, GEM_MAC_TX_CONFIG) & ~GEM_MAC_TX_ENABLE); - GEM_BANK1_BARRIER(sc, GEM_MAC_TX_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MAC_TX_CONFIG, + GEM_READ_4(sc, GEM_MAC_TX_CONFIG) & ~GEM_MAC_TX_ENABLE); + GEM_BARRIER(sc, GEM_MAC_TX_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (GEM_BANK1_BITWAIT(sc, GEM_MAC_TX_CONFIG, GEM_MAC_TX_ENABLE, 0)) + if (gem_bitwait(sc, GEM_MAC_TX_CONFIG, GEM_MAC_TX_ENABLE, 0)) return (1); device_printf(sc->sc_dev, "cannot disable TX MAC\n"); return (0); @@ -987,11 +961,11 @@ gem_init_locked(struct gem_softc *sc) /* step 6 & 7. Program Descriptor Ring Base Addresses. */ /* NOTE: we use only 32-bit DMA addresses here. */ - GEM_BANK1_WRITE_4(sc, GEM_TX_RING_PTR_HI, 0); - GEM_BANK1_WRITE_4(sc, GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0)); + GEM_WRITE_4(sc, GEM_TX_RING_PTR_HI, 0); + GEM_WRITE_4(sc, GEM_TX_RING_PTR_LO, GEM_CDTXADDR(sc, 0)); - GEM_BANK1_WRITE_4(sc, GEM_RX_RING_PTR_HI, 0); - GEM_BANK1_WRITE_4(sc, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0)); + GEM_WRITE_4(sc, GEM_RX_RING_PTR_HI, 0); + GEM_WRITE_4(sc, GEM_RX_RING_PTR_LO, GEM_CDRXADDR(sc, 0)); #ifdef GEM_DEBUG CTR3(KTR_GEM, "loading RX ring %lx, TX ring %lx, cddma %lx", GEM_CDRXADDR(sc, 0), GEM_CDTXADDR(sc, 0), sc->sc_cddma); @@ -1006,13 +980,12 @@ gem_init_locked(struct gem_softc *sc) * RX performance. * Enable silicon bug workarounds for the Apple variants. */ - GEM_BANK1_WRITE_4(sc, GEM_CONFIG, + GEM_WRITE_4(sc, GEM_CONFIG, GEM_CONFIG_TXDMA_LIMIT | GEM_CONFIG_RXDMA_LIMIT | - ((sc->sc_flags & GEM_PCI) != 0 ? GEM_CONFIG_BURST_INF : - GEM_CONFIG_BURST_64) | (GEM_IS_APPLE(sc) ? + GEM_CONFIG_BURST_INF | (GEM_IS_APPLE(sc) ? GEM_CONFIG_RONPAULBIT | GEM_CONFIG_BUG2FIX : 0)); - GEM_BANK1_WRITE_4(sc, GEM_INTMASK, + GEM_WRITE_4(sc, GEM_INTMASK, ~(GEM_INTR_TX_INTME | GEM_INTR_TX_EMPTY | GEM_INTR_RX_DONE | GEM_INTR_RX_NOBUF | GEM_INTR_RX_TAG_ERR | GEM_INTR_PERR | GEM_INTR_BERR @@ -1020,16 +993,16 @@ gem_init_locked(struct gem_softc *sc) | GEM_INTR_PCS | GEM_INTR_MIF #endif )); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_MASK, + GEM_WRITE_4(sc, GEM_MAC_RX_MASK, GEM_MAC_RX_DONE | GEM_MAC_RX_FRAME_CNT); - GEM_BANK1_WRITE_4(sc, GEM_MAC_TX_MASK, + GEM_WRITE_4(sc, GEM_MAC_TX_MASK, GEM_MAC_TX_XMIT_DONE | GEM_MAC_TX_DEFER_EXP | GEM_MAC_TX_PEAK_EXP); #ifdef GEM_DEBUG - GEM_BANK1_WRITE_4(sc, GEM_MAC_CONTROL_MASK, + GEM_WRITE_4(sc, GEM_MAC_CONTROL_MASK, ~(GEM_MAC_PAUSED | GEM_MAC_PAUSE | GEM_MAC_RESUME)); #else - GEM_BANK1_WRITE_4(sc, GEM_MAC_CONTROL_MASK, + GEM_WRITE_4(sc, GEM_MAC_CONTROL_MASK, GEM_MAC_PAUSED | GEM_MAC_PAUSE | GEM_MAC_RESUME); #endif @@ -1038,9 +1011,8 @@ gem_init_locked(struct gem_softc *sc) /* Enable DMA. */ v = gem_ringsize(GEM_NTXDESC); /* Set TX FIFO threshold and enable DMA. */ - v |= ((sc->sc_variant == GEM_SUN_ERI ? 0x100 : 0x4ff) << 10) & - GEM_TX_CONFIG_TXFIFO_TH; - GEM_BANK1_WRITE_4(sc, GEM_TX_CONFIG, v | GEM_TX_CONFIG_TXDMA_EN); + v |= (0x4ff << 10) & GEM_TX_CONFIG_TXFIFO_TH; + GEM_WRITE_4(sc, GEM_TX_CONFIG, v | GEM_TX_CONFIG_TXDMA_EN); /* step 10. ERX Configuration */ @@ -1050,13 +1022,12 @@ gem_init_locked(struct gem_softc *sc) v |= ((ETHER_HDR_LEN + sizeof(struct ip)) << GEM_RX_CONFIG_CXM_START_SHFT); /* Set RX FIFO threshold, set first byte offset and enable DMA. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_CONFIG, + GEM_WRITE_4(sc, GEM_RX_CONFIG, v | (GEM_THRSH_1024 << GEM_RX_CONFIG_FIFO_THRS_SHIFT) | (ETHER_ALIGN << GEM_RX_CONFIG_FBOFF_SHFT) | GEM_RX_CONFIG_RXDMA_EN); - /* Adjusting for the SBus clock probably isn't worth the fuzz. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_BLANKING, + GEM_WRITE_4(sc, GEM_RX_BLANKING, ((6 * (sc->sc_flags & GEM_PCI66) != 0 ? 2 : 1) << GEM_RX_BLANKING_TIME_SHIFT) | 6); @@ -1064,14 +1035,14 @@ gem_init_locked(struct gem_softc *sc) * The following value is for an OFF Threshold of about 3/4 full * and an ON Threshold of 1/4 full. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_PAUSE_THRESH, + GEM_WRITE_4(sc, GEM_RX_PAUSE_THRESH, (3 * sc->sc_rxfifosize / 256) | ((sc->sc_rxfifosize / 256) << 12)); /* step 11. Configure Media. */ /* step 12. RX_MAC Configuration Register */ - v = GEM_BANK1_READ_4(sc, GEM_MAC_RX_CONFIG); + v = GEM_READ_4(sc, GEM_MAC_RX_CONFIG); v &= ~GEM_MAC_RX_ENABLE; v |= GEM_MAC_RX_STRIP_CRC; sc->sc_mac_rxcfg = v; @@ -1082,15 +1053,15 @@ gem_init_locked(struct gem_softc *sc) gem_setladrf(sc); /* step 13. TX_MAC Configuration Register */ - v = GEM_BANK1_READ_4(sc, GEM_MAC_TX_CONFIG); + v = GEM_READ_4(sc, GEM_MAC_TX_CONFIG); v |= GEM_MAC_TX_ENABLE; (void)gem_disable_tx(sc); - GEM_BANK1_WRITE_4(sc, GEM_MAC_TX_CONFIG, v); + GEM_WRITE_4(sc, GEM_MAC_TX_CONFIG, v); /* step 14. Issue Transmit Pending command. */ /* step 15. Give the receiver a swift kick. */ - GEM_BANK1_WRITE_4(sc, GEM_RX_KICK, GEM_NRXDESC - 4); + GEM_WRITE_4(sc, GEM_RX_KICK, GEM_NRXDESC - 4); ifp->if_drv_flags |= IFF_DRV_RUNNING; ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; @@ -1192,16 +1163,13 @@ gem_load_txmbuf(struct gem_softc *sc, struct mbuf **m_head) CTR6(KTR_GEM, "%s: mapping seg %d (txd %d), len %lx, addr %#lx (%#lx)", __func__, seg, nexttx, txsegs[seg].ds_len, - txsegs[seg].ds_addr, - GEM_DMA_WRITE(sc, txsegs[seg].ds_addr)); + txsegs[seg].ds_addr, htole64(txsegs[seg].ds_addr)); #endif - sc->sc_txdescs[nexttx].gd_addr = - GEM_DMA_WRITE(sc, txsegs[seg].ds_addr); + sc->sc_txdescs[nexttx].gd_addr = htole64(txsegs[seg].ds_addr); KASSERT(txsegs[seg].ds_len < GEM_TD_BUFSIZE, ("%s: segment size too large!", __func__)); flags = txsegs[seg].ds_len & GEM_TD_BUFSIZE; - sc->sc_txdescs[nexttx].gd_flags = - GEM_DMA_WRITE(sc, flags | cflags); + sc->sc_txdescs[nexttx].gd_flags = htole64(flags | cflags); txs->txs_lastdesc = nexttx; } @@ -1211,7 +1179,7 @@ gem_load_txmbuf(struct gem_softc *sc, struct mbuf **m_head) __func__, seg, nexttx); #endif sc->sc_txdescs[txs->txs_lastdesc].gd_flags |= - GEM_DMA_WRITE(sc, GEM_TD_END_OF_PACKET); + htole64(GEM_TD_END_OF_PACKET); /* Lastly set SOP on the first descriptor. */ #ifdef GEM_DEBUG @@ -1221,11 +1189,10 @@ gem_load_txmbuf(struct gem_softc *sc, struct mbuf **m_head) if (++sc->sc_txwin > GEM_NTXSEGS * 2 / 3) { sc->sc_txwin = 0; sc->sc_txdescs[txs->txs_firstdesc].gd_flags |= - GEM_DMA_WRITE(sc, GEM_TD_INTERRUPT_ME | - GEM_TD_START_OF_PACKET); + htole64(GEM_TD_INTERRUPT_ME | GEM_TD_START_OF_PACKET); } else sc->sc_txdescs[txs->txs_firstdesc].gd_flags |= - GEM_DMA_WRITE(sc, GEM_TD_START_OF_PACKET); + htole64(GEM_TD_START_OF_PACKET); /* Sync the DMA map. */ bus_dmamap_sync(sc->sc_tdmatag, txs->txs_dmamap, @@ -1256,69 +1223,69 @@ gem_init_regs(struct gem_softc *sc) /* These registers are not cleared on reset. */ if ((sc->sc_flags & GEM_INITED) == 0) { /* magic values */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_IPG0, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_IPG1, 8); - GEM_BANK1_WRITE_4(sc, GEM_MAC_IPG2, 4); + GEM_WRITE_4(sc, GEM_MAC_IPG0, 0); + GEM_WRITE_4(sc, GEM_MAC_IPG1, 8); + GEM_WRITE_4(sc, GEM_MAC_IPG2, 4); /* min frame length */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN); + GEM_WRITE_4(sc, GEM_MAC_MAC_MIN_FRAME, ETHER_MIN_LEN); /* max frame length and max burst size */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_MAC_MAX_FRAME, + GEM_WRITE_4(sc, GEM_MAC_MAC_MAX_FRAME, (ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN) | (0x2000 << 16)); /* more magic values */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_PREAMBLE_LEN, 0x7); - GEM_BANK1_WRITE_4(sc, GEM_MAC_JAM_SIZE, 0x4); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ATTEMPT_LIMIT, 0x10); - GEM_BANK1_WRITE_4(sc, GEM_MAC_CONTROL_TYPE, 0x8808); + GEM_WRITE_4(sc, GEM_MAC_PREAMBLE_LEN, 0x7); + GEM_WRITE_4(sc, GEM_MAC_JAM_SIZE, 0x4); + GEM_WRITE_4(sc, GEM_MAC_ATTEMPT_LIMIT, 0x10); + GEM_WRITE_4(sc, GEM_MAC_CONTROL_TYPE, 0x8808); /* random number seed */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_RANDOM_SEED, + GEM_WRITE_4(sc, GEM_MAC_RANDOM_SEED, ((laddr[5] << 8) | laddr[4]) & 0x3ff); /* secondary MAC address: 0:0:0:0:0:0 */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR3, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR4, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR5, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR3, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR4, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR5, 0); /* MAC control address: 01:80:c2:00:00:01 */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR6, 0x0001); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR7, 0xc200); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR8, 0x0180); + GEM_WRITE_4(sc, GEM_MAC_ADDR6, 0x0001); + GEM_WRITE_4(sc, GEM_MAC_ADDR7, 0xc200); + GEM_WRITE_4(sc, GEM_MAC_ADDR8, 0x0180); /* MAC filter address: 0:0:0:0:0:0 */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR_FILTER0, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR_FILTER1, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR_FILTER2, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADR_FLT_MASK1_2, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADR_FLT_MASK0, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR_FILTER0, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR_FILTER1, 0); + GEM_WRITE_4(sc, GEM_MAC_ADDR_FILTER2, 0); + GEM_WRITE_4(sc, GEM_MAC_ADR_FLT_MASK1_2, 0); + GEM_WRITE_4(sc, GEM_MAC_ADR_FLT_MASK0, 0); sc->sc_flags |= GEM_INITED; } /* Counters need to be zeroed. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_NORM_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_DEFER_TMR_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_PEAK_ATTEMPTS, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_FRAME_COUNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); + GEM_WRITE_4(sc, GEM_MAC_NORM_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_FIRST_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_EXCESS_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_LATE_COLL_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_DEFER_TMR_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_PEAK_ATTEMPTS, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_FRAME_COUNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_LEN_ERR_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_ALIGN_ERR, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_CRC_ERR_CNT, 0); + GEM_WRITE_4(sc, GEM_MAC_RX_CODE_VIOL, 0); /* Set XOFF PAUSE time. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_SEND_PAUSE_CMD, 0x1BF0); + GEM_WRITE_4(sc, GEM_MAC_SEND_PAUSE_CMD, 0x1BF0); /* Set the station address. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR0, (laddr[4] << 8) | laddr[5]); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR1, (laddr[2] << 8) | laddr[3]); - GEM_BANK1_WRITE_4(sc, GEM_MAC_ADDR2, (laddr[0] << 8) | laddr[1]); + GEM_WRITE_4(sc, GEM_MAC_ADDR0, (laddr[4] << 8) | laddr[5]); + GEM_WRITE_4(sc, GEM_MAC_ADDR1, (laddr[2] << 8) | laddr[3]); + GEM_WRITE_4(sc, GEM_MAC_ADDR2, (laddr[0] << 8) | laddr[1]); /* Enable MII outputs. */ - GEM_BANK1_WRITE_4(sc, GEM_MAC_XIF_CONFIG, GEM_MAC_XIF_TX_MII_ENA); + GEM_WRITE_4(sc, GEM_MAC_XIF_CONFIG, GEM_MAC_XIF_TX_MII_ENA); } static void @@ -1346,7 +1313,7 @@ gem_txkick(struct gem_softc *sc) device_get_name(sc->sc_dev), __func__, sc->sc_txnext); #endif GEM_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - GEM_BANK1_WRITE_4(sc, GEM_TX_KICK, sc->sc_txnext); + GEM_WRITE_4(sc, GEM_TX_KICK, sc->sc_txnext); } static void @@ -1435,10 +1402,10 @@ gem_tint(struct gem_softc *sc) for (i = txs->txs_firstdesc;; i = GEM_NEXTTX(i)) { printf("descriptor %d: ", i); printf("gd_flags: 0x%016llx\t", - (long long)GEM_DMA_READ(sc, + (long long)le64toh( sc->sc_txdescs[i].gd_flags)); printf("gd_addr: 0x%016llx\n", - (long long)GEM_DMA_READ(sc, + (long long)le64toh( sc->sc_txdescs[i].gd_addr)); if (i == txs->txs_lastdesc) break; @@ -1453,7 +1420,7 @@ gem_tint(struct gem_softc *sc) * GEM_TX_COMPLETION points to the last descriptor * processed + 1. */ - txlast = GEM_BANK1_READ_4(sc, GEM_TX_COMPLETION); + txlast = GEM_READ_4(sc, GEM_TX_COMPLETION); #ifdef GEM_DEBUG CTR4(KTR_GEM, "%s: txs->txs_firstdesc = %d, " "txs->txs_lastdesc = %d, txlast = %d", @@ -1494,10 +1461,10 @@ gem_tint(struct gem_softc *sc) #ifdef GEM_DEBUG CTR4(KTR_GEM, "%s: GEM_TX_STATE_MACHINE %x GEM_TX_DATA_PTR %llx " "GEM_TX_COMPLETION %x", - __func__, GEM_BANK1_READ_4(sc, GEM_TX_STATE_MACHINE), - ((long long)GEM_BANK1_READ_4(sc, GEM_TX_DATA_PTR_HI) << 32) | - GEM_BANK1_READ_4(sc, GEM_TX_DATA_PTR_LO), - GEM_BANK1_READ_4(sc, GEM_TX_COMPLETION)); + __func__, GEM_READ_4(sc, GEM_TX_STATE_MACHINE), + ((long long)GEM_READ_4(sc, GEM_TX_DATA_PTR_HI) << 32) | + GEM_READ_4(sc, GEM_TX_DATA_PTR_LO), + GEM_READ_4(sc, GEM_TX_COMPLETION)); #endif if (progress) { @@ -1553,7 +1520,7 @@ gem_rint(struct gem_softc *sc) * Read the completion register once. This limits * how long the following loop can execute. */ - rxcomp = GEM_BANK1_READ_4(sc, GEM_RX_COMPLETION); + rxcomp = GEM_READ_4(sc, GEM_RX_COMPLETION); #ifdef GEM_DEBUG CTR3(KTR_GEM, "%s: sc->sc_rxptr %d, complete %d", __func__, sc->sc_rxptr, rxcomp); @@ -1561,8 +1528,7 @@ gem_rint(struct gem_softc *sc) GEM_CDSYNC(sc, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); for (; sc->sc_rxptr != rxcomp;) { m = sc->sc_rxsoft[sc->sc_rxptr].rxs_mbuf; - rxstat = GEM_DMA_READ(sc, - sc->sc_rxdescs[sc->sc_rxptr].gd_flags); + rxstat = le64toh(sc->sc_rxdescs[sc->sc_rxptr].gd_flags); if (rxstat & GEM_RD_OWN) { #ifdef GEM_RINT_TIMEOUT @@ -1594,10 +1560,10 @@ gem_rint(struct gem_softc *sc) printf(" rxsoft %p descriptor %d: ", &sc->sc_rxsoft[sc->sc_rxptr], sc->sc_rxptr); printf("gd_flags: 0x%016llx\t", - (long long)GEM_DMA_READ(sc, + (long long)le64toh( sc->sc_rxdescs[sc->sc_rxptr].gd_flags)); printf("gd_addr: 0x%016llx\n", - (long long)GEM_DMA_READ(sc, + (long long)le64toh( sc->sc_rxdescs[sc->sc_rxptr].gd_addr)); } #endif @@ -1625,7 +1591,7 @@ gem_rint(struct gem_softc *sc) if ((sc->sc_rxptr % 4) == 0) { GEM_CDSYNC(sc, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - GEM_BANK1_WRITE_4(sc, GEM_RX_KICK, + GEM_WRITE_4(sc, GEM_RX_KICK, (sc->sc_rxptr + GEM_NRXDESC - 4) & GEM_NRXDESC_MASK); } @@ -1652,7 +1618,7 @@ gem_rint(struct gem_softc *sc) #ifdef GEM_DEBUG CTR3(KTR_GEM, "%s: done sc->sc_rxptr %d, complete %d", __func__, - sc->sc_rxptr, GEM_BANK1_READ_4(sc, GEM_RX_COMPLETION)); + sc->sc_rxptr, GEM_READ_4(sc, GEM_RX_COMPLETION)); #endif } @@ -1716,13 +1682,10 @@ gem_eint(struct gem_softc *sc, u_int status) device_printf(sc->sc_dev, "%s: status 0x%x", __func__, status); if ((status & GEM_INTR_BERR) != 0) { - if ((sc->sc_flags & GEM_PCI) != 0) - printf(", PCI bus error 0x%x\n", - GEM_BANK1_READ_4(sc, GEM_PCI_ERROR_STATUS)); - else - printf(", SBus error 0x%x\n", - GEM_BANK1_READ_4(sc, GEM_SBUS_STATUS)); + printf(", PCI bus error 0x%x", + GEM_READ_4(sc, GEM_PCI_ERROR_STATUS)); } + printf("\n"); } void @@ -1732,7 +1695,7 @@ gem_intr(void *v) uint32_t status, status2; GEM_LOCK(sc); - status = GEM_BANK1_READ_4(sc, GEM_STATUS); + status = GEM_READ_4(sc, GEM_STATUS); #ifdef GEM_DEBUG CTR4(KTR_GEM, "%s: %s: cplt %x, status %x", @@ -1744,14 +1707,14 @@ gem_intr(void *v) */ if ((status & GEM_INTR_PCS) != 0) { status2 = - GEM_BANK1_READ_4(sc, GEM_MII_INTERRUP_STATUS) | - GEM_BANK1_READ_4(sc, GEM_MII_INTERRUP_STATUS); + GEM_READ_4(sc, GEM_MII_INTERRUP_STATUS) | + GEM_READ_4(sc, GEM_MII_INTERRUP_STATUS); if ((status2 & GEM_MII_INTERRUP_LINK) != 0) device_printf(sc->sc_dev, "%s: PCS link status changed\n", __func__); } if ((status & GEM_MAC_CONTROL_STATUS) != 0) { - status2 = GEM_BANK1_READ_4(sc, GEM_MAC_CONTROL_STATUS); + status2 = GEM_READ_4(sc, GEM_MAC_CONTROL_STATUS); if ((status2 & GEM_MAC_PAUSED) != 0) device_printf(sc->sc_dev, "%s: PAUSE received (PAUSE time %d slots)\n", @@ -1778,7 +1741,7 @@ gem_intr(void *v) gem_tint(sc); if (__predict_false((status & GEM_INTR_TX_MAC) != 0)) { - status2 = GEM_BANK1_READ_4(sc, GEM_MAC_TX_STATUS); + status2 = GEM_READ_4(sc, GEM_MAC_TX_STATUS); if ((status2 & ~(GEM_MAC_TX_XMIT_DONE | GEM_MAC_TX_DEFER_EXP | GEM_MAC_TX_PEAK_EXP)) != 0) @@ -1792,12 +1755,12 @@ gem_intr(void *v) } } if (__predict_false((status & GEM_INTR_RX_MAC) != 0)) { - status2 = GEM_BANK1_READ_4(sc, GEM_MAC_RX_STATUS); + status2 = GEM_READ_4(sc, GEM_MAC_RX_STATUS); /* - * At least with GEM_SUN_GEM and some GEM_SUN_ERI - * revisions GEM_MAC_RX_OVERFLOW happen often due to a - * silicon bug so handle them silently. Moreover, it's - * likely that the receiver has hung so we reset it. + * At least with GEM_SUN_GEM revisions GEM_MAC_RX_OVERFLOW + * happen often due to a silicon bug so handle them silently. + * Moreover, it's likely that the receiver has hung so we + * reset it. */ if ((status2 & GEM_MAC_RX_OVERFLOW) != 0) { if_inc_counter(sc->sc_ifp, IFCOUNTER_IERRORS, 1); @@ -1820,14 +1783,14 @@ gem_watchdog(struct gem_softc *sc) #ifdef GEM_DEBUG CTR4(KTR_GEM, "%s: GEM_RX_CONFIG %x GEM_MAC_RX_STATUS %x GEM_MAC_RX_CONFIG %x", - __func__, GEM_BANK1_READ_4(sc, GEM_RX_CONFIG), - GEM_BANK1_READ_4(sc, GEM_MAC_RX_STATUS), - GEM_BANK1_READ_4(sc, GEM_MAC_RX_CONFIG)); + __func__, GEM_READ_4(sc, GEM_RX_CONFIG), + GEM_READ_4(sc, GEM_MAC_RX_STATUS), + GEM_READ_4(sc, GEM_MAC_RX_CONFIG)); CTR4(KTR_GEM, "%s: GEM_TX_CONFIG %x GEM_MAC_TX_STATUS %x GEM_MAC_TX_CONFIG %x", - __func__, GEM_BANK1_READ_4(sc, GEM_TX_CONFIG), - GEM_BANK1_READ_4(sc, GEM_MAC_TX_STATUS), - GEM_BANK1_READ_4(sc, GEM_MAC_TX_CONFIG)); + __func__, GEM_READ_4(sc, GEM_TX_CONFIG), + GEM_READ_4(sc, GEM_MAC_TX_STATUS), + GEM_READ_4(sc, GEM_MAC_TX_CONFIG)); #endif if (sc->sc_wdog_timer == 0 || --sc->sc_wdog_timer != 0) @@ -1851,9 +1814,9 @@ gem_mifinit(struct gem_softc *sc) { /* Configure the MIF in frame mode. */ - GEM_BANK1_WRITE_4(sc, GEM_MIF_CONFIG, - GEM_BANK1_READ_4(sc, GEM_MIF_CONFIG) & ~GEM_MIF_CONFIG_BB_ENA); - GEM_BANK1_BARRIER(sc, GEM_MIF_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MIF_CONFIG, + GEM_READ_4(sc, GEM_MIF_CONFIG) & ~GEM_MIF_CONFIG_BB_ENA); + GEM_BARRIER(sc, GEM_MIF_CONFIG, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); } @@ -1907,7 +1870,7 @@ gem_mii_readreg(device_t dev, int phy, int reg) "%s: unhandled register %d\n", __func__, reg); return (0); } - return (GEM_BANK1_READ_4(sc, reg)); + return (GEM_READ_4(sc, reg)); } /* Construct the frame command. */ @@ -1915,12 +1878,12 @@ gem_mii_readreg(device_t dev, int phy, int reg) (phy << GEM_MIF_PHY_SHIFT) | (reg << GEM_MIF_REG_SHIFT); - GEM_BANK1_WRITE_4(sc, GEM_MIF_FRAME, v); - GEM_BANK1_BARRIER(sc, GEM_MIF_FRAME, 4, + GEM_WRITE_4(sc, GEM_MIF_FRAME, v); + GEM_BARRIER(sc, GEM_MIF_FRAME, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); for (n = 0; n < 100; n++) { DELAY(1); - v = GEM_BANK1_READ_4(sc, GEM_MIF_FRAME); + v = GEM_READ_4(sc, GEM_MIF_FRAME); if (v & GEM_MIF_FRAME_TA0) return (v & GEM_MIF_FRAME_DATA); } @@ -1950,28 +1913,28 @@ gem_mii_writereg(device_t dev, int phy, int reg, int val) reg = GEM_MII_CONTROL; if ((val & GEM_MII_CONTROL_RESET) == 0) break; - GEM_BANK1_WRITE_4(sc, GEM_MII_CONTROL, val); - GEM_BANK1_BARRIER(sc, GEM_MII_CONTROL, 4, + GEM_WRITE_4(sc, GEM_MII_CONTROL, val); + GEM_BARRIER(sc, GEM_MII_CONTROL, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); - if (!GEM_BANK1_BITWAIT(sc, GEM_MII_CONTROL, + if (!gem_bitwait(sc, GEM_MII_CONTROL, GEM_MII_CONTROL_RESET, 0)) device_printf(sc->sc_dev, "cannot reset PCS\n"); /* FALLTHROUGH */ case MII_ANAR: - GEM_BANK1_WRITE_4(sc, GEM_MII_CONFIG, 0); - GEM_BANK1_BARRIER(sc, GEM_MII_CONFIG, 4, + GEM_WRITE_4(sc, GEM_MII_CONFIG, 0); + GEM_BARRIER(sc, GEM_MII_CONFIG, 4, BUS_SPACE_BARRIER_WRITE); - GEM_BANK1_WRITE_4(sc, GEM_MII_ANAR, val); - GEM_BANK1_BARRIER(sc, GEM_MII_ANAR, 4, + GEM_WRITE_4(sc, GEM_MII_ANAR, val); + GEM_BARRIER(sc, GEM_MII_ANAR, 4, BUS_SPACE_BARRIER_WRITE); - GEM_BANK1_WRITE_4(sc, GEM_MII_SLINK_CONTROL, + GEM_WRITE_4(sc, GEM_MII_SLINK_CONTROL, GEM_MII_SLINK_LOOPBACK | GEM_MII_SLINK_EN_SYNC_D); - GEM_BANK1_BARRIER(sc, GEM_MII_SLINK_CONTROL, 4, + GEM_BARRIER(sc, GEM_MII_SLINK_CONTROL, 4, BUS_SPACE_BARRIER_WRITE); - GEM_BANK1_WRITE_4(sc, GEM_MII_CONFIG, + GEM_WRITE_4(sc, GEM_MII_CONFIG, GEM_MII_CONFIG_ENABLE); - GEM_BANK1_BARRIER(sc, GEM_MII_CONFIG, 4, + GEM_BARRIER(sc, GEM_MII_CONFIG, 4, BUS_SPACE_BARRIER_WRITE); return (0); case MII_ANLPAR: @@ -1982,8 +1945,8 @@ gem_mii_writereg(device_t dev, int phy, int reg, int val) "%s: unhandled register %d\n", __func__, reg); return (0); } - GEM_BANK1_WRITE_4(sc, reg, val); - GEM_BANK1_BARRIER(sc, reg, 4, + GEM_WRITE_4(sc, reg, val); + GEM_BARRIER(sc, reg, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); return (0); } @@ -1994,12 +1957,12 @@ gem_mii_writereg(device_t dev, int phy, int reg, int val) (reg << GEM_MIF_REG_SHIFT) | (val & GEM_MIF_FRAME_DATA); - GEM_BANK1_WRITE_4(sc, GEM_MIF_FRAME, v); - GEM_BANK1_BARRIER(sc, GEM_MIF_FRAME, 4, + GEM_WRITE_4(sc, GEM_MIF_FRAME, v); + GEM_BARRIER(sc, GEM_MIF_FRAME, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE); for (n = 0; n < 100; n++) { DELAY(1); - v = GEM_BANK1_READ_4(sc, GEM_MIF_FRAME); + v = GEM_READ_4(sc, GEM_MIF_FRAME); if (v & GEM_MIF_FRAME_TA0) return (1); } @@ -2058,11 +2021,11 @@ gem_mii_statchg(device_t dev) txcfg |= GEM_MAC_TX_CARR_EXTEND; } (void)gem_disable_tx(sc); - GEM_BANK1_WRITE_4(sc, GEM_MAC_TX_CONFIG, txcfg); + GEM_WRITE_4(sc, GEM_MAC_TX_CONFIG, txcfg); (void)gem_disable_rx(sc); - GEM_BANK1_WRITE_4(sc, GEM_MAC_RX_CONFIG, rxcfg); + GEM_WRITE_4(sc, GEM_MAC_RX_CONFIG, rxcfg); - v = GEM_BANK1_READ_4(sc, GEM_MAC_CONTROL_CONFIG) & + v = GEM_READ_4(sc, GEM_MAC_CONTROL_CONFIG) & ~(GEM_MAC_CC_RX_PAUSE | GEM_MAC_CC_TX_PAUSE); if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0) @@ -2070,21 +2033,21 @@ gem_mii_statchg(device_t dev) if ((IFM_OPTIONS(sc->sc_mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0) v |= GEM_MAC_CC_TX_PAUSE; - GEM_BANK1_WRITE_4(sc, GEM_MAC_CONTROL_CONFIG, v); + GEM_WRITE_4(sc, GEM_MAC_CONTROL_CONFIG, v); *** 445 LINES SKIPPED *** From nobody Sun Aug 6 20:36:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrnx5dZdz4mNWK; Sun, 6 Aug 2023 20:36: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 4RJrnx40MGz4b94; Sun, 6 Aug 2023 20:36:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGLcc37AH2fNd2z7lDeQShq2eFBHOkEKY/pvSvZ0fpI=; b=GNj0Bk9wjCH4l2Gg0jk397G/2IJ8CcanMFT5+jk9zLVQ08A7EWoLceW9P0/ats3FKnKatr 1ADuLGhkbQ35PkMEKBxiK1q9g0kXvL3EPexzIYwZjBmzCd+Y1yCzvPEMTYAqHxsFUKxROJ /ySfz7MyxHx554OT38qDX09eKvAnt7lTlwVE+lpbfBims8rjDAKreIKTO0hJcmsa1WJ6Sx R9N+7DNHv3Iyo0PPrAZhnQLjT2vf9oT1TLCSWIRHaOGBBIkGAzqXkFXn++HIxmmpQCeP+3 ypxrRjaXFdX4pHuTC9eFKo9ZhGZ/1BwODTgUJvBWXaxspdQ5cmJtlpNxiJpdGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354181; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AGLcc37AH2fNd2z7lDeQShq2eFBHOkEKY/pvSvZ0fpI=; b=MghM/1XgoG7f1XF4Dox5qkoiN3Av1XFZnMDFqYrATMurhYO5F0LaBOV79Zf83LCyjkM0P0 QMEiu0WoiBdl4JP1ErUQUNFjOCyWB5QViIw/Keqsv8MJegq38H4vlrYFK5ahgZeXduFQAU +8B53g80jvbhd/oHmGKlg3/o5oBny5xUr+kLM6TUE67m56wos5frbpJwSvYSNXycsTmBZv F8s1PIWKCMbFxw/JZZIe5e2kyPZSn54GdlVlq5JXzKa9l4yS1r3m++v+VaqANWJk0cVoh0 x4JID4/zklQm+Je5b8zW7/4s1m66t0PUvguZEs3vyYisU7OZDjoMu4wRLGvELQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354181; a=rsa-sha256; cv=none; b=A8l0/t5QIclNVR4yBfSX9CFBI8jTIVjfpv+a2T2NQV8PhGVDohBb5k9Ks+m6uc8L9TrLFe SGVGotUT9Q1o4bsNoF2561GvpcPVKQ8W3z8yU2nePseVJART8KrxkNG0Db9+uAdPRPI5ll PL+l1q7BeoJkCyuK/w0FwazvpNacz/oMyJT3ZOi3EIYJekazyKGGXijp6/9dbF5ztcNim/ RaLD+bgSHJudw9Am+tZayqHeGzgJAkqTy3tP8LN5J/MoI9sIRHhOZSMjanY9rxHoLzYvV0 jEm2FmsKNCsStiHObBgzyPRSWuzOro19vTYXtUt3SJw6OXHNDnQyJntoldfwMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrnx367hz9BZ; Sun, 6 Aug 2023 20:36: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 376KaLiu042573; Sun, 6 Aug 2023 20:36:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaLWt042572; Sun, 6 Aug 2023 20:36:21 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:21 GMT Message-Id: <202308062036.376KaLWt042572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 2dd8070638c6 - stable/13 - cas.4: Remove remaining sparc64-specific bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2dd8070638c6703800130a1bff07a929eb376643 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd8070638c6703800130a1bff07a929eb376643 commit 2dd8070638c6703800130a1bff07a929eb376643 Author: Marius Strobl AuthorDate: 2023-04-18 17:06:51 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:10:49 +0000 cas.4: Remove remaining sparc64-specific bit This was missed in 702547720ca01437081fb1b6f9eb281c9541021b. (cherry picked from commit a12d60b99ee5a453e249adc8cf239117f50bd603) --- share/man/man4/cas.4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4 index fa19cc33c2ab..03c3fcd57694 100644 --- a/share/man/man4/cas.4 +++ b/share/man/man4/cas.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 26, 2020 +.Dd April 18, 2023 .Dt CAS 4 .Os .Sh NAME @@ -50,8 +50,7 @@ if_cas_load="YES" The .Nm driver provides support for the Sun Cassini/Cassini+ and National -Semiconductor DP83065 Saturn Gigabit Ethernet controllers found -on-board in Sun UltraSPARC machines and as add-on cards. +Semiconductor DP83065 Saturn Gigabit Ethernet controllers. .Pp All controllers supported by the .Nm From nobody Sun Aug 6 20:36:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrnz0bpZz4mNYx; Sun, 6 Aug 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrny6cFpz4bSX; Sun, 6 Aug 2023 20:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTLprAQz3BPX7B55zij3MtoD1XUGXe4wpncUmwha7LA=; b=UC49CGGM3Ns3g1q/5Nji08Bi112Je/o6J+deE5y9BuysNM8uuOhNe6bgsks1p+TUQ+GchD by4QeL4yYu7aGpvzaM3X4nS34uCNwzKyo9LHDn7ohDhdOMKFX9R17e8jgirsCkivicPVK9 3R7dzg0nstVoRvhqEUXmZR8SnQ7q9XcGymxnygmnzsmOSr7s1mhSmwUo7GqijYRcybhQhI lCPKjGEY0U0ElWM2Z6SgbPbtsKsXmL/Ft2InmpFVy4zkQTc5ykboW4B4eDZyKbHd45psH4 q9gJ/8R/EAYIKE7tUDfExu6EAWemY0Q797Qxb4WmjhBAWAcBbRrZgohXk7vgkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vTLprAQz3BPX7B55zij3MtoD1XUGXe4wpncUmwha7LA=; b=GSQzi+pOTWsPCwIz2eG5VauWhEgYBsGlexuUA8Zb9QpPkpvV8MACBcTB0OAdFIazGfo2Rr f4vxEa8HbeXj1chCnTOUGPunAT3XCWpJ9b32xs6DqKwS/0u55pE8DdZti9bWboesyvPP7x cvzuLVOt6AkOdQ3qvhf8trWfsVTj6pAptWMHCzeiaOoygSMmeegDpOL/Zn9oUikQJkD7Ob j8Qsl16M/U5vibK0zdpiEXEGrIMdBIVRnmATM65chSvUS5jXmIh5KOeGXcse9HLxjVJpCP 69h8Yv8UroEdfNTHsQlQh2SHwNaBpUfzO4lkHfAHGCfoXU6N3xRIOH+8NFdIXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354183; a=rsa-sha256; cv=none; b=vwn3od4Eux2g/yCDBsYvYXRgK1r/oH8yn+QTVZTl57jnDPXB4JuwxABQFbTDR98grGCgWo wJLJyxNUFEILn6fvOul1+PUCwjT937IOOU8kCY7l0J3eKDBpSQzm0pzHIJQMbdbHmvHe1h B7h8bAUwKb/rySknfP9n0kpr9X57NoqiWFyeG2uRkGj/Q78xVySw5CBcwK38vi3wvyLweE dMOhnCOpVXJJaJ0LlX9Hf0/kZrSiNFzYKl0nL4Gy3yeFsesKixczkx7kNCa0+qsiXqC8pR evkHxRn6ZPqBx04sLNdoX8tm0wtH70nMpzE+x5MTeM9KAEal3+0dsRptAMnk3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrny4tg4z8XP; Sun, 6 Aug 2023 20:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaMCs042592; Sun, 6 Aug 2023 20:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaMHd042591; Sun, 6 Aug 2023 20:36:22 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:22 GMT Message-Id: <202308062036.376KaMHd042591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 36670fa153a8 - stable/13 - test: remove remainder of testfloat List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 36670fa153a8dfc2c898217a0d5429675e342f35 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=36670fa153a8dfc2c898217a0d5429675e342f35 commit 36670fa153a8dfc2c898217a0d5429675e342f35 Author: Marius Strobl AuthorDate: 2023-06-30 20:36:39 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:11:42 +0000 test: remove remainder of testfloat These bits are unused since the sparc64-specific glue has been deleted in f33b14f0. (cherry picked from commit eb33b693b364a4547dfcfd21c159ffc4fb339bc2) --- tools/test/testfloat/README.txt | 50 - tools/test/testfloat/fail.c | 46 - tools/test/testfloat/fail.h | 29 - tools/test/testfloat/random.c | 63 - tools/test/testfloat/random.h | 32 - tools/test/testfloat/slowfloat-32.c | 1183 --------- tools/test/testfloat/slowfloat-64.c | 2109 ---------------- tools/test/testfloat/slowfloat.c | 35 - tools/test/testfloat/slowfloat.h | 167 -- tools/test/testfloat/systemBugs.txt | 323 --- tools/test/testfloat/systflags.h | 33 - tools/test/testfloat/systfloat.c | 553 ----- tools/test/testfloat/systmodes.h | 42 - tools/test/testfloat/testCases.c | 3682 ---------------------------- tools/test/testfloat/testCases.h | 69 - tools/test/testfloat/testFunction.c | 1149 --------- tools/test/testfloat/testFunction.h | 135 - tools/test/testfloat/testLoops.c | 2713 -------------------- tools/test/testfloat/testLoops.h | 143 -- tools/test/testfloat/testfloat-history.txt | 57 - tools/test/testfloat/testfloat-source.txt | 444 ---- tools/test/testfloat/testfloat.c | 299 --- tools/test/testfloat/testfloat.txt | 771 ------ tools/test/testfloat/testsoftfloat.c | 1044 -------- tools/test/testfloat/writeHex.c | 183 -- tools/test/testfloat/writeHex.h | 42 - 26 files changed, 15396 deletions(-) diff --git a/tools/test/testfloat/README.txt b/tools/test/testfloat/README.txt deleted file mode 100644 index fe99fd95d641..000000000000 --- a/tools/test/testfloat/README.txt +++ /dev/null @@ -1,50 +0,0 @@ - -Package Overview for TestFloat Release 2a - -John R. Hauser -1998 December 16 - - -TestFloat is a program for testing that a floating-point implementation -conforms to the IEC/IEEE Standard for Binary Floating-Point Arithmetic. -TestFloat is distributed in the form of C source code. The TestFloat -package actually provides two related programs: - --- The `testfloat' program tests a system's floating-point for conformance - to the IEC/IEEE Standard. This program uses the SoftFloat software - floating-point implementation as a basis for comparison. - --- The `testsoftfloat' program tests SoftFloat itself for conformance to - the IEC/IEEE Standard. These tests are performed by comparing against a - separate, slower software floating-point that is included in the TestFloat - package. - -TestFloat depends on SoftFloat, but SoftFloat is not included in the -TestFloat package. SoftFloat can be obtained through the Web page `http:// -HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/SoftFloat.html'. - -TestFloat is documented in three text files: - - testfloat.txt Documentation for using the TestFloat programs - (both `testfloat' and `testsoftfloat'). - testfloat-source.txt Documentation for porting and compiling TestFloat. - testfloat-history.txt History of major changes to TestFloat. - -The following file is also provided: - - systemBugs.txt Information about processor bugs found using - TestFloat. - -Other files in the package comprise the source code for TestFloat. - -Please be aware that some work is involved in porting this software to other -targets. It is not just a matter of getting `make' to complete without -error messages. I would have written the code that way if I could, but -there are fundamental differences between systems that I can't make go away. -You should not attempt to compile the TestFloat sources without first -reading `testfloat-source.txt'. - -At the time of this writing, the most up-to-date information about -TestFloat and the latest release can be found at the Web page `http:// -HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - diff --git a/tools/test/testfloat/fail.c b/tools/test/testfloat/fail.c deleted file mode 100644 index 30bbea6bd7d7..000000000000 --- a/tools/test/testfloat/fail.c +++ /dev/null @@ -1,46 +0,0 @@ - -/* -=============================================================================== - -This C source file is part of TestFloat, Release 2a, a package of programs -for testing the correctness of floating-point arithmetic complying to the -IEC/IEEE Standard for Floating-Point. - -Written by John R. Hauser. More information is available through the Web -page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - -THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort -has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT -TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO -PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY -AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. - -Derivative works are acceptable, even for commercial purposes, so long as -(1) they include prominent notice that the work is derivative, and (2) they -include prominent notice akin to these four paragraphs for those parts of -this code that are retained. - -=============================================================================== -*/ - -#include -#include -#include -#include "milieu.h" -#include "fail.h" - -char *fail_programName = ""; - -void fail( const char *message, ... ) -{ - va_list varArgs; - - fprintf( stderr, "%s: ", fail_programName ); - va_start( varArgs, message ); - vfprintf( stderr, message, varArgs ); - va_end( varArgs ); - fputs( ".\n", stderr ); - exit( EXIT_FAILURE ); - -} - diff --git a/tools/test/testfloat/fail.h b/tools/test/testfloat/fail.h deleted file mode 100644 index 9c338da260aa..000000000000 --- a/tools/test/testfloat/fail.h +++ /dev/null @@ -1,29 +0,0 @@ - -/* -=============================================================================== - -This C header file is part of TestFloat, Release 2a, a package of programs -for testing the correctness of floating-point arithmetic complying to the -IEC/IEEE Standard for Floating-Point. - -Written by John R. Hauser. More information is available through the Web -page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - -THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort -has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT -TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO -PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY -AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. - -Derivative works are acceptable, even for commercial purposes, so long as -(1) they include prominent notice that the work is derivative, and (2) they -include prominent notice akin to these four paragraphs for those parts of -this code that are retained. - -=============================================================================== -*/ - -extern char *fail_programName; - -void fail( const char *, ... ); - diff --git a/tools/test/testfloat/random.c b/tools/test/testfloat/random.c deleted file mode 100644 index 21326c1ff23f..000000000000 --- a/tools/test/testfloat/random.c +++ /dev/null @@ -1,63 +0,0 @@ - -/* -=============================================================================== - -This C source file is part of TestFloat, Release 2a, a package of programs -for testing the correctness of floating-point arithmetic complying to the -IEC/IEEE Standard for Floating-Point. - -Written by John R. Hauser. More information is available through the Web -page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - -THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort -has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT -TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO -PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY -AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. - -Derivative works are acceptable, even for commercial purposes, so long as -(1) they include prominent notice that the work is derivative, and (2) they -include prominent notice akin to these four paragraphs for those parts of -this code that are retained. - -=============================================================================== -*/ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include "milieu.h" -#include "random.h" - -uint8 randomUint8( void ) -{ - - return (bits8) ( random()>>4 ); - -} - -uint16 randomUint16( void ) -{ - - return ( random() & 0x0000ffff ); - -} - -uint32 randomUint32( void ) -{ - - return ( ( (uint32) random()<<16) | ( (uint32) random() & 0x0000ffff) ); -} - -#ifdef BITS64 - -uint64 randomUint64( void ) -{ - - return ( ( (uint64) randomUint32() )<<32 ) | randomUint32(); - -} - -#endif - diff --git a/tools/test/testfloat/random.h b/tools/test/testfloat/random.h deleted file mode 100644 index 7375499ea965..000000000000 --- a/tools/test/testfloat/random.h +++ /dev/null @@ -1,32 +0,0 @@ - -/* -=============================================================================== - -This C header file is part of TestFloat, Release 2a, a package of programs -for testing the correctness of floating-point arithmetic complying to the -IEC/IEEE Standard for Floating-Point. - -Written by John R. Hauser. More information is available through the Web -page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - -THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort -has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT -TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO -PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY -AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. - -Derivative works are acceptable, even for commercial purposes, so long as -(1) they include prominent notice that the work is derivative, and (2) they -include prominent notice akin to these four paragraphs for those parts of -this code that are retained. - -=============================================================================== -*/ - -uint8 randomUint8( void ); -uint16 randomUint16( void ); -uint32 randomUint32( void ); -#ifdef BITS64 -uint64 randomUint64( void ); -#endif - diff --git a/tools/test/testfloat/slowfloat-32.c b/tools/test/testfloat/slowfloat-32.c deleted file mode 100644 index 549654b05e63..000000000000 --- a/tools/test/testfloat/slowfloat-32.c +++ /dev/null @@ -1,1183 +0,0 @@ - -/* -=============================================================================== - -This C source file is part of TestFloat, Release 2a, a package of programs -for testing the correctness of floating-point arithmetic complying to the -IEC/IEEE Standard for Floating-Point. - -Written by John R. Hauser. More information is available through the Web -page `http://HTTP.CS.Berkeley.EDU/~jhauser/arithmetic/TestFloat.html'. - -THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort -has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT -TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO -PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY -AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. - -Derivative works are acceptable, even for commercial purposes, so long as -(1) they include prominent notice that the work is derivative, and (2) they -include prominent notice akin to these four paragraphs for those parts of -this code that are retained. - -=============================================================================== -*/ - -int8 slow_float_rounding_mode; -int8 slow_float_exception_flags; -int8 slow_float_detect_tininess; - -typedef struct { - bits32 a0, a1; -} bits64X; - -typedef struct { - flag isNaN; - flag isInf; - flag isZero; - flag sign; - int16 exp; - bits64X sig; -} floatX; - -static const floatX floatXNaN = { TRUE, FALSE, FALSE, FALSE, 0, { 0, 0 } }; -static const floatX floatXPositiveZero = - { FALSE, FALSE, TRUE, FALSE, 0, { 0, 0 } }; -static const floatX floatXNegativeZero = - { FALSE, FALSE, TRUE, TRUE, 0, { 0, 0 } }; - -static bits64X shortShift64Left( bits64X a, int8 shiftCount ) -{ - int8 negShiftCount; - - negShiftCount = ( - shiftCount & 31 ); - a.a0 = ( a.a0<>negShiftCount ); - a.a1 <<= shiftCount; - return a; - -} - -static bits64X shortShift64RightJamming( bits64X a, int8 shiftCount ) -{ - int8 negShiftCount; - bits32 extra; - - negShiftCount = ( - shiftCount & 31 ); - extra = a.a1<>shiftCount ) | ( extra != 0 ); - a.a0 >>= shiftCount; - return a; - -} - -static bits64X neg64( bits64X a ) -{ - - if ( a.a1 == 0 ) { - a.a0 = - a.a0; - } - else { - a.a1 = - a.a1; - a.a0 = ~ a.a0; - } - return a; - -} - -static bits64X add64( bits64X a, bits64X b ) -{ - - a.a1 += b.a1; - a.a0 += b.a0 + ( a.a1 < b.a1 ); - return a; - -} - -static flag eq64( bits64X a, bits64X b ) -{ - - return ( a.a0 == b.a0 ) && ( a.a1 == b.a1 ); - -} - -static flag le64( bits64X a, bits64X b ) -{ - - return ( a.a0 < b.a0 ) || ( ( a.a0 == b.a0 ) && ( a.a1 <= b.a1 ) ); - -} - -static flag lt64( bits64X a, bits64X b ) -{ - - return ( a.a0 < b.a0 ) || ( ( a.a0 == b.a0 ) && ( a.a1 < b.a1 ) ); - -} - -static floatX roundFloatXTo24( flag isTiny, floatX zx ) -{ - - if ( zx.sig.a1 ) { - slow_float_exception_flags |= float_flag_inexact; - if ( isTiny ) slow_float_exception_flags |= float_flag_underflow; - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - if ( zx.sig.a1 < 0x80000000 ) goto noIncrement; - if ( ( zx.sig.a1 == 0x80000000 ) && ! ( zx.sig.a0 & 1 ) ) { - goto noIncrement; - } - break; - case float_round_to_zero: - goto noIncrement; - case float_round_down: - if ( ! zx.sign ) goto noIncrement; - break; - case float_round_up: - if ( zx.sign ) goto noIncrement; - break; - } - ++zx.sig.a0; - if ( zx.sig.a0 == 0x01000000 ) { - zx.sig.a0 = 0x00800000; - ++zx.exp; - } - } - noIncrement: - zx.sig.a1 = 0; - return zx; - -} - -static floatX roundFloatXTo53( flag isTiny, floatX zx ) -{ - int8 roundBits; - - roundBits = zx.sig.a1 & 7; - zx.sig.a1 -= roundBits; - if ( roundBits ) { - slow_float_exception_flags |= float_flag_inexact; - if ( isTiny ) slow_float_exception_flags |= float_flag_underflow; - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - if ( roundBits < 4 ) goto noIncrement; - if ( ( roundBits == 4 ) && ! ( zx.sig.a1 & 8 ) ) goto noIncrement; - break; - case float_round_to_zero: - goto noIncrement; - case float_round_down: - if ( ! zx.sign ) goto noIncrement; - break; - case float_round_up: - if ( zx.sign ) goto noIncrement; - break; - } - zx.sig.a1 += 8; - zx.sig.a0 += ( zx.sig.a1 == 0 ); - if ( zx.sig.a0 == 0x01000000 ) { - zx.sig.a0 = 0x00800000; - ++zx.exp; - } - } - noIncrement: - return zx; - -} - -static floatX int32ToFloatX( int32 a ) -{ - floatX ax; - - ax.isNaN = FALSE; - ax.isInf = FALSE; - ax.sign = ( a < 0 ); - ax.sig.a1 = ax.sign ? - a : a; - ax.sig.a0 = 0; - if ( a == 0 ) { - ax.isZero = TRUE; - return ax; - } - ax.isZero = FALSE; - ax.sig = shortShift64Left( ax.sig, 23 ); - ax.exp = 32; - while ( ax.sig.a0 < 0x00800000 ) { - ax.sig = shortShift64Left( ax.sig, 1 ); - --ax.exp; - } - return ax; - -} - -static int32 floatXToInt32( floatX ax ) -{ - int8 savedExceptionFlags; - int16 shiftCount; - int32 z; - - if ( ax.isInf || ax.isNaN ) { - slow_float_exception_flags |= float_flag_invalid; - return ( ax.isInf & ax.sign ) ? 0x80000000 : 0x7FFFFFFF; - } - if ( ax.isZero ) return 0; - savedExceptionFlags = slow_float_exception_flags; - shiftCount = 52 - ax.exp; - if ( 56 < shiftCount ) { - ax.sig.a1 = 1; - ax.sig.a0 = 0; - } - else { - while ( 0 < shiftCount ) { - ax.sig = shortShift64RightJamming( ax.sig, 1 ); - --shiftCount; - } - } - ax = roundFloatXTo53( FALSE, ax ); - ax.sig = shortShift64RightJamming( ax.sig, 3 ); - z = ax.sig.a1; - if ( ax.sign ) z = - z; - if ( ( shiftCount < 0 ) - || ax.sig.a0 - || ( ( z != 0 ) && ( ( ax.sign ^ ( z < 0 ) ) != 0 ) ) - ) { - slow_float_exception_flags = savedExceptionFlags | float_flag_invalid; - return ax.sign ? 0x80000000 : 0x7FFFFFFF; - } - return z; - -} - -static floatX float32ToFloatX( float32 a ) -{ - int16 expField; - floatX ax; - - ax.isNaN = FALSE; - ax.isInf = FALSE; - ax.isZero = FALSE; - ax.sign = ( ( a & 0x80000000 ) != 0 ); - expField = ( a>>23 ) & 0xFF; - ax.sig.a1 = 0; - ax.sig.a0 = a & 0x007FFFFF; - if ( expField == 0 ) { - if ( ax.sig.a0 == 0 ) { - ax.isZero = TRUE; - } - else { - expField = 1 - 0x7F; - do { - ax.sig.a0 <<= 1; - --expField; - } while ( ax.sig.a0 < 0x00800000 ); - ax.exp = expField; - } - } - else if ( expField == 0xFF ) { - if ( ax.sig.a0 == 0 ) { - ax.isInf = TRUE; - } - else { - ax.isNaN = TRUE; - } - } - else { - ax.sig.a0 |= 0x00800000; - ax.exp = expField - 0x7F; - } - return ax; - -} - -static float32 floatXToFloat32( floatX zx ) -{ - floatX savedZ; - flag isTiny; - int16 expField; - float32 z; - - if ( zx.isZero ) return zx.sign ? 0x80000000 : 0; - if ( zx.isInf ) return zx.sign ? 0xFF800000 : 0x7F800000; - if ( zx.isNaN ) return 0xFFFFFFFF; - while ( 0x01000000 <= zx.sig.a0 ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - ++zx.exp; - } - while ( zx.sig.a0 < 0x00800000 ) { - zx.sig = shortShift64Left( zx.sig, 1 ); - --zx.exp; - } - savedZ = zx; - isTiny = - ( slow_float_detect_tininess == float_tininess_before_rounding ) - && ( zx.exp + 0x7F <= 0 ); - zx = roundFloatXTo24( isTiny, zx ); - expField = zx.exp + 0x7F; - if ( 0xFF <= expField ) { - slow_float_exception_flags |= - float_flag_overflow | float_flag_inexact; - if ( zx.sign ) { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_down: - z = 0xFF800000; - break; - case float_round_to_zero: - case float_round_up: - z = 0xFF7FFFFF; - break; - } - } - else { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_up: - z = 0x7F800000; - break; - case float_round_to_zero: - case float_round_down: - z = 0x7F7FFFFF; - break; - } - } - return z; - } - if ( expField <= 0 ) { - isTiny = TRUE; - zx = savedZ; - expField = zx.exp + 0x7F; - if ( expField < -27 ) { - zx.sig.a1 = ( zx.sig.a0 != 0 ) || ( zx.sig.a1 != 0 ); - zx.sig.a0 = 0; - } - else { - while ( expField <= 0 ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - ++expField; - } - } - zx = roundFloatXTo24( isTiny, zx ); - expField = ( 0x00800000 <= zx.sig.a0 ) ? 1 : 0; - } - z = expField; - z <<= 23; - if ( zx.sign ) z |= 0x80000000; - z |= zx.sig.a0 & 0x007FFFFF; - return z; - -} - -static floatX float64ToFloatX( float64 a ) -{ - int16 expField; - floatX ax; - - ax.isNaN = FALSE; - ax.isInf = FALSE; - ax.isZero = FALSE; -#ifdef BITS64 - ax.sign = ( ( a & LIT64( 0x8000000000000000 ) ) != 0 ); - expField = ( a>>52 ) & 0x7FF; - ax.sig.a1 = a; - ax.sig.a0 = ( a>>32 ) & 0x000FFFFF; -#else - ax.sign = ( ( a.high & 0x80000000 ) != 0 ); - expField = ( a.high>>( 52 - 32 ) ) & 0x7FF; - ax.sig.a1 = a.low; - ax.sig.a0 = a.high & 0x000FFFFF; -#endif - if ( expField == 0 ) { - if ( ( ax.sig.a0 == 0 ) && ( ax.sig.a1 == 0 ) ) { - ax.isZero = TRUE; - } - else { - expField = 1 - 0x3FF; - do { - ax.sig = shortShift64Left( ax.sig, 1 ); - --expField; - } while ( ax.sig.a0 < 0x00100000 ); - ax.exp = expField; - } - } - else if ( expField == 0x7FF ) { - if ( ( ax.sig.a0 == 0 ) && ( ax.sig.a1 == 0 ) ) { - ax.isInf = TRUE; - } - else { - ax.isNaN = TRUE; - } - } - else { - ax.exp = expField - 0x3FF; - ax.sig.a0 |= 0x00100000; - } - ax.sig = shortShift64Left( ax.sig, 3 ); - return ax; - -} - -static float64 floatXToFloat64( floatX zx ) -{ - floatX savedZ; - flag isTiny; - int16 expField; - float64 z; - -#ifdef BITS64 - if ( zx.isZero ) return zx.sign ? LIT64( 0x8000000000000000 ) : 0; - if ( zx.isInf ) { - return - zx.sign ? LIT64( 0xFFF0000000000000 ) - : LIT64( 0x7FF0000000000000 ); - } - if ( zx.isNaN ) return LIT64( 0xFFFFFFFFFFFFFFFF ); -#else - if ( zx.isZero ) { - z.low = 0; - z.high = zx.sign ? 0x80000000 : 0; - return z; - } - if ( zx.isInf ) { - z.low = 0; - z.high = zx.sign ? 0xFFF00000 : 0x7FF00000; - return z; - } - if ( zx.isNaN ) { - z.high = z.low = 0xFFFFFFFF; - return z; - } -#endif - while ( 0x01000000 <= zx.sig.a0 ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - ++zx.exp; - } - while ( zx.sig.a0 < 0x00800000 ) { - zx.sig = shortShift64Left( zx.sig, 1 ); - --zx.exp; - } - savedZ = zx; - isTiny = - ( slow_float_detect_tininess == float_tininess_before_rounding ) - && ( zx.exp + 0x3FF <= 0 ); - zx = roundFloatXTo53( isTiny, zx ); - expField = zx.exp + 0x3FF; - if ( 0x7FF <= expField ) { - slow_float_exception_flags |= - float_flag_overflow | float_flag_inexact; -#ifdef BITS64 - if ( zx.sign ) { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_down: - z = LIT64( 0xFFF0000000000000 ); - break; - case float_round_to_zero: - case float_round_up: - z = LIT64( 0xFFEFFFFFFFFFFFFF ); - break; - } - } - else { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_up: - z = LIT64( 0x7FF0000000000000 ); - break; - case float_round_to_zero: - case float_round_down: - z = LIT64( 0x7FEFFFFFFFFFFFFF ); - break; - } - } -#else - if ( zx.sign ) { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_down: - z.low = 0; - z.high = 0xFFF00000; - break; - case float_round_to_zero: - case float_round_up: - z.low = 0xFFFFFFFF; - z.high = 0xFFEFFFFF; - break; - } - } - else { - switch ( slow_float_rounding_mode ) { - case float_round_nearest_even: - case float_round_up: - z.low = 0; - z.high = 0x7FF00000; - break; - case float_round_to_zero: - case float_round_down: - z.low = 0xFFFFFFFF; - z.high = 0x7FEFFFFF; - break; - } - } -#endif - return z; - } - if ( expField <= 0 ) { - isTiny = TRUE; - zx = savedZ; - expField = zx.exp + 0x3FF; - if ( expField < -56 ) { - zx.sig.a1 = ( zx.sig.a0 != 0 ) || ( zx.sig.a1 != 0 ); - zx.sig.a0 = 0; - } - else { - while ( expField <= 0 ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - ++expField; - } - } - zx = roundFloatXTo53( isTiny, zx ); - expField = ( 0x00800000 <= zx.sig.a0 ) ? 1 : 0; - } - zx.sig = shortShift64RightJamming( zx.sig, 3 ); -#ifdef BITS64 - z = expField; - z <<= 52; - if ( zx.sign ) z |= LIT64( 0x8000000000000000 ); - z |= ( ( (bits64) ( zx.sig.a0 & 0x000FFFFF ) )<<32 ) | zx.sig.a1; -#else - z.low = zx.sig.a1; - z.high = expField; - z.high <<= 52 - 32; - if ( zx.sign ) z.high |= 0x80000000; - z.high |= zx.sig.a0 & 0x000FFFFF; -#endif - return z; - -} - -static floatX floatXInvalid( void ) -{ - - slow_float_exception_flags |= float_flag_invalid; - return floatXNaN; - -} - -static floatX floatXRoundToInt( floatX ax ) -{ - int16 shiftCount, i; - - if ( ax.isNaN || ax.isInf ) return ax; - shiftCount = 52 - ax.exp; - if ( shiftCount <= 0 ) return ax; - if ( 55 < shiftCount ) { - ax.exp = 52; - ax.sig.a1 = ! ax.isZero; - ax.sig.a0 = 0; - } - else { - while ( 0 < shiftCount ) { - ax.sig = shortShift64RightJamming( ax.sig, 1 ); - ++ax.exp; - --shiftCount; - } - } - ax = roundFloatXTo53( FALSE, ax ); - if ( ( ax.sig.a0 == 0 ) && ( ax.sig.a1 == 0 ) ) ax.isZero = TRUE; - return ax; - -} - -static floatX floatXAdd( floatX ax, floatX bx ) -{ - int16 expDiff; - floatX zx; - - if ( ax.isNaN ) return ax; - if ( bx.isNaN ) return bx; - if ( ax.isInf && bx.isInf ) { - if ( ax.sign == bx.sign ) return ax; - return floatXInvalid(); - } - if ( ax.isInf ) return ax; - if ( bx.isInf ) return bx; - if ( ax.isZero && bx.isZero ) { - if ( ax.sign == bx.sign ) return ax; - goto completeCancellation; - } - if ( ( ax.sign != bx.sign ) - && ( ax.exp == bx.exp ) - && eq64( ax.sig, bx.sig ) - ) { - completeCancellation: - return - ( slow_float_rounding_mode == float_round_down ) ? - floatXNegativeZero - : floatXPositiveZero; - } - if ( ax.isZero ) return bx; - if ( bx.isZero ) return ax; - expDiff = ax.exp - bx.exp; - if ( expDiff < 0 ) { - zx = ax; - zx.exp = bx.exp; - if ( expDiff < -56 ) { - zx.sig.a1 = 1; - zx.sig.a0 = 0; - } - else { - while ( expDiff < 0 ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - ++expDiff; - } - } - if ( ax.sign != bx.sign ) zx.sig = neg64( zx.sig ); - zx.sign = bx.sign; - zx.sig = add64( zx.sig, bx.sig ); - } - else { - zx = bx; - zx.exp = ax.exp; - if ( 56 < expDiff ) { - zx.sig.a1 = 1; - zx.sig.a0 = 0; - } - else { - while ( 0 < expDiff ) { - zx.sig = shortShift64RightJamming( zx.sig, 1 ); - --expDiff; - } - } - if ( ax.sign != bx.sign ) zx.sig = neg64( zx.sig ); - zx.sign = ax.sign; - zx.sig = add64( zx.sig, ax.sig ); - } - if ( zx.sig.a0 & 0x80000000 ) { - zx.sig = neg64( zx.sig ); - zx.sign = ! zx.sign; - } - return zx; - -} - -static floatX floatXMul( floatX ax, floatX bx ) -{ - int8 bitNum; - floatX zx; - - if ( ax.isNaN ) return ax; - if ( bx.isNaN ) return bx; - if ( ax.isInf ) { - if ( bx.isZero ) return floatXInvalid(); - if ( bx.sign ) ax.sign = ! ax.sign; - return ax; - } - if ( bx.isInf ) { - if ( ax.isZero ) return floatXInvalid(); - if ( ax.sign ) bx.sign = ! bx.sign; - return bx; - } - zx = ax; - zx.sign ^= bx.sign; - if ( ax.isZero || bx.isZero ) { - return zx.sign ? floatXNegativeZero : floatXPositiveZero; - } - zx.exp += bx.exp + 1; - zx.sig.a1 = 0; - zx.sig.a0 = 0; - for ( bitNum = 0; bitNum < 55; ++bitNum ) { - if ( bx.sig.a1 & 2 ) zx.sig = add64( zx.sig, ax.sig ); *** 14610 LINES SKIPPED *** From nobody Sun Aug 6 20:36:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp00LFKz4mN8L; Sun, 6 Aug 2023 20:36: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 4RJrnz6pnwz4bCm; Sun, 6 Aug 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HciYxtY7cCITsOXeEiZjyyoIYE5+HYLErJbkwKPRiw4=; b=VBQVxteeD1NK7+MOx+XpvTR/SUu1H2T53INUzjkqiarZ0uKUJaNxnLPheA3eRofKEbUIxM f/Pwp7ZGNNSeLAr5eTDKA2GuFXMH+ixfMj8PF+g6nOVL+1GiG13jOGMRx9BcTWXqJ6+MsU B/voTr4vPRXzzbEreQXXAsZf6IGHQLlIdZUYCz0X6W+Vm6TQPR7N1HrIVHpYU01NjpuqkB exzeYzONa3Z+vb8Z0ZXubPSso+PHAvaBtHdkR5QzG7XWTE4pw3xG0xjDDD6Lk90snnqA0Y pQXoSMM8CWFTFqrckJ9NMRDqcqQhtdjFkfdvd6BMt2Xd+QMLHmJ11SjqTxwxfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HciYxtY7cCITsOXeEiZjyyoIYE5+HYLErJbkwKPRiw4=; b=oAhO+n75K/rnAtBQ1zjujUiffoUO0hzjmoz4LCqt9xJqBjAGwBvTAaYmHWmfdV4JyHaBMz pl13c438/ZzAZXVB5GT05m2IC5tExV3rlLlqgDBpxAm6Hcao8N2b067OBixjr1Ja3xzMy7 4jPPhrbWsJ5jqgHnQD85RXOhlvdIreHrOxtb3qXP7sEFC0H0srniBz/8PSk9zWaH7WBCYI xJun9KjbeSjbeS0pYuztYjx7F8timtshTZRq74b4q1AcL8usx9RCdTuIIK708mlGlk92m2 M2YUGu7C+GG6xYA80Zc/wVbsCrPzuoN/4lfYEWW3CfqbQOOEXd3L/xu2kXu6rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354184; a=rsa-sha256; cv=none; b=vSe+CjY9sZCN+FmLf7hcl1EKB9bOg/TY9Nn/m4LqFMZMHhTBl+o17MGDoHn6oOxMNuANwt cxH7PEZSOKCMl76HrX4wAyBvGuSBc0kyNoVjEEbnY51NEmpiK4osuU0cZenfRtQUyt42yX qIgDgOhGBKbPpPNV97bM++pC6GyZHdgq/JF2d9eiu40mhem2/bSwydRXV/rnleW76BpTmC AzO1Tb+3Gf1gMvtLMBj4+C2efx8TY68v04SH8nw9kaBOkip6s9T8fwEhooyE8k8KCz5KHe hMFovm9K7vwdw0kkYRlIPibM1s2/lvNwILN3boTM0dGGQK9ef+6YzHDTRBM0Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrnz5pC7z93c; Sun, 6 Aug 2023 20:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaNHb042611; Sun, 6 Aug 2023 20:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaNZd042610; Sun, 6 Aug 2023 20:36:23 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:23 GMT Message-Id: <202308062036.376KaNZd042610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 6063ec2f429d - stable/13 - xhci(4): Describe AMD 400 Series USB 3.1 controllers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6063ec2f429d924a36c6b3e8bb706a681cdd6019 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=6063ec2f429d924a36c6b3e8bb706a681cdd6019 commit 6063ec2f429d924a36c6b3e8bb706a681cdd6019 Author: Marius Strobl AuthorDate: 2023-07-22 21:13:46 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:16:30 +0000 xhci(4): Describe AMD 400 Series USB 3.1 controllers While at it, correct the string for 300 series ones, these also are already xHCI 3.1. Fixes: d171d2f2 Add AHCI/XHCI device IDs found on AMD Ryzen+B350 system (cherry picked from commit 83e67a9d14d9cf3830cd52f4f49117bf7220ac49) --- sys/dev/usb/controller/xhci_pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/usb/controller/xhci_pci.c b/sys/dev/usb/controller/xhci_pci.c index e6c9c49e6e66..6df85be9c811 100644 --- a/sys/dev/usb/controller/xhci_pci.c +++ b/sys/dev/usb/controller/xhci_pci.c @@ -108,7 +108,9 @@ xhci_pci_match(device_t self) return ("AMD X399 USB 3.0 controller"); case 0x43b91022: /* X370 */ case 0x43bb1022: /* B350 */ - return ("AMD 300 Series USB 3.0 controller"); + return ("AMD 300 Series USB 3.1 controller"); + case 0x43d51022: + return ("AMD 400 Series USB 3.1 controller"); case 0x78121022: case 0x78141022: case 0x79141022: From nobody Sun Aug 6 20:36:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp11QY4z4mNZ1; Sun, 6 Aug 2023 20:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp10WKZz4bG1; Sun, 6 Aug 2023 20:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBGf2PfYUsDHryfVUPWaedUoBp+uL/gobSKWWwATVXY=; b=bncT6qkHB9cNWp7Q92EqcZxD06v46DmhTNTOrp6CbUDWeP2+fiv9eYiaoQS+sQrlbumE3z GxzU6DTqI2XFYapECbkR8jPNrwDrevepSLtY42vb7NUpZn4GXhX8PM4IlSjS553kdVFaCT DlV53xQEjq9w26BEarzYCqWprwS9IhrcOSl0Wh9jVJviBqNl5f8pjKaWQdlGfLzabrI6G9 E/DZi9rCnnyrjKACQisuiz/waWnQRro+fSYDSygm/BvBI29oVWBlQ2Y3YDY0AzmCPTSOMw SIKZ7KwF9nVta8rxQtanqsdXIQI4mVr6K1nrM423sU76z06j2C+G5rjU+9044Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fBGf2PfYUsDHryfVUPWaedUoBp+uL/gobSKWWwATVXY=; b=D73QizM+IOS9kRVFeky2OIFSM+QrOoJCYNtIz+W3w5b8ACy5SHlF5fresdnybJn8tOgqUL XZgbG9bc92CN6RI1Pmvp1oI02W+jTlKOmQApFVQ0qqLJn04C79pW2CJRLWZYEky7kMIGXR Jf//SUojIbmrSb/jSGvG4/GERCyt2IOBV81XfWfsr114k4T5/f26B2Aa4mdkUczuBCIPIV nxW4jTB9YBodLsmKMFb4HF3iYvnAMxjYBLB3he8T7skObWzaeu6usYGmrW9rDJoZ40oeRO pfxwkrWjXhawvr9si+rlGL0iQ5wrWHKvFmmsR4kSSBQ9hjy1UNOmoFCDyZIBFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354185; a=rsa-sha256; cv=none; b=Uylf2TANE7+GeMTILjzgGE2SZTz8RSkshTbWdA62VKA1s+BakCwnD8nv2wJBeUkRU0rWmS XZvNgx3avxQJYHZh7sqYJ68gOJD5BHzRI567GhLidZtw0XZyqfI6QwjCJ4HDhPSpHBBj98 eNVO2ScpOAOtj/VSeNwMWTS5Cd3lJPo0UzGPAoUz0MPMC30zlV682HpRtJEoBFcgxrlVgy t25rcF9Ogli9/VpilxDIdjRAt1SC1oZIZkVkTMqRq4LsmpF0B+RhANASzkkv3EQqGyjHge Vzlp3w45WygWCbHW45vzO48K6RxPORv0fkToDhEYoLXi4hWvEXmvImpvhLei8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp06jvXz8L1; Sun, 6 Aug 2023 20:36: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 376KaO0C042632; Sun, 6 Aug 2023 20:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaOof042631; Sun, 6 Aug 2023 20:36:24 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:24 GMT Message-Id: <202308062036.376KaOof042631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 3b0d328a2def - stable/13 - gif(4): Revert in{,6}_gif_output() misalignment handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b0d328a2defb7a949f6ca5afd83281ceed1b6c8 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=3b0d328a2defb7a949f6ca5afd83281ceed1b6c8 commit 3b0d328a2defb7a949f6ca5afd83281ceed1b6c8 Author: Marius Strobl AuthorDate: 2023-07-19 17:17:43 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:16:57 +0000 gif(4): Revert in{,6}_gif_output() misalignment handling The code added in c89c8a1029860182eece5d51ec09119b9500e5a1 in order to compensate possible misalignment caused by prepending the IP4/6 header with an EtherIP one got broken at some point by a rewrite of gif(4). For better or worse, 8018ac153f7671699ca008f31c0fad9caef2f531 relaxed the alignment of struct ip from 32 bit to 16 bit, though. As a result, a 16 bit offset of the IPv4 header induced by the addition of the 16 bit EtherIP one no longer is a problem in the first place. The alignment of struct ip6_hdr currently is even only 8 bit, making it even less problematic with regards to possible misalignment. Thus, remove the code for handling misalignment in in{,6}_gif_output() altogether again. While at it, replace the 3 bcopy(9) calls in gif(4) with memcpy(9) as there's no need to handle overlap here. (cherry picked from commit e82d7b2952afaf9625a3d7b05d03c43c1d3e7d9c) --- sys/net/if_gif.c | 2 +- sys/net/if_gif.h | 2 -- sys/netinet/in_gif.c | 19 ++----------------- sys/netinet6/in6_gif.c | 19 ++----------------- 4 files changed, 5 insertions(+), 37 deletions(-) diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index ea4b80690e50..4d2c1dcf091d 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -407,7 +407,7 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, uint32_t af; if (dst->sa_family == AF_UNSPEC) - bcopy(dst->sa_data, &af, sizeof(af)); + memcpy(&af, dst->sa_data, sizeof(af)); else af = RO_GET_FAMILY(ro, dst); /* diff --git a/sys/net/if_gif.h b/sys/net/if_gif.h index 2e61fcc166e1..f8fda6ddf801 100644 --- a/sys/net/if_gif.h +++ b/sys/net/if_gif.h @@ -94,8 +94,6 @@ struct etherip_header { } __packed; #define ETHERIP_VERSION 0x3 -/* mbuf adjust factor to force 32-bit alignment of IP header */ -#define ETHERIP_ALIGN 2 #define GIF_WAIT() epoch_wait_preempt(net_epoch_preempt) diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index a9f3d384fb5a..2caa9fcc23e2 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -272,31 +272,16 @@ in_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn) { struct gif_softc *sc = ifp->if_softc; struct ip *ip; - int len; /* prepend new IP header */ NET_EPOCH_ASSERT(); - len = sizeof(struct ip); -#ifndef __NO_STRICT_ALIGNMENT - if (proto == IPPROTO_ETHERIP) - len += ETHERIP_ALIGN; -#endif - M_PREPEND(m, len, M_NOWAIT); + M_PREPEND(m, sizeof(struct ip), M_NOWAIT); if (m == NULL) return (ENOBUFS); -#ifndef __NO_STRICT_ALIGNMENT - if (proto == IPPROTO_ETHERIP) { - len = mtod(m, vm_offset_t) & 3; - KASSERT(len == 0 || len == ETHERIP_ALIGN, - ("in_gif_output: unexpected misalignment")); - m->m_data += len; - m->m_len -= ETHERIP_ALIGN; - } -#endif ip = mtod(m, struct ip *); MPASS(sc->gif_family == AF_INET); - bcopy(sc->gif_iphdr, ip, sizeof(struct ip)); + memcpy(ip, sc->gif_iphdr, sizeof(struct ip)); ip->ip_p = proto; /* version will be set in ip_output() */ ip->ip_ttl = V_ip_gif_ttl; diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index 54cb81c6130f..eed311b86ff2 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -290,31 +290,16 @@ in6_gif_output(struct ifnet *ifp, struct mbuf *m, int proto, uint8_t ecn) { struct gif_softc *sc = ifp->if_softc; struct ip6_hdr *ip6; - int len; /* prepend new IP header */ NET_EPOCH_ASSERT(); - len = sizeof(struct ip6_hdr); -#ifndef __NO_STRICT_ALIGNMENT - if (proto == IPPROTO_ETHERIP) - len += ETHERIP_ALIGN; -#endif - M_PREPEND(m, len, M_NOWAIT); + M_PREPEND(m, sizeof(struct ip6_hdr), M_NOWAIT); if (m == NULL) return (ENOBUFS); -#ifndef __NO_STRICT_ALIGNMENT - if (proto == IPPROTO_ETHERIP) { - len = mtod(m, vm_offset_t) & 3; - KASSERT(len == 0 || len == ETHERIP_ALIGN, - ("in6_gif_output: unexpected misalignment")); - m->m_data += len; - m->m_len -= ETHERIP_ALIGN; - } -#endif ip6 = mtod(m, struct ip6_hdr *); MPASS(sc->gif_family == AF_INET6); - bcopy(sc->gif_ip6hdr, ip6, sizeof(struct ip6_hdr)); + memcpy(ip6, sc->gif_ip6hdr, sizeof(struct ip6_hdr)); ip6->ip6_flow |= htonl((uint32_t)ecn << 20); ip6->ip6_nxt = proto; From nobody Sun Aug 6 20:36:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp25Ltqz4mNRt; Sun, 6 Aug 2023 20:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp21Bcbz4bfc; Sun, 6 Aug 2023 20:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15x0A83o1ZhYzW2rDneKZj8PaT0knF0GidfEZ7kcSeg=; b=aV/iBSKIZUda6FjxTlOlix3hUiuD+PEv3MXKx+z0SzwtXbazjqMBT2QqVCTPzKKEWhb4xn BEGWW6zwBpKrKpVTymrAAqG/hExdjkUqpFG3T1ghLtReFp6SRnDcqm5keIGBtw1WU3Xid6 uzKRo5IMjLZP93c0JfCNmYXa5qjUghhBbYvM+qZZR391v6mf2guTWfO/L6tqTUAE7jr4Vw exPtDnA1oe7nMaKhGI89R6o48RVDFwuT7l0Y8p0tyByrMZeqiqeUVzzEaqQnRFLlh9fUb9 5GQk6RcECzjcB8nO39CheNWVEIwSbv+sAvKrAp5FSJyMa7rOMz8Y4sOtR0CoJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15x0A83o1ZhYzW2rDneKZj8PaT0knF0GidfEZ7kcSeg=; b=x+nM+d0CJn4jM4Ifnm576otbT4tY6ZW/To2Yv0N83ODMM7xre9s8uUYmi+l7tOhXjoTuvF BGDXjJs51K4fjdIAYBpt9jJLvyYhToKQbKnvSqzzma119SFHv8kRlkFHpxpNTwpFi7lDby t+vE2CeEuZv9y4dnWCEShNhDbXg0eDRNoVfW1zfn2khyD5GUX0kkYHRx7vygIVrcY05kaC L5KeZ3rticRGc6Wjqze4FocCiFlruVhra3DWEQ43SXtpoXeA4VBtK7LHEWfBiXtuVf3YwK JAgFo7MNdQj8xY1HIFtyVJvT6UYZTakSnOkcogT6sRzmuHgBxjXAsyxqrNM7vA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354186; a=rsa-sha256; cv=none; b=l+/DLNFnLRUi1l5KXlpxTjMaT4xu5srcdPIdNgkGsSUsft67k0wdVWz/c3Mgm/obuSADBm dWfKYwcpplGY4w8TEuKK6SJ7ajboe0MrC8g2m4Sd+j1DJ1BfwI9LwbyV4dau7c0dtFNfyQ sJ69L9sC8f9wqMdF+RzYVm+Ek4JKzyYdOQbJtwpX8XdHMYOanGbQs88VeH/Kaoc5vk2+vw m4Z9tz9uraMK72kyiR5UBGMn23bO7QbLTAzmef4drLlUmfP95HVt9qK/mdfCYWOcnXAE+T 2kD+BIL5MjdjjbzIO+MGRMwwUaBclfWWfgZ54jIeUf9Xt+LMYfXpqalkrujbLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp20Hl9z8mX; Sun, 6 Aug 2023 20:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaPIb042653; Sun, 6 Aug 2023 20:36:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaPB0042652; Sun, 6 Aug 2023 20:36:25 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:25 GMT Message-Id: <202308062036.376KaPB0042652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: b59b3443f39d - stable/13 - gif(4): Assert that gif_output() isn't called for EtherIP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b59b3443f39d2b7d6c631094fde7723e0aec1319 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=b59b3443f39d2b7d6c631094fde7723e0aec1319 commit b59b3443f39d2b7d6c631094fde7723e0aec1319 Author: Marius Strobl AuthorDate: 2023-07-23 16:58:42 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:17:30 +0000 gif(4): Assert that gif_output() isn't called for EtherIP With the current implementation of if_bridge(4), bridge_enqueue() calls gif_transmit() only. Ensure it stays that way so that the expectations in both drivers are either met or changed accordingly. PR: 227450 (cherry picked from commit 8a0308722372a3ac6a94967ae4fe3123842309e2) --- sys/net/if_gif.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index 4d2c1dcf091d..343c1cd070ad 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -406,6 +406,9 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst, { uint32_t af; + KASSERT(ifp->if_bridge == NULL, + ("%s: unexpectedly called with bridge attached", __func__)); + if (dst->sa_family == AF_UNSPEC) memcpy(&af, dst->sa_data, sizeof(af)); else From nobody Sun Aug 6 20:36:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp33PR2z4mNV6; Sun, 6 Aug 2023 20:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp32Drbz4bX1; Sun, 6 Aug 2023 20:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xY6Dle7Npn/9iYNI0eaa+7TGO6VtWSukX+/n8E+NNg8=; b=u+CNSlw4HGO1bVc3izpVU0cm+TYqU0coNmkAJ+9VrbLBu9SYXb+Gnci2xpCq3d6erFcv+i aUSHUig/a5ItX7nYyMkvmjtS6iVcueulP7GFHCBO9xvmno77M2R0C3hZcVcJTTtP8x1gQL MafSP+6Uxx99tr6U+aFoXycteJwj8rFgQFhSk4PCLB9qP/A1lXZF7+y/J3XQcmKGVW392K 8E7N5cp0Lr+h9FgOEdSHBR/3FcAHMEid/inPG2Pe3G5VR3w20q/K38RuboJNrP2JU8g+fE avefwgC6DLAYjEKjHuFd8aB5o1+s57TVwuIYueXWZ+HQ6MEC9fwWsfj0UNt7Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xY6Dle7Npn/9iYNI0eaa+7TGO6VtWSukX+/n8E+NNg8=; b=Q/SCNC4DQUAJOZWFZWCLiSg1Hr0QYx3E+JjvTfpOFx6Td43jLWWBObjvUhL1lcTV4QaYW5 jgYschq3bLQaqRvY/6Bdzkmb7iefjP9n/m3F1/u3zdx5LMz6qENBOpSjE11hLBX73omvPS 8sNVRtxFqoKVmENkZa1CnLPLrBZNByMWEbP81hQkxAdnp6vSRUERkMmifzNBIs8VP/73wO mzuneZY65T1GOAdNM+RYcbkaOT9gIPJfCd1OZ8rBdeP7kQnMFT1jvwBDYCpWuhaCRPpHtN /4z7r4BjWO0QVdXM3k6ErAqMgrYgZhL99LWXrkMdLj4HjhUugJOX/cB7UgW+dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354187; a=rsa-sha256; cv=none; b=ybTs/K5BNbVY43kkoRssMl1PW95Q3IXbXltTixHqGSmMeeWDCkAQLeMUbKtL7K7UJBoByQ 8BA1qAXU+qaAr/eknI5mcnK4xw3EbpqfU8pjM7lkxE32ScwbQd5P98jHC2XVsJ/E/SkOrH wW5LvqgTaIy+nYQKiu/zf+v9RqwUQLIrLCp2dxkdMF7xOGS44bY8UKNxDTUDKzljLkNnU4 bCXI2dmYEjBMbyVhtH/fS762/NM9myvifXZXOd06fAXIDuHQJqXwAvmVGgF/1fp+jUSf7w iG/TaKSUEFp6CFLeXW8IckOIs4mrWB74rXyTrgQXvgSQC+2NmcgKhvZdXqufNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp31L4jz8xd; Sun, 6 Aug 2023 20:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaRvc042672; Sun, 6 Aug 2023 20:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaRuv042671; Sun, 6 Aug 2023 20:36:27 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:27 GMT Message-Id: <202308062036.376KaRuv042671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 0dac0289c775 - stable/13 - ofw(4): Add my copyright and additional history for ofw_reg_to_paddr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0dac0289c77505f48cafaee6537b59f343c2f4ce Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=0dac0289c77505f48cafaee6537b59f343c2f4ce commit 0dac0289c77505f48cafaee6537b59f343c2f4ce Author: Marius Strobl AuthorDate: 2023-07-26 07:38:53 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:21:40 +0000 ofw(4): Add my copyright and additional history for ofw_reg_to_paddr() The ofw_reg_to_paddr() in this file is the powerpc OF_decode_addr() formerly added in 812403402e0bc2165c03e37c6f657c7405f95c15. However, the latter function in turn was based on the sparc64 counterpart I previously added in 2b2250b149706f492dd615a518aa669e39b78d0a. (cherry picked from commit 29fe5efc8aad3b283f2f53f24dc8ee3f3d0d6a58) --- sys/dev/ofw/ofw_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/ofw/ofw_subr.c b/sys/dev/ofw/ofw_subr.c index ec69e203dafd..c50ae056d022 100644 --- a/sys/dev/ofw/ofw_subr.c +++ b/sys/dev/ofw/ofw_subr.c @@ -1,4 +1,5 @@ /*- + * Copyright (c) 2005 by Marius Strobl * Copyright (c) 2015 Ian Lepore * All rights reserved. * @@ -26,6 +27,8 @@ * The initial ofw_reg_to_paddr() implementation has been copied from powerpc * ofw_machdep.c OF_decode_addr(). It was added by Marcel Moolenaar, who did not * assert copyright with the addition but still deserves credit for the work. + * The powerpc OF_decode_addr() in turn was based on the sparc64 counterpart + * written by Marius Strobl. */ #include From nobody Sun Aug 6 20:36:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp454nhz4mNRx; Sun, 6 Aug 2023 20:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp4429Yz4bd6; Sun, 6 Aug 2023 20:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tA/noNIXOSOr3NCrvMiOoGHldB862Ym/Pa+UYoL0kbY=; b=BzIb6+66TiAqI6Z1QYqBz+jRGsD/hdkHG7F7ZiV2hCNfUQ1ZfTBS3xW/qJ08f/BmMPc9l1 W/ULD9xO7Ikw4dxFVvbQjjRlDHVxWRXBj9vToM34Fy3qmXuMqfsU5bLc52MLnGkhk7IaDC JcvA3PhaM3xkqCOhjZn8hrII/WVpYxJfUh2tf1/pNbQRKHTBzvPWVPT3ZkkIRAgRzht1Ck W7gF5kXpCTeJrAr8Q9xwiCBGZkHV9hhPgCYybT4DMJO38bb9U8kLGPy7C49gRjHmAAK0dj 5rhhvHMJQ42t6v4qdviXYhoCe4FTDH9KcWTJsC3JmjLePj/Vl7i7Q03p30Qg4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tA/noNIXOSOr3NCrvMiOoGHldB862Ym/Pa+UYoL0kbY=; b=iekc+EY9CA7bsO+lVgktMHXe+8hUaePajwF0dEEFLvfJiUHlnLrf9GIzjq4aUFE/C5WOhO sY46LHV1wjVu9CV+ZbkyHxqQwOBQOIrQhdyXPwUKblgrGshgfEs6BY+qcxgFmU80W2Uxas DfT76ZodilgQGOKORsex2e8t0NyRgEfvFa4Bhqx4BPgX+IV4nAPJUKdpIpSOMw/5fyYgn1 WEp4pjGFX8mAMGfFj8WcEfxb4Peabq3BHQEmzPUESPrXRLCIVJlkkAup0aXjAhLtlJ1+El dbgr3E8BVWWSgwWc5GLAw0ogOV2S9Us/O7Htee8wtNoXlch79tc8fLLZbeFJ+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354188; a=rsa-sha256; cv=none; b=p/h1h8e5Va+yAau3DN/2a4nO5UOv+EdHQY070c2JByAWqXSvwJfpZk/2DAFH4jL2A+aizs x2V0VHg++vH/IGs6/a8RMcIMcY+rKg7jidLPnvLHGmY9VyIObiU+BSIDukD8dzi8NfFLbD LNSqEo3soLPLlyzQ2h239z0mVS65AV1fXPaniytyt7abbm96uKRMcayc9wf8mxSoW8IlY+ 6+q4ruFDdpX5ydRQHoOU4LyQ/6S0B4ADtExPODuhoC+sTD3R2vG5YVu+fDmhpbmnnMkfe/ 8GNL8FWJKWIqR8VHp79O+sXFgWuwuMxZABku2K2pywUq+WvVXW2413IiCAoJsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp421HPz91D; Sun, 6 Aug 2023 20:36: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 376KaSPL042697; Sun, 6 Aug 2023 20:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaSPR042696; Sun, 6 Aug 2023 20:36:28 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:28 GMT Message-Id: <202308062036.376KaSPR042696@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 20972319d2ee - stable/13 - Fix dead reference to boot0(8) to point to boot0cfg(8). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 20972319d2eebda83a27081756a5d85fc4ec875f Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=20972319d2eebda83a27081756a5d85fc4ec875f commit 20972319d2eebda83a27081756a5d85fc4ec875f Author: Jens Schweikhardt AuthorDate: 2022-09-16 17:08:22 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:26:38 +0000 Fix dead reference to boot0(8) to point to boot0cfg(8). (cherry picked from commit cf13e67730d232eb637987306b13bda100671d97) --- lib/geom/part/gpart.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 832f53d1bfc6..31299831ba6b 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -221,7 +221,7 @@ MBR bootcode contains Volume Serial Number by default, and .Nm tries to preserve it when installing new bootstrap code. This option skips preservation to help with some versions of -.Xr boot0 8 +.Xr boot0cfg 8 that do not support Volume Serial Number. .It Fl b Ar bootcode Embed bootstrap code from the file From nobody Sun Aug 6 20:36:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp54DVPz4mNFp; Sun, 6 Aug 2023 20:36: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 4RJrp53f9nz4bZd; Sun, 6 Aug 2023 20:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAzsSPrSu4IxJE85u6tQaBqruIFSSV+SNVIw4Ozh1T4=; b=fyi/zaQb8lWbYUwH5IFLcAKOgkwejnh6V1fVN1vQEpuShMCuBk+dOJLXxc4qQXOZ4WhCZ1 WFb9y5APixcMTTi1V5G0oYlNlzE5d7DDqeNaVz8EwxQuOf5lcPq26jjXORtZFHNl6Y23xu Orm6qL+6jnb2E60Ng7GXx80eeaz74okdgsdQIRj8L6TQ3CCI1ibyl+cg9/RI12CE7QlcYl PlbCTsl8qS+kyHIr4KZTozpyzLQWVNj4EOnDCe/D2xqxwG6wrV2NSf/16u6o4p8/BF7VX/ o3wbycppQYHqVUVGcxrXFQ+byM8vQbaMi+vyGO9ZJbyDhbEyZmIxWre8BS2iPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EAzsSPrSu4IxJE85u6tQaBqruIFSSV+SNVIw4Ozh1T4=; b=CLkP0TvS+V4cAEkZaZOsDtKC4Gv3H5ywaaG4Fp6sN8Ocaer62hGKOUvo0yC5RSkNiSEG/j 9zaJXDogPXx52lrackMHBFlERs2A6yq2Q+UIaAhmuVu7WiBOLDmnc25I8btHzYgm+AT9tv mZtAUaWGWBP5CGKZ1xwu4djct0K5JN7C7wS2DrSAXWiRxPfgNipb3xX+EilrDKYsvFhRsp 6XJbYnFbJ7TqlahW36qi4ZlSfHzj9z5p17qHEKt0rhAmCcJLPlYfofCQhrXe3mGt0znzC3 /XVhy97c6kQ3j6dOHv+vE+RpqzwtOSG/ZBJttsUcgQ460NnvmKjXXkVaddaeqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354189; a=rsa-sha256; cv=none; b=QGx5X8w2Vu0QRZEtMT2FTfABFXpKiNmlUhoLAYW9dKvA7E3RSHdBxae71l21Z+kPE+/hXi FjolW8QtzFCYJ9AT6WM8MyrwLwPBpvesIK3G/EQIxiPMP/VYHK9N1Wlaqcsj6x2YPzDo4a C+3ENxwJOmrUBJYG2VW8qfytgxU+X2Af8GHt2LLEVxDP8i1AedReXjEikooorWx0/JBrfy PMd83RC9TB0tcEMVCOOS/vHIvakHdEka6lqTsn705tIi3hpg+OcMmWTYb6QMHBbenUjKhy XFpk2U1gKUlz7crSGwamnPOIqJsBVvsxbZQxTan0m1bHqgSzXEG67EAlnIS3Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp52lpwz8kX; Sun, 6 Aug 2023 20:36: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 376KaTQS042716; Sun, 6 Aug 2023 20:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaTu9042715; Sun, 6 Aug 2023 20:36:29 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:29 GMT Message-Id: <202308062036.376KaTu9042715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 7bf80c94f7ae - stable/13 - gpart(8): Refer to a related manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bf80c94f7ae927ef7d73004392fa3b92301a853 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf80c94f7ae927ef7d73004392fa3b92301a853 commit 7bf80c94f7ae927ef7d73004392fa3b92301a853 Author: Tom Hukins AuthorDate: 2023-06-02 02:41:27 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:28:30 +0000 gpart(8): Refer to a related manual page Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit d275d2e3d375ae3c60fde1d7b1fc2f4b1c3fb4ef) --- lib/geom/part/gpart.8 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 31299831ba6b..35e2d904a2d0 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -551,7 +551,9 @@ Requires the .Cd GEOM_PART_APM kernel option. .It Cm BSD -Traditional BSD disklabel, usually used to subdivide MBR partitions. +Traditional BSD +.Xr disklabel 8 , +usually used to subdivide MBR partitions. .Po This scheme can also be used as the sole partitioning method, without an MBR. From nobody Sun Aug 6 20:36:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp656s9z4mNWg; Sun, 6 Aug 2023 20:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp64dxxz4bpQ; Sun, 6 Aug 2023 20:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fql286rnDoBed0yhmZCTj8fDXga+ElPaEL+mbSaWr3E=; b=cSBXLBFUDl1QKjZz7S0CO4/qTMNxBu9p7sSPWWEkLGzqsbPebg+Mfeoc9cnUz7kci1xFyA 8/0Xx4b3+9TasGdbUQLDztX+lw8zfdFrLNrciZy/vJAtV3mgGRxIQNmfmBDIVYWuxsxPeS U8lzORGXvVx58veG6Md2uE1SgY+ElHK2qeh9PE+AjC/bF/kK/F/4ivNR831eIc92SOdCZI t2xUQudrGFNzpSNDWTCQAWpKOz7t0bAAOIvMZt19+9/rvyPdnvQcjtTJUAuOdyn9hJMByg MtufwNIKnbGWHMkPD3CSv/AkCSPNwFjLQPxPEjFDLraj1zkFJuF7outcGMt+FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354190; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fql286rnDoBed0yhmZCTj8fDXga+ElPaEL+mbSaWr3E=; b=l+H1DWThoAFi320s4LiRMKVJjJSGruTOEw8SqJ/CoEj2quIJdDVO5y5PESfbWMdW/F8y2y vhz/Az7hfdzQR4ciMfMWnXcvAmT+HhcljbliBtdZ9FIPoeGeCmaUhnrstw7p+Z4kqnDpgM SmVYFH8M0zeh8MaKyL+APAKOuQ8vijf43ZtqKaEGhO1NmYfeh7BzhOobR9fu7i7g3+gtw1 F11ZxxvRomfXOp66FjKmZUnt2AdcnmrxvF31D4sdDhVsDhVBe6Ts6Acp/dHx9BOdLBgsbq myTn2m2Q4w/GnMxOij9IAfgUUoBWYxUTlOMSjZwpioBZuPNWyecl7EI6eGkZEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354190; a=rsa-sha256; cv=none; b=yNooYUs4Eg1io79eN6x5Qcf1waTXjJLRxDFq83nk1iVgbHHja6BOC79IfCbB5m62zK4XIw ufYYuEN+XmN52hEN1FORtI8mB84wv7Y7gmR62+l08hBfzdtVfnBnC7711F9T5J1qSbUbEa rc6SByjEti4gB9cyXVOCj8OENzZ7KFvL+sQce9RnzIKecAgDsIk1hcSiyUvBGJPYdViQnr cHBr+SwpTsXcqE6lXGs71uayKn1EMqIZlhw7Dx9rI8St/1suCs5atujxI1jveVUYwaLpoT gnYv8k2zbI0UijNHN0F3/ojbRfq1NVeLUUomKogdp/awyNkmP/6tUnn5GMRtkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp63kZxz91F; Sun, 6 Aug 2023 20:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaUoj042735; Sun, 6 Aug 2023 20:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaUft042734; Sun, 6 Aug 2023 20:36:30 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:30 GMT Message-Id: <202308062036.376KaUft042734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: e8d85eaf1c6a - stable/13 - cam(3): Add a manual page cross reference List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8d85eaf1c6a908a377c266617936231bddb230b Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=e8d85eaf1c6a908a377c266617936231bddb230b commit e8d85eaf1c6a908a377c266617936231bddb230b Author: Tom Hukins AuthorDate: 2023-06-02 02:41:27 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:36:50 +0000 cam(3): Add a manual page cross reference Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit 3e1af044c9b33109b48bcca1c8c27bbe91836d37) --- lib/libcam/cam.3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3 index 5e8eb61698c4..b8ed66c4dcb5 100644 --- a/lib/libcam/cam.3 +++ b/lib/libcam/cam.3 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 23, 2020 +.Dd March 27, 2023 .Dt CAM 3 .Os .Sh NAME @@ -121,7 +121,8 @@ .Fc .Sh DESCRIPTION The CAM library consists of a number of functions designed to aid in -programming with the CAM subsystem. +programming with the CAM subsystem described in +.Xr cam 4 . This man page covers the basic set of library functions. More functions are documented in the man pages listed From nobody Sun Aug 6 20:36:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp80lKFz4mNFt; Sun, 6 Aug 2023 20:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp75tDkz4bxV; Sun, 6 Aug 2023 20:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kLwuL1rZY3HaJ5MU0jMci7e1aS91TtQUWd4GHSgFbg=; b=ATR5q09v6gdgsWmn5DpuDTiuC3uYaZ3fu5aJq1Pfdp1r4m1Tphxau5FRewvfhI+U6WkM0c GXGDY5IXwM7KEx59gGW9cg6+O6ggvXkGni0xiO/XfRKL9qN3YhOaMrkBeH74fsAkNSYmv8 EZb6J2MVlMyY9ui73daELQqhEAFivJoJtcdN1gc+I8ajzXuT72YskkIzRbeRQGLQVhth1S ERNdheELTzC/ZqUCjH8aGBg8h3v4KE1ULaKk2dx+9dzdso8fndXG0NGBjntR0LByOyT2yI o7OZqSPwLbmcinDwvTbAfbMMnXuVGRcYjaGRVpKvaiqHbtkwgUZ+kVywTulWYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5kLwuL1rZY3HaJ5MU0jMci7e1aS91TtQUWd4GHSgFbg=; b=ezkO1wRqQG6M4QExoCD/CRmbZNjE4nVM1SIUP+Btrz1A0ZmnMko2XleOWPgxI2IZfvyOsT 7hxU7ZMu4S54v/8ne+qHOR/lvr4/yiT5j0ivarX9rwpfXZ9KMO1wD5fA1Z38pJwfzsgVLH PZNU3L8LLOLqPKSZ+3NF0K6WTJdi13QfVRlS/67benCnj8JpHHBWZPRjoT/mIKGe72g/nT VECh6zL1htwvPbCEYiMd5NUTO6frNncwhUgvHUWoKqqYt7ryFqBSOSRBevJv9j9s+FNATW nAgCWn2yTW4S7PX5AZKZ9K/3uopOe/qR2zsFVKt5xOht2zGDpYbvYlK1yonjWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354191; a=rsa-sha256; cv=none; b=uojF6TrtpbTPsrghDvqHzbDqO62zEesJM2AjRMXcMQVXOA4yIvbQLPYC1UtG0H0F0MiIfg jCz6CFuhQHT1+4ErR/ZTX19ic1E+tajgiMTW66A3c4gstKHyhuAp2SpVo03sSa+ggurzpN 60ErPEmWugdmUg/pIryCT86DZK2X9ogi70v5FexuP6+4D2b0wveI78tSLLIJ0+cQi9T9xv jjNiTCA/e1AOPw95nnE28blQiLSq3JEQXeIAd2sEQaPT79U089QDmDxoIEDb34sDLPmpR3 /LN+VTEW2tJVUfaTAahyE7eEaX/hmHf0f45Sh+3CPAep/c4gE2vcIDnR/pNNSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp74z6Nz8L2; Sun, 6 Aug 2023 20:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaVwT042754; Sun, 6 Aug 2023 20:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaVF0042753; Sun, 6 Aug 2023 20:36:31 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:31 GMT Message-Id: <202308062036.376KaVF0042753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: a38661a36b5e - stable/13 - update external URL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a38661a36b5e489ad2ca986ec3d44eaa443b7c3e Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=a38661a36b5e489ad2ca986ec3d44eaa443b7c3e commit a38661a36b5e489ad2ca986ec3d44eaa443b7c3e Author: Wolfram Schneider AuthorDate: 2022-02-05 17:09:48 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:38:04 +0000 update external URL (cherry picked from commit c918f50f8bdf7fb34707df5bb2faa719336fb808) --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 236ddd8c479d..dc010530fbba 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -1796,7 +1796,7 @@ One of those two options is required. Persistent reservations are complex, and fully explaining them is outside the scope of this manual. Please visit -http://www.t10.org +https://www.t10.org and download the latest SPC spec for a full explanation of persistent reservations. .Bl -tag -width 8n From nobody Sun Aug 6 20:36:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrp90BC4z4mNZF; Sun, 6 Aug 2023 20:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrp86p0qz4c1C; Sun, 6 Aug 2023 20:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTwRwHIQtoEhiKkPEMNn3quqL4rAIMdU9W7p+NULMSw=; b=m1RWqmmYW4sBq5FINb4EKZ0YQH8xLfzlKK9N/v3L7HJDHaC4f/p1tjlVE06We4l/C8PNzj SH7YmOzOj9i7WBu9MNI26tbMAl0tmmvwx8qwmwSW5gTQ0BJ2Va3xidJqRJmgDg7xk92TLJ wuI0f8D1Fe7V4RMCfyaXmD12YI7WW9trgRnpPxTFsdnsk5pWtaabddWqhaDs8HVG/Yb7Y5 D2Raj4aXO4biGj+b54Q7UJ+jX1NUYQRN6bG7bz+LY1pTdm7tzwWhTZ1PRaFUmst6G3zv2/ /m20V/g6R87nA6pI6TcVHHmcuWDmy7Bht/JoDg5UNYI4hzJxMvi9wOSE5EdvUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HTwRwHIQtoEhiKkPEMNn3quqL4rAIMdU9W7p+NULMSw=; b=dUv2v6icSKOi0y0sIul3vM3UQ9u3WEysE4kV4UAbccxPtRuDi2CRCgV20gCkgJKJ1AQNMY H1Kzgc8wJhoMJ2tU4yJ8VhMI9RRn3jlWCFJUX9O4OFsqC0HcgMM6upuqQys7b/8n25DQDw ZJzUnjhIX2qiOu3sn1DSZRK68EDk77Bo9ZkWOvldykNPIxwv7aA2OKDrMUUxZeou4P68wh wWO6FJvGsey64SHuAnOIlvC2s6ekQvl3exqM5WACpuKTww0MD8v99JcojR4+W0hZvHbFtB 8/AmW7PDRzGXml925lUwcThp7VHNCpdF7WoNX6QWBV/bB31TOeGI09ldVswbZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354193; a=rsa-sha256; cv=none; b=gagnsUu9TCMelvv6tmhqzbrN/5MWXPJwOtZiYh2jeF/v93MuGyBCHBlKeqhBG8rHfUsAJZ MyxYfYv1HBcNskZ3JyImrBZGhTheRqMglw44+QNszybJT4U9N/izmfCD8magaBvtvkk0yH U8y2KKBj2s+L1gjfYtdVzxWYtBV1z0gYySoo4SPnYv8jkq+NtHDIPGNNhMnmZ1v3pbnra9 a+P69hjwdX+J8iMcLu+9VqPMn8+AQ1K8OZ3Lng7m8RZgadAP1n6BXxkBdJatu318ys9buJ l1ejkDcMXFWII8LlfrSYvIvWRTJJU0r2Y2F8pTVuNfne1y3WmONVEe+PkLrYbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp85tgvz8xf; Sun, 6 Aug 2023 20:36:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaWL2042776; Sun, 6 Aug 2023 20:36:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaWnJ042775; Sun, 6 Aug 2023 20:36:32 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:32 GMT Message-Id: <202308062036.376KaWnJ042775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 3fb913e58d10 - stable/13 - camcontrol(8): Add manual page cross references List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fb913e58d1027920b6ad8d24dd5ea6d0bff4a91 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=3fb913e58d1027920b6ad8d24dd5ea6d0bff4a91 commit 3fb913e58d1027920b6ad8d24dd5ea6d0bff4a91 Author: Tom Hukins AuthorDate: 2023-06-02 02:41:27 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:38:31 +0000 camcontrol(8): Add manual page cross references Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit 2675b8bd3d940e75fc5bfb550c46af5fca262072) --- sbin/camcontrol/camcontrol.8 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index dc010530fbba..72cad0622ea8 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 20, 2021 +.Dd March 27, 2023 .Dt CAMCONTROL 8 .Os .Sh NAME @@ -372,7 +372,8 @@ The .Nm utility is designed to provide a way for users to access and control the .Fx -CAM subsystem. +CAM subsystem described in +.Xr cam 4 . .Pp The .Nm @@ -2910,6 +2911,7 @@ that was created using this format string. .Xr cam 4 , .Xr pass 4 , .Xr xpt 4 , +.Xr diskinfo 8 , .Xr trim 8 , .Xr zonectl 8 .Sh HISTORY From nobody Sun Aug 6 20:36:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpB2hR4z4mNbt; Sun, 6 Aug 2023 20:36: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 4RJrpB1SFwz4blC; Sun, 6 Aug 2023 20:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dasqcTtndseggz/pMIz7jQ22+yjFg18QEHatXUbSO8=; b=dnv2FmrStpyzC+oM5+smJsSafqJLqyN3WU7NBezi3weBV2Jl9iFT0vKXYWNgNF65xFTJ2V /gRYt0Bae1Ukew7eAxruwj/zFTyUJxCYpqG3RulhoJF3u6aHLEvJUik9FWxPAI3IN3QL8b mzVOey4cdC8w8yiZVeh3tWriAQ0orcQGecKHDuz/yDd+2ZKEDBRujg5R0oYnU25+yDrfJm BfnhuhtiUaInfS7dH6SusmHlf4xdRcoE8LVaXdfN3HxdBM+TZTOM6O3aP/unQxWFhc/6z2 ZeTabK2Wxy/F43gI6ez7wiouF6zqmXTNE1GGYuCgumFzIYkkVLSG1FzSpwROUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354194; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7dasqcTtndseggz/pMIz7jQ22+yjFg18QEHatXUbSO8=; b=bg72SIJKSxMW4rWfDCetGzxPpguP73svMe7QwYpWzZvrS7YxxabDMXZhG26NEnrSaEkZUx J4+wKBfI328Nr0IqmrO2+56abqbltqddhKKMwGIK2fQTsQQ1B5+HNRnntnlaqpmlil/b4X 0uFNnDJdBR/yIEinauxG323PN+63+R0Efnjc0eo4wMBO5WBYYlS+VUOH1Bwc7MyZpPl09c aoRkwXu1+OFB8L+DvS7mM0hJFNXkbRLJ5Idq0OuIJrFzoFlukFJBvK8dvBmopkG18dUIne 394bUhYdiWn0Bajkuz8+SJcxjPCqrk2091EPeuNSkMJmyAE7RXNkV5BCbdhdEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354194; a=rsa-sha256; cv=none; b=uVo5Rxs0FyY/uAtDmsgbeVZ3Y3EqXRjaOkmmWuyVmp5dnQwewqfAX3DyTvf6iEvi0xQfVm 6DOEIrzg+55bWaIe/Vr2OmNP1GTCAe38qDm8VjyDv8covkb9oxgehosjg92VoiVkPVHMnq l2D+q25mfU49W7IJeQHo/Ba4kHqthp8/bnQFvAtvo1guO3f2847xSEg0eZu0oQpT9fLdIE M5gnFeM2WYT/8+gQ/JJ0voqCk2XGNWHne8mFvHpHT9z+Md4GPB3gKDPh0O2CkXZacherw4 iIEg/GiqDDtmf1HqEEplWO0DyZqxEvti/9ahXcVu7yaZIhHMWgTz/KS0Bm804Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrp96tDPz8XQ; Sun, 6 Aug 2023 20:36:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaXFT042801; Sun, 6 Aug 2023 20:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaX4O042800; Sun, 6 Aug 2023 20:36:33 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:33 GMT Message-Id: <202308062036.376KaX4O042800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 555a4a30a0a0 - stable/13 - camcontrol(8): Use simpler language List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 555a4a30a0a0eac7cf873dd256bf0ee4fb10a980 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=555a4a30a0a0eac7cf873dd256bf0ee4fb10a980 commit 555a4a30a0a0eac7cf873dd256bf0ee4fb10a980 Author: Tom Hukins AuthorDate: 2023-06-02 02:41:27 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:38:40 +0000 camcontrol(8): Use simpler language Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit 2bcbf4d8314654b91f7d688194b047f7151aa955) --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 72cad0622ea8..4ccf89b5a2a5 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -370,7 +370,7 @@ .Sh DESCRIPTION The .Nm -utility is designed to provide a way for users to access and control the +utility allows users to access and control the .Fx CAM subsystem described in .Xr cam 4 . From nobody Sun Aug 6 20:36:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpC3JpFz4mNS6; Sun, 6 Aug 2023 20:36: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 4RJrpC2Cpbz4c65; Sun, 6 Aug 2023 20:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iP3CX+Ldzw7X7CLlbbRCjYJ5jatMMHoGYZlIMB0ttE=; b=pzaJnCSjwGG49lFWgoDiyYIjwp6t/d6J44nIZj1Jv02q1wBfS+2onZTTehY6ccOWFxonwd 21/yxpySFn/0B70R0agttFiUYhTsR0TDT1DJXCJCnxHZQAbAloO8pMHG+zN+RVWvWnPPAu mMZl78nh4JpmtUzdAEz09/y4fgumkJko8J7N7NsF2/HrCjNaWfyXUOG40ZScKc0DuOmsB3 zDkYCDVMUyShhWg45a2T0neBAKvUihG2JWyKYXWWTVcRN055w65+RoU6qghmWdw/y8Pb0v HKWQxn6rmWO+OWhuFM6Z3YcSIiVLoCRTPQQqVd9lpakuIC6oHbR+kHVivLoWEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0iP3CX+Ldzw7X7CLlbbRCjYJ5jatMMHoGYZlIMB0ttE=; b=HJVZB+5q6FG47kGwk6NPy47psU+9VGnfKBreHjUwFVPhC374QM6LVQaaHAgQ9Wmiu/vbHr imeVDVNQMb8D/F1RoCsY/KNQ0Pi9biyjk8y0dd26IExa3NzYrP4sPCwXcxot5EJLv9g9rc ieqOPQJ2BAmt8yRwqDIeV+dEIHk5ojfyLUN/WyMKZm55P4/jpUGeCNIQhb7+f3h72VWfu4 CJqTSZoKkn6zjrf6KyOYDz31GSrkgGABWyURiW3WSPrVd4YuLcHgJuHK1sMV1FQoDRdLnH AFGfM+5hfyaDgZ6DARThAlPfctquN+xCmbSAR1x6P2KDrytwVBs8UfqXD+Y4gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354195; a=rsa-sha256; cv=none; b=ThRXTQLqLrNd9blKUh8UfVStjW3wOZm7bU+G/yqHQ2ewcZXyJzUx+h77ROkZmP0SAobAGV xnzNQswXYxETWtvXzCELxbJ4bgieIo34ffvSy+r0qfY+96Trlzbz72vUrR0Gne+7cs0Fe7 7YvtsgXmw9kF7ZaJ3tymge7AeGiZsVBn53+KVdSD0kSAdPvQfIn7joDcPYMLTgU4k0woK9 +OtpEsBoN3HvoxTzHJby1WgZKkK1/ZQJ80RqsPeQurpxK4okQmw1MbFaM/9lO/g+zfG1uN I5YCz7KEDORXbB05iDZVxRGsJB5NbQdixdqwG54a3geGKmauYp27EiX8JOSHgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpC0kP3z93d; Sun, 6 Aug 2023 20:36: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 376KaZAC042820; Sun, 6 Aug 2023 20:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaZgZ042819; Sun, 6 Aug 2023 20:36:35 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:35 GMT Message-Id: <202308062036.376KaZgZ042819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 4b96066ac09a - stable/13 - gpart(8): Improve manual page syntax List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4b96066ac09a280d2b98a4bf10653aa62ae4ac4b Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=4b96066ac09a280d2b98a4bf10653aa62ae4ac4b commit 4b96066ac09a280d2b98a4bf10653aa62ae4ac4b Author: Tom Hukins AuthorDate: 2023-06-02 02:41:28 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:43:36 +0000 gpart(8): Improve manual page syntax Fix various warnings from `mandoc -Tlint lib/geom/part/gpart.8`. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit 409594ef340b71252a0dc1fedbdb36977642e20a) --- lib/geom/part/gpart.8 | 65 ++++++++++++++++++++++++++++++++------------ lib/libcam/cam.3 | 2 +- sbin/camcontrol/camcontrol.8 | 2 +- 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 35e2d904a2d0..68f112cfe30a 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -566,7 +566,9 @@ Requires the .Cm GEOM_PART_BSD kernel option. .It Cm BSD64 -64-bit implementation of BSD disklabel used in DragonFlyBSD to subdivide MBR +64-bit implementation of BSD disklabel used in +.Dx +to subdivide MBR or GPT partitions. Requires the .Cm GEOM_PART_BSD64 @@ -772,50 +774,67 @@ See .Sx CAVEATS section below. .It Cm dragonfly-label32 -A DragonFlyBSD partition subdivided into filesystems with a +A +.Dx +partition subdivided into filesystems with a .Bx disklabel. The scheme-specific type is .Qq Li "!9d087404-1ca5-11dc-8817-01301bb8a9f5" for GPT. .It Cm dragonfly-label64 -A DragonFlyBSD partition subdivided into filesystems with a +A +.Dx +partition subdivided into filesystems with a disklabel64. The scheme-specific type is .Qq Li "!3d48ce54-1d16-11dc-8696-01301bb8a9f5" for GPT. .It Cm dragonfly-legacy -A legacy partition type used in DragonFlyBSD. +A legacy partition type used in +.Dx . The scheme-specific type is .Qq Li "!bd215ab2-1d16-11dc-8696-01301bb8a9f5" for GPT. .It Cm dragonfly-ccd -A DragonFlyBSD partition used with Concatenated Disk driver. +A +.Dx +partition used with Concatenated Disk driver. The scheme-specific type is .Qq Li "!dbd5211b-1ca5-11dc-8817-01301bb8a9f5" for GPT. .It Cm dragonfly-hammer -A DragonFlyBSD partition that contains a Hammer filesystem. +A +.Dx +partition that contains a Hammer filesystem. The scheme-specific type is .Qq Li "!61dc63ac-6e38-11dc-8513-01301bb8a9f5" for GPT. .It Cm dragonfly-hammer2 -A DragonFlyBSD partition that contains a Hammer2 filesystem. +A +.Dx +partition that contains a Hammer2 filesystem. The scheme-specific type is .Qq Li "!5cbb9ad1-862d-11dc-a94d-01301bb8a9f5" for GPT. .It Cm dragonfly-swap -A DragonFlyBSD partition dedicated to swap space. +A +.Dx +partition dedicated to swap space. The scheme-specific type is .Qq Li "!9d58fdbd-1ca5-11dc-8817-01301bb8a9f5" for GPT. .It Cm dragonfly-ufs -A DragonFlyBSD partition that contains an UFS1 filesystem. +A +.Dx +partition that contains an UFS1 filesystem. The scheme-specific type is .Qq Li "!9d94ce7c-1ca5-11dc-8817-01301bb8a9f5" for GPT. .It Cm dragonfly-vinum -A DragonFlyBSD partition used with Logical Volume Manager. +A +.Dx +partition used with Logical Volume Manager. The scheme-specific type is .Qq Li "!9dd4478f-1ca5-11dc-8817-01301bb8a9f5" for GPT. @@ -906,32 +925,44 @@ The scheme-specific type is .Qq Li "!5808c8aa-7e8f-42e0-85d2-e1e90434cfb3" for GPT. .It Cm netbsd-ccd -A NetBSD partition used with Concatenated Disk driver. +A +.Nx +partition used with Concatenated Disk driver. The scheme-specific type is .Qq Li "!2db519c4-b10f-11dc-b99b-0019d1879648" for GPT. .It Cm netbsd-cgd -An encrypted NetBSD partition. +An encrypted +.Nx +partition. The scheme-specific type is .Qq Li "!2db519ec-b10f-11dc-b99b-0019d1879648" for GPT. .It Cm netbsd-ffs -A NetBSD partition that contains an UFS filesystem. +A +.Nx +partition that contains an UFS filesystem. The scheme-specific type is .Qq Li "!49f48d5a-b10e-11dc-b99b-0019d1879648" for GPT. .It Cm netbsd-lfs -A NetBSD partition that contains an LFS filesystem. +A +.Nx +partition that contains an LFS filesystem. The scheme-specific type is .Qq Li "!49f48d82-b10e-11dc-b99b-0019d1879648" for GPT. .It Cm netbsd-raid -A NetBSD partition used in a software RAID configuration. +A +.Nx +partition used in a software RAID configuration. The scheme-specific type is .Qq Li "!49f48daa-b10e-11dc-b99b-0019d1879648" for GPT. .It Cm netbsd-swap -A NetBSD partition dedicated to swap space. +A +.Nx +partition dedicated to swap space. The scheme-specific type is .Qq Li "!49f48d32-b10e-11dc-b99b-0019d1879648" for GPT. @@ -1445,7 +1476,6 @@ label: /sbin/gpart bootcode -b /boot/boot ada0s1 .Ed .Ss VTOC8 -.Pp Create a VTOC8 scheme on .Pa da0 : .Bd -literal -offset indent @@ -1498,7 +1528,6 @@ This is equivalent to the previous example: /sbin/gpart destroy -F da0 .Ed .Ss Backup and Restore -.Pp Create a backup of the partition table from .Pa da0 : .Bd -literal -offset indent diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3 index b8ed66c4dcb5..066976b61426 100644 --- a/lib/libcam/cam.3 +++ b/lib/libcam/cam.3 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2023 +.Dd June 1, 2023 .Dt CAM 3 .Os .Sh NAME diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index 4ccf89b5a2a5..b0b19e89ae03 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2023 +.Dd June 1, 2023 .Dt CAMCONTROL 8 .Os .Sh NAME From nobody Sun Aug 6 20:36:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpD4xtSz4mNVQ; Sun, 6 Aug 2023 20:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrpD3TFBz4bw0; Sun, 6 Aug 2023 20:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWKDHY5v9NQn6HIzpgOe7J1YQxEwyDNVmkxVyYoInIk=; b=jdRJNGfhlm9sGPBQvzoavJ1aPQhnth5WYxGCc5nBXTpsjWs2gWDreNVicxfD+MjNkbvYkx FC24YKqOJsLHSt/wk4Uf/lrAXSFng7+Xls0IuX+SuxshHwaBhPHDhCfd5qcCoABhr3q2sh 8GX/HaXQs78Bl+tlMuVtJAGa9JvycwHwYYF135yBO1+meXhQTTe3r89hPplj4NlckUoHyn 0+QteqrtpDZ/TLi5KOkmgtTiQwdG8Qw7NqWMoUY0BCd8fYts17z3CzWPI95IY+CKQ0A6TL t/fnvsCiwy2FivBZR/FdxXCXmtEi4sO9XfzqjCRNTmvgxInfe69nYkQkeel3BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eWKDHY5v9NQn6HIzpgOe7J1YQxEwyDNVmkxVyYoInIk=; b=nYtXvriuWl4Khea6gkYwOW5PDYYnnEhMDi525iefJ28M7yW3X4kPeQo7ZkaIa0VFVGWwFq G9l6X/crOCS+WqSOd25yxrAsGpgnQCEjvmZ8cLTV18RMm5XX43zDUDhRHEZLH7l8h535bD 1ghU1KMhwNARryCFlql59dJrz/w/Vz1EQbvafVuVCP6g7SNhQJhNhRfQSKpF7TB39GTcgh H8Y5n9apDDujiW3aKyRyP/7rxKWDjk0j3dCMj4tLmchT0Id3exExXzw8w4IfoRbQ+cHVvS 78t7dNGc7yJuJXgKYXO1dmr5pGREOF6wh0ZWhKswL4ynqCYH9QE9dwtRH+H+ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354196; a=rsa-sha256; cv=none; b=Z69WDxVll/xdSjuCRV5L2N3X/pySMtYAeLmLszNAcx/9WUNMQbbxMfjKLAvVzTakDFooqw OqQqfUlP4Lx5OaWWgA05WjrJes+ZnAGQ/pQ4qiexW1Qvoku2WluRtm1JSt9eGKrZqtwBIN DLnTvpRkLd7hpsPr0gS8QOuN4TVds0kkew9FCx+Qjcp293l64lt1z+NhMPfiWZMJ7fzMyu iy1D7mb6nYfIrZ+vP+S7KfbhJgkmTQRmdReGtzdIZCxNcdyb0sl9HeqqE7wfTAoT4PkIMJ 0gHQxb4/G8RvSgA37DtUssudQnke6/qO/TnDvRNiCf1V2OddlPIFHgXj6cFN+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpD1j1Hz93f; Sun, 6 Aug 2023 20:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376KaaG7042844; Sun, 6 Aug 2023 20:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KaaqZ042843; Sun, 6 Aug 2023 20:36:36 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:36 GMT Message-Id: <202308062036.376KaaqZ042843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: de256b499f33 - stable/13 - Minor grammar nit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: de256b499f335b6d17ce1cbe6e255c303bb5c934 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=de256b499f335b6d17ce1cbe6e255c303bb5c934 commit de256b499f335b6d17ce1cbe6e255c303bb5c934 Author: Andreas Bjornestad AuthorDate: 2021-03-03 16:17:26 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:45:07 +0000 Minor grammar nit PR: docs/253975 (cherry picked from commit 25352f9fda43f6ad112d78a8a6e00b77259802d7) --- lib/geom/part/gpart.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 68f112cfe30a..2bc1daba2ad6 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -169,7 +169,7 @@ to be multiple of value. .It Fl b Ar start The logical block address where the partition will begin. -A SI unit suffix is allowed. +An SI unit suffix is allowed. .It Fl f Ar flags Additional operational flags. See the section entitled @@ -188,7 +188,7 @@ partition labels. .It Fl s Ar size Create a partition of size .Ar size . -A SI unit suffix is allowed. +An SI unit suffix is allowed. .It Fl t Ar type Create a partition of type .Ar type . @@ -424,7 +424,7 @@ about its use. Specifies the index of the partition to be resized. .It Fl s Ar size Specifies the new size of the partition, in logical blocks. -A SI unit suffix is allowed. +An SI unit suffix is allowed. .El .\" ==== RESTORE ==== .It Cm restore From nobody Sun Aug 6 20:36:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpF5vcxz4mNG5; Sun, 6 Aug 2023 20:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrpF3sTzz4c6g; Sun, 6 Aug 2023 20:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JotmX1N9RiU+Kk60RZxm31ByYQ07Jrx4pWMYA2hOeFw=; b=o0UpSEyEeoqTrg7jMXG2bsckpnyz9XtQugGr/c+Ai0fNb7krj8zRKKx2FMuH61XcPKUTkV QluqcZl6am1j6DeiwCXqnHxf4vewI3XoyRNbnb3r3Wni6hhmM81pcjbr1lATneeXlEIq7o yJsiYYKJd2VpwA3LtqL+lt1GeCM5ljmtnHI2AXtkqn3JpoQSQPQJj/Zvtq/8f+pYNFJmv8 jOSS8S6t8G6hQzzKIIPllDY4gxlV8goLHsZI1v4Fe268QM1fFEHaSJKvqeQ/oMeOEMMzis ozsJ9IhHrV+BDUAjBgEozcN57mrauujEsHNLVzJ66AY3Ay1IsygEQcQ2dUbxxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JotmX1N9RiU+Kk60RZxm31ByYQ07Jrx4pWMYA2hOeFw=; b=phnXB0vXjlIA3D2meKmMd35UiXi5dZ3PB07vbYP54zZHtKVWL8GKlSNWpXNlhBFLud5yXA oMP8BGtK1DiC3Yak902/oBmNLoVSB2mIoCGKSje8ZpQ3ZG5znK85ueCY0DU4Tt+DYvtIX2 H1t7ZewKKIfv/mnEZELt4ym/Oapy40Trki1MmQXsXmimRWgO1IMLldQ6ia9naS2Pk4VHOP 2KPBocO8uonQ+McET7cA30R+eAX4gHo/+NeRpMbqq5D3vwweNJEcqz3wxUXyXq7Litme5y fX4ty61VEjAzabVjLEm/8vMoZHtsetDCk+wi9wrEWkDOu/jLDmgMJ90I+8ThzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354197; a=rsa-sha256; cv=none; b=ygq6i+zxp3sOHFcjAoNg6Z2Qqjb8iTLDVnn17ppJIQkRWPCkrZOkA9xj+w+pLcRkQh40es W1Bso8KHyAPyCBB21J861e0pfEG7svOHL+MiBL56jJBI6VPVtLJ7zpBjjRdemMgeDish7P UTuHOj3zcJrDRRVc0EYe/ssvqh8/jcRPHR54w0teM+qqXpPDdlDYc8wRVqDnzmEtigoWC1 rlWRE4lcj3knrggKnmoTgD5B8LpPTI5rBO7Bml0I45gd+Th8htWZhzAjFuPWpf5xojWR7g 3vVERUI1sbIAeaYwSDomArRX+rztAvxB0Wc2Q7p36oVzQVuMYUJSQlWmXAwhgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpF2mjmz8xg; Sun, 6 Aug 2023 20:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 376Kaba8042864; Sun, 6 Aug 2023 20:36:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Kabqm042863; Sun, 6 Aug 2023 20:36:37 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:37 GMT Message-Id: <202308062036.376Kabqm042863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: f28b14e6ce69 - stable/13 - geom(4): Add cross reference to geom(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f28b14e6ce697b7f95598e9c635c911f43cbdcc1 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=f28b14e6ce697b7f95598e9c635c911f43cbdcc1 commit f28b14e6ce697b7f95598e9c635c911f43cbdcc1 Author: Tom Hukins AuthorDate: 2023-03-27 20:50:25 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:46:49 +0000 geom(4): Add cross reference to geom(8) PR: 264387 Reviewed by: ceri Pull Request: https://github.com/freebsd/freebsd-src/pull/702 (cherry picked from commit e5bc2547a5f8173d1e5b72c1713a54dc89e29620) --- share/man/man4/geom.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4 index f6988c663f54..91ba9360ec3b 100644 --- a/share/man/man4/geom.4 +++ b/share/man/man4/geom.4 @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2019 +.Dd March 27, 2023 .Dt GEOM 4 .Os .Sh NAME @@ -445,6 +445,7 @@ Dump contents of gctl requests. .El .Sh SEE ALSO .Xr libgeom 3 , +.Xr geom 8 , .Xr DECLARE_GEOM_CLASS 9 , .Xr disk 9 , .Xr g_access 9 , From nobody Sun Aug 6 20:36:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpG6qnhz4mNc4; Sun, 6 Aug 2023 20:36: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 4RJrpG5mmtz4cCM; Sun, 6 Aug 2023 20:36:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOA3W2FJZNrHFyg/KCTkZ6kt5gyIC7VILkbX9JNbyQ4=; b=EJtpvCy1CppD7J69GsRvsW/EONJw43zubf5pUvrft2NwMZO/1rEcLjmUtGjbxXQqxIrKs6 4WmMzPJ47BZL0d6Lh6/b9dBlDGOMSyavMeHLak+gvus8Fb6E91/DBAbNdRQZI5FLYtN6kw jEdQcchna8E5fAm7/BkLgdCs6EJub8HbOp/ShFDwgWP2TCokPWuD/uxUh5Orrvo4hNJS9n pgdQDRxftt9f2EVNd1ETCS8J7RQmfGCPJl0bpRxpaSuznAXn/kfja0bbeZAFaIo1X54xEN n3qEJT2alLX+nyE2lp2aS5QqIKcBWBCGdhM5p/JA8Br+E7I016P5P9rWlnO8Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOA3W2FJZNrHFyg/KCTkZ6kt5gyIC7VILkbX9JNbyQ4=; b=CGL7UXxCNULh0WPsbvgkJCkRPLKojjeVTbavXOYY4dLbqbOthXhVC/dxTxMIpPqGJW9jws Gnfi0l4dHKvRAZdiRuNIILH7JEGz/7gsjqNoNL8GllPWhghLL5cbEtW+vkw/+KW6sKq1Zr Id6NZFrXiTvO/mQ2jPxj6iK1jMcP+tta38pJu1A0yAqHQj0HVQFKjLMh9RGJA4cDN4XiCQ sbmjVu2iU92rND3QrcKSRBHsOvvEWOPoceqdYM6Bzn7UiwDq9TNe7bdOvUlDBWXG/iZjSs zSYxPW6jtGZBES/uHsLcet740o/xerLGOBtbuJI4necbVgp41rqMGSdOoqjutQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354198; a=rsa-sha256; cv=none; b=tx3YU4GUc9UWDySSYuIL1/+K8AAwMNLUXiZtfBFy0gf90V+u4T6VsBp2YOdDaB5Yaa6bFc yhIiRWo4nnD+lvPnG9tkbgOQWwgEvUDCFbSSgV1gqYUAlaYJlc6A4xMuXZkfYOCToXpVRO gRjg5bJ2o1pSarv+bRSIycLWaz/K9+hOiAAfeuaxnTGJTb6KlSz5WhXBzJcQSW/cc/emEE wAz8ojO5UPmWddxyUsbBXRdTPPBsLUKthowtBhDGDWk1NfIK3dEfaUhXGAX+E8UPRHB0g1 Gm9v1j/hZ07dpCKhGq4W+ub2ngqfg3Y4aC189YJlYlQEtXCzYfMHZzcgCTzA6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpG411Sz8XR; Sun, 6 Aug 2023 20:36: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 376Kactt042891; Sun, 6 Aug 2023 20:36:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376KacB5042889; Sun, 6 Aug 2023 20:36:38 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:38 GMT Message-Id: <202308062036.376KacB5042889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: aa63608809b6 - stable/13 - base: Remove support for the VTOC8 partitioning scheme List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa63608809b60066f14a044c9c652039ba24b214 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=aa63608809b60066f14a044c9c652039ba24b214 commit aa63608809b60066f14a044c9c652039ba24b214 Author: Marius Strobl AuthorDate: 2023-07-26 11:08:37 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:49:05 +0000 base: Remove support for the VTOC8 partitioning scheme The removal of the sparc64 support in February 2020 obsoleted the VTOC8 partitioning scheme as no other FreeBSD platform makes use of it. Moreover, the code is bitrotting as nothing defines e. g. LOADER_VTOC8_SUPPORT any more and, thus, should go now, too. With this change, the following commits are reverted as far as VTOC8 is concerned and parts haven't already previously been deleted along with prior sparc64 removals: 094fcb157d4c98211899cf09d06e2cf19149b7e0 a7d366e9589c95feda6f3bc78c59c6355d51f126 ba8d50d08b9df4e8213f9a6997ff6792ecebcd9b The alignment example d9711c28efc4ec89ba5ea11f8fd63e9d0a7fc81b added to the VTOC8 section of gpart.8 is folded into the MBR one. This should finally conclude the deorbit of sparc64-specific bits. We had joy, we had fun we ran Unix on a Sun. But that source and the song of FreeBSD have all gone. Credits to Michael Bueker for the original "Unix on a Sun" and Rod McKuen for the "Seasons in the Sun" lyrics. (cherry picked from commit 4ef1c6f75d25ba0c264ab274a1b449467a6ee817) --- ObsoleteFiles.inc | 4 + lib/geom/part/geom_part.c | 132 ++--- lib/geom/part/gpart.8 | 76 +-- share/man/man4/geom.4 | 5 +- stand/common/part.c | 100 ---- stand/common/part.h | 1 - sys/conf/NOTES | 1 - sys/conf/files | 1 - sys/conf/options | 1 - sys/geom/part/g_part_vtoc8.c | 604 --------------------- sys/modules/geom/geom_part/Makefile | 3 +- .../geom/geom_part/geom_part_vtoc8/Makefile | 10 - sys/sys/disk/vtoc.h | 110 ---- sys/sys/vtoc.h | 5 - tools/boot/install-boot.sh | 12 - usr.bin/mkimg/Makefile | 3 +- usr.bin/mkimg/tests/mkimg_test.sh | 2 +- usr.bin/mkimg/vtoc8.c | 113 ---- usr.sbin/efibootmgr/efibootmgr.c | 1 - 19 files changed, 58 insertions(+), 1126 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5848dc27a5cd..4c0fca28c4bf 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20230806: Removal of support for the VTOC8 partitioning scheme +OLD_FILES+=usr/include/sys/disk/vtoc.h +OLD_FILES+=usr/include/sys/vtoc.h + # 20230806 meteor.4 removed, see also 20200301 entry below OLD_FILES+=usr/share/man/man4/meteor.4.gz diff --git a/lib/geom/part/geom_part.c b/lib/geom/part/geom_part.c index 70eb83a66c97..04e730c7719e 100644 --- a/lib/geom/part/geom_part.c +++ b/lib/geom/part/geom_part.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include @@ -89,8 +88,7 @@ static _Noreturn void gpart_issue(struct gctl_req *, unsigned int); static void gpart_show(struct gctl_req *, unsigned int); static void gpart_show_geom(struct ggeom *, const char *, int); static int gpart_show_hasopt(struct gctl_req *, const char *, const char *); -static void gpart_write_partcode(struct ggeom *, int, void *, ssize_t); -static void gpart_write_partcode_vtoc8(struct ggeom *, int, void *); +static void gpart_write_partcode(struct gctl_req *, int, void *, ssize_t); static void gpart_print_error(const char *); static void gpart_backup(struct gctl_req *, unsigned int); static void gpart_restore(struct gctl_req *, unsigned int); @@ -1107,14 +1105,38 @@ gpart_bootfile_read(const char *bootfile, ssize_t *size) } static void -gpart_write_partcode(struct ggeom *gp, int idx, void *code, ssize_t size) +gpart_write_partcode(struct gctl_req *req, int idx, void *code, ssize_t size) { char dsf[128]; + struct gmesh mesh; + struct gclass *classp; + struct ggeom *gp; struct gprovider *pp; - const char *s; + const char *g, *s; char *buf; off_t bsize; - int fd; + int error, fd; + + s = gctl_get_ascii(req, "class"); + if (s == NULL) + abort(); + g = gctl_get_ascii(req, "arg0"); + if (g == NULL) + abort(); + error = geom_gettree_geom(&mesh, s, g, 0); + if (error != 0) + errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + classp = find_class(&mesh, s); + if (classp == NULL) { + geom_deletetree(&mesh); + errx(EXIT_FAILURE, "Class %s not found.", s); + } + gp = find_geom(classp, g); + if (gp == NULL) + errx(EXIT_FAILURE, "No such geom: %s.", g); + s = find_geomcfg(gp, "scheme"); + if (s == NULL) + errx(EXIT_FAILURE, "Scheme not found for geom %s", gp->lg_name); LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { s = find_provcfg(pp, "index"); @@ -1149,65 +1171,17 @@ gpart_write_partcode(struct ggeom *gp, int idx, void *code, ssize_t size) printf("partcode written to %s\n", pp->lg_name); } else errx(EXIT_FAILURE, "invalid partition index"); -} -static void -gpart_write_partcode_vtoc8(struct ggeom *gp, int idx, void *code) -{ - char dsf[128]; - struct gprovider *pp; - const char *s; - int installed, fd; - - installed = 0; - LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - s = find_provcfg(pp, "index"); - if (s == NULL) - continue; - if (idx != 0 && atoi(s) != idx) - continue; - snprintf(dsf, sizeof(dsf), "/dev/%s", pp->lg_name); - if (pp->lg_sectorsize != sizeof(struct vtoc8)) - errx(EXIT_FAILURE, "%s: unexpected sector " - "size (%d)\n", dsf, pp->lg_sectorsize); - if (pp->lg_mediasize < VTOC_BOOTSIZE) - continue; - fd = open(dsf, O_WRONLY); - if (fd == -1) - err(EXIT_FAILURE, "%s", dsf); - /* - * We ignore the first VTOC_BOOTSIZE bytes of boot code in - * order to avoid overwriting the label. - */ - if (lseek(fd, sizeof(struct vtoc8), SEEK_SET) != - sizeof(struct vtoc8)) - err(EXIT_FAILURE, "%s", dsf); - if (write(fd, (caddr_t)code + sizeof(struct vtoc8), - VTOC_BOOTSIZE - sizeof(struct vtoc8)) != VTOC_BOOTSIZE - - sizeof(struct vtoc8)) - err(EXIT_FAILURE, "%s", dsf); - installed++; - close(fd); - if (idx != 0 && atoi(s) == idx) - break; - } - if (installed == 0) - errx(EXIT_FAILURE, "%s: no partitions", gp->lg_name); - else - printf("partcode written to %s\n", - idx != 0 ? pp->lg_name: gp->lg_name); + geom_deletetree(&mesh); } static void gpart_bootcode(struct gctl_req *req, unsigned int fl) { - struct gmesh mesh; - struct gclass *classp; - struct ggeom *gp; - const char *g, *s; + const char *s; void *bootcode, *partcode; size_t bootsize, partsize; - int error, idx, vtoc8; + int error, idx; if (gctl_get_int(req, "nargs") != 1) errx(EXIT_FAILURE, "Invalid number of arguments."); @@ -1231,31 +1205,6 @@ gpart_bootcode(struct gctl_req *req, unsigned int fl) goto nopartcode; } - s = gctl_get_ascii(req, "class"); - if (s == NULL) - abort(); - g = gctl_get_ascii(req, "arg0"); - if (g == NULL) - abort(); - error = geom_gettree_geom(&mesh, s, g, 0); - if (error != 0) - errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); - classp = find_class(&mesh, s); - if (classp == NULL) { - geom_deletetree(&mesh); - errx(EXIT_FAILURE, "Class %s not found.", s); - } - gp = find_geom(classp, g); - if (gp == NULL) - errx(EXIT_FAILURE, "No such geom: %s.", g); - s = find_geomcfg(gp, "scheme"); - if (s == NULL) - errx(EXIT_FAILURE, "Scheme not found for geom %s", gp->lg_name); - if (strcmp(s, "VTOC8") == 0) - vtoc8 = 1; - else - vtoc8 = 0; - if (gctl_has_param(req, GPART_PARAM_INDEX)) { idx = (int)gctl_get_intmax(req, GPART_PARAM_INDEX); if (idx < 1) @@ -1268,28 +1217,17 @@ gpart_bootcode(struct gctl_req *req, unsigned int fl) if (gctl_has_param(req, GPART_PARAM_PARTCODE)) { s = gctl_get_ascii(req, GPART_PARAM_PARTCODE); - if (vtoc8 != 0) - partsize = VTOC_BOOTSIZE; - else - partsize = 1024 * 1024; /* Arbitrary limit. */ + partsize = 1024 * 1024; /* Arbitrary limit. */ partcode = gpart_bootfile_read(s, &partsize); error = gctl_delete_param(req, GPART_PARAM_PARTCODE); if (error) errc(EXIT_FAILURE, error, "internal error"); - if (vtoc8 == 0) { - if (idx == 0) - errx(EXIT_FAILURE, "missing -i option"); - gpart_write_partcode(gp, idx, partcode, partsize); - } else { - if (partsize != VTOC_BOOTSIZE) - errx(EXIT_FAILURE, "invalid bootcode"); - gpart_write_partcode_vtoc8(gp, idx, partcode); - } + if (idx == 0) + errx(EXIT_FAILURE, "missing -i option"); + gpart_write_partcode(req, idx, partcode, partsize); free(partcode); } - geom_deletetree(&mesh); - nopartcode: if (bootcode != NULL) gpart_issue(req, fl); diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 2bc1daba2ad6..a6f9fbd884a8 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 7, 2023 +.Dd July 26, 2023 .Dt GPART 8 .Os .Sh NAME @@ -544,7 +544,7 @@ See Several partitioning schemes are supported by the .Nm utility: -.Bl -tag -width ".Cm VTOC8" +.Bl -tag -width ".Cm BSD64" .It Cm APM Apple Partition Map, used by PowerPC(R) Macintosh(R) computers. Requires the @@ -599,15 +599,6 @@ The option enables backward compatibility for partition names in the EBR scheme. It also prevents any type of actions on such partitions. -.It Cm VTOC8 -Sun's SMI Volume Table Of Contents, used by -.Tn SPARC64 -and -.Tn UltraSPARC -computers. -Requires the -.Cm GEOM_PART_VTOC8 -kernel option. .El .Pp See @@ -680,36 +671,36 @@ A partition dedicated to swap space. The scheme-specific types are .Qq Li "!FreeBSD-swap" -for APM, +for APM, and .Qq Li "!516e7cb5-6ecf-11d6-8ff8-00022d09712b" -for GPT, and tag 0x0901 for VTOC8. +for GPT. .It Cm freebsd-ufs A .Fx partition that contains a UFS or UFS2 filesystem. The scheme-specific types are .Qq Li "!FreeBSD-UFS" -for APM, +for APM, and .Qq Li "!516e7cb6-6ecf-11d6-8ff8-00022d09712b" -for GPT, and tag 0x0902 for VTOC8. +for GPT. .It Cm freebsd-vinum A .Fx partition that contains a Vinum volume. The scheme-specific types are .Qq Li "!FreeBSD-Vinum" -for APM, +for APM, and .Qq Li "!516e7cb8-6ecf-11d6-8ff8-00022d09712b" -for GPT, and tag 0x0903 for VTOC8. +for GPT. .It Cm freebsd-zfs A .Fx partition that contains a ZFS volume. The scheme-specific types are .Qq Li "!FreeBSD-ZFS" -for APM, +for APM, and .Qq Li "!516e7cba-6ecf-11d6-8ff8-00022d09712b" -for GPT, and 0x0904 for VTOC8. +for GPT. .El .Pp Other symbolic names that can be used with the @@ -1196,18 +1187,6 @@ After all pools are detected, .Pa /boot/loader is started from the first one found set as bootable. .Pp -The VTOC8 scheme does not support embedding bootstrap code. -Instead, the 8 KBytes bootstrap code image -.Pa /boot/boot1 -should be written with the -.Cm gpart bootcode -command with the -.Fl p Ar bootcode -option to all sufficiently large VTOC8 partitions. -To do this the -.Fl i Ar index -option could be omitted. -.Pp The APM scheme also does not support embedding bootstrap code. Instead, the 800 KBytes bootstrap code image .Pa /boot/boot1.hfs @@ -1306,7 +1285,7 @@ GEOM class. The default value is shown next to each variable. .Bl -tag -width indent .It Va kern.geom.part.allow_nesting : No 0 -By default, some schemes (currently BSD, BSD64 and VTOC8) do not permit +By default, some schemes (currently BSD and BSD64) do not permit further nested partitioning. This variable overrides this restriction and allows arbitrary nesting (except within partitions created at offset 0). @@ -1443,12 +1422,12 @@ using a traditional .Bx disklabel. .Pp -First, we create the partition table and a single 64 GB partition, -then we mark that partition active (bootable) and install the -first-stage boot loader: +First, we create the partition table as well as a single partition 64 GB in +size and an alignment of 4 kB, then we mark that partition active (bootable) +and install the first-stage boot loader: .Bd -literal -offset indent /sbin/gpart create -s MBR ada0 -/sbin/gpart add -t freebsd -s 64G ada0 +/sbin/gpart add -t freebsd -s 64G -a 4k ada0 /sbin/gpart set -a active -i 1 ada0 /sbin/gpart bootcode -b /boot/boot0 ada0 .Ed @@ -1475,31 +1454,6 @@ label: .Bd -literal -offset indent /sbin/gpart bootcode -b /boot/boot ada0s1 .Ed -.Ss VTOC8 -Create a VTOC8 scheme on -.Pa da0 : -.Bd -literal -offset indent -/sbin/gpart create -s VTOC8 da0 -.Ed -.Pp -Create a 512MB-sized -.Cm freebsd-ufs -partition to contain a UFS filesystem from which the system can boot. -.Bd -literal -offset indent -/sbin/gpart add -s 512M -t freebsd-ufs da0 -.Ed -.Pp -Create a 15GB-sized -.Cm freebsd-ufs -partition to contain a UFS filesystem and aligned on 4KB boundaries: -.Bd -literal -offset indent -/sbin/gpart add -s 15G -t freebsd-ufs -a 4k da0 -.Ed -.Pp -After creating all required partitions, embed bootstrap code into them: -.Bd -literal -offset indent -/sbin/gpart bootcode -p /boot/boot1 da0 -.Ed .Ss Deleting Partitions and Destroying the Partitioning Scheme If a .Em "Device busy" diff --git a/share/man/man4/geom.4 b/share/man/man4/geom.4 index 91ba9360ec3b..cb8f23aca7f3 100644 --- a/share/man/man4/geom.4 +++ b/share/man/man4/geom.4 @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2023 +.Dd July 26, 2023 .Dt GEOM 4 .Os .Sh NAME @@ -62,7 +62,6 @@ .Cd options GEOM_PART_GPT .Cd options GEOM_PART_LDM .Cd options GEOM_PART_MBR -.Cd options GEOM_PART_VTOC8 .Cd options GEOM_RAID .Cd options GEOM_RAID3 .Cd options GEOM_SHSEC @@ -494,8 +493,6 @@ Use .Cd GEOM_MULTIPATH , .It .Cd GEOM_PART_MBR , -.It -.Cd GEOM_PART_VTOC8 , and .It .Cd GEOM_LABEL diff --git a/stand/common/part.c b/stand/common/part.c index 4ae38bfb7682..90d7855b53ff 100644 --- a/stand/common/part.c +++ b/stand/common/part.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include @@ -70,7 +69,6 @@ struct pentry { uint8_t bsd; uint8_t mbr; uuid_t gpt; - uint16_t vtoc8; } type; STAILQ_ENTRY(pentry) entry; }; @@ -519,88 +517,6 @@ out: return (table); } -#ifdef LOADER_VTOC8_SUPPORT -static enum partition_type -vtoc8_parttype(uint16_t type) -{ - - switch (type) { - case VTOC_TAG_FREEBSD_SWAP: - return (PART_FREEBSD_SWAP); - case VTOC_TAG_FREEBSD_UFS: - return (PART_FREEBSD_UFS); - case VTOC_TAG_FREEBSD_VINUM: - return (PART_FREEBSD_VINUM); - case VTOC_TAG_FREEBSD_ZFS: - return (PART_FREEBSD_ZFS); - } - return (PART_UNKNOWN); -} - -static struct ptable * -ptable_vtoc8read(struct ptable *table, void *dev, diskread_t dread) -{ - struct pentry *entry; - struct vtoc8 *dl; - uint8_t *buf; - uint16_t sum, heads, sectors; - int i; - - if (table->sectorsize != sizeof(struct vtoc8)) - return (table); - buf = malloc(table->sectorsize); - if (buf == NULL) - return (table); - if (dread(dev, buf, 1, 0) != 0) { - DPRINTF("read failed"); - ptable_close(table); - table = NULL; - goto out; - } - dl = (struct vtoc8 *)buf; - /* Check the sum */ - for (i = sum = 0; i < sizeof(struct vtoc8); i += sizeof(sum)) - sum ^= be16dec(buf + i); - if (sum != 0) { - DPRINTF("incorrect checksum"); - goto out; - } - if (be16toh(dl->nparts) != VTOC8_NPARTS) { - DPRINTF("invalid number of entries"); - goto out; - } - sectors = be16toh(dl->nsecs); - heads = be16toh(dl->nheads); - if (sectors * heads == 0) { - DPRINTF("invalid geometry"); - goto out; - } - DPRINTF("VTOC8 detected"); - for (i = 0; i < VTOC8_NPARTS; i++) { - dl->part[i].tag = be16toh(dl->part[i].tag); - if (i == VTOC_RAW_PART || - dl->part[i].tag == VTOC_TAG_UNASSIGNED) - continue; - entry = malloc(sizeof(*entry)); - if (entry == NULL) - break; - entry->part.start = be32toh(dl->map[i].cyl) * heads * sectors; - entry->part.end = be32toh(dl->map[i].nblks) + - entry->part.start - 1; - entry->part.type = vtoc8_parttype(dl->part[i].tag); - entry->part.index = i; /* starts from zero */ - entry->type.vtoc8 = dl->part[i].tag; - STAILQ_INSERT_TAIL(&table->entries, entry, entry); - DPRINTF("new VTOC8 partition added"); - } - table->type = PTABLE_VTOC8; -out: - free(buf); - return (table); - -} -#endif /* LOADER_VTOC8_SUPPORT */ - #define cdb2devb(bno) ((bno) * ISO_DEFAULT_BLOCK_SIZE / table->sectorsize) static struct ptable * @@ -678,16 +594,6 @@ ptable_open(void *dev, uint64_t sectors, uint16_t sectorsize, } else if (table->type == PTABLE_ISO9660) goto out; -#ifdef LOADER_VTOC8_SUPPORT - if (be16dec(buf + offsetof(struct vtoc8, magic)) == VTOC_MAGIC) { - if (ptable_vtoc8read(table, dev, dread) == NULL) { - /* Read error. */ - table = NULL; - goto out; - } else if (table->type == PTABLE_VTOC8) - goto out; - } -#endif /* Check the BSD label. */ if (ptable_bsdread(table, dev, dread) == NULL) { /* Read error. */ table = NULL; @@ -928,12 +834,6 @@ ptable_iterate(const struct ptable *table, void *arg, ptable_iterate_t *iter) if (table->type == PTABLE_GPT) sprintf(name, "p%d", entry->part.index); else -#endif -#ifdef LOADER_VTOC8_SUPPORT - if (table->type == PTABLE_VTOC8) - sprintf(name, "%c", (uint8_t) 'a' + - entry->part.index); - else #endif if (table->type == PTABLE_BSD) sprintf(name, "%c", (uint8_t) 'a' + diff --git a/stand/common/part.h b/stand/common/part.h index b991ae3c381c..68acce22cb06 100644 --- a/stand/common/part.h +++ b/stand/common/part.h @@ -36,7 +36,6 @@ enum ptable_type { PTABLE_BSD, PTABLE_MBR, PTABLE_GPT, - PTABLE_VTOC8, PTABLE_ISO9660 }; diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 300e85c8cacd..693f85fa0fe1 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -174,7 +174,6 @@ options GEOM_PART_EBR # Extended Boot Records options GEOM_PART_GPT # GPT partitioning options GEOM_PART_LDM # Logical Disk Manager options GEOM_PART_MBR # MBR partitioning -options GEOM_PART_VTOC8 # SMI VTOC8 disk label options GEOM_RAID # Soft RAID functionality. options GEOM_RAID3 # RAID3 functionality. options GEOM_SHSEC # Shared secret. diff --git a/sys/conf/files b/sys/conf/files index 5c94b3928ccf..b6b99253805e 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3740,7 +3740,6 @@ geom/part/g_part_ebr.c optional geom_part_ebr geom/part/g_part_gpt.c optional geom_part_gpt geom/part/g_part_ldm.c optional geom_part_ldm geom/part/g_part_mbr.c optional geom_part_mbr -geom/part/g_part_vtoc8.c optional geom_part_vtoc8 geom/raid/g_raid.c optional geom_raid geom/raid/g_raid_ctl.c optional geom_raid geom/raid/g_raid_md_if.m optional geom_raid diff --git a/sys/conf/options b/sys/conf/options index 05ca15e5c651..41cf6b5d99a7 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -128,7 +128,6 @@ GEOM_PART_EBR opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_LDM opt_geom.h GEOM_PART_MBR opt_geom.h -GEOM_PART_VTOC8 opt_geom.h GEOM_RAID opt_geom.h GEOM_RAID3 opt_geom.h GEOM_SHSEC opt_geom.h diff --git a/sys/geom/part/g_part_vtoc8.c b/sys/geom/part/g_part_vtoc8.c deleted file mode 100644 index 37ee7cf1c030..000000000000 --- a/sys/geom/part/g_part_vtoc8.c +++ /dev/null @@ -1,604 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2008 Marcel Moolenaar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "g_part_if.h" - -FEATURE(geom_part_vtoc8, "GEOM partitioning class for SMI VTOC8 disk labels"); - -struct g_part_vtoc8_table { - struct g_part_table base; - struct vtoc8 vtoc; - uint32_t secpercyl; -}; - -static int g_part_vtoc8_add(struct g_part_table *, struct g_part_entry *, - struct g_part_parms *); -static int g_part_vtoc8_create(struct g_part_table *, struct g_part_parms *); -static int g_part_vtoc8_destroy(struct g_part_table *, struct g_part_parms *); -static void g_part_vtoc8_dumpconf(struct g_part_table *, - struct g_part_entry *, struct sbuf *, const char *); -static int g_part_vtoc8_dumpto(struct g_part_table *, struct g_part_entry *); -static int g_part_vtoc8_modify(struct g_part_table *, struct g_part_entry *, - struct g_part_parms *); -static const char *g_part_vtoc8_name(struct g_part_table *, - struct g_part_entry *, char *, size_t); -static int g_part_vtoc8_probe(struct g_part_table *, struct g_consumer *); -static int g_part_vtoc8_read(struct g_part_table *, struct g_consumer *); -static const char *g_part_vtoc8_type(struct g_part_table *, - struct g_part_entry *, char *, size_t); -static int g_part_vtoc8_write(struct g_part_table *, struct g_consumer *); -static int g_part_vtoc8_resize(struct g_part_table *, struct g_part_entry *, - struct g_part_parms *); - -static kobj_method_t g_part_vtoc8_methods[] = { - KOBJMETHOD(g_part_add, g_part_vtoc8_add), - KOBJMETHOD(g_part_create, g_part_vtoc8_create), - KOBJMETHOD(g_part_destroy, g_part_vtoc8_destroy), - KOBJMETHOD(g_part_dumpconf, g_part_vtoc8_dumpconf), - KOBJMETHOD(g_part_dumpto, g_part_vtoc8_dumpto), - KOBJMETHOD(g_part_modify, g_part_vtoc8_modify), - KOBJMETHOD(g_part_resize, g_part_vtoc8_resize), - KOBJMETHOD(g_part_name, g_part_vtoc8_name), - KOBJMETHOD(g_part_probe, g_part_vtoc8_probe), - KOBJMETHOD(g_part_read, g_part_vtoc8_read), - KOBJMETHOD(g_part_type, g_part_vtoc8_type), - KOBJMETHOD(g_part_write, g_part_vtoc8_write), - { 0, 0 } -}; - -static struct g_part_scheme g_part_vtoc8_scheme = { - "VTOC8", - g_part_vtoc8_methods, - sizeof(struct g_part_vtoc8_table), - .gps_entrysz = sizeof(struct g_part_entry), - .gps_minent = VTOC8_NPARTS, - .gps_maxent = VTOC8_NPARTS, -}; -G_PART_SCHEME_DECLARE(g_part_vtoc8); -MODULE_VERSION(geom_part_vtoc8, 0); - -static int -vtoc8_parse_type(const char *type, uint16_t *tag) -{ - const char *alias; - char *endp; - long lt; - - if (type[0] == '!') { - lt = strtol(type + 1, &endp, 0); - if (type[1] == '\0' || *endp != '\0' || lt <= 0 || - lt >= 65536) - return (EINVAL); - *tag = (uint16_t)lt; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_NANDFS); - if (!strcasecmp(type, alias)) { - *tag = VTOC_TAG_FREEBSD_NANDFS; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_SWAP); - if (!strcasecmp(type, alias)) { - *tag = VTOC_TAG_FREEBSD_SWAP; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_UFS); - if (!strcasecmp(type, alias)) { - *tag = VTOC_TAG_FREEBSD_UFS; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_VINUM); - if (!strcasecmp(type, alias)) { - *tag = VTOC_TAG_FREEBSD_VINUM; - return (0); - } - alias = g_part_alias_name(G_PART_ALIAS_FREEBSD_ZFS); - if (!strcasecmp(type, alias)) { - *tag = VTOC_TAG_FREEBSD_ZFS; - return (0); - } - return (EINVAL); -} - -static int -vtoc8_align(struct g_part_vtoc8_table *table, uint64_t *start, uint64_t *size) -{ - - if (*size < table->secpercyl) - return (EINVAL); - if (start != NULL && (*start % table->secpercyl)) { - *size += (*start % table->secpercyl) - table->secpercyl; - *start -= (*start % table->secpercyl) - table->secpercyl; - } - if (*size % table->secpercyl) - *size -= (*size % table->secpercyl); - if (*size < table->secpercyl) - return (EINVAL); - return (0); -} - -static int -g_part_vtoc8_add(struct g_part_table *basetable, struct g_part_entry *entry, - struct g_part_parms *gpp) -{ - struct g_part_vtoc8_table *table; - int error, index; - uint64_t start, size; - uint16_t tag; - - if (gpp->gpp_parms & G_PART_PARM_LABEL) - return (EINVAL); - - error = vtoc8_parse_type(gpp->gpp_type, &tag); - if (error) - return (error); - - table = (struct g_part_vtoc8_table *)basetable; - index = entry->gpe_index - 1; - start = gpp->gpp_start; - size = gpp->gpp_size; - if (vtoc8_align(table, &start, &size) != 0) - return (EINVAL); - - KASSERT(entry->gpe_start <= start, (__func__)); - KASSERT(entry->gpe_end >= start + size - 1, (__func__)); - entry->gpe_start = start; - entry->gpe_end = start + size - 1; - - be16enc(&table->vtoc.part[index].tag, tag); - be16enc(&table->vtoc.part[index].flag, 0); - be32enc(&table->vtoc.timestamp[index], 0); - be32enc(&table->vtoc.map[index].cyl, start / table->secpercyl); - be32enc(&table->vtoc.map[index].nblks, size); - return (0); -} - -static int -g_part_vtoc8_create(struct g_part_table *basetable, struct g_part_parms *gpp) -{ - struct g_provider *pp; - struct g_part_entry *entry; - struct g_part_vtoc8_table *table; - uint64_t msize; - uint32_t acyls, ncyls, pcyls; - - pp = gpp->gpp_provider; - - if (pp->sectorsize < sizeof(struct vtoc8)) - return (ENOSPC); - if (pp->sectorsize > sizeof(struct vtoc8)) - return (ENXIO); - - table = (struct g_part_vtoc8_table *)basetable; - - msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX); - table->secpercyl = basetable->gpt_sectors * basetable->gpt_heads; - pcyls = msize / table->secpercyl; - acyls = 2; - ncyls = pcyls - acyls; - msize = ncyls * table->secpercyl; - - snprintf(table->vtoc.ascii, sizeof(table->vtoc.ascii), - "FreeBSD%lldM cyl %u alt %u hd %u sec %u", - (long long)(msize / 2048), ncyls, acyls, basetable->gpt_heads, - basetable->gpt_sectors); - be32enc(&table->vtoc.version, VTOC_VERSION); - be16enc(&table->vtoc.nparts, VTOC8_NPARTS); - be32enc(&table->vtoc.sanity, VTOC_SANITY); - be16enc(&table->vtoc.rpm, 3600); - be16enc(&table->vtoc.physcyls, pcyls); - be16enc(&table->vtoc.ncyls, ncyls); - be16enc(&table->vtoc.altcyls, acyls); - be16enc(&table->vtoc.nheads, basetable->gpt_heads); - be16enc(&table->vtoc.nsecs, basetable->gpt_sectors); - be16enc(&table->vtoc.magic, VTOC_MAGIC); - - basetable->gpt_first = 0; - basetable->gpt_last = msize - 1; - basetable->gpt_isleaf = 1; - - entry = g_part_new_entry(basetable, VTOC_RAW_PART + 1, - basetable->gpt_first, basetable->gpt_last); - entry->gpe_internal = 1; - be16enc(&table->vtoc.part[VTOC_RAW_PART].tag, VTOC_TAG_BACKUP); - be32enc(&table->vtoc.map[VTOC_RAW_PART].nblks, msize); - return (0); -} - -static int -g_part_vtoc8_destroy(struct g_part_table *basetable, struct g_part_parms *gpp) -{ - - /* Wipe the first sector to clear the partitioning. */ - basetable->gpt_smhead |= 1; - return (0); -} - -static void -g_part_vtoc8_dumpconf(struct g_part_table *basetable, - struct g_part_entry *entry, struct sbuf *sb, const char *indent) -{ - struct g_part_vtoc8_table *table; - - table = (struct g_part_vtoc8_table *)basetable; - if (indent == NULL) { - /* conftxt: libdisk compatibility */ - sbuf_printf(sb, " xs SUN sc %u hd %u alt %u", - be16dec(&table->vtoc.nsecs), be16dec(&table->vtoc.nheads), - be16dec(&table->vtoc.altcyls)); - } else if (entry != NULL) { - /* confxml: partition entry information */ - sbuf_printf(sb, "%s%u\n", indent, - be16dec(&table->vtoc.part[entry->gpe_index - 1].tag)); - } else { - /* confxml: scheme information */ - } -} - -static int -g_part_vtoc8_dumpto(struct g_part_table *basetable, - struct g_part_entry *entry) -{ - struct g_part_vtoc8_table *table; - uint16_t tag; - - /* - * Allow dumping to a swap partition or a partition that - * has no type. - */ - table = (struct g_part_vtoc8_table *)basetable; - tag = be16dec(&table->vtoc.part[entry->gpe_index - 1].tag); - return ((tag == 0 || tag == VTOC_TAG_FREEBSD_SWAP || - tag == VTOC_TAG_SWAP) ? 1 : 0); -} - -static int -g_part_vtoc8_modify(struct g_part_table *basetable, - struct g_part_entry *entry, struct g_part_parms *gpp) -{ - struct g_part_vtoc8_table *table; - int error; - uint16_t tag; - - if (gpp->gpp_parms & G_PART_PARM_LABEL) - return (EINVAL); - - table = (struct g_part_vtoc8_table *)basetable; - if (gpp->gpp_parms & G_PART_PARM_TYPE) { - error = vtoc8_parse_type(gpp->gpp_type, &tag); - if (error) - return(error); - - be16enc(&table->vtoc.part[entry->gpe_index - 1].tag, tag); - } - return (0); -} - -static int -vtoc8_set_rawsize(struct g_part_table *basetable, struct g_provider *pp) -{ - struct g_part_vtoc8_table *table; - struct g_part_entry *baseentry; - off_t msize; - uint32_t acyls, ncyls, pcyls; - - table = (struct g_part_vtoc8_table *)basetable; - msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX); *** 616 LINES SKIPPED *** From nobody Sun Aug 6 20:36:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpJ0CqNz4mNZN; Sun, 6 Aug 2023 20:36: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 4RJrpH6fY5z4cCh; Sun, 6 Aug 2023 20:36:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E50Nlwp2/YvgzihPlZYFXG3brNA2nPH4NnTOFQ6Knt8=; b=mnOr/4M4wGyV/CszeCUcc70Uqw+1qQl/l5UWDT7PkH61rjV6264XPEJLMjgaSZ/+xhBQuk FGTVgtQAcXdhpJzuMGqpzjn6G4Z4AYcTAljfPnFWNdeXp6dvHGxKpyvIpyOJytwbTn4BVN jk7CgSxDdBPauCQjvR9wbxdVsWidNCsV5MY5VOSYT42B/NvciMMLSPXLlanPoUaOlwfowZ 9NGmGR3n3WtOKTHmG+PguXy+xglWht9CkDq7p3IUiWHjyhHsi4Iu5nWzJ2lNamORx67LXo G2FoxJq6hQUcZvw1AXvMgR3dilEW50Sq0ZKB/fUGGbfDSoEiK1+ZRWlkVRNf3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E50Nlwp2/YvgzihPlZYFXG3brNA2nPH4NnTOFQ6Knt8=; b=MjoRx6ZGaml65uIYxyiPGPHTfzTFDYV4Cq0Oqwcb21joeWroXCnO/FDZ1fPA7LbNY0LzQv q2jhzVjxyF1l9j3NQxHGkGRv1LbdOfgdDtuIFHyHCt3ERQT4Nx7IW9d44rHyBVzTu7M9F1 BgYba6mxz4wTzn2Yp/qPzhbIi5d3qBkG0jBx8Rxz3gSj+NGvm3Mi4F0Uhbi1wO18MDvbHk fvAJEpN3Xryc7wj8SsrG3U4jmC1Rayw+aKsjSFa3NQ6Cqlt5Gja3vz3B3hcr26Tn0pYUzQ ix+b5Zc2XmDjmQSngvy2B5LiTcSjlRyhgjoqXJ0OTIyMFoCCDVbU1Zpi9bvlLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354199; a=rsa-sha256; cv=none; b=Mo9+r4DZQIwDj9WUxl53qI9i6av+fwwbzC69E2SG3ajq80EdmOd34QIijQYznc14Y3bMlB CZE0fkPkK1NRnI7E9bzw9c9c5CFJvzColTIiDFva1XBr7KieXIo2cHaOc480mHn0CGUeI6 X23gjkBIupMQrjkXdAHzHw0yqy4bmAdzAdiMw4hVm3kj6iZdC4rPfS/QpuoC3WeZ6x6MKQ iewOHXbGBJBw0ACuYvnnHhxS3hOEM1VpHPhnIBqw9bOQdcQ/qPHT1yjBln7mZh+65jI8jC 0UVHdtuSy8jZQLVhPmY+hcjUg3DU66U5taraS/SL/cgyrgkCDVh4r17Eu8gaiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpH52s9z91G; Sun, 6 Aug 2023 20:36: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 376Kad8G042917; Sun, 6 Aug 2023 20:36:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Kadbo042916; Sun, 6 Aug 2023 20:36:39 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:39 GMT Message-Id: <202308062036.376Kadbo042916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 0096e445c55a - stable/13 - ffs: wait for trims earlier during unmount to avoid panic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0096e445c55a4a882c213d91eaf33766e27439f4 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=0096e445c55a4a882c213d91eaf33766e27439f4 commit 0096e445c55a4a882c213d91eaf33766e27439f4 Author: Chuck Silvers AuthorDate: 2022-04-08 17:19:40 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 17:56:42 +0000 ffs: wait for trims earlier during unmount to avoid panic All softdep processing is supposed to be completed by softdep_flushfiles() and no more deps are supposed to be created after that, but if a pending trim completes after softdep_flushfiles() and before softdep_unmount() then the blkfree that is performed by ffs_blkfree_trim_task() will create a dep when none should exist, and if softdep_unmount() is called before that dep is freed then the kernel will panic. Prevent this by waiting for trims to complete earlier in the unmount process, in ffs_flushfiles(), so that any deps will be freed and any modified CG buffers will be flushed by the final fsync of the devvp in ffs_flushfiles() as intended. (cherry picked from commit 3dc5f8e19d8c975a5e27752d65f9aa91d67c9c9e) --- sys/ufs/ffs/ffs_vfsops.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index e77d5e336bf1..23d0c9bc60df 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1452,9 +1452,7 @@ ffs_unmount(struct mount *mp, int mntflags) if (susp) vfs_write_resume(mp, VR_START_WRITE); if (ump->um_trim_tq != NULL) { - while (ump->um_trim_inflight != 0) - pause("ufsutr", hz); - taskqueue_drain_all(ump->um_trim_tq); + MPASS(ump->um_trim_inflight == 0); taskqueue_free(ump->um_trim_tq); free (ump->um_trimhash, M_TRIM); } @@ -1564,6 +1562,20 @@ ffs_flushfiles(struct mount *mp, int flags, struct thread *td) if (qerror == 0 && (error = vflush(mp, 0, flags, td)) != 0) return (error); + /* + * If this is a forcible unmount and there were any files that + * were unlinked but still open, then vflush() will have + * truncated and freed those files, which might have started + * some trim work. Wait here for any trims to complete + * and process the blkfrees which follow the trims. + * This may create more dirty devvp buffers and softdep deps. + */ + if (ump->um_trim_tq != NULL) { + while (ump->um_trim_inflight != 0) + pause("ufsutr", hz); + taskqueue_drain_all(ump->um_trim_tq); + } + /* * Flush filesystem metadata. */ From nobody Sun Aug 6 20:36:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpK0bbXz4mNfG; Sun, 6 Aug 2023 20:36: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 4RJrpJ6j9Vz4c4y; Sun, 6 Aug 2023 20:36:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KT1UnCecoSTidARWjYZmPyPNTMEk94xA7XmKosEjcU=; b=mt5ER85FBS/er09qgwTskUXYwaPcEAdjmQx6vUIcr2X5dTrDHlds+dESlRgC0Fd7U+Fd4T 3m9jGa7kgjFEkhfpmfcmMca+TalrV5H1Tw3iAUwu6lmE5IA2YZncCj2gymo4VKZyuDgorm ZH41T+qmeb+WgeGH86gLFRdVvmoGzTnnnrNS+FrwPv8RM8YdcAb4KXLG9Nrb/zzIrF6tzr +yx4negBt4/SrtxNxpuLqN+fy3r1mqIAjf6WQpjkhv6i/hMjvV6DLV88OXxafE9Y/nFrSH YX5rvSyhOVHuDYu2FLwZfbFM9w3q/fmcq9B5bOr/mUZkmgarvtw685d5QvHdbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+KT1UnCecoSTidARWjYZmPyPNTMEk94xA7XmKosEjcU=; b=tUWVUffDpa6z2WbMQPlLqMwvLl+IvjCP0/OGb/aP2z5K4ZuOzoWrl+FXfsDk8JgGp9vqns WD3kcgY4wPm4QhwRTKRlxHp5CUFcekDuml6RwLnQRDIPEhe2hYQgco9lmyGyQrny9EodL2 P/iE5eklR83BjleByfyW380ATs+jytE7/9TEAoVrShj7uEjIcLPGyApV/8tQURazP1s3GU ZGIlLOFktSFoUddwWkQd1DHI7Ma34Wi/VCE04Akv3fxMddRZ/3M3PXf1Mgevlv0e2ebBfl l9aY/J05EPPlmVxujlys+Cj19V3ZiSHghlQReCP56c2NaESdmFzuI1HOErsLIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354200; a=rsa-sha256; cv=none; b=EmXk1ws8vnCvcniYVHVQDGA0WEgvnlf71N2udSjhvqDbr9RKyJGFWx0D+IN6Iqaw8xMw3t W8WG3pOAyQkPdPF+f4+JqdJXKbKdk87cnXq561Ek9sLusYr/AQVEQi9w59LWFSbyx4V1Rf 6J42j41WkD81cvCxFmIhfhM9RlbJkjwR6rN7njZKojUC40EB1I7M/K2EVVnCs95nHPZlqL Db2Z10i9yqaz91yawZO84a6C5AltWk2mDF9c3Ccvz70x7rCnuEWriaRqdW7kcRMC8UbV0X axwyI3ssnyadhDsvPbdPB9JdQorXB22Lgk30V4C5wU7MGaHWwS2k4Mxxn42Obg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpJ5pwJz9Bb; Sun, 6 Aug 2023 20:36: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 376Kaeie042936; Sun, 6 Aug 2023 20:36:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Kae8C042935; Sun, 6 Aug 2023 20:36:40 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:40 GMT Message-Id: <202308062036.376Kae8C042935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 685f0d228395 - stable/13 - tests: also remove sparc64 case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 685f0d228395bc1074ebef998832176d5186bd15 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=685f0d228395bc1074ebef998832176d5186bd15 commit 685f0d228395bc1074ebef998832176d5186bd15 Author: Ed Maste AuthorDate: 2022-11-08 18:14:55 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 18:52:57 +0000 tests: also remove sparc64 case (cherry picked from commit 185efcc376b9dcb3b920d1053a250ac754ad163a) --- tests/sys/kern/ptrace_test.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index 2657d8b18ce6..1e917d6e1935 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -59,8 +59,7 @@ __FBSDID("$FreeBSD$"); * Architectures with a user-visible breakpoint(). */ #if defined(__aarch64__) || defined(__amd64__) || defined(__arm__) || \ - defined(__i386__) || defined(__mips__) || defined(__riscv) || \ - defined(__sparc64__) + defined(__i386__) || defined(__mips__) || defined(__riscv) #define HAVE_BREAKPOINT #endif @@ -78,11 +77,6 @@ __FBSDID("$FreeBSD$"); #define SKIP_BREAK(reg) ((reg)->r_regs[PC] += 4) #elif defined(__riscv) #define SKIP_BREAK(reg) ((reg)->sepc += 4) -#elif defined(__sparc64__) -#define SKIP_BREAK(reg) do { \ - (reg)->r_tpc = (reg)->r_tnpc + 4; \ - (reg)->r_tnpc += 8; \ -} while (0) #endif #endif From nobody Sun Aug 6 20:36:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJrpL30c4z4mNfN; Sun, 6 Aug 2023 20:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJrpL0dHDz4cGS; Sun, 6 Aug 2023 20:36:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PBfWCXW1DRQPgcxzY1DNUxn2bPidZqkIXIUCzxEudmc=; b=ClaYEWuv70beUoHnEAGDxkuM8NLRfDKbC53nn77Bkcfwx1DtTT8QOYPckvYFf++tlN+piq 2y6H9lpUJPKPs0jhv1XrZRj6Pz+15rQoQESi12ov30d14kwESOjPvBbOpFswDKMzKVYT7a TuEys3NGSyhsoZ95ZpqEqukIzO3nQdBSk2WSfwfMMw5+F6wtwyxO3UbCyV67BPoyuZjdmi 4IrLnHaKEzPUr5v70tXXm0Xp0EfrK7E19W7JxRfD90w9GRNJk4yC0AhISu9Ee6h+1xS1wK lms82k+2+5LMJqs4WZioQ0eK5mSlTYW8CJbkXeKveQ9cMJekCuG7sRr4KoK+Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691354202; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PBfWCXW1DRQPgcxzY1DNUxn2bPidZqkIXIUCzxEudmc=; b=bIp1o5xWQ1/V67QymOtvNLQjEIdLus7PATf1tmQbjepxeNkZSOfjJYWOFDJBCIr9s8BJ1L zRGgAr0MvKSBaewRxim05MlJ8bYS/4a/7eASx8xkOlnnXvxg1dz+srZtDe+j+yB35ubhwf UdE8PbqC2A0EKD6IxEtdTUmUTYoSp8Io+4dqbXboJl9PCmsBSffCpwIc0vHUQm0NnYY1Gp bxbvktR7KwWX2oaOUugv4Qy4rf3FQhIkCF8CNXqDxxpTAyqdkMwmBOnxbANdNHLRqlAWGx Hpq3L+Nv2NKVyg1yWIHJOGDONKqi02Nx6C2lvMuppgDwzlO54CpNIxs2okj9jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691354202; a=rsa-sha256; cv=none; b=v1iNLCGQ803E+iUpt5ASoNPfSIpCKaoEGByh03i6iHiHqZW8XogIZgkfdpyH2ctdr3ihig hreZNyD3DfV6TunsHlRQ3RZuYy/6msZx0OC/BsaCPSMLIs9YYYPcj3e5HOc/3NYnE4K7fG 6QKEPdluVOeCHHYwSDurEQd8wodTzEJ03Jw1vfS1eY2veVI2xIKBiTKA3yea/9+cHyNT/x BjTjT3a0XKTo5nBKaH2+5Cs/HBj4xfwpdOXXDLApQes+A+MNZcdjKEl9zVCelG3tyii1ks e7etXqeoTVtHnW+G9NK5wimACqqOUKu9xehc86a+zR+WFycoLYz9fjl+AWePzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJrpK6s5mz91H; Sun, 6 Aug 2023 20:36: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 376Kaf28042958; Sun, 6 Aug 2023 20:36:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376Kafkq042957; Sun, 6 Aug 2023 20:36:41 GMT (envelope-from git) Date: Sun, 6 Aug 2023 20:36:41 GMT Message-Id: <202308062036.376Kafkq042957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: 46c05afd2f76 - stable/13 - stand: Update testing script for arch retirement List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 46c05afd2f766e7a3700266d17b103087e1a26c5 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=46c05afd2f766e7a3700266d17b103087e1a26c5 commit 46c05afd2f766e7a3700266d17b103087e1a26c5 Author: Warner Losh AuthorDate: 2022-08-14 14:41:11 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 19:01:41 +0000 stand: Update testing script for arch retirement And catch up to changes in booting methods currently supported. Add riscv. (cherry picked from commit aff95057bca1dc929996a616b0c39a6ff89a1bbf) --- tools/boot/rootgen.sh | 47 ++++++++--------------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index b61fff647b5c..fcd5c0afef46 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -645,29 +645,6 @@ mk_geli_mbr_zfs_both() { # u-boot # powerpc -mk_sparc64_nogeli_vtoc8_ufs_ofw() { - src=$1 - img=$2 - mntpt=$3 - geli=$4 - scheme=$5 - fs=$6 - bios=$7 - - cat > ${src}/etc/fstab < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marius Strobl Subject: git: e616ceec8295 - stable/13 - gitignore: whack dead architectures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e616ceec82957d8b2f57d3b7f110d908f9ea4469 Auto-Submitted: auto-generated The branch stable/13 has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=e616ceec82957d8b2f57d3b7f110d908f9ea4469 commit e616ceec82957d8b2f57d3b7f110d908f9ea4469 Author: Mateusz Guzik AuthorDate: 2022-11-23 01:18:03 +0000 Commit: Marius Strobl CommitDate: 2023-08-06 19:05:36 +0000 gitignore: whack dead architectures (cherry picked from commit 04af98db59102159682c366cbdaeca2d260d46a8) --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitignore b/.gitignore index b59f2b4b1d32..668b6d90483a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,13 +10,9 @@ _.amd64.* _.arm.* _.arm64.* _.i386.* -_.ia64.* _.mips.* -_.pc98.* _.powerpc.* _.riscv.* -_.sparc64.* -_.sun4v.* GPATH GRTAGS GTAGS From nobody Sun Aug 6 21:14:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJsdf25YHz4mRH3; Sun, 6 Aug 2023 21:14:14 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJsdd4XFwz4tVg; Sun, 6 Aug 2023 21:14:13 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 376LE6pP099688 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 7 Aug 2023 00:14:09 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 376LE6pP099688 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 376LE60Z099687; Mon, 7 Aug 2023 00:14:06 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 7 Aug 2023 00:14:06 +0300 From: Konstantin Belousov To: Marius Strobl Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 96c76d930656 - main - exit1(): Revert sparc64 workaround Message-ID: References: <202308062029.376KTvj6025811@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202308062029.376KTvj6025811@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RJsdd4XFwz4tVg 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:6939, ipnet:2001:470::/32, country:US] On Sun, Aug 06, 2023 at 08:29:57PM +0000, Marius Strobl wrote: > The branch main has been updated by marius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a > > commit 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a > Author: Marius Strobl > AuthorDate: 2023-08-06 19:54:57 +0000 > Commit: Marius Strobl > CommitDate: 2023-08-06 20:26:01 +0000 > > exit1(): Revert sparc64 workaround > > If this still is a problem on other architectures, it should be fixed > properly. > > This reverts commit 5486ffc898503a846ecaf3f5ef9f9269beb4540e. > --- > sys/kern/kern_exit.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c > index cb0939ded6e1..e3345c14df26 100644 > --- a/sys/kern/kern_exit.c > +++ b/sys/kern/kern_exit.c > @@ -238,13 +238,7 @@ exit1(struct thread *td, int rval, int signo) > TSPROCEXIT(td->td_proc->p_pid); > > p = td->td_proc; > - /* > - * XXX in case we're rebooting we just let init die in order to > - * work around an unsolved stack overflow seen very late during > - * shutdown on sparc64 when the gmirror worker process exists. > - * XXX what to do now that sparc64 is gone... remove if? > - */ > - if (p == initproc && rebooting == 0) { > + if (p == initproc) { > printf("init died (signal %d, exit %d)\n", signo, rval); > panic("Going nowhere without my init!"); > } I believe this was a right thing to do, regardless of the sparc64 stack overflow. When rebooting NFS-booted machine, page-in over NFS stops working, perhaps due to interface going down, while userspace is still alive. In this situation, pager returns KERN_FAILURE which translates to SIGSEGV to userspace. If init(8) process gets the signal, we would panic instead of continuing the reboot. From nobody Sun Aug 6 21:27:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJsx86xfKz4mS1R; Sun, 6 Aug 2023 21:27: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 4RJsx86FChz4vl9; Sun, 6 Aug 2023 21:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691357260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1vpxBKHaNiQ/nzg7bg1iLD66g5iXOPlURM8yvH7mYk=; b=hkwsO7P0bWa9BNo9L+3vI6euSSlrrIt87Jjon5liShkrz9vhaae3oBzRHCKS5Tpmc1vYrT 9G3p26XTwiOCyFUL355pfAWaUkg4/tnZFjLBEKcKWsXo7YAoxujK7w+Vx9v7f48+ZKf1Eh N7KTRMuRXYP2Y7tDCUR9nfhzRmNalyJsIDxNNTAi4NAsWc7qWUQ6sLSkbygxb2m4Mch3wd hnfJ06dSZSImQvpMlvVvrtbSDfU4vCx5ag2i/NR81KJtCwN40LmSVWhHSz3iZq2lBu32pp 8XzXMww80DvVt4Cg26NOF551LrfAo/8ktHHt555Yfjs5oun4QxzT9TWHIbgiXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691357260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L1vpxBKHaNiQ/nzg7bg1iLD66g5iXOPlURM8yvH7mYk=; b=ojUsCJeiBswNeIhsE3RCxIK/tDeej+5CqqKgAppiZe+xR54nNeRpU9nSnSFUXNutkLAOW7 iu3T20f8BUt5IVLIUi24LDSvXwxSu/6tPVUn5kdQulMXxf92TMQXMswbiXXBvpZ2QTLeWH f/14BUA9asTlTKSSDsMdprDDgCq6IOWkYMgtI8Oymyo0GYhAXPvnKnjJKThSLfRHnyci8S H0GE3zKAdoiTSYd57axK6QL7SbGPljm+orKwV67JpnC+O4XtTAOUOiEcD3x0VGPSwqPU9d 90pbny1Bl5o43+l8DeEPrhnOfMt7uB7RcqO3TVFbVg9Gs+wRjwz7QJJ0r2PW7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691357260; a=rsa-sha256; cv=none; b=Z5fqCjP1wkE7HFlOkSZ5xKZv2rPHKKV8gvFj8kP0arD53eAtxjZLWbpnzGoQIztzCPbeoM Gx6TIRdzc3ulyQyY4hgUaHYNuypc4d+Btjjjve7z0c3VdDJRz6NKWBmQkd9nh9wR2Rdqaj eyRCKohdfGLICYMjYavA7Okx/KwLhl+KymwAfTOsJantLYuHF1E9+pEEs0qAxLAKo3HhVK zOigT3tzxTX6DKx2fB2Tc+PmPgHpFRxDffwS/9lNEaWZNKszleVqKPZzp0CnHnpZfOlpsG JU5J+4MuOPVPJW+6M2F9kWdJ6WwQv33JWOtIJWjZCnStWVTIsVIutUuyifnmkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJsx855xPzBTX; Sun, 6 Aug 2023 21:27: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 376LReTe026247; Sun, 6 Aug 2023 21:27:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376LRei9026246; Sun, 6 Aug 2023 21:27:40 GMT (envelope-from git) Date: Sun, 6 Aug 2023 21:27:40 GMT Message-Id: <202308062127.376LRei9026246@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: 15876d9fd83f - main - sys/cdefs.h: fix for use __restrict in C++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15876d9fd83fdfa7d541ea747eb40faeade975d2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=15876d9fd83fdfa7d541ea747eb40faeade975d2 commit 15876d9fd83fdfa7d541ea747eb40faeade975d2 Author: Sebastian Huber AuthorDate: 2023-08-06 13:27:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-06 21:09:52 +0000 sys/cdefs.h: fix for use __restrict in C++ Newlib shares large parts of with FreeBSD and received this bug report: https://sourceware.org/pipermail/newlib/2023/020400.html As an extension, GCC and clang offer C99-style restricted pointers in C++ mode: https://gcc.gnu.org/onlinedocs/gcc/Restricted-Pointers.html We notice that this extension is broken when including newlib headers: restricted pointers are treated as ordinary pointers. We traced this to the following section of newlib/libc/include/sys/cdefs.h: /* * GCC 2.95 provides `__restrict' as an extension to C90 to support the * C99-specific `restrict' type qualifier. We happen to use `__restrict' as * a way to define the `restrict' type qualifier without disturbing older * software that is unaware of C99 keywords. */ #if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 #define __restrict #else #define __restrict restrict #endif #endif While the GCC __restrict extension was indeed introduced in GCC 2.95, it is not limited to this version; the extension is also not limited to C90: https://gcc.gnu.org/gcc-2.95/c++features.html Rewrite the logic in the header so that __restrict is kept alone when available. PR: 272723 MFC after: 1 week --- sys/sys/cdefs.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 1de042339c3a..797460c08db8 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -403,17 +403,15 @@ #endif /* - * GCC 2.95 provides `__restrict' as an extension to C90 to support the - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as - * a way to define the `restrict' type qualifier without disturbing older - * software that is unaware of C99 keywords. + * We use `__restrict' as a way to define the `restrict' type qualifier + * without disturbing older software that is unaware of C99 keywords. + * GCC also provides `__restrict' as an extension to support C99-style + * restricted pointers in other language modes. */ -#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) -#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 -#define __restrict -#else +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 #define __restrict restrict -#endif +#elif !__GNUC_PREREQ__(2, 95) +#define __restrict #endif /* From nobody Sun Aug 6 21:27:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJsxB0Cd8z4mRyX; Sun, 6 Aug 2023 21:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJsx96gfzz4vgJ; Sun, 6 Aug 2023 21:27:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691357262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ck4u+O6thfW0rUR9w2d8u7NJ9OzKCqDmZuG/NX9qUY=; b=C78vna+KLlLlWWwXbCDm61P4uhqp0iYhW5n3AbXv5BgppwnaxKnO35nt4aKL3uZKuTmmc+ EsBMQ1OWsSgMPbOanEvHdJf1F3QQdD/Ma9zDQIygD4BqHcsLL3ntqrRpsvwbseAnMVWyux GPp6Mc0QmkF5RgIgcUdYoSW7n1miaWjl7l88suUOgxMs8yLcGMnlHC/O/sQszBcqOewVNe YI2kCxsZA2bLTCcFFYUiY5YVtj1boJ9wgWB4D7mcjayt0ufZqz8E+wAdOvyi1Mi10piqAa 2TRoZ5EW99WnHDGwydukJK+jZjSjPLLHrJ2ViwkrKDFwrDk3CbEKmCxYPY02Ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691357262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ck4u+O6thfW0rUR9w2d8u7NJ9OzKCqDmZuG/NX9qUY=; b=EqI3mGmKCyFHTV2+RU2VAn1TTqmfHercG+vMWp7dJbV91CXFxrWyEfLnYb2DIt7gZiVhbI 6zEhgCYLDvMwiSVH9NxR3cr2qQw6m7AnIky490ig1tOnvGqpMbXt9Hg+SSxbeID58DMeSk clu08Ci2g7Id4mjui/spFnLa81+yaTsaL2LrtSJm9k9THVegzbSzoimcajQrxsd4ok/meH DsUaURvBJAxAdwBwoEWddDp+co7MjsZq5qid6Gr0j4n9QtDNTcZFlID3RMP5QFlQAMViDY fRdpB9hb/AMlttGkYDssJsA5FoQ29AzhdS8K7j/itZgDIxqVwIwQ794jAJDgSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691357262; a=rsa-sha256; cv=none; b=h3yIsrrz5W42xOybfJ/pOKmFA44vxSPe6sz4UrFqJPzmsHgaJhWk+DQpusuQGChpBPbsMW 2M7Tt+c7ygE8Rxu21QGrP2Bp/X+gJryd9Qr/2UaMItTjZgwm174YYKU4k4FOK0F3yv4Ex8 JiLGteamAYz2xKJiu3HSmkPyxouf74uhDeheC95dSFFVbllTiMxKRHqrkiwmpgGqaeEGyy lki/N/pFeN/WIB/do1ZjQDExayHgGm9hO5yekLDga9GqV+S9cANSNFGQaiyQUiq9NHIqWx bq3Ft+kqHXhwROAHindXwQTylVGKPifviqYUXENSr8JlOk1/85C0ILkPxKYd7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJsx95VNTzBHP; Sun, 6 Aug 2023 21:27: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 376LRfRU026266; Sun, 6 Aug 2023 21:27:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 376LRfCp026265; Sun, 6 Aug 2023 21:27:41 GMT (envelope-from git) Date: Sun, 6 Aug 2023 21:27:41 GMT Message-Id: <202308062127.376LRfCp026265@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: 676f02a4823f - main - acpi_spibus.c: fix i386 build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 676f02a4823f8a4a6e10a1cba73c6324c19b651b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=676f02a4823f8a4a6e10a1cba73c6324c19b651b commit 676f02a4823f8a4a6e10a1cba73c6324c19b651b Author: Konstantin Belousov AuthorDate: 2023-08-06 21:08:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-06 21:09:52 +0000 acpi_spibus.c: fix i386 build intmax_t requires %j format specifier, %z is for size_t. Fixes: 7d380b986a1808164846cfd9afb5ae3f99921fcf Sponsored by: The FreeBSD Foundation --- sys/dev/spibus/acpi_spibus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/spibus/acpi_spibus.c b/sys/dev/spibus/acpi_spibus.c index c7b897937eea..7241ad15bdab 100644 --- a/sys/dev/spibus/acpi_spibus.c +++ b/sys/dev/spibus/acpi_spibus.c @@ -213,7 +213,7 @@ acpi_spibus_get_apple_res(device_t spibus, ACPI_HANDLE dev, *(uint64_t *)comp[1].Buffer.Pointer : 0; if (bootverbose) - printf(" %s: %zu\n", k, (intmax_t)val); + printf(" %s: %ju\n", k, (intmax_t)val); if (strcmp(k, "spiSclkPeriod") == 0) { if (val != 0) From nobody Sun Aug 6 21:31:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJt1Z6Y49z4mSD8; Sun, 6 Aug 2023 21:31:30 +0000 (UTC) (envelope-from marius@btk.zeist.de) Received: from btk.zeist.de (btk.zeist.de [IPv6:2a01:4f8:221:2f4f::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "btk.zeist.de", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJt1Z3y2pz3CKW; Sun, 6 Aug 2023 21:31:30 +0000 (UTC) (envelope-from marius@btk.zeist.de) Authentication-Results: mx1.freebsd.org; none Received: from btk.zeist.de (localhost [127.0.0.1]) by btk.zeist.de (8.17.1/8.17.1/BTK.ZEIST.DE) with ESMTPS id 376LVROF031477 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 6 Aug 2023 23:31:27 +0200 (CEST) (envelope-from marius@btk.zeist.de) Received: (from marius@localhost) by btk.zeist.de (8.17.1/8.17.1/Submit) id 376LVRMv031476; Sun, 6 Aug 2023 23:31:27 +0200 (CEST) (envelope-from marius) Date: Sun, 6 Aug 2023 23:31:27 +0200 From: Marius Strobl To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 96c76d930656 - main - exit1(): Revert sparc64 workaround Message-ID: References: <202308062029.376KTvj6025811@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4RJt1Z3y2pz3CKW 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:24940, ipnet:2a01:4f8::/32, country:DE] On Mon, Aug 07, 2023 at 12:14:06AM +0300, Konstantin Belousov wrote: > On Sun, Aug 06, 2023 at 08:29:57PM +0000, Marius Strobl wrote: > > The branch main has been updated by marius: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a > > > > commit 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a > > Author: Marius Strobl > > AuthorDate: 2023-08-06 19:54:57 +0000 > > Commit: Marius Strobl > > CommitDate: 2023-08-06 20:26:01 +0000 > > > > exit1(): Revert sparc64 workaround > > > > If this still is a problem on other architectures, it should be fixed > > properly. > > > > This reverts commit 5486ffc898503a846ecaf3f5ef9f9269beb4540e. > > --- > > sys/kern/kern_exit.c | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c > > index cb0939ded6e1..e3345c14df26 100644 > > --- a/sys/kern/kern_exit.c > > +++ b/sys/kern/kern_exit.c > > @@ -238,13 +238,7 @@ exit1(struct thread *td, int rval, int signo) > > TSPROCEXIT(td->td_proc->p_pid); > > > > p = td->td_proc; > > - /* > > - * XXX in case we're rebooting we just let init die in order to > > - * work around an unsolved stack overflow seen very late during > > - * shutdown on sparc64 when the gmirror worker process exists. > > - * XXX what to do now that sparc64 is gone... remove if? > > - */ > > - if (p == initproc && rebooting == 0) { > > + if (p == initproc) { > > printf("init died (signal %d, exit %d)\n", signo, rval); > > panic("Going nowhere without my init!"); > > } > I believe this was a right thing to do, regardless of the sparc64 stack > overflow. When rebooting NFS-booted machine, page-in over NFS stops > working, perhaps due to interface going down, while userspace is still > alive. In this situation, pager returns KERN_FAILURE which translates > to SIGSEGV to userspace. If init(8) process gets the signal, we would > panic instead of continuing the reboot. Well, I used to reboot NFS-boot machines _a lot_ during development and never saw the problem in that context (even with the workaround in place, I would have seen init(8) die), only when rebooting hosts booted from a gmirror(4)-backed file-system. However, feel free to put the code back with an appropriate comment if you think it's generally the right thing to to. Marius From nobody Sun Aug 6 22:53:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJvr82H8jz4pXdb; Sun, 6 Aug 2023 22:53:28 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJvr80R3gz3MR9; Sun, 6 Aug 2023 22:53:27 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 376MrKTk025167 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 7 Aug 2023 01:53:23 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 376MrKTk025167 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 376MrKaQ025164; Mon, 7 Aug 2023 01:53:20 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 7 Aug 2023 01:53:20 +0300 From: Konstantin Belousov To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 61f4c4d3dd38 - main - lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) Message-ID: References: <202308061410.376EA6WM096467@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202308061410.376EA6WM096467@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RJvr80R3gz3MR9 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:6939, ipnet:2001:470::/32, country:US] On Sun, Aug 06, 2023 at 02:10:06PM +0000, Robert Clausecker wrote: > +ARCHFUNCS(__strchrnul) > + ARCHFUNC(__strchrnul, scalar) This line uses spaces instead of tab for indent. > + ARCHFUNC(__strchrnul, baseline) > +ENDARCHFUNCS(__strchrnul) > + From nobody Sun Aug 6 23:14:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJwK53KPxz4pZ7F; Sun, 6 Aug 2023 23:15:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJwK46lNTz3NNY; Sun, 6 Aug 2023 23:15:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 376NEvXv030084 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 7 Aug 2023 02:15:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 376NEvXv030084 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 376NEvIm030083; Mon, 7 Aug 2023 02:14:57 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 7 Aug 2023 02:14:57 +0300 From: Konstantin Belousov To: Robert Clausecker Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 61f4c4d3dd38 - main - lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) Message-ID: References: <202308061410.376EA6WM096467@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202308061410.376EA6WM096467@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RJwK46lNTz3NNY 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:6939, ipnet:2001:470::/32, country:US] On Sun, Aug 06, 2023 at 02:10:06PM +0000, Robert Clausecker wrote: > The branch main has been updated by fuz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 > > commit 61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 > Author: Robert Clausecker > AuthorDate: 2023-06-30 14:45:11 +0000 > Commit: Robert Clausecker > CommitDate: 2023-08-06 13:58:27 +0000 > > lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) > > A lot better than the generic (pre) implementaion. We do not beat glibc > for long strings, likely due to glibc switching to AVX once the input is > sufficiently long. X86-64-v3 and v4 implementations may be added at a > future time. > > os: FreeBSD > arch: amd64 > cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz > │ strchrnul_pre.out │ strchrnul_scalar.out │ strchrnul_baseline.out │ > │ sec/op │ sec/op vs base │ sec/op vs base │ > Short 129.68µ ± 3% 59.91µ ± 1% -53.80% (p=0.000 n=20) 44.37µ ± 1% -65.79% (p=0.000 n=20) > Mid 21.15µ ± 0% 19.30µ ± 0% -8.76% (p=0.000 n=20) 12.30µ ± 0% -41.85% (p=0.000 n=20) > Long 13.772µ ± 0% 11.028µ ± 0% -19.92% (p=0.000 n=20) 3.285µ ± 0% -76.15% (p=0.000 n=20) > geomean 33.55µ 23.36µ -30.37% 12.15µ -63.80% > > │ strchrnul_pre.out │ strchrnul_scalar.out │ strchrnul_baseline.out │ > │ B/s │ B/s vs base │ B/s vs base │ > Short 919.3Mi ± 3% 1989.7Mi ± 1% +116.45% (p=0.000 n=20) 2686.8Mi ± 1% +192.28% (p=0.000 n=20) > Mid 5.505Gi ± 0% 6.033Gi ± 0% +9.60% (p=0.000 n=20) 9.466Gi ± 0% +71.97% (p=0.000 n=20) > Long 8.453Gi ± 0% 10.557Gi ± 0% +24.88% (p=0.000 n=20) 35.441Gi ± 0% +319.26% (p=0.000 n=20) > geomean 3.470Gi 4.983Gi +43.62% 9.584Gi +176.22% > > For comparison, glibc on the same machine: > > │ strchrnul_glibc.out │ > │ sec/op │ > Short 49.73µ ± 0% > Mid 14.60µ ± 0% > Long 1.237µ ± 0% > geomean 9.646µ > > │ strchrnul_glibc.out │ > │ B/s │ > Short 2.341Gi ± 0% > Mid 7.976Gi ± 0% > Long 94.14Gi ± 0% > geomean 12.07Gi > > Sponsored by: The FreeBSD Foundation > Approved by: mjg > Differential Revision: https://reviews.freebsd.org/D41333 > --- > lib/libc/amd64/string/Makefile.inc | 1 + > lib/libc/amd64/string/strchrnul.S | 167 +++++++++++++++++++++++++++++++++++++ > 2 files changed, 168 insertions(+) > > diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc > index 1bfefa7be98c..b5260cfd78d1 100644 > --- a/lib/libc/amd64/string/Makefile.inc > +++ b/lib/libc/amd64/string/Makefile.inc > @@ -8,6 +8,7 @@ MDSRCS+= \ > memmove.S \ > memset.S \ > strcat.S \ > + strchrnul.S \ > strcmp.S \ > strlen.S \ > stpcpy.S > diff --git a/lib/libc/amd64/string/strchrnul.S b/lib/libc/amd64/string/strchrnul.S > new file mode 100644 > index 000000000000..6d22f31850f8 > --- /dev/null > +++ b/lib/libc/amd64/string/strchrnul.S > @@ -0,0 +1,167 @@ > +/*- > + * Copyright (c) 2023 The FreeBSD Foundation > + * > + * This software was developed by Robert Clausecker > + * under sponsorship from the FreeBSD Foundation. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE > + */ > + > +#include > + > +#include "amd64_archlevel.h" > + > +#define ALIGN_TEXT .p2align 4,0x90 # 16-byte alignment, nop-filled > + > + .weak strchrnul > + .set strchrnul, __strchrnul > + > +ARCHFUNCS(__strchrnul) > + ARCHFUNC(__strchrnul, scalar) > + ARCHFUNC(__strchrnul, baseline) > +ENDARCHFUNCS(__strchrnul) ... > +1: sub $8, %rdi # undo advance past buffer > +2: tzcnt %rax, %rax # first NUL or c byte match tzcnt is the _V3 feature, while __strchrnul_scalar seems to be used for _V2. Am I missing something? From nobody Sun Aug 6 23:20:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJwRN3T8Jz4pZN1 for ; Sun, 6 Aug 2023 23:20:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 4RJwRN1RvPz3NnZ for ; Sun, 6 Aug 2023 23:20:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3176a439606so2936178f8f.3 for ; Sun, 06 Aug 2023 16:20:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691364030; x=1691968830; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oh05DwA/LquwktMXHUC1qwPa5KI9yYVZ+9vrRxz+e3w=; b=ZKwMeI/UL1Yh+G23qd3NqwlfujpFAonFQfQSen8UoKE9K7lJ0BRhSt6ZAtFFZelXGr UZEJmdfdQ7WX8FZUN9x3KeaqwSBC41ipMK95ZjeOAx6Cu0J5dervJgwW6XB0Ui8lyvN8 LRYLHkbHebf0qagjkX0aSLmfK+rBrHp67bLrmfLQyRnIDlIMuZlwBSyPSC3uxpXHzm7g 5VuL5rgYg7o6wSgg35GQmMh66pfRhUa/VuSpQm1X2UuCKM4Fb6Abz0gAvTRwyJOG6NhT pHMz2jFrK1KHVcmFdPHNUi1oXNju9z+xZ892J5Lw3mzawmvqZSgWMR9EmFSCiixEG0z0 6cfA== X-Gm-Message-State: AOJu0YzCtENcTxdqrUumnDZp3bRz9ufbCXUBrtZ/+Dgfi76jI6aVaPbl S9oNosEf5YJED9bYZB3URxbFUw== X-Google-Smtp-Source: AGHT+IFju6d96AsG7r/v/Wfe3pXRdAQlwCxXLucTfN1JeQ68X2vdtZ3MNMe1IGjS+VVwMZJBQ0yl/g== X-Received: by 2002:a5d:464a:0:b0:315:a1bb:4d7b with SMTP id j10-20020a5d464a000000b00315a1bb4d7bmr4170180wrs.35.1691364029752; Sun, 06 Aug 2023 16:20:29 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id x10-20020a5d490a000000b00317ab75748bsm8627140wrq.49.2023.08.06.16.20.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Aug 2023 16:20:29 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 61f4c4d3dd38 - main - lib/libc/amd64/string: add strchrnul implementations (scalar, baseline) From: Jessica Clarke In-Reply-To: <202308061410.376EA6WM096467@gitrepo.freebsd.org> Date: Mon, 7 Aug 2023 00:20:18 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202308061410.376EA6WM096467@gitrepo.freebsd.org> To: Robert Clausecker X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RJwRN1RvPz3NnZ X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 6 Aug 2023, at 15:10, Robert Clausecker wrote: >=20 > The branch main has been updated by fuz: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D61f4c4d3dd38c5b79e04fff1dedb0207= 1ebb33f2 >=20 > commit 61f4c4d3dd38c5b79e04fff1dedb02071ebb33f2 > Author: Robert Clausecker > AuthorDate: 2023-06-30 14:45:11 +0000 > Commit: Robert Clausecker > CommitDate: 2023-08-06 13:58:27 +0000 >=20 > lib/libc/amd64/string: add strchrnul implementations (scalar, = baseline) >=20 > A lot better than the generic (pre) implementaion. We do not beat = glibc > for long strings, likely due to glibc switching to AVX once the = input is > sufficiently long. X86-64-v3 and v4 implementations may be added = at a > future time. >=20 > os: FreeBSD > arch: amd64 > cpu: 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz > =E2=94=82 strchrnul_pre.out =E2=94=82 = strchrnul_scalar.out =E2=94=82 strchrnul_baseline.out = =E2=94=82 > =E2=94=82 sec/op =E2=94=82 sec/op vs base = =E2=94=82 sec/op vs base =E2=94=82 > Short 129.68=C2=B5 =C2=B1 3% 59.91=C2=B5 =C2=B1 1% = -53.80% (p=3D0.000 n=3D20) 44.37=C2=B5 =C2=B1 1% -65.79% (p=3D0.000 = n=3D20) > Mid 21.15=C2=B5 =C2=B1 0% 19.30=C2=B5 =C2=B1 0% = -8.76% (p=3D0.000 n=3D20) 12.30=C2=B5 =C2=B1 0% -41.85% (p=3D0.000 = n=3D20) > Long 13.772=C2=B5 =C2=B1 0% 11.028=C2=B5 =C2=B1 0% = -19.92% (p=3D0.000 n=3D20) 3.285=C2=B5 =C2=B1 0% -76.15% (p=3D0.000 = n=3D20) > geomean 33.55=C2=B5 23.36=C2=B5 -30.37% = 12.15=C2=B5 -63.80% >=20 > =E2=94=82 strchrnul_pre.out =E2=94=82 = strchrnul_scalar.out =E2=94=82 strchrnul_baseline.out = =E2=94=82 > =E2=94=82 B/s =E2=94=82 B/s vs = base =E2=94=82 B/s vs base = =E2=94=82 > Short 919.3Mi =C2=B1 3% 1989.7Mi =C2=B1 1% +116.45% = (p=3D0.000 n=3D20) 2686.8Mi =C2=B1 1% +192.28% (p=3D0.000 n=3D20) > Mid 5.505Gi =C2=B1 0% 6.033Gi =C2=B1 0% +9.60% = (p=3D0.000 n=3D20) 9.466Gi =C2=B1 0% +71.97% (p=3D0.000 n=3D20) > Long 8.453Gi =C2=B1 0% 10.557Gi =C2=B1 0% +24.88% = (p=3D0.000 n=3D20) 35.441Gi =C2=B1 0% +319.26% (p=3D0.000 n=3D20) > geomean 3.470Gi 4.983Gi +43.62% = 9.584Gi +176.22% >=20 > For comparison, glibc on the same machine: >=20 > =E2=94=82 strchrnul_glibc.out =E2=94=82 > =E2=94=82 sec/op =E2=94=82 > Short 49.73=C2=B5 =C2=B1 0% > Mid 14.60=C2=B5 =C2=B1 0% > Long 1.237=C2=B5 =C2=B1 0% > geomean 9.646=C2=B5 >=20 > =E2=94=82 strchrnul_glibc.out =E2=94=82 > =E2=94=82 B/s =E2=94=82 > Short 2.341Gi =C2=B1 0% > Mid 7.976Gi =C2=B1 0% > Long 94.14Gi =C2=B1 0% > geomean 12.07Gi >=20 > Sponsored by: The FreeBSD Foundation > Approved by: mjg > Differential Revision: https://reviews.freebsd.org/D41333 > --- > lib/libc/amd64/string/Makefile.inc | 1 + > lib/libc/amd64/string/strchrnul.S | 167 = +++++++++++++++++++++++++++++++++++++ > 2 files changed, 168 insertions(+) >=20 > diff --git a/lib/libc/amd64/string/Makefile.inc = b/lib/libc/amd64/string/Makefile.inc > index 1bfefa7be98c..b5260cfd78d1 100644 > --- a/lib/libc/amd64/string/Makefile.inc > +++ b/lib/libc/amd64/string/Makefile.inc > @@ -8,6 +8,7 @@ MDSRCS+=3D \ > memmove.S \ > memset.S \ > strcat.S \ > + strchrnul.S \ > strcmp.S \ > strlen.S \ > stpcpy.S > diff --git a/lib/libc/amd64/string/strchrnul.S = b/lib/libc/amd64/string/strchrnul.S > new file mode 100644 > index 000000000000..6d22f31850f8 > --- /dev/null > +++ b/lib/libc/amd64/string/strchrnul.S > @@ -0,0 +1,167 @@ > +/*- > + * Copyright (c) 2023 The FreeBSD Foundation > + * > + * This software was developed by Robert Clausecker > + * under sponsorship from the FreeBSD Foundation. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above = copyright > + * notice, this list of conditions and the following disclaimer in = the > + * documentation and/or other materials provided with the = distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' = AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF > + * SUCH DAMAGE > + */ > + > +#include > + > +#include "amd64_archlevel.h" > + > +#define ALIGN_TEXT .p2align 4,0x90 # 16-byte alignment, nop-filled > + > + .weak strchrnul > + .set strchrnul, __strchrnul > + > +ARCHFUNCS(__strchrnul) > + ARCHFUNC(__strchrnul, scalar) This line specifically is using spaces not a tab for indentation. Jess From nobody Mon Aug 7 00:59:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJydy28Mgz4pk0B; Mon, 7 Aug 2023 00:59: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 4RJydy1cF8z3WfW; Mon, 7 Aug 2023 00:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f9R2qvhsSyMRXfkjWVjUq+Tf8isDP4EK/xpGo639MMk=; b=dUm4Iw1SnUxJHg40DbP3zreD/+aPxT1BpmIhs/wiUd+Z9BeTUTiD84sOTdQNor2nu+awRK 2DtDxrzWGek8FIqhHHtVXDgVPPmEy5BapJSzXWcYYtfzYf+6CQ9MR4ZmicbtjLa88RVnIa W6kjuRd1bDCkTXj2Ll4v4ggifpFb72x9/1B0YKwg5iLv3NLPRbLakhsFx8xluXXRpRQPdU onmJLdxR/9i8KlNnmQFD7mxLiiPP33iE/6dmZS7o/JQ/soC3m+EhynuBPXxwEtHnAFmYPK B3RolXBpA098VpySppWxIrwHR9N/STJiin8xn/kfTbHKOKQRvgX0Uda1QZAccQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f9R2qvhsSyMRXfkjWVjUq+Tf8isDP4EK/xpGo639MMk=; b=G2hohYZmRziJgWwLgy1gAISUPL48wixb+2u/KAd4i1bSHFezOlYp2u3j6Z8idV0jxHTXoF 8VDdP/q1k7fP90a5EK1h5V7ZG+68NdW6hsPiXeayDlPxNUJPWHSqZ6tMyzLw3BmQIy10eG wE9VUEyzlFwhtP6qoRZMBMx2Q9sUjgwj/gbHhcxGR6qny+do0hduxVD93roUyHwgpLRKy8 RW1vt/9tSetZIoKlNLu55nmuQQkmqsmYEVBnhDqh5KmP9wuEZCtE5c/Or9u8U5uJScsuQ/ 52J44rELfEwyLGWL0RryDFpOB1sqYY2RjqYjvjGEQQyO852NDC3K4HXBsSkiEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369990; a=rsa-sha256; cv=none; b=j+1U9i7c/rqC0auoBUhaEJvpCs+zujCrla4uWpSzn7Xg1Oik9nLuY/xH8piMY8Lzet99B7 NHoLy/V3dg2HfuKojAnBQWRzmMBOvIlei9GpP87z4PysGYdqKikdKdq3aDgvI7qlf5R1tE 7ucXN+Wq28EDtPTWW7EXu+UVmJDJWeC1MRtHHjAvSl0sQwEZWrHJ0A6Ife4ntEonQDL+Y9 fbqkzPWXa9p40alBnAgswjwX/cU6Pqce3Cb3LztRGqElPRzJXRoOIJqL20a2+To56rMmah tynAnPcr5FCyFPJNCNxVlB9NU5lWYzoOCGXQxf6wBWpuRPb6wOS845lUeNq0Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJydy0X3qzXbY; Mon, 7 Aug 2023 00:59: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 3770xnBv077188; Mon, 7 Aug 2023 00:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3770xnGF077187; Mon, 7 Aug 2023 00:59:49 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:49 GMT Message-Id: <202308070059.3770xnGF077187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2b0cd3b55294 - stable/13 - killpg(2): close a race with fork(2), part1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b0cd3b552942c642a84f8e224b989c02d97125d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2b0cd3b552942c642a84f8e224b989c02d97125d commit 2b0cd3b552942c642a84f8e224b989c02d97125d Author: Konstantin Belousov AuthorDate: 2023-06-12 07:33:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 killpg(2): close a race with fork(2), part1 (cherry picked from commit 3360b48525fc966894e77b8cd9c124669664472d) --- sys/kern/init_main.c | 1 + sys/kern/kern_fork.c | 28 ++++++++++++++++++++++++++++ sys/kern/kern_proc.c | 20 ++++++++++++++++++++ sys/kern/kern_prot.c | 17 +++++++++++++---- sys/kern/kern_sig.c | 8 ++++++++ sys/sys/proc.h | 2 ++ 6 files changed, 72 insertions(+), 4 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index c8cb0f5613ee..2f98d8a577d9 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -489,6 +489,7 @@ proc0_init(void *dummy __unused) LIST_INSERT_HEAD(&allproc, p, p_list); LIST_INSERT_HEAD(PIDHASH(0), p, p_hash); mtx_init(&pgrp0.pg_mtx, "process group", NULL, MTX_DEF | MTX_DUPOK); + sx_init(&pgrp0.pg_killsx, "killpg racer"); p->p_pgrp = &pgrp0; LIST_INSERT_HEAD(PGRPHASH(0), &pgrp0, pg_hash); LIST_INIT(&pgrp0.pg_members); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 2d7e7bc0de4a..6fb9d2a83c8f 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -851,11 +851,13 @@ fork1(struct thread *td, struct fork_req *fr) struct vmspace *vm2; struct ucred *cred; struct file *fp_procdesc; + struct pgrp *pg; vm_ooffset_t mem_charged; int error, nprocs_new; static int curfail; static struct timeval lastfail; int flags, pages; + bool killsx_locked; flags = fr->fr_flags; pages = fr->fr_pages; @@ -912,6 +914,7 @@ fork1(struct thread *td, struct fork_req *fr) fp_procdesc = NULL; newproc = NULL; vm2 = NULL; + killsx_locked = false; /* * Increment the nprocs resource before allocations occur. @@ -941,6 +944,28 @@ fork1(struct thread *td, struct fork_req *fr) } } + /* + * Atomically check for signals and block threads from sending + * a signal to our process group until the child is visible. + */ + pg = p1->p_pgrp; + if (sx_slock_sig(&pg->pg_killsx) != 0) { + error = ERESTART; + goto fail2; + } else if (__predict_false(p1->p_pgrp != pg || sig_intr() != 0)) { + /* + * Either the process was moved to other process + * group, or there is pending signal. sx_slock_sig() + * does not check for signals if not sleeping for the + * lock. + */ + sx_sunlock(&pg->pg_killsx); + error = ERESTART; + goto fail2; + } else { + killsx_locked = true; + } + /* * If required, create a process descriptor in the parent first; we * will abandon it if something goes wrong. We don't finit() until @@ -1031,6 +1056,7 @@ fork1(struct thread *td, struct fork_req *fr) } do_fork(td, fr, newproc, td2, vm2, fp_procdesc); + sx_sunlock(&pg->pg_killsx); return (0); fail0: error = EAGAIN; @@ -1049,6 +1075,8 @@ fail2: fdrop(fp_procdesc, td); } atomic_add_int(&nprocs, -1); + if (killsx_locked) + sx_sunlock(&pg->pg_killsx); pause("fork", hz / 2); return (error); } diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 2879af8f9335..09796d542b4d 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -311,6 +311,7 @@ pgrp_init(void *mem, int size, int flags) pg = mem; mtx_init(&pg->pg_mtx, "process group", NULL, MTX_DEF | MTX_DUPOK); + sx_init(&pg->pg_killsx, "killpg racer"); return (0); } @@ -574,6 +575,7 @@ errout: int enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) { + struct pgrp *old_pgrp; sx_assert(&proctree_lock, SX_XLOCKED); @@ -585,6 +587,11 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) KASSERT(!SESS_LEADER(p), ("enterpgrp: session leader attempted setpgrp")); + old_pgrp = p->p_pgrp; + if (!sx_try_xlock(&old_pgrp->pg_killsx)) + return (ERESTART); + MPASS(old_pgrp == p->p_pgrp); + if (sess != NULL) { /* * new session @@ -626,6 +633,7 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) doenterpgrp(p, pgrp); + sx_xunlock(&old_pgrp->pg_killsx); return (0); } @@ -635,6 +643,7 @@ enterpgrp(struct proc *p, pid_t pgid, struct pgrp *pgrp, struct session *sess) int enterthispgrp(struct proc *p, struct pgrp *pgrp) { + struct pgrp *old_pgrp; sx_assert(&proctree_lock, SX_XLOCKED); PROC_LOCK_ASSERT(p, MA_NOTOWNED); @@ -647,8 +656,19 @@ enterthispgrp(struct proc *p, struct pgrp *pgrp) KASSERT(pgrp != p->p_pgrp, ("%s: p %p belongs to pgrp %p", __func__, p, pgrp)); + old_pgrp = p->p_pgrp; + if (!sx_try_xlock(&old_pgrp->pg_killsx)) + return (ERESTART); + MPASS(old_pgrp == p->p_pgrp); + if (!sx_try_xlock(&pgrp->pg_killsx)) { + sx_xunlock(&old_pgrp->pg_killsx); + return (ERESTART); + } + doenterpgrp(p, pgrp); + sx_xunlock(&pgrp->pg_killsx); + sx_xunlock(&old_pgrp->pg_killsx); return (0); } diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index cf88cae3a72d..3677c6db368e 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -332,12 +332,13 @@ sys_setsid(struct thread *td, struct setsid_args *uap) struct pgrp *newpgrp; struct session *newsess; - error = 0; pgrp = NULL; newpgrp = uma_zalloc(pgrp_zone, M_WAITOK); newsess = malloc(sizeof(struct session), M_SESSION, M_WAITOK | M_ZERO); +again: + error = 0; sx_xlock(&proctree_lock); if (p->p_pgid == p->p_pid || (pgrp = pgfind(p->p_pid)) != NULL) { @@ -345,7 +346,12 @@ sys_setsid(struct thread *td, struct setsid_args *uap) PGRP_UNLOCK(pgrp); error = EPERM; } else { - (void)enterpgrp(p, p->p_pid, newpgrp, newsess); + error = enterpgrp(p, p->p_pid, newpgrp, newsess); + if (error == ERESTART) { + sx_xunlock(&proctree_lock); + goto again; + } + MPASS(error == 0); td->td_retval[0] = p->p_pid; newpgrp = NULL; newsess = NULL; @@ -391,10 +397,11 @@ sys_setpgid(struct thread *td, struct setpgid_args *uap) if (uap->pgid < 0) return (EINVAL); - error = 0; - newpgrp = uma_zalloc(pgrp_zone, M_WAITOK); +again: + error = 0; + sx_xlock(&proctree_lock); if (uap->pid != 0 && uap->pid != curp->p_pid) { if ((targp = pfind(uap->pid)) == NULL) { @@ -456,6 +463,8 @@ done: sx_xunlock(&proctree_lock); KASSERT(error == 0 || newpgrp != NULL, ("setpgid failed and newpgrp is NULL")); + if (error == ERESTART) + goto again; uma_zfree(pgrp_zone, newpgrp); return (error); } diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 79440c2866df..77f63252454a 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1769,6 +1769,7 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) } sx_sunlock(&allproc_lock); } else { +again: sx_slock(&proctree_lock); if (pgid == 0) { /* @@ -1784,10 +1785,17 @@ killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi) } } sx_sunlock(&proctree_lock); + if (!sx_try_xlock(&pgrp->pg_killsx)) { + PGRP_UNLOCK(pgrp); + sx_xlock(&pgrp->pg_killsx); + sx_xunlock(&pgrp->pg_killsx); + goto again; + } LIST_FOREACH(p, &pgrp->pg_members, p_pglist) { killpg1_sendsig(p, false, &arg); } PGRP_UNLOCK(pgrp); + sx_xunlock(&pgrp->pg_killsx); } MPASS(arg.ret != 0 || arg.found || !arg.sent); if (arg.ret == 0 && !arg.sent) diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 997ff110bcdc..d3daa0c6879a 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -113,6 +113,8 @@ struct pgrp { pid_t pg_id; /* (c) Process group id. */ struct mtx pg_mtx; /* Mutex to protect members */ int pg_flags; /* (m) PGRP_ flags */ + struct sx pg_killsx; /* Mutual exclusion between group member + * fork() and killpg() */ }; #define PGRP_ORPHANED 0x00000001 /* Group is orphaned */ From nobody Mon Aug 7 00:59:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJydz3hJGz4pk4x; Mon, 7 Aug 2023 00:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJydz2cZcz3X0Y; Mon, 7 Aug 2023 00:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMbRQHzOAYAjHFwElg11+Gp0tQK+AJsjeYGJQn7A3NQ=; b=oV041il/eirria9c/2ihoQu+a58EWDyNYzhOH20nR8GcVOTRKfhe9tS7LEUrR8IJe9w4nI 7YvExkUiyk4i2rgDxd+kyq3nO9d3d4HYg8Ge6/u869wH+h7XNXrukp0sHJlRWxKegEDs1A WsRqzxafM82EUrfFlMDlgQbT7zPnhX5GogoC6IKSNBPaIVntioIBRb6G2tRbX3+7jFmTRS 1/dwxAVKQ8Gi0F+RVA3BnwGExOj5WH6t+q1NNVxSTv0gTDJYXHJanjzEeRnEQHtbZ06buy gr/0vH2s0MpWmZ8ihH5F7GInXi/zNszFJ0lalF5tGE4Fc6xIL8+UPYUdyHpQ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KMbRQHzOAYAjHFwElg11+Gp0tQK+AJsjeYGJQn7A3NQ=; b=JsFzjImSeurYTEQLkSoAABITMBN+orcK5y+sdda2cooE/pbvaMUaZ5RPj34Nb8rBh4Qhx1 4990yH6nwzhSMZ8njhOCYOccRoS+A9+BIf4+PE4cJek6H8MJtI3qLU07Yiar/d1eJTF2RC oWy37JelrrYO6oTmpAayvEkd6GSG3JGqoXdIjuLOSPMfnSxfI2R4VLgyikSfpHt4rggg0q jqdtQ98w2y/QMTXK0dDMqElGyzRhWSbtWH/ZRdtMcG08mTAc8rvRdnnFwkvKqZLxO33pC2 gixWnIArWdB6i2mb0a1VdGRKtdtMhdiZ/YhZKtukJWk9Y1J0d5/qjIgVQSzQBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369991; a=rsa-sha256; cv=none; b=q6FnA1de5LLItfc5PJZ0YEIR1N65Q2AVTov7YUrEo/Rll76BaquXcENTL4Dv7i7ikiDxaN tIvErQAXFDJVYTOXc5PlgTj2iq4rSMj7TPF8kF6ZtV1eFV+4MyQyYGPXDJl2kIXC8DZDUv h/L/lQ2pWb0gf3O8i3KyumfpFlpvQpsk4GTKlsf1/6pNQ0HTCjURYMZxqTtuBzFrU0mzlf 6KBgzwSsdHYdoRqDdl3KE7azFA97d0GLn3J6cHSpTAIMAw0XSJPcNa8TNWCsfkb9WEFsYN u1suDNN+ZER9RUEn93xGr4RG6HG5hw56/UeJKeEDm8KyVNmWCMpw+xXQXlsn4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJydz17kmzY1q; Mon, 7 Aug 2023 00:59: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 3770xpmw077207; Mon, 7 Aug 2023 00:59:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3770xpF2077206; Mon, 7 Aug 2023 00:59:51 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:51 GMT Message-Id: <202308070059.3770xpF2077206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 54747740ccc6 - stable/13 - sigtd(): prefer non-stopped thread as a target for signal queue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 54747740ccc6a717c54f23324639bedff5f64211 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54747740ccc6a717c54f23324639bedff5f64211 commit 54747740ccc6a717c54f23324639bedff5f64211 Author: Konstantin Belousov AuthorDate: 2023-07-21 09:41:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 sigtd(): prefer non-stopped thread as a target for signal queue (cherry picked from commit dfe172484d0e1de0bb32bcab8775eb83e15031c0) --- sys/kern/kern_sig.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 77f63252454a..e002d7d0e5fa 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2100,14 +2100,18 @@ sigtd(struct proc *p, int sig, bool fast_sigblock) if (curproc == p && !SIGISMEMBER(curthread->td_sigmask, sig) && (!fast_sigblock || curthread->td_sigblock_val == 0)) return (curthread); + + /* Find a non-stopped thread that does not mask the signal. */ signal_td = NULL; FOREACH_THREAD_IN_PROC(p, td) { if (!SIGISMEMBER(td->td_sigmask, sig) && (!fast_sigblock || - td != curthread || td->td_sigblock_val == 0)) { + td != curthread || td->td_sigblock_val == 0) && + (td->td_flags & TDF_BOUNDARY) == 0) { signal_td = td; break; } } + /* Select random (first) thread if no better match was found. */ if (signal_td == NULL) signal_td = FIRST_THREAD_IN_PROC(p); return (signal_td); From nobody Mon Aug 7 00:59:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyf02tVrz4pk87; Mon, 7 Aug 2023 00: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 4RJyf02LPSz3Wcc; Mon, 7 Aug 2023 00: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=1691369992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9ZX/FqWVNvVcCf9S4p0NEzEOs2Gt5xSuywdqL/Lgd0=; b=UEzNNACPK6I1h3YwqbM1FmnOZsQKsbPaMVODOrmnR46G77EOmR+ADE7IYKdjo2ZWCmxyRt HrLNnLe5s2qUaHCDcXxi5mp4hO3qfy4RLLx57TXYrg7JxdBaXpaQn2BnibyII/ZEsYS414 Ka+rmTVr0ui2G0ypj5MSheImaJV2SxfjVa8trFQHNkUESbtA1JXXOhj65URG6GXwA5M1ck TWFeq6AFnPtTmYea6WlX+tv+aqmgMBf5lrrCcpdDf8fLSOsPXaNGP3gFbTSFWOLC0V4j4k 2mHx1/KNi2+LdGlJ02HjHzlKH8dhOOa+IvgsmzFAgAA2W6KMWtLkieZbrGamOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i9ZX/FqWVNvVcCf9S4p0NEzEOs2Gt5xSuywdqL/Lgd0=; b=l0GtNKCJmY4ljS4Tl6PCMZ3WX4myAlmayhlxNh77GPjlxIm57ca/PvBxiqzXx/DQhbpO78 zbZbLF6BAlzKCTVR+dIraM1IljELKol/QaYZ1XSXW0dNPFWTxH3ZB4F8L9muQNlLS/AsuU iidsbT1yT3v/dHHmx8uJQzzzyJfTAjiH6ziSuqLi996KjO8vtT2Tl5fmdhE34ZKCuWei7V wpGhCkmBlIvS2QecF2ZHTNnF3xf+wJQTJ15i1v3RxPa99d/kPuhmkcihmp1VnTcaOB1aHu uIHEfIgLHuW/py5so1RAaYKgpVja7Ip/vVwkLDJfbQbcDCgZ8z+D+kRsutrScw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369992; a=rsa-sha256; cv=none; b=XoSxunX0n3oeag9ZhfawxZJLeaV3M2kKH7as4L7pvRJjgtZVJ5MkzMebIUU7b8Nx2xTUq3 Xjtozz0cPdrjHDISNnUWcIrR+qfUtM2lz/s9FtF8D4JAXbwTIAgULpLyCzwWPRm6wiyJBi 8avwe/H26CPs6Oaq7xxQtkAgp01ePLYj0ouXuUGjEeAO6xkL3s9ALCmTQZWu0hnDpNRa7l kiAV7wsp9uJ1wYCWyrrvyGyd1g4z2uuxfrRK3zBmtbVOq03Lgg33tDSs4Y5Wp6a27Au+Ig ob7gtnxitgSw7trpX6qod8MhbZYdqIpUpjLhN+TClyxnar+nk65Wr8mo9Shpiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyf01QhCzXqZ; Mon, 7 Aug 2023 00: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 3770xq4i077226; Mon, 7 Aug 2023 00: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 3770xqim077225; Mon, 7 Aug 2023 00:59:52 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:52 GMT Message-Id: <202308070059.3770xqim077225@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 910aa553a9ba - stable/13 - killpg(): close a race with fork(), part 2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 910aa553a9baaa66030b40dc56c254bcc74a9286 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=910aa553a9baaa66030b40dc56c254bcc74a9286 commit 910aa553a9baaa66030b40dc56c254bcc74a9286 Author: Konstantin Belousov AuthorDate: 2023-07-20 21:19:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 killpg(): close a race with fork(), part 2 (cherry picked from commit 232b922cb363e01ac0dd2a277d93cf74d8485e79) --- sys/kern/kern_fork.c | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 6fb9d2a83c8f..3b612e7b8990 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -857,7 +857,7 @@ fork1(struct thread *td, struct fork_req *fr) static int curfail; static struct timeval lastfail; int flags, pages; - bool killsx_locked; + bool killsx_locked, singlethreaded; flags = fr->fr_flags; pages = fr->fr_pages; @@ -915,6 +915,7 @@ fork1(struct thread *td, struct fork_req *fr) newproc = NULL; vm2 = NULL; killsx_locked = false; + singlethreaded = false; /* * Increment the nprocs resource before allocations occur. @@ -945,14 +946,37 @@ fork1(struct thread *td, struct fork_req *fr) } /* - * Atomically check for signals and block threads from sending - * a signal to our process group until the child is visible. + * If we are possibly multi-threaded, and there is a process + * sending a signal to our group right now, ensure that our + * other threads cannot be chosen for the signal queueing. + * Otherwise, this might delay signal action, and make the new + * child escape the signaling. */ pg = p1->p_pgrp; - if (sx_slock_sig(&pg->pg_killsx) != 0) { + if (p1->p_numthreads > 1) { + if (sx_try_slock(&pg->pg_killsx) != 0) { + killsx_locked = true; + } else { + PROC_LOCK(p1); + if (thread_single(p1, SINGLE_BOUNDARY)) { + PROC_UNLOCK(p1); + error = ERESTART; + goto fail2; + } + PROC_UNLOCK(p1); + singlethreaded = true; + } + } + + /* + * Atomically check for signals and block processes from sending + * a signal to our process group until the child is visible. + */ + if (!killsx_locked && sx_slock_sig(&pg->pg_killsx) != 0) { error = ERESTART; goto fail2; - } else if (__predict_false(p1->p_pgrp != pg || sig_intr() != 0)) { + } + if (__predict_false(p1->p_pgrp != pg || sig_intr() != 0)) { /* * Either the process was moved to other process * group, or there is pending signal. sx_slock_sig() @@ -1056,8 +1080,8 @@ fork1(struct thread *td, struct fork_req *fr) } do_fork(td, fr, newproc, td2, vm2, fp_procdesc); - sx_sunlock(&pg->pg_killsx); - return (0); + error = 0; + goto cleanup; fail0: error = EAGAIN; #ifdef MAC @@ -1075,9 +1099,16 @@ fail2: fdrop(fp_procdesc, td); } atomic_add_int(&nprocs, -1); +cleanup: if (killsx_locked) sx_sunlock(&pg->pg_killsx); - pause("fork", hz / 2); + if (singlethreaded) { + PROC_LOCK(p1); + thread_single_end(p1, SINGLE_BOUNDARY); + PROC_UNLOCK(p1); + } + if (error != 0) + pause("fork", hz / 2); return (error); } From nobody Mon Aug 7 00:59:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyf14ntKz4pk61; Mon, 7 Aug 2023 00:59: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 4RJyf13ypsz3WZd; Mon, 7 Aug 2023 00:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nidSNCKXZs5okZ5gvYGqPr+uEQIViEfcoNlsdUhOmdE=; b=SU1VIV9wO/asNTqCc9sfvriwrGd0+e2SNvAKXd4HhJJRggVogIx8ejiLyjh7sp2RmP0F81 6pijfg8+uYhxwAgqAxnwlIaSeTRZyrhvDy98TF+v5nH3oGXDbtvwV8si8vHNEW3yKeIium dylF6QT5DcQ8gqMyA0KO4RPyPlqs1h/7k29RHzLRKDBfQqN0V6/Y1LrrdoP1VoqKPW5tsx yOL2iWVaouNLzHvb1zeZBtG/P5T9HJAQUlbEtoN48qOWULF0gMo1OV7JoWvo6DtdWuZ6xU CtCwbK2nrsBfxzl8PF71IBs4qcVhbodGgKWak7QzlGwIfrgKzQK1kXd5e16wXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nidSNCKXZs5okZ5gvYGqPr+uEQIViEfcoNlsdUhOmdE=; b=IUrjrLb0V/DSyVoOUVImD6e02Y4AVp8eVu/R4eOqFtmAyyJHKIDwKVgXda4Vm8hf/I2X7G ys0+/G7vPQYehVL2pB0exKzP5wwJgG8JVw1H95r+ybPjoIhJAlPmRsvKelvVPRGG7xnVb/ DJzNFhp7q4MOYNdZmlbk0M5KMbP8OUch0I9P/6CAnsYSePNTDmbieNKi5hSwXEr0ZdYIuG UgxR6DOQOHSSAqeYZsfOEOJ2aatOiPUFwM1Fo0jU70NdQZuCfhwSdNvAxdIuuq3FXbSAAB tzDrkF9whjp3FkrgOGSxOhjPwDnYqtcwXDgxvhocJdfVqI8eWlKncc57JYtvTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369993; a=rsa-sha256; cv=none; b=EvwT1rCPI9dteWF6iYKr5K70T2oE5zBVsPld5LvBhkVSuhwt8OZMb2qlfeSSK3m/T5VQ02 QL5WU+DFUbSFJ4lE9zRQPBUSLC+8GG+1dGnekeYdgIeWXWvm3BF5PFAOg9+Fy0Pzvq5ZOP MEkXBCX7ftmMwrGYHwyLyj3Rk9j6iCzPUQ2st9GFUY/6FcPZC37F096m1W7hHaUu9Ig/AT ZXKMlUIapXBqopXnh6DayYcGgAt7683Xs/cF03yIX9PPCDfDoIA6GVD7vW/50/rl3udiat O1AloqmEnl834pkHTAc2cXO0EN7cCT28VlOB6zckvdWJGXpukxNnsrXLFeZO1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyf12ZCZzXqb; Mon, 7 Aug 2023 00:59: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 3770xrf2077246; Mon, 7 Aug 2023 00:59:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3770xrmq077245; Mon, 7 Aug 2023 00:59:53 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:53 GMT Message-Id: <202308070059.3770xrmq077245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c25f1912ea6a - stable/13 - fork1(): properly track the state of the pg_killsx lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c25f1912ea6a9ca510625eac2111d3b2ae67b40d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c25f1912ea6a9ca510625eac2111d3b2ae67b40d commit c25f1912ea6a9ca510625eac2111d3b2ae67b40d Author: Konstantin Belousov AuthorDate: 2023-07-26 23:24:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 fork1(): properly track the state of the pg_killsx lock (cherry picked from commit 474708c334a7d4fb27049e7dabaf5b74542568dd) --- sys/kern/kern_fork.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 3b612e7b8990..cc8e730b10fd 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -984,6 +984,7 @@ fork1(struct thread *td, struct fork_req *fr) * lock. */ sx_sunlock(&pg->pg_killsx); + killsx_locked = false; error = ERESTART; goto fail2; } else { From nobody Mon Aug 7 00:59:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyf25W34z4pk0G; Mon, 7 Aug 2023 00:59: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 4RJyf24PdVz3Wgw; Mon, 7 Aug 2023 00:59:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GSngTGBZ+EMeibS5270R5UXvI9bDIw6fP9Y9/s7VTI=; b=DXzYbWnpf91U5q/b4a8pNR6+GoCpnXiu+Y6k+h6hDaoApeCWLvWSJ2UJ2yCz95jvLdug5y SiRRzgnXC017bYcJON7DB9BY3cb97hIiBNCJ/2fo4+ZhGrLOlwjPpx/HHJsmMEia2nkQkC mhzESC2A+5zW6cuLpCg9J5N5+CjbQn8UAW04mWr0kl+RpvD7neWNtKgmnNnB+4tgUJ6XgC wvRzE6gGJKNdw+o4BvXJlIlHuvDHB8zkMRkzTYhkYlS7q0vMVzM2P3jfcnZubtbEk2DWTL hN4rpbPbNnrY7yO0TMh0k23CNdfDnap39OD5HTLQC5yJuRHV2j8O9HiaUGKJqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691369994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5GSngTGBZ+EMeibS5270R5UXvI9bDIw6fP9Y9/s7VTI=; b=JJnMUyPk1S94iv9oW7KtxUMNggQajtmUInT9iLmm/daK7CcYwdPBB8UMEGbRPSkfYnCyH3 9ecraLQp8pHpAg4a3nBsqPMZEMwuw/oetU6fTd8pzAcGq0JW1UYoDDLLwJhhmi9dR4PlRT 64wndmuNrrthWlRl0HkrGjkSXK9OfPpfrnwBAlzdh+ELhFkuJO2tKPxSTlce2aKBgN2IxJ F4OtG0wO0jGwAIFR5J/qjuhKd8WqRPtZkQF0D1f/tsXTUYQOIQANc1qxfEBt6PBC0BRLqS hAMLNaFnQafoeuf2D/cRhYLv49U28dlWdXVaDbx4FKLl4GqTY1Z7Dj0+Q5ik7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691369994; a=rsa-sha256; cv=none; b=aqY7EvN7hW6Z4uoLuWY6vwvLqmTOEECB/709v2Ddmf4CloAqHa0rK8Fr1Ho2+hPI2jgWmv xIULBn1j+fAcYq3Xq1Fvuoxekq+tY7JpmpQBJTYdFCyMK8cT0KwfNbCcAvTvc/3AWD6z5Y p5KOnQmyI4aFlQ7oGtPccUCl1fzCKcj3TQ8uDNWSEflcOLFDnnAcBjOdWt3taSmx+/oVbq oskGQo/R2BuKN30K2mifmTsSXEikqhopGBIA57Ox+awLn2mfWJ2ESv8r2tXmsEhuCVVYxX OABWf6gC5luZcepBonKA4F3PxShrJhyIi9DzThS+qgbEL9x527IlsWT2VW2EIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyf23VLVzXMV; Mon, 7 Aug 2023 00:59: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 3770xs45077268; Mon, 7 Aug 2023 00:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3770xsjL077267; Mon, 7 Aug 2023 00:59:54 GMT (envelope-from git) Date: Mon, 7 Aug 2023 00:59:54 GMT Message-Id: <202308070059.3770xsjL077267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 746c8f0cd706 - stable/13 - cd9660: do not leak buffers in cd9660_rrip_loop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 746c8f0cd7061bcda4bb68cb612827288459bee6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=746c8f0cd7061bcda4bb68cb612827288459bee6 commit 746c8f0cd7061bcda4bb68cb612827288459bee6 Author: Konstantin Belousov AuthorDate: 2023-07-31 22:55:13 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-07 00:48:45 +0000 cd9660: do not leak buffers in cd9660_rrip_loop() PR: 272856 (cherry picked from commit fa3cf6cdc68cb6d6f2c440f2653258d68eae1015) --- sys/fs/cd9660/cd9660_rrip.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 87bc64c9b7d2..5d64e2c17f0a 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -549,12 +549,18 @@ cd9660_rrip_loop(isodir,ana,table) } if (ana->fields && ana->iso_ce_len) { - if (ana->iso_ce_blk >= ana->imp->volume_space_size - || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size - || bread(ana->imp->im_devvp, - ana->iso_ce_blk << - (ana->imp->im_bshift - DEV_BSHIFT), - ana->imp->logical_block_size, NOCRED, &bp)) + if (ana->iso_ce_blk >= ana->imp->volume_space_size || + ana->iso_ce_off + ana->iso_ce_len > + ana->imp->logical_block_size) + break; + if (bp != NULL) { + brelse(bp); + bp = NULL; + } + if (bread(ana->imp->im_devvp, + ana->iso_ce_blk << + (ana->imp->im_bshift - DEV_BSHIFT), + ana->imp->logical_block_size, NOCRED, &bp) != 0) /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off); From nobody Mon Aug 7 01:00:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyfV4XPXz4pk66; Mon, 7 Aug 2023 01:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJyfV3vmMz3Y3H; Mon, 7 Aug 2023 01:00:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JpETDS7mBPSVyAikM2jTre9+AaFigfCPIehYSbUbdA=; b=EFPDzafMAWsU+Q87ps/AVfI4JOqJWFrfOQLDrjwdM4Hmx8r3v29KGX9P5Fa1Xz3ufh5skS /ghPSzLv4Ehj4YZoBXY3ZEnpt4wPEhojEy+pYgJ0QbEPNi8epsd2iqR4ROKXf0RjlOBvNA nv3Gapjgk+oqdJBTlX1HycBlcnDA2fhO4K/PspaIadomc2UGH06s9JTtPQXSVHWTGRVPlC 9wTYYAPdxcFHtqYZubvX8YTXyKj+2ykE2h1eaIwn3q1HyOeSr3M83BvSbOZeu1kMMuv4LQ 0i6k4qpV5jKCRwrygieqUk0XincRv5eyq4awaq0r0WAKseGF7n+SwD8Stp572w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/JpETDS7mBPSVyAikM2jTre9+AaFigfCPIehYSbUbdA=; b=RDOCnrvoYZm77oy3tpBkRxXVHEaMIHGzRJPNquUwhRVzGAWS+lebn7YB1Yq0wetQ5mBcuv VSobscJ07hytBZEANqkh97Uu4gAs6xhSNeBUZBALKVUNmdPVvPlSdY1/IKULqahoaA4ZUw 9TROkbdmvvNwGOZS2DWoyQ2udSu72k5Yea5vZ1Dok+T5Jawz4CgijXyYdsVf/cyZHfJv+e oEiKFIGMwUziF15PPYFgOtQ4eVa734tRjSzQibrDCChHes49u6rwOu8Kf5p+rSKlQEXNym FTaHHNX1+hqGDQ9sMSNlQ2ezvqcfjFvtZLDcwZvGwoOkyQdBUrk+VzJlkoUiIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691370018; a=rsa-sha256; cv=none; b=xjgMLFPcpa8fnVP40OBWhF9EG38hnI2ZRAAjwfiTN7sz3Y0Hol5lLCBccQYDu6dV+h4O3V +pqMo5KrRvOnOPzN2ibPB3GlCLoGzXnKsEnRZnSAJW+U0XpPbzeFTPlGIXYITUtIxC5J7t PB4ViScCv4XRBfsfyJ8Qk/I8dxFyz1SiLOuyv6AXLFqXqSs0Z3s8Ip8QQ1AO0gzccw5YJ4 4mJnSvAhnfhfHw9CmzpPSTvfxutfx/w7433sPbJpoERWV6YRYRtQZEVHggjCezZDRkQW9/ AaLiNwHiKYQeFTIt/EXwaC4gakrVqgy/mpT3y7eh+uc6cAEZCrzDuNkAPql9KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyfV30cVzY1r; Mon, 7 Aug 2023 01:00: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 37710ISe087011; Mon, 7 Aug 2023 01:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37710InY087010; Mon, 7 Aug 2023 01:00:18 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:00:18 GMT Message-Id: <202308070100.37710InY087010@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1dcd1a539275 - main - LinuxKPI: implement get_random_u32_inclusive() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1dcd1a539275fe69173bfc4dfc32c963fc7dcdbe Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1dcd1a539275fe69173bfc4dfc32c963fc7dcdbe commit 1dcd1a539275fe69173bfc4dfc32c963fc7dcdbe Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 21:03:30 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 00:52:41 +0000 LinuxKPI: implement get_random_u32_inclusive() Implementation of get_random_u32_inclusive(). This is needed by an update for wireless drivers. Sponsored by: The FreeBSD Foundation MFC after: 10 days Differential Revision: https://reviews.freebsd.org/D40121 --- sys/compat/linuxkpi/common/include/linux/random.h | 30 +++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/random.h b/sys/compat/linuxkpi/common/include/linux/random.h index fafb87cae9fe..561953be277a 100644 --- a/sys/compat/linuxkpi/common/include/linux/random.h +++ b/sys/compat/linuxkpi/common/include/linux/random.h @@ -4,6 +4,10 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. + * Copyright 2023 The FreeBSD Foundation + * + * Portions of this software was developed by Björn Zeeb + * 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 @@ -36,8 +40,6 @@ #include #include -#define get_random_u32() get_random_int() - static inline void get_random_bytes(void *buf, int nbytes) { @@ -54,6 +56,30 @@ get_random_int(void) return (val); } +#define get_random_u32() get_random_int() + +/* + * See "Fast Random Integer Generation in an Interval" by Daniel Lemire + * [https://arxiv.org/pdf/1805.10941.pdf] for implementation insights. + */ +static inline uint32_t +get_random_u32_inclusive(uint32_t floor, uint32_t ceil) +{ + uint64_t x; + uint32_t t, v; + + MPASS(ceil >= floor); + + v = get_random_u32(); + t = ceil - floor + 1; + x = (uint64_t)t * v; + while (x < t) + x = (uint64_t)t * get_random_u32(); + v = x >> 32; + + return (floor + v); +} + static inline u_long get_random_long(void) { From nobody Mon Aug 7 01:00:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyfX0tZ9z4pjwb; Mon, 7 Aug 2023 01:00: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 4RJyfW6chVz3Y8G; Mon, 7 Aug 2023 01:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hMmh3Qc0SHCipyD4+OlEUwxipr35Qd2/e0cNic9/Vg=; b=HiJTgULl1q9COAaxaAn+nvqUvi1DkPgpOt386LPtTzKqEpG0Fjo3rUFBQWnGUFdbOd7wdw MFPWYmq7Nmzo1pEgiYv95Qu/MCp7FLFEAthD4CYe6gDg+s8hLZKaHzwlOB+Gv0zncc2HOo zVZEu5Rv+8XgfQ40+z73Y9RRVBYwG4ZU64otPVRW1J60IwOgx1UiERSPOO9JtNnCz0D3Fg zrpUk4eO2oimatG9j8iOWXABtw1FUhdEAiwi0xb8dVWWdgkQSn58GLgmB/fozir8JNZ4cM LVhWJbFDxnBJsMTnfRBJfywiPUEmG0WFW1zDNvi+khnvr+Vqb/9wsyB2pyNR7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370019; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hMmh3Qc0SHCipyD4+OlEUwxipr35Qd2/e0cNic9/Vg=; b=tTpN7mq+6W1hfLLBoxpJQhT9Ir25i2V4tgjs92aB4AXHX0On3CLgdiuK6sYVilAoo6sDr4 15PhH8+P4Wu+3j7Vrz8BySFPwBNmd+hb8WTi7TNSZhFhE2M6ASPqTg66I6EEC0qcDeNs/Y 2UXKANH7feqN/SzBg9kAMh6aasFxG7245Hnzp14Gj5+N0pQM5VmqvVSYbCW7S+xFclOlBa iwguPc3VpIEup4MLSzrOgiWcZjGzqMBPWeKnmVKX/h48+CAxH1qoma0deJXAtuQ4HW/VWL 4dGawIdyjqHbEYkzCVlrLvCPZoiD5utVrtohS3hsta55wRCUp0ptyL/r7nWteA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691370019; a=rsa-sha256; cv=none; b=R7Qx5bE3kCiCRtxBSFyM69r0gK46RH/2vfpTMOKTHXUxcYGEozjX+3E1p0gVxjHipr/cTl busJyUdrejJSlYjU0tFVi56ad8zZDRw1TYzpnBBUrfiSkA+yYqLyihsSWSz13YVPkK9GJG s9wZFjdi/ql1X77vqmVm9NOY1KnHh9wacYi9w21vnWDOuc9ojUx3wn8bzrfEkVKmBiJP3d 4YiY5QbSQkoDpIrmPtsv/ty3ncbhFJoaydIpUEAg6Q3nkgRBMJJDUfbqkoHiiqt9jvme2q xFFpNFxWwQV9ORqT7saIq3/plSkuC9zUIVQj09UqP537TCP15rzfB+cPfsbuPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyfW4RCDzY1s; Mon, 7 Aug 2023 01:00: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 37710Jid087031; Mon, 7 Aug 2023 01:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37710JIS087030; Mon, 7 Aug 2023 01:00:19 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:00:19 GMT Message-Id: <202308070100.37710JIS087030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f74c09f3ec69 - main - LinuxKPI: pci.h add more constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f74c09f3ec69a6cdba46aa821ab665d2f87142f7 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f74c09f3ec69a6cdba46aa821ab665d2f87142f7 commit f74c09f3ec69a6cdba46aa821ab665d2f87142f7 Author: Bjoern A. Zeeb AuthorDate: 2023-07-26 02:58:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 00:54:03 +0000 LinuxKPI: pci.h add more constants Add two more PCI_EXP_LNKSTA_CLS constants to the compat defines needed by wireless drivers. Sponsored by: The FreeBSD Foundation MFC after: 10 days Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D41258 --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 6891f8878534..adf8930f871a 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -146,6 +146,8 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_EXP_TYPE_DOWNSTREAM PCIEM_TYPE_DOWNSTREAM_PORT /* Downstream Port */ #define PCI_EXP_FLAGS_SLOT PCIEM_FLAGS_SLOT /* Slot implemented */ #define PCI_EXP_TYPE_RC_EC PCIEM_TYPE_ROOT_EC /* Root Complex Event Collector */ +#define PCI_EXP_LNKSTA_CLS PCIEM_LINK_STA_SPEED +#define PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */ #define PCI_EXP_LNKCAP_SLS_2_5GB 0x01 /* Supported Link Speed 2.5GT/s */ #define PCI_EXP_LNKCAP_SLS_5_0GB 0x02 /* Supported Link Speed 5.0GT/s */ #define PCI_EXP_LNKCAP_SLS_8_0GB 0x03 /* Supported Link Speed 8.0GT/s */ From nobody Mon Aug 7 01:00:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyfY0ZCrz4pk8Z; Mon, 7 Aug 2023 01:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJyfX6WzHz3Y5t; Mon, 7 Aug 2023 01:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+17hKKygByMtTqZIOTI0/JAxwlITEHlAaJi6f4zaYk=; b=sP6NwFwd3SOkgGlyeHdzYaifC9Wg01NzijIuzCkMT64SA448TDd0KIsbNPCIMflLlrpIxe YQQz6VsXrIUmLPUzh4BgrUUw6wIR1MwQ/AEM2HVU9fYplhErOPqC9eUyRdZ4KxXxKtnoHk hvJz/XVM4zdVb53Om6aCGjPeBN3HARe/vcHR+zp5RtmR/wxonDupxv9gwOkhhCDw6UondA a3ax6nHiouefTuQ19RvXGm62ghRyVmJQkEsddSq+HCePdMJI9WP5QueobqXRdHHxuRn+R2 ZdVvlhKSxx6xG4MbBTr8YnSyRlPKYBh2Kvd2/bJcLbmFC9hf4DcyHVuRefv8Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+17hKKygByMtTqZIOTI0/JAxwlITEHlAaJi6f4zaYk=; b=actpMhao98YyG9fEji67SRG0PSt4TqlGpBhAkGRry3pQm/qlVJpKlK9j25xm2YqlViF5wl ElZ15vw/tCSkBHUMd/bizCivrFltOpi2/E2/y0Lv3Gw+WVmQqoSKO9IUaEZjyB7HE+K8Vu p9yfjHZqClbkxjHIM7o/HX7jlByTdy9c8mO3KhouMb2VZx3r7NBpN6KdEiH3X7njGKUKHx 2eTyIbhQa62hVqmUTxJ2g4iivyV9fykEGppENuVZG53JVtROduXjRDKdneh3oMN4L/FMsg DMwrmMqOZF3vDMXOR5hjtHyEsmapiyNOeP7MpxDokgbAXfGB8nDkR/gSWp5Q/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691370020; a=rsa-sha256; cv=none; b=IrJoKiWjslPFwWlqNR0jLoGxnFFhcWnz/89hxcYc9G3RCmngQZD0/RhLSDNwh6X5PCpaEP KeHFVsEMO/eSkE6+ZgjSgmTr3baSuMDeOOwQ5krz2/nsNU1x1bzhYKhwR+OGSZ6ZIuTX6/ RAUh+hJavpiHEFpU8V6+SKIglohZe7SyKZEv2tWX5CrnO5xAiGMgDftCu6TcrPir8OmGVM xLOjks9I7OMYYV2IrVP1IsoRxIeDtZfWux6TrjATH5G4mMnwbti962nltWTKN7aro2i62y JvxzTbtXuBSuELNupN8F/rwXHpeTaHAXUUGpOFeOlZcKzbisa1qTmgCvzwFi7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyfX4zW7zXYn; Mon, 7 Aug 2023 01:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37710K23087050; Mon, 7 Aug 2023 01:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37710K1C087049; Mon, 7 Aug 2023 01:00:20 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:00:20 GMT Message-Id: <202308070100.37710K1C087049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 9e9c682ff3a1 - main - LinuxKPI: reduce usage of struct vm_page and vm_page_t List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e9c682ff3a1aec20a7e5f5b1dd88ceaec7c3950 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=9e9c682ff3a1aec20a7e5f5b1dd88ceaec7c3950 commit 9e9c682ff3a1aec20a7e5f5b1dd88ceaec7c3950 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 02:03:39 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 00:55:30 +0000 LinuxKPI: reduce usage of struct vm_page and vm_page_t We currently define (Linux) page to (FreeBSD) vm_page. Cleanup some of the direct struct vm_page and vm_page_t declarations and usages in the Linux KPI and make them 'struct page' or 'struct page *' to prepare for more upcoming work. This should be a NOP. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41255 --- sys/compat/linuxkpi/common/include/asm/set_memory.h | 12 ++++++------ sys/compat/linuxkpi/common/include/linux/gfp.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/highmem.h | 12 ++++++------ sys/compat/linuxkpi/common/include/linux/mm.h | 10 +++++----- sys/compat/linuxkpi/common/include/linux/pagevec.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_page.c | 6 +++--- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/set_memory.h b/sys/compat/linuxkpi/common/include/asm/set_memory.h index cdb7ad912acc..ae50148f0314 100644 --- a/sys/compat/linuxkpi/common/include/asm/set_memory.h +++ b/sys/compat/linuxkpi/common/include/asm/set_memory.h @@ -54,7 +54,7 @@ set_memory_wb(unsigned long addr, int numpages) } static inline int -set_pages_uc(vm_page_t page, int numpages) +set_pages_uc(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -63,7 +63,7 @@ set_pages_uc(vm_page_t page, int numpages) } static inline int -set_pages_wc(vm_page_t page, int numpages) +set_pages_wc(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -76,7 +76,7 @@ set_pages_wc(vm_page_t page, int numpages) } static inline int -set_pages_wb(vm_page_t page, int numpages) +set_pages_wb(struct page *page, int numpages) { KASSERT(numpages == 1, ("%s: numpages %d", __func__, numpages)); @@ -85,7 +85,7 @@ set_pages_wb(vm_page_t page, int numpages) } static inline int -set_pages_array_wb(vm_page_t *pages, int addrinarray) +set_pages_array_wb(struct page **pages, int addrinarray) { int i; @@ -95,7 +95,7 @@ set_pages_array_wb(vm_page_t *pages, int addrinarray) } static inline int -set_pages_array_wc(vm_page_t *pages, int addrinarray) +set_pages_array_wc(struct page **pages, int addrinarray) { int i; @@ -105,7 +105,7 @@ set_pages_array_wc(vm_page_t *pages, int addrinarray) } static inline int -set_pages_array_uc(vm_page_t *pages, int addrinarray) +set_pages_array_uc(struct page **pages, int addrinarray) { int i; diff --git a/sys/compat/linuxkpi/common/include/linux/gfp.h b/sys/compat/linuxkpi/common/include/linux/gfp.h index 55558500dd30..9e6d3a665869 100644 --- a/sys/compat/linuxkpi/common/include/linux/gfp.h +++ b/sys/compat/linuxkpi/common/include/linux/gfp.h @@ -99,8 +99,8 @@ extern void *linux_page_address(struct page *); /* * Page management for unmapped pages: */ -extern vm_page_t linux_alloc_pages(gfp_t flags, unsigned int order); -extern void linux_free_pages(vm_page_t page, unsigned int order); +extern struct page *linux_alloc_pages(gfp_t flags, unsigned int order); +extern void linux_free_pages(struct page *page, unsigned int order); void *linuxkpi_page_frag_alloc(struct page_frag_cache *, size_t, gfp_t); void linuxkpi_page_frag_free(void *); void linuxkpi__page_frag_cache_drain(struct page *, size_t); diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h index 1c2c97e03578..a3f9af82400e 100644 --- a/sys/compat/linuxkpi/common/include/linux/highmem.h +++ b/sys/compat/linuxkpi/common/include/linux/highmem.h @@ -47,7 +47,7 @@ #define PageHighMem(p) (0) -static inline vm_page_t +static inline struct page * kmap_to_page(void *addr) { @@ -55,7 +55,7 @@ kmap_to_page(void *addr) } static inline void * -kmap(vm_page_t page) +kmap(struct page *page) { struct sf_buf *sf; @@ -73,7 +73,7 @@ kmap(vm_page_t page) } static inline void * -kmap_atomic_prot(vm_page_t page, pgprot_t prot) +kmap_atomic_prot(struct page *page, pgprot_t prot) { vm_memattr_t attr = pgprot2cachemode(prot); @@ -87,21 +87,21 @@ kmap_atomic_prot(vm_page_t page, pgprot_t prot) } static inline void * -kmap_atomic(vm_page_t page) +kmap_atomic(struct page *page) { return (kmap_atomic_prot(page, VM_PROT_ALL)); } static inline void * -kmap_local_page_prot(vm_page_t page, pgprot_t prot) +kmap_local_page_prot(struct page *page, pgprot_t prot) { return (kmap_atomic_prot(page, prot)); } static inline void -kunmap(vm_page_t page) +kunmap(struct page *page) { struct sf_buf *sf; diff --git a/sys/compat/linuxkpi/common/include/linux/mm.h b/sys/compat/linuxkpi/common/include/linux/mm.h index 8dab5b9daa76..00d102b6af4b 100644 --- a/sys/compat/linuxkpi/common/include/linux/mm.h +++ b/sys/compat/linuxkpi/common/include/linux/mm.h @@ -248,19 +248,19 @@ vma_pages(struct vm_area_struct *vma) #define offset_in_page(off) ((unsigned long)(off) & (PAGE_SIZE - 1)) static inline void -set_page_dirty(struct vm_page *page) +set_page_dirty(struct page *page) { vm_page_dirty(page); } static inline void -mark_page_accessed(struct vm_page *page) +mark_page_accessed(struct page *page) { vm_page_reference(page); } static inline void -get_page(struct vm_page *page) +get_page(struct page *page) { vm_page_wire(page); } @@ -307,7 +307,7 @@ pin_user_pages_remote(struct task_struct *task, struct mm_struct *mm, } static inline void -put_page(struct vm_page *page) +put_page(struct page *page) { vm_page_unwire(page, PQ_ACTIVE); } @@ -323,7 +323,7 @@ vm_get_page_prot(unsigned long vm_flags) return (vm_flags & VM_PROT_ALL); } -static inline vm_page_t +static inline struct page * vmalloc_to_page(const void *addr) { vm_paddr_t paddr; diff --git a/sys/compat/linuxkpi/common/include/linux/pagevec.h b/sys/compat/linuxkpi/common/include/linux/pagevec.h index 4224124c4fe4..9ba8ff8effa0 100644 --- a/sys/compat/linuxkpi/common/include/linux/pagevec.h +++ b/sys/compat/linuxkpi/common/include/linux/pagevec.h @@ -13,7 +13,7 @@ struct pagevec { uint8_t nr; - struct vm_page *pages[PAGEVEC_SIZE]; + struct page *pages[PAGEVEC_SIZE]; }; static inline unsigned int @@ -41,7 +41,7 @@ pagevec_count(struct pagevec *pvec) } static inline unsigned int -pagevec_add(struct pagevec *pvec, struct vm_page *page) +pagevec_add(struct pagevec *pvec, struct page *page) { pvec->pages[pvec->nr++] = page; return PAGEVEC_SIZE - pvec->nr; diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 6fcf9373a2f5..0cb724ebf6c4 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -98,10 +98,10 @@ linux_page_address(struct page *page) IDX_TO_OFF(page->pindex))); } -vm_page_t +struct page * linux_alloc_pages(gfp_t flags, unsigned int order) { - vm_page_t page; + struct page *page; if (PMAP_HAS_DMAP) { unsigned long npages = 1UL << order; @@ -148,7 +148,7 @@ linux_alloc_pages(gfp_t flags, unsigned int order) } void -linux_free_pages(vm_page_t page, unsigned int order) +linux_free_pages(struct page *page, unsigned int order) { if (PMAP_HAS_DMAP) { unsigned long npages = 1UL << order; diff --git a/sys/compat/linuxkpi/common/src/linux_shmemfs.c b/sys/compat/linuxkpi/common/src/linux_shmemfs.c index 741bb20c1aab..6ae11e8ef57e 100644 --- a/sys/compat/linuxkpi/common/src/linux_shmemfs.c +++ b/sys/compat/linuxkpi/common/src/linux_shmemfs.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); struct page * linux_shmem_read_mapping_page_gfp(vm_object_t obj, int pindex, gfp_t gfp) { - vm_page_t page; + struct page *page; int rv; if ((gfp & GFP_NOWAIT) != 0) From nobody Mon Aug 7 01:00:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyfb5GVqz4pk8b; Mon, 7 Aug 2023 01:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJyfZ496sz3Y1M; Mon, 7 Aug 2023 01:00:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KS/FvjNwiomed9woklZ+yjyDHxuP4pf8uuycw6pQfrk=; b=UOnNSLPV6Sd3eOlsqbWTysxO4Qn6s0pl0XHiMUhTosWU96Dtn6ydMFd2PjjLdvfDhQ8mUa Co1EgKh4myGuR9EeCGOQivKqOAJX8Ckd7IqrCaOCrU5ox+ctYzc1fjruKi3JqfBojebz7l pfrwohJjimbA/Hiyg+gNvFFX0WLbfrUduh6cb+j2MgPYCX6cHqBWoR/J+ffmgdSFg5WNTT I3/dnhZF7hU0kjiyvfOBOuN75PWexZc9Ksma5SUsdd4HZ+OW+Def3w+lUWpvum6v2A1IvB 3498HkbaedKkg8ow9jBGG+NA9ZunXdGsnusRzSfhVKdcGrelOTuxjD9CynJlJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KS/FvjNwiomed9woklZ+yjyDHxuP4pf8uuycw6pQfrk=; b=nB+ECl7OFF5OphR6v9OeGQOgSwntvf7UULHETSyt/ALqodosyuYzem6w8QSO51BZOsWjRf U3UHWp+ZpaDMK6n+77RZve37bIPZ74PDdjd4UbcQkhSEm9GNky3uvghu9o9rUg5OUUAcIz LsYyp2JlEIUaa9CvyoN9ZLAT0br7DRCp2UUOq9gnhOYej/7tpE8woiphb15l1H4ifx6rsG JgDZN/EL5TDo7RuA/BtGtcHBYIQpgQIJyXNh+myobPxyJWFGQwb6BzNHE60sUCwtctI6r7 dbEResC0HrW00mu4jmZ+fAImjM4tPBCUs4No8X6ZiTCRg8sbKhxy0Vn/O4yZ8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691370022; a=rsa-sha256; cv=none; b=Xmo+TdfQy6ILln+TzSBHSI+qZjK2HlAgdMRgzjRkZvhoKNQ9hX0BjLi3W3auZSw+epVWjf 7YZPvDsZXdAaq4X0Juz9895YEBSV+GF3Gi7EiwLq9nwUocSFHcP213dk671/iGEe1wjRqS 0uoW6m5PUf37inirIBP0QhPdb7fH7OqLOuqagpugrqXTHwDCvPQ3MmOkbMW8FA3p1JtPrs LH3Cb4Fd2gEBK9ZJ7zzrhleR6jQFTjASO31d+Wspz/Jl1K+PWBavek12tUx3RuXdLTOUm6 5Q8gVBz/sjiQt2y3eg2aJtTOzMRRcLi2dvc42/RXNKg4xc9iX0Ou7TbmiEE2/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyfY5wdKzXMX; Mon, 7 Aug 2023 01:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37710LoL087069; Mon, 7 Aug 2023 01:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37710LLk087068; Mon, 7 Aug 2023 01:00:21 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:00:21 GMT Message-Id: <202308070100.37710LLk087068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d1ea07642c47 - main - LinuxKPI: cleanup internal calls to VM_PAGE_TO_PHYS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1ea07642c47e26effec58f53b7369bf5f797252 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ea07642c47e26effec58f53b7369bf5f797252 commit d1ea07642c47e26effec58f53b7369bf5f797252 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 03:15:29 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 00:57:42 +0000 LinuxKPI: cleanup internal calls to VM_PAGE_TO_PHYS Replace FreeBSD native VM_PAGE_TO_PHYS() calls with page_to_phys() allowing us to work on a struct page in the future using the one single public Linux KPI interface to map to a native FreeBSD vm_page. This should be a NOP. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41256 --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 4 ++-- sys/compat/linuxkpi/common/include/linux/highmem.h | 2 +- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 4 ++-- sys/compat/linuxkpi/common/src/linux_page.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 01395cc7a0d5..e910545e04fc 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -183,7 +183,7 @@ dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, size_t size, enum dma_data_direction dir, unsigned long attrs) { - return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size)); + return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); } /* linux_dma_(un)map_sg_attrs does not support attrs yet */ @@ -198,7 +198,7 @@ dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction) { - return (linux_dma_map_phys(dev, VM_PAGE_TO_PHYS(page) + offset, size)); + return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); } static inline void diff --git a/sys/compat/linuxkpi/common/include/linux/highmem.h b/sys/compat/linuxkpi/common/include/linux/highmem.h index a3f9af82400e..f770bef6b3b7 100644 --- a/sys/compat/linuxkpi/common/include/linux/highmem.h +++ b/sys/compat/linuxkpi/common/include/linux/highmem.h @@ -60,7 +60,7 @@ kmap(struct page *page) struct sf_buf *sf; if (PMAP_HAS_DMAP) { - return ((void *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))); + return ((void *)PHYS_TO_DMAP(page_to_phys(page))); } else { sched_pin(); sf = sf_buf_alloc(page, SFB_NOWAIT | SFB_CPUPRIVATE); diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index b448262f3497..703e0a59e03c 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -158,7 +158,7 @@ sg_next(struct scatterlist *sg) static inline vm_paddr_t sg_phys(struct scatterlist *sg) { - return (VM_PAGE_TO_PHYS(sg_page(sg)) + sg->offset); + return (page_to_phys(sg_page(sg)) + sg->offset); } static inline void * @@ -649,7 +649,7 @@ sg_pcopy_to_buffer(struct scatterlist *sgl, unsigned int nents, break; vaddr = (char *)sf_buf_kva(sf); } else - vaddr = (char *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page)); + vaddr = (char *)PHYS_TO_DMAP(page_to_phys(page)); memcpy(buf, vaddr + sg->offset + offset, len); if (!PMAP_HAS_DMAP) sf_buf_free(sf); diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 0cb724ebf6c4..cc45a77eadbe 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -91,7 +91,7 @@ linux_page_address(struct page *page) if (page->object != kernel_object) { return (PMAP_HAS_DMAP ? - ((void *)(uintptr_t)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(page))) : + ((void *)(uintptr_t)PHYS_TO_DMAP(page_to_phys(page))) : NULL); } return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS + From nobody Mon Aug 7 01:00:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJyfc0mtwz4pk2Z; Mon, 7 Aug 2023 01:00: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 4RJyfb39Z0z3XvS; Mon, 7 Aug 2023 01:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gE1F+3Fu6HSYjKtR9xeMNqURPg/l0biUMc2xV+de1Q=; b=xz4tPjXc2Mz8+v7sXGQnHH6XUV1QSrJvzjiHEWNcSopiAovPGVty+IFgC8wWHfmLIN89u3 lVBkD8YeKjqlP2lMNes0W8QT0+WeuoT38bkh1F+m9m2nFTIODRyi4eSUjaUWqtpauWRl3c YiN1qJd+6e1iYFBnbGcqPf562tFMOOX7LeLZK5LzOV1DV74YrbtgBG1Q7uAcUxPMwvlPSa tEgAAcDVlIT5o95kz5Qah7rt5ixXlF7V0D0pTEwqPvbionRKeYk1z70O0t6xn6gKCBT9vn 2kgDTY3PS2eNv5ws0nbK8qwtOXj1OEwFqV1PDEPGFAwv9rPq0jODlgjhf/zWDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691370023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8gE1F+3Fu6HSYjKtR9xeMNqURPg/l0biUMc2xV+de1Q=; b=wpCiCeHVxyqFi1ttGWEmzrg7gEmRpGWFuDHmz0+zCCdWUkPJyJt0O1y5h1buWtFoustWZc VEOhWSJmt09m0kcqIk8AC46ad+l4/oNsUXAHdclBAh2Dc2WtgyBIiQtUq+RMUn39QPZ5wa cI4bSc79fyAfe7+UjTIvWnEagatAqVWZvz9djOmcs9tm0sCtAz/7eL4ZYzMpY4ZtB9i84p N2EpY1Vi1LCxBX0cu+Nvn+O+F7j9tFIYc3A6isIGWvsZLUCFNzUPeSCX5VM3l3ofLxwlHj m5cMNz+/s3hMPgu3viwyMq6hlc6IBaPOAHcXPUUcnXRxFwPU2+OorziarkIHgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691370023; a=rsa-sha256; cv=none; b=V+6wG2RHRG4swfklTNgYB2fL5agOmX8AwLMBFsRDP/8XXcFsKZLN7SHgsc4vc2HZLuTmSE jBzVwL1L/zM7SDm3REZleEPGeebg4u1evf/kwZjKrwnopVsWWmsjfthIqq90LTBu8ELJ4z 0Lasyyl+fFdi+vYoSlvOJRfEK7U3PCLJEPG3qpc01L3OJEcLOMi0CUA/EyZvOJoLBuwnZ6 0L0vXHzLpTLNIoyoTl4W0ktm4SClxLqcgsJSF1J3dh6s7P3OAt0SEiBZEAGypORCRHV2Kc 1fmjMLTlCLhhMXTfe5JIy8+XFOoLf5HDN/vGy1AOuQMh3l9jw+cd10pP/WhrUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJyfb0QBHzY0y; Mon, 7 Aug 2023 01:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37710MWa087089; Mon, 7 Aug 2023 01:00:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37710M2f087088; Mon, 7 Aug 2023 01:00:22 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:00:22 GMT Message-Id: <202308070100.37710M2f087088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: dcb0c54968db - main - LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcb0c54968db10d3c7619f16c4bcfa9284d50ea2 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb0c54968db10d3c7619f16c4bcfa9284d50ea2 commit dcb0c54968db10d3c7619f16c4bcfa9284d50ea2 Author: Bjoern A. Zeeb AuthorDate: 2023-07-31 05:28:42 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 00:58:21 +0000 LinuxKPI: replace vtophys+PHYS_TO_VM_PAGE with virt_to_page Rather than using the FreeBSD internal calls vtophys() and PHYS_TO_VM_PAGE() use the already existing LinuxKPI abstraction for this called virt_to_page(). This reduces the amount of compat code to maintain and will allow further work on struct [vm_]page. This should be a NOP. Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41257 --- sys/compat/linuxkpi/common/src/linux_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index cc45a77eadbe..e6c44e0368fc 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -138,7 +138,7 @@ linux_alloc_pages(gfp_t flags, unsigned int order) if (vaddr == 0) return (NULL); - page = PHYS_TO_VM_PAGE(vtophys((void *)vaddr)); + page = virt_to_page((void *)vaddr); KASSERT(vaddr == (vm_offset_t)page_address(page), ("Page address mismatch")); @@ -526,7 +526,7 @@ linuxkpi_page_frag_free(void *addr) { vm_page_t page; - page = PHYS_TO_VM_PAGE(vtophys(addr)); + page = virt_to_page(addr); linux_free_pages(page, 0); } From nobody Mon Aug 7 01:24:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJz9s6CYrz4pm7L; Mon, 7 Aug 2023 01:24: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 4RJz9s5fSzz3cB9; Mon, 7 Aug 2023 01:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691371441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JBuVJMWcYTt/0Oi7BtA0DI/5KGG9YtkiBIo9K0rt/cM=; b=Bt2zKlOV0ZsEY/8kNn8Zn7ZHXPKRVThq2S0TlqRqih1k9Hy54xsTxYBqCqN47cQQMNDZcq 4odJm6H8lXaZvc50r1+g9wi/g0T3Lzth/bbZwwlhF17XgkCheJZNjBcdxVBO42GEe6oUDu vQOxtXsHzuHQcMJmoKbVCA21YnLGBY+PxfN7zJ505HiaHv0sNn30iN28/DKH/JnjwMyAfs a0emxGTqhDxQYboQ1KsHB0+Ji0cqYidKlmY+bEsOhlApkwATQLA2frocQrO+93WkNaSuw3 rCMUVtK55jFZvKB9U9psqAcJXkugdpn3dhPsr3eaQoOXXb/ZpT5bplTXiol3Qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691371441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JBuVJMWcYTt/0Oi7BtA0DI/5KGG9YtkiBIo9K0rt/cM=; b=G/jo2DQ3dGznr1mdV5pQCXIGXqjezWvEVx5irgDw753zGQH26zKbBjLqTbzD0/JO2o7CeT 62W60f1F/biZW+Q1KQrUHCre9NfB3xQwQWgRdv/R5kdRFPZS2kN5Ij1cyifWql9p+YeUYD 5e9/XTuORvyEHJ7lcjQyyFQnc9LlbMFrKb1xYiGI6iREaRMfUa/3nImBq3iIa3CDSOnsq1 RHBQpnVCfOQTdkfcjhCkpnKYWbkB2Hos7Xuap0rmgweU/PZLVGIbtPfiP/HxLLrKKMCnrh hSdSWvdRQ+GM1DxTRe13RlKbLjMwdHwl93k4hHNSj8jCSD44JBqksdsKfXMumQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691371441; a=rsa-sha256; cv=none; b=vdn1183Rv8e61RHiz4Mh+VZRl/lgWnpR5qC0+9wIer2lMb+oMh2qDtKqaE34CnOJ2mlwMB L28Gae5/vUgxeJpK2V1Nj2ulgmW9lX+uRzRfxiiDQHqrGx1fr5tkGrGQ04Q+7NiSu2hPHa 5DXXBjiGtaCelxNxrpGH/drSpLbbCIMweKSD2Qf3HoDxXKS6QXVlu/EPkto/hwNCzjWI16 Q4Hh/Z7BpXjU1j0+H1mS3fqUg6gpXxVgK7D8lU2qnK50ISNfyH0rjxfV1V2d+Zk7F5hx3u fxM/4pJ0Xjsd0xzfI13MBA50/GzMnzcclB8vATMYtBhVa6njK8x6lD4Bu24/kA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJz9s4j38zYbW; Mon, 7 Aug 2023 01:24:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3771O1Va026748; Mon, 7 Aug 2023 01:24:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3771O1eH026747; Mon, 7 Aug 2023 01:24:01 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:24:01 GMT Message-Id: <202308070124.3771O1eH026747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d73de4574319 - main - net80211: Radiotap: add two more EHT defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d73de457431943526cad7bd74e60f6264032d3c0 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d73de457431943526cad7bd74e60f6264032d3c0 commit d73de457431943526cad7bd74e60f6264032d3c0 Author: Bjoern A. Zeeb AuthorDate: 2023-07-26 02:57:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-07 01:22:53 +0000 net80211: Radiotap: add two more EHT defines An updated iwlwifi needs further radiotap updates for EHT. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/net80211/ieee80211_radiotap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net80211/ieee80211_radiotap.h b/sys/net80211/ieee80211_radiotap.h index 1515ce7afd34..4b05a8a2854b 100644 --- a/sys/net80211/ieee80211_radiotap.h +++ b/sys/net80211/ieee80211_radiotap.h @@ -537,6 +537,8 @@ struct ieee80211_radiotap_eht_usig { #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN 0x00000008 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN 0x00000010 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC 0x00000020 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_CHECKED 0x00000040 +#define IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK 0x00000080 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER 0x00007000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW 0x00038000 #define IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL 0x00040000 From nobody Mon Aug 7 01:52:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RJzpN4pTCz4pp3R; Mon, 7 Aug 2023 01:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RJzpN47bnz3gHq; Mon, 7 Aug 2023 01:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691373132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbRlDC8RLb+HYi5uK19sBSZgPePLC7vBcxl4ntOM4Ms=; b=n51Ibum+3+8QtfQeIkRmR9Fby7Ngwyi2JohNoDCCYMHFzEggpnkjeC3syHEfA9ij3N+MXf 0EIUuk8VexdasUM88celPONsIoT95O6dnYp7ZF0DkbI8dgRDtpYAuf8S5eHXvG+HXwSh77 hbaVlCymWd2smJQ4p4ICehbSZUfaIY8NjtcWPxwZMZuLlA4pFxe63cGC3P2nwRpSR8WE7q KygLziupkJG171KB0xd7PlD2DwECDwZnnZ1ALU3EB1bLv3nJIPWFbr4yms8fLAL+U7/Rri TiuJyDisNaaCp+1t6e8yBuHqbVc6g5Xf4PXqEbmf5jKsLKNLVxqpYtkxEuJZ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691373132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbRlDC8RLb+HYi5uK19sBSZgPePLC7vBcxl4ntOM4Ms=; b=a60u6mhyYVOLoZqRlATBU9hQZ3bY2i9IBSpho1BK57FpCcSt8HXSZsXCBASl/CO6aRJqdU hFcwN8MvYY646UFWejr1K0pNjOls55DNkjh1faQ7wlYQMlTbj8Ld3XoDUm9a/mWQEVGz0T Gy2sDj7fUDyKdLJ0L/Sm/Lv6y3RMB1cx2IhszRpLbI4xPlKHiSuDGlqlDOvx9vsOZAJ2cS W+pf1GmxCd/vXW7VT+D14D7x18Vu0xZCxR6BCWDDlp8lLWxw4clDLrk0Ii9fyWMxPJLhZT EiBCND+A++XSiEioEotvYfgdhLuaKxDHa2Vi7vc0c6bftPGu1StS2C/5f3icTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691373132; a=rsa-sha256; cv=none; b=xzHzOrikgWXqjL+SkxJ+bhXCdovEQDwpDgVyC4T0lBfwYFs7kfJKqOgGSjkYSMMAJd8Bo3 1Qw9J6HGvK/Cg6l1kRkXG8vFd2UspnPIYEyxl6KhLUXScFnYFdqLvOR4dOX9BlVPDy9AXI TTEbDaQkhTJtJsEhTERGXEchF77nrunADGVQ9pIvp8gtR0tZd45OulbN8MgAslyVLOR9TK 0fW8Mr8vHYjuhiu/1pjz/FnYsf0F0fTsy7WRyvG0YIu7Lw9ziyZt4h8EY/7bXbNH9gr96X 5UdHU03qUQTQdakgduqkPqUDt6KWs2Fc1wm5fhjXAkUmuGNnDE2jJ+nNucwSRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RJzpN3BfkzZJN; Mon, 7 Aug 2023 01:52:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3771qC4b074611; Mon, 7 Aug 2023 01:52:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3771qCjJ074610; Mon, 7 Aug 2023 01:52:12 GMT (envelope-from git) Date: Mon, 7 Aug 2023 01:52:12 GMT Message-Id: <202308070152.3771qCjJ074610@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 395b9c9977c5 - main - OCI: Bump image size to 6 GB List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 395b9c9977c521a4565e9898299a6abfbf54127c Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=395b9c9977c521a4565e9898299a6abfbf54127c commit 395b9c9977c521a4565e9898299a6abfbf54127c Author: Colin Percival AuthorDate: 2023-08-07 01:51:35 +0000 Commit: Colin Percival CommitDate: 2023-08-07 01:51:35 +0000 OCI: Bump image size to 6 GB 5 GB is no longer enough. Sponsored by: https://www.patreon.com/cperciva --- release/tools/oci.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/tools/oci.conf b/release/tools/oci.conf index 47231d65d79b..c57a7683a500 100644 --- a/release/tools/oci.conf +++ b/release/tools/oci.conf @@ -27,7 +27,7 @@ export VM_EXTRA_PACKAGES=" " # Should be enough for base image, image can be resized in needed -export VMSIZE=5g +export VMSIZE=6g # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST=" From nobody Mon Aug 7 03:49:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RK2Q819zHz4pyqd; Mon, 7 Aug 2023 03:49: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 4RK2Q80kL6z4Lcx; Mon, 7 Aug 2023 03:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691380192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrLpLQXGKwzb7yTXkeXrL+fqpU7TCpul0LiORiAC1yM=; b=a4U1tS/I5XhrVQ2HQ/cvZNrNJX94J0iOKGp6zD3qpNI41poVns0zk6PhekVPjoFL8eG2bk F8CUwg4puLD5htC9Om0ePX+rEzYlMHE3DaD6+jLKA8F5f+fqsS4SH7TPSTOFAiAoGY2FhL IQ1bfxUvFvg+IVlzmsS4qzkcBFR89porzMWfNDKqHx+cKGW5koAnFVKOhYDsT5yJAbJkkd 6Af8jdV7bvkCsSp+fFoS9UTf+t1siFJq7CPfLigHWTDorZAXL+5Smkwz/6LWqiuaM9nbSt 1uN5Umdg5Ri7y5DwVfyqOO988arQs4VfYDTFdaQUBLcQQCOFlYw2N7IpFPBVlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691380192; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrLpLQXGKwzb7yTXkeXrL+fqpU7TCpul0LiORiAC1yM=; b=pN6KP16IOs+U5k0DIYhfvcN5enmBEz339ng8NT7arrJFhyxSJEI0yKDd06E7JphZHLDlxH z2K1U1rGLeJti342AcvZnZm/elEGN3ZQ2uD4IhDTxj96lrWf50ZLKTd/hD5pQeVVTWKrVr f6KdcQHdhipnXAVXuZXM/mUoIc1MFLjFMzYh9LDxtnMNlt0wj7bPVB7HzDSMP3Vq0WDnLB 7aD6FooJb03ddfRPQiFcGzzZ+G59Il/Uqy+CU+wmDXTVNB0TXTIKvq8jRvglFhiP+GJQlh mP71UwzqFS4AbAqwEdzQwqggWt77KwMW4D89ocjRh9VyQMryjEKJgCv6KDe0gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691380192; a=rsa-sha256; cv=none; b=gnblVZfZJn+X1LlM1LGSPE6bhlszvSUS7+UHdnrFdHwb9GGiJVO+5fyun2QPiVoJcqAATX +72p0VtNKavOIA5IXx04fwbgso2IgPsUp517uzQvOiSa1cxzuAna6z6eSTDG73b1OI9JpZ YmVV2MT2X/VFZHujNBysDzItYyOERDtjLfMYUJRq91QC4Eszljr7gC4yyCJH6eopfnk/Y3 6AGuPkz1TaOX/pU8fPcZFqYGsqUgBBQUSNqyzdvFkcrqhdwCnkXM1nI5/QK+BSVEdYfm3S xOQ2zMgT5cEKpbG34+jbmO0KsQvvnS43rdnzSz6Ijx5ZBYk5qjUoW5BRyFLLmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RK2Q76wZQzdCB; Mon, 7 Aug 2023 03:49: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 3773npuq062058; Mon, 7 Aug 2023 03:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3773nppG062057; Mon, 7 Aug 2023 03:49:51 GMT (envelope-from git) Date: Mon, 7 Aug 2023 03:49:51 GMT Message-Id: <202308070349.3773nppG062057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 9610cbc09e72 - main - patch: don't run off the end of path if it ends in '/'. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9610cbc09e72c370369b5cc0e165542a2c5fdca7 Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=9610cbc09e72c370369b5cc0e165542a2c5fdca7 commit 9610cbc09e72c370369b5cc0e165542a2c5fdca7 Author: Pedro F. Giffuni AuthorDate: 2023-08-07 03:27:27 +0000 Commit: Pedro F. Giffuni CommitDate: 2023-08-07 03:27:27 +0000 patch: don't run off the end of path if it ends in '/'. Found by fuzzing (afl) in OpenBSD. Obtained from: OpenBSD (CVS 1.65) --- usr.bin/patch/pch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/patch/pch.c b/usr.bin/patch/pch.c index d1d71f95644c..e180c7075712 100644 --- a/usr.bin/patch/pch.c +++ b/usr.bin/patch/pch.c @@ -1618,7 +1618,8 @@ num_components(const char *path) size_t n; const char *cp; - for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++, cp++) { + for (n = 0, cp = path; (cp = strchr(cp, '/')) != NULL; n++) { + cp++; while (*cp == '/') cp++; /* skip consecutive slashes */ } From nobody Mon Aug 7 12:05:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKFPc1vZ4z4mTrL; Mon, 7 Aug 2023 12:05: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 4RKFPc0jXyz3WvT; Mon, 7 Aug 2023 12:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691409908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDm8WahW3ZlBhouV4rFRadLnV+VHTj5Tranud4wGKPI=; b=qfaLgkX1JdmsNcysHazeV6LDEMbiEuVksrgv1xmWwSSmVq/QqwfH5QJ2kPnoxZn4s9QYuX qSGkaknWVLVclEE0FmcJicGI5D0PNBY32pwK2wamtLcFVP8pEzADzfltWN1k9O/QrrLpRK UKzE2/qNNxYsTec7wIR294lTX7TFcG6APXdA8yv2e96bpNbceYwl5P/hU44BzjFW+ljbS6 VbtbjzrbXKsPIsA4+ou8VR60J1FfHj/EzeqDC/vKTBPjdCVmki38TxEACedTxD39M7pQjS F6BlNhAYLjCza5VSRIBFftZH76eaIArsMBeb+9/Jmm0/JRUKX2uk0HKwzohCYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691409908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VDm8WahW3ZlBhouV4rFRadLnV+VHTj5Tranud4wGKPI=; b=dxdTCyEjnS78MMpMLxztEeWwGW3+KS3TZj30YnaT2W2VE0WuXBPe14gTbuGvzac0NQzOf7 QKH3nt8DdD/uPZgYUEfusN7hvsL5Ij+VIbTGs7E8Kkq/y/ntFhgrgZjR/P+kUfHqEeuZ9m C/BYDYbTEG3jwGImAxIkW+cX+AebAHVtfo4Din4j4uRYgmzZmfvHnNxPdlrCR6oVwDIYSU tadIqDATouhLLay0/WUswVJ9nCUa5Gy0J1zXKWOkTDb5gKglbweBBaAagSZFYtTMUZtXgm t0/lo1vXUVv+LtZQmZNH3oWL84NDiHfE9lHTju6cnS57vU4Bfb3Lkrdp1LzKmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691409908; a=rsa-sha256; cv=none; b=ZNsogxzu2tDcgsvvobNFvH0ZCRd7t9MPsUxpArYLDWrc+fjR8fS7ImAt7u1JaC3cehD5yW l+eWzj2On9UoCNkxIH+Co7OgN7vxFnxHwQZnr4kvtRttxXQ1SBlJfUrQvnn4wHrqzP2laX J88RoXtOhiqVNM+hGG1DgR3kVmXTT4B5uP1tzXZVavp2r5YbeVozQUoU/oB0xrE5J1BS5W VoPGYCQx8r8QhieQGq/6eisrZ7YFcaxyEpCQYc2yHWegEuG/V7sZScFX20P1aPEZroCojZ AMi59BStEDmRBMJqDnfhspZufTfBqiihoJPHpQ8FnWFKXieaByE6FeR7qdkmJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKFPb6mySzrVF; Mon, 7 Aug 2023 12:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377C57CZ093717; Mon, 7 Aug 2023 12:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377C578e093716; Mon, 7 Aug 2023 12:05:07 GMT (envelope-from git) Date: Mon, 7 Aug 2023 12:05:07 GMT Message-Id: <202308071205.377C578e093716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d7302cabc0b9 - main - lib/libc/amd64/string/strchrnul.S: fix wrong indentation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7302cabc0b9de44e2c7a65003b0c6b60c3e09e0 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d7302cabc0b9de44e2c7a65003b0c6b60c3e09e0 commit d7302cabc0b9de44e2c7a65003b0c6b60c3e09e0 Author: Robert Clausecker AuthorDate: 2023-08-07 12:03:28 +0000 Commit: Robert Clausecker CommitDate: 2023-08-07 12:03:28 +0000 lib/libc/amd64/string/strchrnul.S: fix wrong indentation Uses spaces instead of tabs for this line by accident. Reported by: jrtc27, kib Approved by: kib --- lib/libc/amd64/string/strchrnul.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/strchrnul.S b/lib/libc/amd64/string/strchrnul.S index 6d22f31850f8..9aa9591b07ca 100644 --- a/lib/libc/amd64/string/strchrnul.S +++ b/lib/libc/amd64/string/strchrnul.S @@ -36,7 +36,7 @@ .set strchrnul, __strchrnul ARCHFUNCS(__strchrnul) - ARCHFUNC(__strchrnul, scalar) + ARCHFUNC(__strchrnul, scalar) ARCHFUNC(__strchrnul, baseline) ENDARCHFUNCS(__strchrnul) From nobody Mon Aug 7 12:19:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKFjs5mtWz4mW3r; Mon, 7 Aug 2023 12:19: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 4RKFjs5HB5z3Y6r; Mon, 7 Aug 2023 12:19:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691410753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLsxvwzxq2Lmub+/jyMdLQx7QEllZKMOXxkhVn2k8Ws=; b=TT7DZVRkhBevslDGvRQyPAFHSeiPqo31PmiRfvR+nKdRa5lF0L5D6x/i24aVtVdUOSnbsb S1n/gp8C9Tm+uQpwedrI1QEkx8eXwse7rpIY9VVOGSba+Y105+pNnesG1a05wdROxBd5i/ Pg3KZRev0wo+KWsD0p9YsW/X4U8UfLLHB0zPn7bv8CyzpWGUu6IwrtAfv6J8VV8QSndKrB x4LdE/VcMTAdpksr33jDBcnmPcKBaPMB5tL7gb5UA2ctxnw1PhBigop14m8iMCEWdOrTr3 v6vYA9HCRbYfCwQD3n0FrBdUvX6hZxLTTiHG6mtaM3VBouPLIYaT3zPnD1Ondw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691410753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sLsxvwzxq2Lmub+/jyMdLQx7QEllZKMOXxkhVn2k8Ws=; b=tjO7/1WMkK5Sc6ywANcMop4cGjQXmoY/UN8AHy7PLGu8Z2/TdR6jolSEXSGGrxCY2oZAAg WAdI0oAZE5pkKebNDv40zgnmOyC15s3+1l+MqvYAZh6ddeB90I9H+g8It4C0hR/nKYa/bS kAzeEAfkmvVppvuCX3MmXyjwASk/IWFvVY2viY1BxHjGD4gSPKfc6uMJ4In2NKAD50wdqX aoM6OeTulXdiMOcRbP8GTG+5um2ymTCBqEqx1MtXQWK5uqA45+ec2hGgDNpKhj42Wnrvto xOGjzCwiy6UK8I25fkBx2NUYpr6GB3xt1MagiN+YV74sN9iK/i98As2xB+r2vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691410753; a=rsa-sha256; cv=none; b=luVKRYj24yMqO99J0LKluIarGa1+AbPBH9FAohgUpXGlPeWOa/JQSIWfn7RCVM17Ko4baw nx0DgnnTOTAxafQWYq0TGSWj55LJXpeIwNZ4gqgrdgA6TCo8v51GvsxHs4krIQyPrt48LN /STXY9dviNSPkHfejMCMgSq/fCUp7Ny+ouoTA9zgXgilWV2wl9ibPn9K5KBLQ32M3B2ePu k4+8azOyDTfYURzVV+C//hD8c+it4U5fov/hpDZPOaXjXqHzXIJkPpc03VugAkesApcX7y YvoedBrve3jWaXci9HK0XekWb3ePqL5Ahs/DoyHHDee4ICEJBZAUolXnu8vLfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKFjs4Nknzs7D; Mon, 7 Aug 2023 12:19: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 377CJDSM010447; Mon, 7 Aug 2023 12:19:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377CJDp5010446; Mon, 7 Aug 2023 12:19:13 GMT (envelope-from git) Date: Mon, 7 Aug 2023 12:19:13 GMT Message-Id: <202308071219.377CJDp5010446@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: 2ea65afbd11d - main - md5: extend capabilites List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ea65afbd11d40df9ada460d6503cf5fc5fbbf9d Auto-Submitted: auto-generated The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=2ea65afbd11d40df9ada460d6503cf5fc5fbbf9d commit 2ea65afbd11d40df9ada460d6503cf5fc5fbbf9d Author: Mariusz Zaborski AuthorDate: 2023-08-07 12:16:03 +0000 Commit: Mariusz Zaborski CommitDate: 2023-08-07 12:19:26 +0000 md5: extend capabilites In 4849767cb16a4, we did a large refactor of the md5(1) source code. One of them is that instead of reading data using read(2) syscall, we are using binary stream input (fread(3)). fread(3) requires additional Capsicum capabilities: sha256 CAP operation requires CAP_FSTAT, descriptor holds CAP_READ sha256 RET fstat -1 errno 93 Capabilities insufficient Reviewed by: des Differential Revision: https://reviews.freebsd.org/D41348 --- sbin/md5/md5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 459d364f8ca7..abc542ced82c 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -621,7 +621,7 @@ main(int argc, char *argv[]) */ if (*(argv + 1) == NULL) { #ifdef HAVE_CAPSICUM - cap_rights_init(&rights, CAP_READ); + cap_rights_init(&rights, CAP_READ, CAP_FSTAT); if (caph_rights_limit(fileno(f), &rights) < 0 || caph_enter() < 0) err(1, "capsicum"); From nobody Mon Aug 7 14:07:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJ6X4x5cz4pgV2; Mon, 7 Aug 2023 14:07: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 4RKJ6X1r7Rz4H1f; Mon, 7 Aug 2023 14:07:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691417236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cp6opIjVn6IxNCR7bpKgAbadfsdk8fWF9Yw+yjllGBY=; b=PKv8mKen7Qy+ttwR562VyK3RNY9/P7zd+4t/X6N3XFQ3dp4v6mYPqNP8F9r/qy438pt3ZX HQmLi8aVNtAz0kBKhrgpQqojuyE4bUbfCdw8GYya5hxP4CDZHsSAzb3+KW3Y4zngTS8JdM VR2dLHgcw1ROgRrtHwa8Bh4y1B4G2YP4+VY14StyAHIiJEuoxgUvfJbIYLr3k9wMJECmPD VYj+RdOkoRTURB7GjCNeYB6f6Q54PPKvyLRa6nqoLW7s5OqRNtOFSHp3j/tuKO4xVMfZ+4 FTLm1+ftKzmqo7gSDjGTjjeAZDXGUUmckxSit275D23zMUHLKTwgrUrt8AUGQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691417236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cp6opIjVn6IxNCR7bpKgAbadfsdk8fWF9Yw+yjllGBY=; b=LVrevgAIEv2x/cg60LRtxnQ6ucLi0cnU0Zzp3lM8C1dHjfBcO4wkHqB/hbqGv4Z3Bkc7hR 1P4gy3hVs3Nt8pOmv1R0tRJrbcFBKakHUy81ALbk/GJiAVSEFn3cyCt44dQO//M246QKgm Gm5A9xXdBT8jf7/5i03+4uPgiCL+1eVO/SGaLqol1hOUeH6NDAOBtpmkYIF5IMVEzqg9bM J8+XCaCodeyI+hUPYdoc2spRPFXO1S2KLasvCeUiQ5fDX/UyiZif/G1YZo4cNwyc5bIy6d erOioMu5DSQfLEYkRhsUB4RsnZuXsshV60WQnxWGM/GfaCXa9Z/mY/ZRcLP/fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691417236; a=rsa-sha256; cv=none; b=lCs1JatHbZztOJzr/JT1dtDUvPRPWqr6v+LMNLdJ0NALM0FZHzTUFu4blSFTLMCFcJJd1r QpXrxP5L8GXMMAAyvKfad4pCDujfncCllwI1tTgBZt4B7JqLaHYS3IsAktIBgh6oMuQmwo wvh3gHenMI90+YRsXxuuTbBveLzDhoY4lVvxE/uD0E/DFL1aY/8y7GSFTPTtxi1L5nuiDP 7vR6Zz1VuFop5m3TcrE3x595wqaGB40p7Zpo0UazsYHoRPstxcqBCrAZ8KYKVaIedPzCwq 3M3fUgup/TavDsVOMbjlUVUqebztKQ/KlWuE7sUEpD7lMsYMUcRBRgSTPzi+qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJ6X0vw3zvVM; Mon, 7 Aug 2023 14:07: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 377E7GPP093557; Mon, 7 Aug 2023 14:07:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377E7Gj4093556; Mon, 7 Aug 2023 14:07:16 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:07:16 GMT Message-Id: <202308071407.377E7Gj4093556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c7508914f41c - stable/13 - pcpu: Remove unused definitions of ALT_STACK_SIZE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c7508914f41c0121c97ec058ad52c8f938471fc6 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c7508914f41c0121c97ec058ad52c8f938471fc6 commit c7508914f41c0121c97ec058ad52c8f938471fc6 Author: Mark Johnston AuthorDate: 2023-07-24 15:26:08 +0000 Commit: Mark Johnston CommitDate: 2023-08-07 14:02:18 +0000 pcpu: Remove unused definitions of ALT_STACK_SIZE This was added originally for the sparc64 port and apparently copied to other platforms. No functional change intended. MFC after: 1 week (cherry picked from commit 1083a8cd855b4ec09b62bf9c1df5b06a972a91ea) --- sys/arm/include/pcpu.h | 2 -- sys/arm64/include/pcpu.h | 2 -- sys/riscv/include/pcpu.h | 2 -- 3 files changed, 6 deletions(-) diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h index 651d9d586ef4..48fd6e325295 100644 --- a/sys/arm/include/pcpu.h +++ b/sys/arm/include/pcpu.h @@ -37,8 +37,6 @@ #include #include -#define ALT_STACK_SIZE 128 - struct vmspace; #endif /* _KERNEL */ diff --git a/sys/arm64/include/pcpu.h b/sys/arm64/include/pcpu.h index 8ec4a33b0d67..d6439b180e3c 100644 --- a/sys/arm64/include/pcpu.h +++ b/sys/arm64/include/pcpu.h @@ -33,8 +33,6 @@ #include #include -#define ALT_STACK_SIZE 128 - typedef int (*pcpu_bp_harden)(void); typedef int (*pcpu_ssbd)(int); struct debug_monitor_state; diff --git a/sys/riscv/include/pcpu.h b/sys/riscv/include/pcpu.h index bdb2a4e2c5df..7a186504a7bd 100644 --- a/sys/riscv/include/pcpu.h +++ b/sys/riscv/include/pcpu.h @@ -42,8 +42,6 @@ #include #include -#define ALT_STACK_SIZE 128 - /* Keep in sync with db_show_mdpcpu() */ #define PCPU_MD_FIELDS \ struct pmap *pc_curpmap; /* Currently active pmap */ \ From nobody Mon Aug 7 14:07:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJ6Y56jKz4pgV3; Mon, 7 Aug 2023 14:07: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 4RKJ6Y2Vx3z4HBx; Mon, 7 Aug 2023 14:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691417237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNA9emn0zPS48bKwkaERbRWtCeYJLaLd/HvezpWgAVE=; b=gN4MWNG4ESpIz60sN/F9IwHE0i6vlj6AZomVSToO9A+8s+VXhcTWyx6k4e3syMXb6FMlFD dgxPSuKei9C8w9I9/DLyTZKS5mJr0uphA7B7mbURRm2d3gWmGO7j0o01El2xFIunAhLqj5 6dHBjKk2a0ngetCbQmJLo8a3pi0q6sGZG4EVvYDhfq2Uvn4TdzbG/JzKogLFIkR6D90qDD SoVEVTsQCWufYhDiI00VeOCO5cVQ+2jild9vIJ0WbEwKVNn7F+5A8E3KeUyNrT4JuBZS0+ F83AgspKz8XPet+sPR+DymI/XZMSN6sUKIDnBBaTzU3D8/C/XMnTVquJqk4Efg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691417237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNA9emn0zPS48bKwkaERbRWtCeYJLaLd/HvezpWgAVE=; b=yjGO0NHtiu4GU1kYaTl8dIUboTcj7PUVuU2up+fxQSc39mQf1qLXiIXoZGnXOBvJ105/aV pL4LU/Flx0YEzA7tW7bdPvnBq9g7AL0UxyA0cAtzKFbGaS65aaEDEsTcHjx+4x7r9azV2U JqnlRPfUTCI+JkWbSe4VoVjSikUESCkESPj2hLRRXfCQVzZLjs1/xyLff0SyMLdlM/ZFAb z5xcls+Y0DPdBXAjJ+CCDQun/SeIQyf1GHvHbgt5n9spnoiLFx6cUbdNBkWj4s2adfpqrm WVnjf1Zy91T7dvA2fNB/bcd3swbPcofaOd6yp1LI9dTUzOK5TlYXAQtyUrCqIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691417237; a=rsa-sha256; cv=none; b=mvl4WKsbV54dTCH4433WfrE3JZqFO7sn9l5rUnwKZkOYUFXNqiQtkcEtnKMEvLK+ZF4899 ZfFfREd388uZV6PH1FVS2CJambmC80gX/LK31JXpdcEiPRJemXT8Bq5py7wDnWdZP941nI K7gIcZaPeaPq7sV2bW/6bSx1anVN7szSTbga6+jBfH+FJBYqa3sT/3wYVdhcxWnUYR2OMO uS91e+2SYcE0rEMhnH74ptQ76YspEV3zk1LcJFhSpoE4zZEheNiky3UBLZ098h5Gz3h9gr xTKMIIZz/IRvU9/y8QgWueacgACczhgftjmk49f56JXRrhm8cgcE2CsbwYYAlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJ6Y1ZcgzvMb; Mon, 7 Aug 2023 14:07: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 377E7HWi093579; Mon, 7 Aug 2023 14:07:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377E7HjQ093578; Mon, 7 Aug 2023 14:07:17 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:07:17 GMT Message-Id: <202308071407.377E7HjQ093578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d67ef8ac7de7 - stable/13 - arm64: Add constants for decoding ISS fields for WF* exceptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d67ef8ac7de7370157b1bd09843e7c5fa15ec111 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d67ef8ac7de7370157b1bd09843e7c5fa15ec111 commit d67ef8ac7de7370157b1bd09843e7c5fa15ec111 Author: Mark Johnston AuthorDate: 2023-07-28 13:32:45 +0000 Commit: Mark Johnston CommitDate: 2023-08-07 14:02:18 +0000 arm64: Add constants for decoding ISS fields for WF* exceptions WFI and WFIT trap to EL2 when executed in a vmm guest. (Currently WFE/WFET are not configured to trap.) We only handle WFI at the moment, so these constants are useful when handling the exception. Reviewed by: andrew MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D41199 (cherry picked from commit dd24d475d514bba755111c5eecfef1d362b9d68c) --- sys/arm64/include/armreg.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index b24c6ec94c65..7275725a709a 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -319,6 +319,26 @@ #define ISS_INSN_S1PTW (0x01 << 7) #define ISS_INSN_IFSC_MASK (0x1f << 0) +#define ISS_WFx_TI_SHIFT 0 +#define ISS_WFx_TI_MASK (0x03 << ISS_WFx_TI_SHIFT) +#define ISS_WFx_TI_WFI (0x00 << ISS_WFx_TI_SHIFT) +#define ISS_WFx_TI_WFE (0x01 << ISS_WFx_TI_SHIFT) +#define ISS_WFx_TI_WFIT (0x02 << ISS_WFx_TI_SHIFT) +#define ISS_WFx_TI_WFET (0x03 << ISS_WFx_TI_SHIFT) +#define ISS_WFx_RV_SHIFT 2 +#define ISS_WFx_RV_MASK (0x01 << ISS_WFx_RV_SHIFT) +#define ISS_WFx_RV_INVALID (0x00 << ISS_WFx_RV_SHIFT) +#define ISS_WFx_RV_VALID (0x01 << ISS_WFx_RV_SHIFT) +#define ISS_WFx_RN_SHIFT 5 +#define ISS_WFx_RN_MASK (0x1f << ISS_WFx_RN_SHIFT) +#define ISS_WFx_RN(x) (((x) & ISS_WFx_RN_MASK) >> ISS_WFx_RN_SHIFT) +#define ISS_WFx_COND_SHIFT 20 +#define ISS_WFx_COND_MASK (0x0f << ISS_WFx_COND_SHIFT) +#define ISS_WFx_CV_SHIFT 24 +#define ISS_WFx_CV_MASK (0x01 << ISS_WFx_CV_SHIFT) +#define ISS_WFx_CV_INVALID (0x00 << ISS_WFx_CV_SHIFT) +#define ISS_WFx_CV_VALID (0x01 << ISS_WFx_CV_SHIFT) + #define ISS_MSR_DIR_SHIFT 0 #define ISS_MSR_DIR (0x01 << ISS_MSR_DIR_SHIFT) #define ISS_MSR_Rt_SHIFT 5 From nobody Mon Aug 7 14:20:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJPs0WWPz4phGV; Mon, 7 Aug 2023 14:20: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 4RKJPr6d2qz4JKZ; Mon, 7 Aug 2023 14:20:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hzKWDk5MW5sa4fxmF08iydMc5zsCvxVIVcGDD89Xz8=; b=CkV85dSACF1lKEqRuVRSaj0n2te2Z7HM1h7fI20Sv0Q10xtyXOOnmsKMEweiBntV9EbYM8 Po1ZqHGXAKr5xrcm+1bocmwZIcC4SOOL/t/pmpHysmcARxUFHi3GCiRTO1VA3nkW/H6drb nP0VgmdCEP4rnARXhCxQdqVl+NJscQXLn6n8tMPWMgzLTZrTw4IlnEmnvi7c/XYH3elaw2 Spkrl/95WpyLn8KRtavW/wKMbqlNXaWpiwTt0IIpMGHB3PIUSETe+vo3FuRy8urZ9bbtWS BUVGOgpeGurXYH00X+1I087+sM+WsAgn5v2smRIdRJE5MJxu0WOrx9vJMl0HfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hzKWDk5MW5sa4fxmF08iydMc5zsCvxVIVcGDD89Xz8=; b=CsjQfYGOsp5sr5LGEMvbXcQyGFhGT/X42R2bX07TremeeR05ELhgfeTMkW+kDWFV29JWlD 7sd5GLqfsTRVxcBAMG5OH2TvawNpa30ZMnUU4qzViyeNqoGgh55jdSu2umXKQyeED5XFq+ RLnFKo9RsRBATToCgTLNrV9MN7DEnnzlrpqNc9hrqnMw1kaIeY1+4ZV5ru8NN+bAw+7atd U+sRQ7Nte4hBL5YTYPmTmFsOet2TPndXewzVDXkA2uiKPEXOQgSJNfgGXhMgcvCzyF1jaB rGvyapsA0Bfs7gCdTP0mOC89+krqExMXPJ3TqhcwVo9xh1zhakEX0tQ4LXnAvQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418032; a=rsa-sha256; cv=none; b=YruCoJ4JjJivgxtJW+KUBT0T+Ru1jpaKWMbJalsREXVBTYgEi9oRM7+aa3kw+dTrjdjCgc mIKOiUecBYZ83PXjAKOlRbF9Ft6KQEEH7wySdhHQaZ6PasfyvzQBhPZNE6EKaF7DFV/sRh uxsWR8CJc11xivfFYTehxB23MEXEHt+E57yT4dhxFiHPdljoZWi9PHEh9WVqusEVKWCDrV cA4qgRd4ZChe3E/MKuBQaOjMW+6Vmy6fvr2A5iqc5WzOR6GBxvMQePJ7Cpq3XhUqp65zgF p2CHR3GdMAaz8Y7jhBg5T4n8/xKgaFVLqSebiuYp5ZOmpcHC4alJvy/nCA626A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJPr5PLQzvVm; Mon, 7 Aug 2023 14:20: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 377EKWrt020154; Mon, 7 Aug 2023 14:20:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EKWEG020144; Mon, 7 Aug 2023 14:20:32 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:20:32 GMT Message-Id: <202308071420.377EKWEG020144@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: 454c425dbed1 - main - ossl: Add missing labels to bsaes-armv7.S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 454c425dbed1d341025c71a8645011a980e20ccd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=454c425dbed1d341025c71a8645011a980e20ccd commit 454c425dbed1d341025c71a8645011a980e20ccd Author: Mark Johnston AuthorDate: 2023-08-07 14:17:16 +0000 Commit: Mark Johnston CommitDate: 2023-08-07 14:17:16 +0000 ossl: Add missing labels to bsaes-armv7.S There is a bug in the OpenSSL script which generates this file; the bug is in the process of being fixed upstream. Specifically, when generating the output, bsaes-armv7.pl strips some labels that are used when the output asm is compiled with __KERNEL__ defined, resulting in a build error. As a step towards adding armv7 support to ossl(4), manually patch the generated asm. The upstream fix will be imported later. Reviewed by: andrew, jhb, emaste MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Stormshield Differential Revision: https://reviews.freebsd.org/D41303 --- sys/crypto/openssl/arm/bsaes-armv7.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/crypto/openssl/arm/bsaes-armv7.S b/sys/crypto/openssl/arm/bsaes-armv7.S index 2e452f75a643..b9ef9881e3e5 100644 --- a/sys/crypto/openssl/arm/bsaes-armv7.S +++ b/sys/crypto/openssl/arm/bsaes-armv7.S @@ -1130,7 +1130,7 @@ bsaes_cbc_encrypt: vstmia r4, {q7} .align 2 - +0: #endif vld1.8 {q15}, [r8] @ load IV @@ -1390,7 +1390,7 @@ bsaes_ctr32_encrypt_blocks: vstmia r12, {q7} @ save last round key .align 2 - add r12, r3, #248 +0: add r12, r3, #248 vld1.8 {q0}, [r8] @ load counter add r8, r6, #.LREVM0SR-.LM0 @ borrow r8 vldmia r12, {q4} @ load round0 key @@ -1625,7 +1625,7 @@ bsaes_xts_encrypt: vstmia r12, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak @@ -2111,7 +2111,7 @@ bsaes_xts_decrypt: vstmia r4, {q7} .align 2 - sub sp, #0x90 @ place for tweak[9] +0: sub sp, #0x90 @ place for tweak[9] #endif vld1.8 {q8}, [r0] @ initial tweak adr r2, .Lxts_magic From nobody Mon Aug 7 14:24:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV20P5jz4phfL; Mon, 7 Aug 2023 14:24: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 4RKJV17251z4KfS; Mon, 7 Aug 2023 14:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f9Z+126uuvlGPG4Pndenb9/v4XN9SXR0K0IcySEBqcE=; b=n/q74DhmLz+bAhh3OAuMDnP2QaQRxaW2tPtWCJix4NcTCnBwm6CqLqPTH2nIHTyGOdwuwN nZieln1b0QUcb6oRXCqIE8aB6b4d8giZet279I1Mv+Oo4+DbD6pxoLMg+iWk8CAEXE6GCq X79gb9Cd2KB1B1SFT+j5uCwOwy+aQK0ZrXO2nqmF8qHmdygF18qfLfUqdPc0oxPQtUm+0m II/5/W+3TrhLMyzYweCjU3KsXAmpVBauDaCtJgJKQEuNUMb8v1CvyYtekLHtaCd2hU4iUU SNsqpLa6JKiROtZ/BUTrwUK1W2KsHxpHQEnrA4M73trGDs9yjaD+J0swpHv1oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f9Z+126uuvlGPG4Pndenb9/v4XN9SXR0K0IcySEBqcE=; b=dyNM4ltxA/VCMagfOEsROYWK9Evc7l7dXk/G8V+3Z4/mPAxc5BIO4NPHzPT+paIwwEofV+ 9yPKsDg/MFM2TgDlyDEWIluizVKvjKiWlWYyYetaCDN8OyZTEyAKB0t8BltiKcFrgrRlxW 4W5v5nf6dqOR+ZRfQWZ2ifxKRrk8S6TTr+TFXYdX11f3CKGbzotAlbEGBRRreQHhwVwjWa GZWlYmRxhdPH6wL+QNkb60Tl2rIc5GQqZoYJYPuc7utWhpg06piB5s9MYecJ0eeyqsbKiT Cy+/ElpV1THCoAYL2AZvRTPXoXUSTimeu3p4WfoF6to/rngGh73iLzAaQx6jBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418250; a=rsa-sha256; cv=none; b=L7Q8GiSqhI/SElJZVsFujfetVwC/9EBtLZX70InvPZLUOZviEagdNVSZQzcDexliMBOSj8 mj7DEDpQYo3BZyts+aCciSa1jiGzAF5hIyco53bjWQiBBAnlMQtEcKJ8Ue1wdvh+NWxgoX 3/1z5cCQCakEzRpKSN4RuIfqKt2Oy580Nd3TQkt2p3bey3T8al9qNDmTcmf7nM1/y+PAtC VjRcobd+Pbsh1z4SjHSUCyHtCF9hx85c27JW6cNCl2bMQympr0Ird9Or6ddLv2Dc+lbBsY Sx10FPk2vqmmZe6RO03C51ecvTOfrBdmQC2czB9kDWHiacstrdUmQTIHXJl+cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV165rPzvGT; Mon, 7 Aug 2023 14:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EO9jd025718; Mon, 7 Aug 2023 14:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EO9BU025717; Mon, 7 Aug 2023 14:24:09 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:09 GMT Message-Id: <202308071424.377EO9BU025717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: fbae16ed99ad - stable/13 - man: Link _Fork(2) man page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fbae16ed99ad092e4550b678d2eaf82269bc0a11 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=fbae16ed99ad092e4550b678d2eaf82269bc0a11 commit fbae16ed99ad092e4550b678d2eaf82269bc0a11 Author: Dmitry Chagin AuthorDate: 2023-07-28 08:54:20 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:19:54 +0000 man: Link _Fork(2) man page Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41221 MFC after: 1 week (cherry picked from commit 03eab865aabab1e6737ad0fd1537f7d0a8c3ee02) --- lib/libc/sys/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 23ab196c5f46..42428d16b4a8 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -407,6 +407,7 @@ MLINKS+=ffclock.2 ffclock_getcounter.2 \ ffclock.2 ffclock_setestimate.2 MLINKS+=fhlink.2 fhlinkat.2 MLINKS+=fhopen.2 fhstat.2 fhopen.2 fhstatfs.2 +MLINKS+=fork.2 _Fork.2 MLINKS+=fsync.2 fdatasync.2 MLINKS+=getdirentries.2 getdents.2 MLINKS+=getfh.2 lgetfh.2 \ From nobody Mon Aug 7 14:24:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV30x2Yz4pj1j; Mon, 7 Aug 2023 14:24: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 4RKJV30MXwz4Kt8; Mon, 7 Aug 2023 14:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZoBhAgOwofnmVx5YQbMrv/r49F689X1U7nJzh2D50E=; b=xWyOKXq28jtTZP/XURl/xCOjOGARn5bnMMqrOpzqk6NBUJir5JJy8uE6n+LucZjBTPeVsK 9Mb3hosGowT18MnlBUMQHV/kDWtNhyOztXcSmjlD8Xwe6z3lI4K+XBRYFwMISYYmcIKaM7 77DY2eCNFrut+1Ofu0Ym8bhTci1L2PNz5E+0Oxbo+7riho2qpLaqBraBLmSoCLwEZGpL0Y iFYGVNp4VkfbIlT97gQY8aAdgzA3HmsrYfsf+fOdSENo3isg3RAQwiHT23+HoAAbtMN05u SABX/xyD1rD1WgYIEENLOn9ImSfrXR9zfH2tEBwJpmDIFVFd3+NRTJKOzgZIJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418251; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZoBhAgOwofnmVx5YQbMrv/r49F689X1U7nJzh2D50E=; b=sxCKcQx87fKGlMF7Hij9kqF47H7AI3OdLKSFX3+/J4JVbaVVstTDdgoU+bXQhQxAUy8qjY hNkBOHieRK8wKR9Wj7irENNvpTuJap/EVRSqNhgesWwyUuxNmPf2FlhpWoVZsEZ/T7LyQl ou9+R1v/zGoOK/fZtFlbZsm40KgadyEMi1hLKwvd0kJsOnJMrE/ndxPIlNP+mqvwDXcxtf rkbtAdxz4qnSuzdtQD7Lqz/Kgd3dS7LoM39jX+57J3o9r1UcOa7eDRhPol67ycvh8Kbx6f u/CVfSUaGqYC4EwtlwGCCsNesrz61ijtqMEWlo5KFC3YbUmc8c35RWEg5q2brw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418251; a=rsa-sha256; cv=none; b=kx6oOAvgZl76Y5bhxCxF2x8a0VnFxCt92GRWO5rn3rfnvp1eZBHpAK6gHLlQzxMj9saLY4 HT5IUWJRJn2wnoK7lLshFQGTxrpSgPbff3olcsYSEtPEA6NVG7nrevZf37RWp9g7O4prNc oOOztkhzihWOllx9EUoFN3UBfSttwVjnXBKrVQSSZiCpgyQpl/2/WXqT7RtqiPJhntPwcT rxMeGZmtkU5qqJZHfA+urJyIlbk4BpZT7NCCe13tTCB4ORFvVXgsP0RtKHWkvAFSYT6EPD BtrEPEJNRZuSwJtlZMd7oB6os7TfbUS72qfhsIGnPDME/pAKLpo4rCuPO2/0eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV26b77zwFc; Mon, 7 Aug 2023 14:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOAYW025744; Mon, 7 Aug 2023 14:24:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOAwD025743; Mon, 7 Aug 2023 14:24:10 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:10 GMT Message-Id: <202308071424.377EOAwD025743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 73ac090e9244 - stable/13 - signal: Get rid of gsignal() as it not used anywhere List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73ac090e924411f59e2146280fda68d0eff2862e Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=73ac090e924411f59e2146280fda68d0eff2862e commit 73ac090e924411f59e2146280fda68d0eff2862e Author: Dmitry Chagin AuthorDate: 2023-07-13 07:41:51 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:19:55 +0000 signal: Get rid of gsignal() as it not used anywhere Reviewed by: imp, kib Differential Revision: https://reviews.freebsd.org/D41007 MFC after: 1 week (cherry picked from commit 17cb2ac3dfcab3f47727c3c1725c61f6b98f690b) --- sys/kern/kern_sig.c | 19 ------------------- sys/sys/signalvar.h | 1 - 2 files changed, 20 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index e002d7d0e5fa..8cce356d3bf0 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1965,25 +1965,6 @@ kern_sigqueue(struct thread *td, pid_t pid, int signum, union sigval *value) return (error); } -/* - * Send a signal to a process group. - */ -void -gsignal(int pgid, int sig, ksiginfo_t *ksi) -{ - struct pgrp *pgrp; - - if (pgid != 0) { - sx_slock(&proctree_lock); - pgrp = pgfind(pgid); - sx_sunlock(&proctree_lock); - if (pgrp != NULL) { - pgsignal(pgrp, sig, 0, ksi); - PGRP_UNLOCK(pgrp); - } - } -} - /* * Send a signal to a process group. If checktty is 1, * limit to members which have a controlling terminal. diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h index 70f4f1bdaa50..55e38fbc0c17 100644 --- a/sys/sys/signalvar.h +++ b/sys/sys/signalvar.h @@ -383,7 +383,6 @@ sigallowstop(int prev) int cursig(struct thread *td); void execsigs(struct proc *p); -void gsignal(int pgid, int sig, ksiginfo_t *ksi); void killproc(struct proc *p, const char *why); ksiginfo_t *ksiginfo_alloc(int mwait); void ksiginfo_free(ksiginfo_t *ksi); From nobody Mon Aug 7 14:24:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV41rMbz4phbj; Mon, 7 Aug 2023 14:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKJV41926z4L2G; Mon, 7 Aug 2023 14:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t43WjRkUWVHVRt3TAfYjb48qDlPGrjDoIjwyboylLJE=; b=S0KqdWnzfOqq9w7Ow/o1Z/DrMs5RBlq7bwEuXAKniRl1f84dRBTQQnN+M3uuE+iAbHztki bHa1+VZznmZKPwL8joCy5tbh0UgxRp1qLPeCn0UMpEVeKp01UTf3MHnjS6dD/QozvVUj2u /WLAEb5f/bp+dq0+qrHjs/LPGufCD9xA6zBM4oKobAysDrvY+R+uFYP2cJsKTV3mB6UXqv 7wbXuTRfqYvj1c/TnWpGVlILkzMOdupnBWqpQwkdWynNso33F1JI02b1FEMKNCNmwrG1kv eoFdEqIONR5vAXIaLvZwEZEUaqEUNq7uDTwMbnKz2GMTu21ApJAldi0HjPqqEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t43WjRkUWVHVRt3TAfYjb48qDlPGrjDoIjwyboylLJE=; b=WOhJJRxgcuu8ZmQGNz70UbAA07MzeGuW43IWb+Mk6cKZKobluUyrTUoGQCBBEW/Kg0aroB UdULp/aD5TsyRpXVCWow5WmkGh5c2IAB3HYAinwkqFjAa1IsAz10trikPHqBzvmnEZdsBS pQRvupALA9Y5/LebyLknLub3iX8qsBAt2gv/EaKfXZgxDSBWN1sVXIB8pSCBxn8rvmzG9c tx4qTvCaDkygsRPdpH391huh6wFsl/05G0OEnYnGVDpjOZNaOIojDlNWmm9KrL88V0JzIb M1bpY8o2CMXMrSq4wrrGEEf1AD/PKt0tLJ/g/yLfLH72WpHUhLA/LqyjCz6P4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418252; a=rsa-sha256; cv=none; b=QZQaYK2mDzdM1QfAU7Sl7DPwoz1dJmj6/CSvZnM4zDK6KSgcgOfeZALIn9ic4GbFhBPfex SGJpYiZX4pHYegW21mURBAmBLgoQWdntjpo4ou4GLlsC8xKXCv3J5/7pve26X++Hs348Fa 6lwKtVWa8xUqEuNjDJNHZ3lIIKokn8PKjVIE1dR3zEaVwx9eqWJAqQpJCU1r4KQNhTrDn8 A7q+Qz4CTH6AtNjWoZ7VVDPdegsFGVv9ZPwKdTDNSTnXsEH0nh/r0fhb715slmr1Xt5f0D 6lsq/RlweFTMRhGMTjok4cr7KhoJWfLwuPfGyRAUdVGUC6dtv9nRBb4ju5mfLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV40FRQzvyv; Mon, 7 Aug 2023 14:24:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOBg1025763; Mon, 7 Aug 2023 14:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOBhZ025762; Mon, 7 Aug 2023 14:24:11 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:11 GMT Message-Id: <202308071424.377EOBhZ025762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 24d41b6c95f9 - stable/13 - signal: Remove gsignal references from manuals List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24d41b6c95f90dffe55b65875e840452c8655caf Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=24d41b6c95f90dffe55b65875e840452c8655caf commit 24d41b6c95f90dffe55b65875e840452c8655caf Author: Dmitry Chagin AuthorDate: 2023-07-13 21:15:47 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:55 +0000 signal: Remove gsignal references from manuals Reported by: Mina Galić, mhorne Reviewed by: Mina Galić, mhorne Differential Revision: https://reviews.freebsd.org/D41020 MFC after: 1 week (cherry picked from commit c3f58005d92e5ac189e7dcb2d6d868ed5a0f27fa) --- ObsoleteFiles.inc | 3 +++ share/man/man9/Makefile | 3 +-- share/man/man9/psignal.9 | 23 +---------------------- share/man/man9/signal.9 | 3 +-- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4c0fca28c4bf..aa51b59e6a54 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -62,6 +62,9 @@ OLD_FILES+=usr/share/man/man4/meteor.4.gz # 20230806: remove bt(4) man page OLD_FILES+=usr/share/man/man4/bt.4.gz +# 20230714: gsignal +OLD_FILES+=/usr/share/man/man9/gsignal.9.gz + # 20230622: new clang import which bumps version from 15.0.7 to 16.0.1 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index f9ace3802494..414a00fbf1f3 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1825,8 +1825,7 @@ MLINKS+=prng.9 prng32.9 \ prng.9 prng64_bounded.9 MLINKS+=proc_rwmem.9 proc_readmem.9 \ proc_rwmem.9 proc_writemem.9 -MLINKS+=psignal.9 gsignal.9 \ - psignal.9 pgsignal.9 \ +MLINKS+=psignal.9 pgsignal.9 \ psignal.9 tdsignal.9 MLINKS+=pwmbus.9 pwm.9 MLINKS+=random.9 arc4rand.9 \ diff --git a/share/man/man9/psignal.9 b/share/man/man9/psignal.9 index aa170322e7cf..936f47f930e7 100644 --- a/share/man/man9/psignal.9 +++ b/share/man/man9/psignal.9 @@ -28,14 +28,13 @@ .\" $NetBSD: psignal.9,v 1.1 1996/06/22 22:57:35 pk Exp $ .\" $FreeBSD$ .\" -.Dd October 8, 2011 +.Dd July 14, 2023 .Dt PSIGNAL 9 .Os .Sh NAME .Nm psignal , .Nm kern_psignal , .Nm pgsignal , -.Nm gsignal , .Nm tdsignal .Nd post signal to a thread, process, or process group .Sh SYNOPSIS @@ -46,8 +45,6 @@ .Ft void .Fn pgsignal "struct pgrp *pgrp" "int signum" "int checkctty" .Ft void -.Fn gsignal "int pgid" "int signum" -.Ft void .Fn tdsignal "struct thread *td" "int signum" .Sh DESCRIPTION These functions post a signal to a thread or one or more processes. @@ -129,24 +126,6 @@ is no action is taken. .Pp The -.Fn gsignal -function posts signal number -.Fa signum -to each member of the process group identified by the group id -.Fa pgid . -.Fn gsignal -first finds the group structure associated with -.Fa pgid , -then invokes -.Fn pgsignal -with the argument -.Fa checkctty -set to zero. -If -.Fa pgid -is zero no action is taken. -.Pp -The .Fn tdsignal function posts signal number .Fa signum diff --git a/share/man/man9/signal.9 b/share/man/man9/signal.9 index a2e54fef012d..d6906f359c18 100644 --- a/share/man/man9/signal.9 +++ b/share/man/man9/signal.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 8, 2013 +.Dd July 14, 2023 .Dt SIGNAL 9 .Os .Sh NAME @@ -430,7 +430,6 @@ function returns either a valid signal number or zero. .Fn issignal returns either a valid signal number or zero. .Sh SEE ALSO -.Xr gsignal 9 , .Xr pgsignal 9 , .Xr psignal 9 .Sh AUTHORS From nobody Mon Aug 7 14:24:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV535Wmz4pj45; Mon, 7 Aug 2023 14:24: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 4RKJV52NqFz4L50; Mon, 7 Aug 2023 14:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ri08VKKRYUokIEBw+ZUy6zIgOnUlzCj/loFgO4668nw=; b=AqPP2E6uPSgf3bLaNQJn8XIKZ4VNgLbbi+n+CIBHrkuRoqPL4DW4tuSM/CYuEOse3lQOlr s3DUrJ6urp+0JycMWMT4mH9oGuTOSnxK3+NkN2sKWZKJipDKOiiZvGs3DXrfOGhyFO46D+ kZfihTGPqDNNDJcqWcSIPKMMOf+weLBpt0iXkZ964l5QFsG4+2VJD8ANJSrzHt8eq9Z513 8KA5Yi178w6W2WIRJ6n8w1uG2WvMrzNV4T0sDsE9A4aiVKp12Pf81nEmj5pRfp1j95DBjD XFNnEiBWGF4aTGddxCagx/8DTQcZn0EYLZ6Z38a6CIeXazZ6iWaP5BuAk8lk7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ri08VKKRYUokIEBw+ZUy6zIgOnUlzCj/loFgO4668nw=; b=DDqIwULh3FlEE5AZApe0l15w+n/agEJ8kDfQR+ct+IerIBIq9jM2VdLVNlxqshCn6cVawI SvPHTRGs4toj6OtkYvbYJiz8pd0qDPIZrRXrKMnB+DAVQSBEZZ9GmuWPKjNQ/yQMAJ0/DO Thn9OZDHztL2dQRAElxTojV0cqPxjm7X4GoaD/pXBH6NqDZ1mcZxvlZjoerAytsFs+JnW0 YY3FNVK8uE3BeCbtMAASvuSsoQ7LE7b0DRnRk4RKsSIL0ap9lcSc4ojGMMEf8GdKK9jmZp rXonJVKUb778Bvr2YEYEYaOUGXJF1JDqDeIu3RUWPnBAiXmFzy0qt7G1JOo25A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418253; a=rsa-sha256; cv=none; b=IJb76Xn1jIYuII3CPBmkCtNb72VkQOrw63qLLKy0+ylAd+ALvnlM1arGKDIlYBUacbtx6z b7KmH1+6cvWCqbDzxZADLClMA7qZr4ATX+aZSlvbHgfVNaV3lT2UAEDaHYoMxwzp2Le6ea TOvLKVUB4Brosufx+is5WjucfJhduvgBTr1ZQ3C0O+xWG1P+hr31af57qI/g6yBMDe9Lu+ SVpZ2pjnu18l9EN7BV0POFynghnmrctVMQnaz7h08u16RNyXdcCX51Prmmj3i5lqLYrCxg RxXWdIYCdLDr2HSoXqnrzCQQGyvcHt/bf2FB7t/kptHSVFqLsih8zUnTwGp1Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV51Tf0zvnR; Mon, 7 Aug 2023 14:24: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 377EODMU025784; Mon, 7 Aug 2023 14:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EODSE025783; Mon, 7 Aug 2023 14:24:13 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:13 GMT Message-Id: <202308071424.377EODSE025783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 70d248d25af7 - stable/13 - ObsoleteFiles.inc: Remove leading slash from 20230714 entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 70d248d25af753f3fd777c4bd427d1cfd8e0b110 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=70d248d25af753f3fd777c4bd427d1cfd8e0b110 commit 70d248d25af753f3fd777c4bd427d1cfd8e0b110 Author: Marius Strobl AuthorDate: 2023-07-19 16:56:35 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 ObsoleteFiles.inc: Remove leading slash from 20230714 entry Fixes: c3f58005d92e signal: Remove gsignal references from manuals (cherry picked from commit 37eec7f68a79d100d8f5d439138acc21cd8b4efa) --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index aa51b59e6a54..58c63d3003af 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -63,7 +63,7 @@ OLD_FILES+=usr/share/man/man4/meteor.4.gz OLD_FILES+=usr/share/man/man4/bt.4.gz # 20230714: gsignal -OLD_FILES+=/usr/share/man/man9/gsignal.9.gz +OLD_FILES+=usr/share/man/man9/gsignal.9.gz # 20230622: new clang import which bumps version from 15.0.7 to 16.0.1 OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h From nobody Mon Aug 7 14:24:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV65WfYz4pj1w; Mon, 7 Aug 2023 14:24: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 4RKJV63Hr9z4Kw5; Mon, 7 Aug 2023 14:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXCS6ORZGvLvla/VsM4Tz8jN3DP3evX3zrXE0bN0V9E=; b=CWkP1Yc9YtGwLWcgblbdSXRTNWaQc6YjcOaCyvl+IwyaLl3XrIA8y1km9dynRC4jDxFcMr L9aBLTShsXSQrDgCo71lSbnHMVegkv9oHRVg3fyKN1hgEkkgyELDuQWMf6YfideKlQR6MJ nqamHis+DWAQX5d5bgqeVU+XGTY1eRlmyzFE/j+ZQAPyFbs2tx66UtwwRIBqt10p+jsCfu q8rUlVJ8Zlbf+MkN1qw9ALeZvLf88oWVyWwVgdn17LN07dr/lHS7yfQXPQS/GIpurYNnUu M8M8OwsSNRT2VBC8X2aAZ/ts6N197M1X38l6klEv2oINbpCGHkqedzvFecqn3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AXCS6ORZGvLvla/VsM4Tz8jN3DP3evX3zrXE0bN0V9E=; b=XiDWy1sSwcTMLNatGJruE4zZmYb/HEkjvL3mdDxVFghZZmrheyh4KYChVm86D4PLvBGd+7 MZ1snhYw8etzBQ/7LGWsdLXYKlj/1A7Yt+1YYjv3uwR924ZJHMEru+MgA1fj/lOYxDfF3i PD8offpEjY/QJIFmtyqBIp6yEF0JnhtKTKRZas24B40AJBvoMgfydmKuXPSIAPTb971Bqc HkPENBYYJ/J18kf4x26w4p0iNi7skG1tuHYSCXdHE5CJ/OHfM60tZ4b4ygEmdpwe3ZV0Fg 2Lr9T/dphFuTG4/ofAQeM26IbH2cFbLwQ/MByfJaochUnHq0YHqR2fM00aC2Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418254; a=rsa-sha256; cv=none; b=VAKX8lb7kn4AVUvycVrTHZs+sVYhhdkNV4WE9AZMTD/RLjeq6yRRgC1jC1+xDeAsAvbznG iDcrsESQqUqWhF+c0zTFVMShiZ+WIyOXX1H2fsmMOUzyRseo2FK6ugSYxjvkEFpdDh3GfE 4JSNUTzlofyfdxrDKXsysINHpzbGEDfDElUtpPQ7sbOtiV3Mc90DSuGv77yoThfkBvyi4E KdOfIDnL4n0VhQuo2XmTwG9N5i86M5fBXXwoBdprKFRyED2k0lSq86IHQGUeRcLuWOFm9U KtOcbv3c3afp4A8GdYBdOpYKl8d7oRQBgtWyt3jdZHJbIOFltD5Ys6faBXZE7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV62PLNzvyw; Mon, 7 Aug 2023 14:24: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 377EOEsr025803; Mon, 7 Aug 2023 14:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOE5q025802; Mon, 7 Aug 2023 14:24:14 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:14 GMT Message-Id: <202308071424.377EOE5q025802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 4e15e32a60b6 - stable/13 - linux(4): Properly allocate buffer for kern_getdirentries in readdir List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e15e32a60b601f6e9b8eae7902ff8e958a62933 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4e15e32a60b601f6e9b8eae7902ff8e958a62933 commit 4e15e32a60b601f6e9b8eae7902ff8e958a62933 Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 linux(4): Properly allocate buffer for kern_getdirentries in readdir Looks like prior to ino64 project the size of the struct linux_dirent was greater (or equal) to the size of the native struct dirent so the native dirent fit into the buffer. After ino64 project the size of the native struct dirent has increased. Spotted by gcc12. MFC after: 2 weeks (cherry picked from commit fc1c787aa0157090e765ebba484e6e290e99f177) --- sys/compat/linux/linux_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 3dfea8946e33..0def70e70581 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -603,7 +603,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) struct l_dirent *linux_dirent; int buflen, error; - buflen = LINUX_RECLEN(LINUX_NAME_MAX); + buflen = sizeof(*bdp); buf = malloc(buflen, M_TEMP, M_WAITOK); error = kern_getdirentries(td, args->fd, buf, buflen, From nobody Mon Aug 7 14:24:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV75ZGdz4phSg; Mon, 7 Aug 2023 14:24: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 4RKJV74JHRz4L83; Mon, 7 Aug 2023 14:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Wdifw/oemLPqCbM3xXkgBnhwQesPjJkEddKlLLR8hc=; b=ANLESaNIaFPfanFdH4GOgExj7bLefPzSO9lj4bAixBoeuyCWpUtTsxSpB/y8FZCkGOCXbf zVyl19laoVmQ4dBQaz1VYUjPlMRQoL6uQZR+SW28HKiisdDaqou+g4WvGEFmACcm7dBD9t r32xa9/ySSuVnJRvN+YrpaWoKeWYfXOEZabul0Bolfvqm86tVo6/LPToWhfYBJT+us+cHY m0HiCm4+5Wfkwa6HfBMq9JjalZPXhCbmTthJeyTfQrl8agjBxtJVKiToHvbAQnmmKBjI1Z 7gUFVDinxvP0kDq/XENVl68Jwr0TKhtZvBPuwqhNq7dCeYoIt2KAYDEP9Wup7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Wdifw/oemLPqCbM3xXkgBnhwQesPjJkEddKlLLR8hc=; b=Ntdkfi3QJK9lR+rpBgoHEtLYZk3iOqo7GxXmaiZSMVIhQY+cmwEmqT0szTH3bANrpF5mtd WzJKxNYNjkS+qY6An2TUb6pbbZLVaN9lqm8NDuyIvVMy/3bRej4RGyJbB1QMRUsiC9zJfG HbCSDjz1Sxbsta3AF2lYDfsSo0C8A2HW8TO7DZQX/FRO+cPZWSs8LDXkBftkwbA7oQZn6k ZcjkhGxZ6qUoxt6ohgscpapaecCyb/d4KIBnFD3HzbaHvCBd3kNFD39Wj4sWS+rwvGPoHv hI9xxAzUeg2ZVaxFhXmWOwh/WCV+sDhh/sGfIz99tWC0vaKj77TxeuhK/ygbjg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418255; a=rsa-sha256; cv=none; b=bSY94DV2dlJ7876J9TGpX9iTfIiiojPVyNiszkT8PUm6917dsqVQaEzp5NoTuPVY1GgTGi faYFs+T6jq15t8BiReB7ijxdVE/XNC2AMOb5imjaj0tOySnLQGdPALbBijQxrzi2jrevFV 5vQ/QdJA8CAduGQ0SVSITbFLfkjSXSGrKONQJJ4aBmL3eEVM5OZ+Cd8fXEQmddnPB/7T+Q w+WSDVaiIdKEUwPWyNWdGyY7pcZ87f17P945KodPSYJzcFZlvSZIiq1Pa35P+6Ee+X/qWH 3B7WRh3807hbo52O5MlCt6vEZZftYCBz0TskcovcKcYA17U0WXT6tnY1boBPRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV736pzzvGV; Mon, 7 Aug 2023 14:24: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 377EOFrY025824; Mon, 7 Aug 2023 14:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOFmW025823; Mon, 7 Aug 2023 14:24:15 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:15 GMT Message-Id: <202308071424.377EOFmW025823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 1821249a4d70 - stable/13 - linux(4): Delete a useless variable in readdir List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1821249a4d70fd8732f6f0eef42b3cbe0fe03f5f Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1821249a4d70fd8732f6f0eef42b3cbe0fe03f5f commit 1821249a4d70fd8732f6f0eef42b3cbe0fe03f5f Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 linux(4): Delete a useless variable in readdir MFC after: 2 weeks (cherry picked from commit fffb2e8de691ba6677616f7e0e5c442f4e7e722a) --- sys/compat/linux/linux_file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 0def70e70581..3e1b5299cf0b 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -598,9 +598,8 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) struct dirent *bdp; caddr_t buf; /* BSD-format */ int linuxreclen; /* Linux-format */ - caddr_t lbuf; /* Linux-format */ off_t base; - struct l_dirent *linux_dirent; + struct l_dirent *linux_dirent; /* Linux-format */ int buflen, error; buflen = sizeof(*bdp); @@ -615,12 +614,12 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) if (td->td_retval[0] == 0) goto out; - lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO); + linux_dirent = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, + M_WAITOK | M_ZERO); bdp = (struct dirent *) buf; linuxreclen = LINUX_RECLEN(bdp->d_namlen); - linux_dirent = (struct l_dirent*)lbuf; linux_dirent->d_ino = bdp->d_fileno; linux_dirent->d_off = bdp->d_off; linux_dirent->d_reclen = bdp->d_namlen; @@ -630,7 +629,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) if (error == 0) td->td_retval[0] = linuxreclen; - free(lbuf, M_TEMP); + free(linux_dirent, M_TEMP); out: free(buf, M_TEMP); return (error); From nobody Mon Aug 7 14:24:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV85Dwlz4pj22; Mon, 7 Aug 2023 14:24: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 4RKJV84n5Pz4L1W; Mon, 7 Aug 2023 14:24:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiMK1QK7W6N3aafuDt3F5VodDS8Adf/OPpdgcLPjGec=; b=scTkQ3kXj3UkrPKmf5O23gmaquVaRyB70SPsrp1o8s4S0tEkxvvTZ9yFAv4vqPlXrn6xN5 i03FYMoehGy208YxRCN440id+Pu/MAirbFgWCT7ViCSzPR9btoOIgvMPCa+OfbmUDaimDn Mq1YTizayPxhf6pcfPe/MnRg6OUSmc654iFAG6VjY6KhtLEF2sh7m2o4w/pV7TuOEan3sR 5VYXAEUGtEMHfQEzLmMFwG5g4gF1NtWemUd+thT7p7dk83VqRVqBbb9L8jSoRI2mjqJOJp 9jp/pfKIBcMIRxVSLg5Ir3UFR00wxkK8owRWUA/GRHlEsas54MoGgoMWaSY3+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SiMK1QK7W6N3aafuDt3F5VodDS8Adf/OPpdgcLPjGec=; b=nIVrRyuquVr2D6m/5Z3F2xID5EOMWIGxs0vwa7dzNy5+zuyXiU9NVcOxCsldFbiiR1yyxs YJ5vU7KBW1gTF1/U49wkdFHyAZ/tkwpGPbWB2rzl5PfMsjLBQIwqBoeEjI3b3QvZPCyI4r 7Pq8k9YbfTuojZesf4MJg71+Pv55j1b3OUeLO2wSKwZDJCMMHCBKSEAPWfKo9V1/vfs1b6 9g4XV98CgUNQ4t3Aq/efkUGg2wBWqhyyvPlTXFhJuU4cMbbA/KNks318UxTaPUvBiKhhbs 5fVYBJV+3AODSTvRQxDfeaO6lzR2rXqkEITAp22FTK/JcfdlKDrv1fjGFf5DlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418256; a=rsa-sha256; cv=none; b=a+81lrlke7o1Ha0l9V09MEC8Q+L8tbT5LbHFf3heqwQAPRReyVALr4/z4kzhDjziPH6k8g 0GuybwUJIKhgIZ5/SsFBsovIZCnE+HEA7miS7uxGNMvFBuvkALZiY6OVAuhxDFIRAHSH1e aCzNz7V+ke/Cf5sby36WW45gk1cXY+SXVCfEf8hfuMoflz0fjuNGeRhtY/MpeUwiLylQ3H 4qIjj/PUcxBSb5IPB3SlB+MnneAsh/ag4SkzL1sTeS97vWo0L2BfroOQV/0LL6MpmRv8U/ JJCkp9TuMwtrh+1tTcnhnZ14KqLQuwd+0ccE9O4V4YYDg7Zzkm8CAXbSNBmH+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV83pz3zwFd; Mon, 7 Aug 2023 14:24: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 377EOGLa025849; Mon, 7 Aug 2023 14:24:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOGot025848; Mon, 7 Aug 2023 14:24:16 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:16 GMT Message-Id: <202308071424.377EOGot025848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7027716f9d8d - stable/13 - linux(4): Use M_LINUX for malloc type in readdir List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7027716f9d8d2877df78efa033cdb0249db44aba Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7027716f9d8d2877df78efa033cdb0249db44aba commit 7027716f9d8d2877df78efa033cdb0249db44aba Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 linux(4): Use M_LINUX for malloc type in readdir MFC after: 2 weeks (cherry picked from commit 13d049ab8dd718d0723229d54062c91b2fc68fda) --- sys/compat/linux/linux_file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 3e1b5299cf0b..249034231c36 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -603,7 +603,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) int buflen, error; buflen = sizeof(*bdp); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_LINUX, M_WAITOK); error = kern_getdirentries(td, args->fd, buf, buflen, &base, NULL, UIO_SYSSPACE); @@ -614,7 +614,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) if (td->td_retval[0] == 0) goto out; - linux_dirent = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, + linux_dirent = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); bdp = (struct dirent *) buf; @@ -629,9 +629,9 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) if (error == 0) td->td_retval[0] = linuxreclen; - free(linux_dirent, M_TEMP); + free(linux_dirent, M_LINUX); out: - free(buf, M_TEMP); + free(buf, M_LINUX); return (error); } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ From nobody Mon Aug 7 14:24:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJV96Yl8z4pj4S; Mon, 7 Aug 2023 14:24: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 4RKJV961VMz4LFB; Mon, 7 Aug 2023 14:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhVgjrJv9z6V+ABN0UhoWcaH0SqCwqmoTg7GPB7qrXg=; b=UpxpoVpMVLaw5zkdtQIMUAEpz+yY/78RLwX36B5v2obtu8tbTIogEC8VO2PqIWA/eHY8Ij NzzDocg0GGxnlOHjWprbR9ElBviIKuCQE6GO08b5U7oLOcq5jrK1MJw0gZDTbpSDnTuteJ GG5X5QpVxUaloc7axbCx0V/KNjj5wBkLSiE6KW29TAZPD7dHMbC7ufyJIxaH93O1L7ngp1 CCSiKBm1Zq0I+a8g/d+lyXChKcLHd2dJ6YxzaK/0n29O1Nn7B7121eQaOUTXXVJXHY4WPK PoFMRicfgzM6sixfyxSYpDpEjaOl39UHn0E290cUvYcFmz4NwuoeNPObaCaPtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mhVgjrJv9z6V+ABN0UhoWcaH0SqCwqmoTg7GPB7qrXg=; b=wCBnFOjud9p10qqpfn2Ox+BTbKj64KM6mzNsRLUrL9PqpRWHU42XNTqH/Ro5X2TbPsa4VL g/91jajYeB+KyrJDOPbf5W4CPPVtGKwTPXQTS3GjmcCa4eCHP+BDF1B9TsGA9yX6+R0XHd 88GLdvslHws523RnBm0NZRSdUYLdtE64XheR5xAE/AC2o9tyVjgmMURMalNqxQSswwR4NG AghPLjEInE+Yyb0MYzsKoRQfxJlbwAThW695y/mPR3i3i0kkFhI6a1OYtfQjunY0vBoeJg lKFDxXeUb6552icRb5F41L6uv0j+M0ezdFrB6LS+4P2yev/EDhQiMR+ubUeUXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418257; a=rsa-sha256; cv=none; b=eCUw2xBo8x48YH/pShRLRwCsuNz0GZd+HZUOOmrkhq6TnvbpsCyWwyeSiip2mgDM4fuYET i/xtQGvhsptXx0ZjvsiE1TBCiCls0Fy9TJKm/G8naam1qk32xP5gE7bmQNJcvQrVClqBV3 UFz0Ps4mOMQeWwoR4/QOIYDliiSsBoY7uR6s1CKqmKKbd7INeWcfhE2jxEfwMtopHHXgCp wmsOT3NnWH64BLQbj64RrcaDeddtdjmi0D2lw0LP1rfvPpO25ZPs+Ztkzhw4DbprZSWKV4 eOKxhQhoZ4SzNdYK7Cvh5HpDiiFGPqYAkZO2BmC/1nj3K4a8gHqrCtRBfW2Msg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJV94lR0zwBY; Mon, 7 Aug 2023 14:24:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOHSE025868; Mon, 7 Aug 2023 14:24:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOHGG025867; Mon, 7 Aug 2023 14:24:17 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:17 GMT Message-Id: <202308071424.377EOHGG025867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: d41dfdb6f413 - stable/13 - linux(4): Delete a useless variable in getdents64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d41dfdb6f413ab3acba2897c7c992fbbd271382e Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d41dfdb6f413ab3acba2897c7c992fbbd271382e commit d41dfdb6f413ab3acba2897c7c992fbbd271382e Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:58 +0000 linux(4): Delete a useless variable in getdents64 MFC after: 2 weeks (cherry picked from commit b27f3237c82bde866cb24f7299eaa356e8b29eb2) --- sys/compat/linux/linux_file.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 249034231c36..da492ec4c4cb 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -526,7 +526,6 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) int len, reclen; /* BSD-format */ caddr_t outp; /* Linux-format */ int resid, linuxreclen; /* Linux-format */ - caddr_t lbuf; /* Linux-format */ off_t base; struct l_dirent64 *linux_dirent64; int buflen, error; @@ -542,7 +541,8 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) goto out1; } - lbuf = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO); + linux_dirent64 = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_TEMP, + M_WAITOK | M_ZERO); len = td->td_retval[0]; inp = buf; @@ -563,7 +563,6 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) goto out; } - linux_dirent64 = (struct l_dirent64*)lbuf; linux_dirent64->d_ino = bdp->d_fileno; linux_dirent64->d_off = bdp->d_off; linux_dirent64->d_reclen = linuxreclen; @@ -585,7 +584,7 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) td->td_retval[0] = retval; out: - free(lbuf, M_TEMP); + free(linux_dirent64, M_TEMP); out1: free(buf, M_TEMP); return (error); From nobody Mon Aug 7 14:24:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJVC1CrDz4phSr; Mon, 7 Aug 2023 14:24: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 4RKJVB6gW0z4LFR; Mon, 7 Aug 2023 14:24:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWl10pX1T45+LsYyB4wCQyhNq7HIbwQ4lXxu8qhLTdo=; b=pxfG68mYh/TtbtxmnGVMEPkzxhpzsT0qSfZGXtp1OKHmfY1E6mLV11HBU/BW1pSI9nXoXa x64jnG9Yw/uDMur2Ma030MztqoUUNdnIY4SlQQv6B8aBgwqEORIEQYDzReplHDsCR596Zd CMr3qmI2pLav1nM/EolKA35CYoYx1A/yXuMFsU/5KhZz0OUhYBldHTlujKBGUg74CbBcha dovDv36roo4LezfvmkXS+bhTIUmC/MDc7khs1HwWs/DQ9eSmkkuqsIpnYdzKbocqeaCGx5 qBxZesSBaWxKuhNKHlDXmX6PmqYt0ibavq6WWYxQtiLaYUpiv6LRiyi6IeElYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XWl10pX1T45+LsYyB4wCQyhNq7HIbwQ4lXxu8qhLTdo=; b=x8T3swSR2HVwlyEipNAMYM5OJnls7s0D7c4e34JoWqqaLZ6tkja7DWTeyOWzPjvil0putu WbAQ7JL8NpleJomAFTCG4GCfOWelctA+A8jJmcZCkGQJnFK5EEt3cgPaqhkbovK/+E4Vf2 ybp4JJyj3S89g0nfAmEdtwrb0WIpd0RDjsxujGTbX8BA9jEr2CxvphtvpNHqXFsC14MLpx vpX9S7SssDstc91/DU9z47xskIYMXF94wmfiEqRKi+xhtCjoN8E5jLUdUVpyVGxzb8Ghjr Lr4iBNK2ExE+TKFqLYTgO7Vp/rHoLULRBteGsJrEbur01gKILx+/vSGwWTOj5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418258; a=rsa-sha256; cv=none; b=DWo4+4JnomkN4E/yFrSYj5/k7ZrciAn77HoGLydow1APtw9zkdQKOcQIF2vi974y7a5IWL jP0ikjTwpl/MGfR3u4ilcqpFHRyxc4AB81rj93TJ6NICiYkkYfxMSHc1cIvo1rlawNivC2 ivWXumlI4v8m0HMn5OaSJYhSPujJWr8Vh3ZYnhPYent1JMfbp0wNTstPSbwT2/bRuP9/7R BGLaAYZo7pBGCwfc9MqFzdtQToyNiT/Pt8QuX8phqJdvJTxMRXIeMb7z9Uh0qscnOK05ZF fsCygXGettz/0PJafCYEdugdMQrz7+XPdd/G1oaE4ua41sSOMCMYSwwJvE0bNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJVB5X7szwFf; Mon, 7 Aug 2023 14:24: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 377EOI3B025891; Mon, 7 Aug 2023 14:24:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOIQe025890; Mon, 7 Aug 2023 14:24:18 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:18 GMT Message-Id: <202308071424.377EOIQe025890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: b4ebdfe9980f - stable/13 - linux(4): Use M_LINUX for malloc type in getdents64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4ebdfe9980f00353ca91bad1acdf7e0bf80f47c Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b4ebdfe9980f00353ca91bad1acdf7e0bf80f47c commit b4ebdfe9980f00353ca91bad1acdf7e0bf80f47c Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Use M_LINUX for malloc type in getdents64 MFC after: 2 weeks (cherry picked from commit e27e3fa71c8f31304efa5e065876a34ee603a388) --- sys/compat/linux/linux_file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index da492ec4c4cb..573c4c8a2eae 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -532,7 +532,7 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) size_t retval; buflen = min(args->count, MAXBSIZE); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_LINUX, M_WAITOK); error = kern_getdirentries(td, args->fd, buf, buflen, &base, NULL, UIO_SYSSPACE); @@ -541,7 +541,7 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) goto out1; } - linux_dirent64 = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_TEMP, + linux_dirent64 = malloc(LINUX_RECLEN64(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); len = td->td_retval[0]; @@ -584,9 +584,9 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) td->td_retval[0] = retval; out: - free(linux_dirent64, M_TEMP); + free(linux_dirent64, M_LINUX); out1: - free(buf, M_TEMP); + free(buf, M_LINUX); return (error); } From nobody Mon Aug 7 14:24:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJVD28qBz4phby; Mon, 7 Aug 2023 14:24: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 4RKJVD02VVz4LTH; Mon, 7 Aug 2023 14:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uhw5HbH9vfsWBS0rqvY8UmgqGlN3HVX4hYtoliUXHP0=; b=xZ5b1x1994qdVlq6lnPaj6JH+JeMyeXgrNTlm08vayTfTkr5MQIbWjV4xGXXwiPqJ0Q6iB QD5oPnE7TWxDFoJ+XqpQmnhtbv5NoHUa2O1RphcBUj7FRJ5KZtDsRhFPqLgGNaSyrRmFg0 OH87hnQ0tqySLwGP4/TJFe/+XlURFPMstvqM75FurEzaiM8z2NvtRf8lwl+74vXWkLqgEE 4rddvLGZtXQ4SVrbr+85dxW+JhLKhKVAQ1Dk+WJAsLIPRJRUEfE5z/QtS9FHbNNrDCYrt/ nvjOHZueJ05/A25FVMLrn+IuJ7avK/MPcQ/Yg9jg/gwfU/gFqV5n2S/c4Ie3gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uhw5HbH9vfsWBS0rqvY8UmgqGlN3HVX4hYtoliUXHP0=; b=JGdbxNVewAr1ehilN+UNWD1zsZfrX7vo0QEa35duCPaR2rP2tit55rNNVTZ3i/9ielmDi3 pPVyE29PJ8t3V5Rh8zj5t7pwR0zZ9riqOgarkROqQsFnC1CQh3EiQofs00krjNYqCIUApt LY46f5lCLCZA95ytiVuMnXSu1VQc33hr+neXBgaEi3YvIC7kVQmCHB/h6EecjvVnHEX1Ie ZDEciC0T4Yd4xHsNXWjT7AtyXW6ks4fQ9ekz0lUtbWPRnNCaDqqT4ayt/Z2ZBdcbqAYsXM rLE3UjUhRfBqIESstH2jiNKGUvs0p/CQ+9DRB8E12d0c6EowgrCeRL5f+HpX1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418260; a=rsa-sha256; cv=none; b=OQMBL5I1hqJ/zEip+1kJRXYcJQ5AjLtm5YG3jYLhOVkUNB8vooM3Pq6vPVVnieJdnemSk6 aaLTtGfV+4e4/U/6srgxiik7Z389wld5SJD45RMnOaG0CAP624tCXdwLdmWwpVfPhm2McE v3JRc/7Ibv5yEXBWL9u/FaQxje7NJ+yNBm8fftc2vdhUcOLeOfGxNWmmo1YSgF9IhIQjur LkZE5jSaz4dBgze9BrORLpg7zsqpYKrxXG7rRaOA9OmPL/wzRtPFsMdGu1utIV5X3iA7/x /Vk7KNV4HFjYejdRHAnkOEab7zbJgVOXtUjgQnW/fpPtfFYVLtaQWOTjegfrOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJVC6G0nzwBZ; Mon, 7 Aug 2023 14:24: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 377EOJo1025913; Mon, 7 Aug 2023 14:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOJKf025912; Mon, 7 Aug 2023 14:24:19 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:19 GMT Message-Id: <202308071424.377EOJKf025912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e644694f5f3b - stable/13 - linux(4): Use M_LINUX for malloc type in getdents List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e644694f5f3b26470e53a7856fd7de057be197cb Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e644694f5f3b26470e53a7856fd7de057be197cb commit e644694f5f3b26470e53a7856fd7de057be197cb Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Use M_LINUX for malloc type in getdents MFC after: 2 weeks (cherry picked from commit 7729467781670a84059d50c4726dc94cbf4500e9) --- sys/compat/linux/linux_file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 573c4c8a2eae..5f195e46a8a9 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -456,7 +456,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) size_t retval; buflen = min(args->count, MAXBSIZE); - buf = malloc(buflen, M_TEMP, M_WAITOK); + buf = malloc(buflen, M_LINUX, M_WAITOK); error = kern_getdirentries(td, args->fd, buf, buflen, &base, NULL, UIO_SYSSPACE); @@ -465,7 +465,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) goto out1; } - lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO); + lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO); len = td->td_retval[0]; inp = buf; @@ -511,9 +511,9 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) td->td_retval[0] = retval; out: - free(lbuf, M_TEMP); + free(lbuf, M_LINUX); out1: - free(buf, M_TEMP); + free(buf, M_LINUX); return (error); } #endif From nobody Mon Aug 7 14:24:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJVF1vxhz4phfg; Mon, 7 Aug 2023 14:24: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 4RKJVF104mz4LJm; Mon, 7 Aug 2023 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUGH38gMdjKmOtb67ezXCIpCAOHk9XOvwiWKbx2E4Yk=; b=eV7QYyXC1paYosTSvnFb9WN9eSvY9a1/Etju9FoyLs8Zz9quUKgJd5IWzdIHVA0YVRcofq BdT+OJYRr1G3Po5wHhLI1RLo8qbtpevWu5alc6KX35DU8bPU4NWImhDD1L1VilpdgN0y0m ++QrYWq94C6KHNAaEnatNFNoV4Mi+0LU0STEpC8SMUAg3BhrFF9tGpW4mZPI7rB68RbnVw qU8Abk3k5t0e3lgbx7JTvdWQXROqBmnz5o1JFZeD98SZrGy8Yje94UXiJIWIs0HAPQM35H NEIYKNssDZEwLv/QhKHjf3xZdyxgNFStDEFqOQJalGJKKaUuYMxooKcPwEFOIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tUGH38gMdjKmOtb67ezXCIpCAOHk9XOvwiWKbx2E4Yk=; b=fysCbsrREuB9WdA5p1etK8OCtWsFUOaTPFF5gaNcRduDRnMm19/r9qdAg+d+VJAyCfANud osGX5O7scyUTT2DIMWXK8BSfyfETnYPYFXq6V2t7J2g9D2z/p6eYw3Uxv2Zt6y4rIyuZ92 0ZrVlMw/aGKrnLP/2bcefMmPkXAsrEOvZyjuaBPdnEQgjh7EaLEF0ye4fdJ9y/pHPfyibc nutln1cymVzK/aFVpq7oITypIMh1afQZIme3qyR8PmvYagSmWt5SaBhf0yDfz+bdi8eUSa IGZuxQWMNrsSus+NGljyXqPgpK+cWx7Sl9Sd8+5s9pFU38/hqw3x8+4M3tMiBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418261; a=rsa-sha256; cv=none; b=HTc4+VRlU2ZVrZ7vVClXejVKkUNWdPz2XJolgXM9LOqvevjFvKEQRN8l5CDCQXBWZJkH/g xmYUD6SmnzlyMcwA8MyoxKtjz+HeYmYOXTQTL/bx7Ub+DNaBHJuU76iHr6gkmpU213ggDj kIiz1sVqYFs4jML8ZUfaqgeQw4oGFvrZ7bghUCJrNAWB0EaNHDyPuW/t4nHuRvnuzZDl7H KIbDu3SUWXspvFUWNdY48xAzFpPXLLixTq4StehUGa+3TwKsK7i4H/JSj5uvA0xkeZ/Rqr RObat7BNY+A2ADPoD1ofJe/J+fPJ2fgjCxCi1UfNQNvaVQ+9cahSxUGbcgECvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJVF03rNzvnS; Mon, 7 Aug 2023 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOKRM025932; Mon, 7 Aug 2023 14:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOKHM025931; Mon, 7 Aug 2023 14:24:20 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:20 GMT Message-Id: <202308071424.377EOKHM025931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 76efe26bafe2 - stable/13 - linux(4): Use M_LINUX for malloc type of proc emuldata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 76efe26bafe2632a84e14451b9d04726edf942fb Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=76efe26bafe2632a84e14451b9d04726edf942fb commit 76efe26bafe2632a84e14451b9d04726edf942fb Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Use M_LINUX for malloc type of proc emuldata MFC after: 2 weeks (cherry picked from commit b834497c6d0cccaeebad8d94a32c8dd3ec0d3f9b) --- sys/compat/linux/linux_emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index ab877116b9fc..f6c071c9fb4a 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -147,7 +147,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) p = newtd->td_proc; /* non-exec call */ - em = malloc(sizeof(*em), M_TEMP, M_WAITOK | M_ZERO); + em = malloc(sizeof(*em), M_LINUX, M_WAITOK | M_ZERO); if (init_thread) { LINUX_CTR1(proc_init, "thread newtd(%d)", newtd->td_tid); @@ -281,7 +281,7 @@ linux_common_execve(struct thread *td, struct image_args *eargs) p->p_emuldata = NULL; PROC_UNLOCK(p); - free(em, M_TEMP); + free(em, M_LINUX); free(pem, M_LINUX); } return (EJUSTRETURN); @@ -353,7 +353,7 @@ linux_thread_dtor(struct thread *td) LINUX_CTR1(thread_dtor, "thread(%d)", em->em_tid); - free(em, M_TEMP); + free(em, M_LINUX); } void From nobody Mon Aug 7 14:24:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJVG2nxxz4phww; Mon, 7 Aug 2023 14:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKJVG1wV9z4LVY; Mon, 7 Aug 2023 14:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVNVKfrPxs3sIojZwrUWlIc9xdqKjLWd60iUoHBT20E=; b=f+lHlIXIw8d6MiYrKqdVWmi3C0iYbpLxG7V53w5RhP6y0vh2Pbq130Jf64j5fL6uNevOzW 3XgS9ERrJPK2BnKtSR9rx3/tWUdN3nMtX3AORRwX5Uq8a5Xq/9/CYsQGtb0C0xdP4/1zWh DRMREQ5GyjYWz50+rCvIg0+s5L08VwHoxKpZup/xNU8CvqXGCSCbtUS8Y3U6yZNP8w9MRh Hh84Eo/9xXoovdfy1G5zBMspuZ3rkRL4dgYKirtEg8w1vd/BtxOzurztNadX1OIbGkacTn 20m+cU9GHKPXDWMkBvUzxgh8D0gJC+r1ZVr8q29pW80ese/joFfospkZ2abFBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bVNVKfrPxs3sIojZwrUWlIc9xdqKjLWd60iUoHBT20E=; b=kuCjAvLOjbX0QiHHaQ+PTkhF2JOpIenxa73gpkZTXCq1sdccInvLtRGcuG/t4WOLcgsg1U gAksXXayL3de+8LTf+ReuXHcXIpUDUD+sstJJCABDSUb8FQJuqpsFu8nWAVwyX1C67fLCA vMIpO2ZWgbaxyXjS/VbyqsR3EAT+VVXUrneFIUXzBHuRmEJJj4Ih1zH7TBTJTR//scmxEY duN75ybuAhNEiCAWhDo4BN1VrZ+AnouyA9dvsP2tUXjWaP1E8JNtNMj98VTSxxRibOAeEZ rPocYcBsbkg0ZGvLRK44+Nfq1lIz7HiFw6W/a8xf9RjorxyODNJLDVq+FWoCDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418262; a=rsa-sha256; cv=none; b=mBHvjanCEcaKSmsB2GM1QPVeuV9Kpj5j+DArSUQhWVwUDk3HLAOYR2QISbC1GCCvJCxH/y XwTlkAjht7fHzDhEfa8IL4ZBz7zX/XL8W6T8LF45bX1Fiip2hPjvR4O2H6d4kQ5sw7I+14 nKWtQiLNIjmCSk0n8F8sgYGb8VOoBoDuPzvMkPtRpFJvb3E2A+u+C7JlbPPdoQZt5TVBR0 FsVjjvYPfLwHSb8fBgo4L+2TsPm3ALInWxmL16pUAQvVygfjOXeuxqp5YgslVYyJFz9uyz oocV9XmtrR9gIgC0NWs4/ZSvkotm7E4YrNWjCefR7cbX2tvNd+MDAzKDnXlrfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJVG1101zvxn; Mon, 7 Aug 2023 14:24:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EOMpE025958; Mon, 7 Aug 2023 14:24:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOMl2025957; Mon, 7 Aug 2023 14:24:22 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:22 GMT Message-Id: <202308071424.377EOMl2025957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 520891109c09 - stable/13 - linux(4): Fix control message size calculation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 520891109c096084774165015529e18de5a93cf1 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=520891109c096084774165015529e18de5a93cf1 commit 520891109c096084774165015529e18de5a93cf1 Author: Dmitry Chagin AuthorDate: 2023-07-29 08:21:35 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Fix control message size calculation To determine the size in bytes needed to hold a control message and its contents of length len, CMSG_SPACE should be used. Reviewed by: Differential Revision: https://reviews.freebsd.org/D41224 MFC after: 1 week (cherry picked from commit 67116c69052d27dbd6d6c066104850d4d53f0041) --- sys/compat/linux/linux_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 0bcba7167f2f..393faa5429ce 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1847,7 +1847,7 @@ cont: if (error != 0) goto bad; - if (outlen + LINUX_CMSG_LEN(datalen) > maxlen) { + if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) { if (outlen == 0) { error = EMSGSIZE; goto err; @@ -1866,7 +1866,7 @@ cont: error = copyout(data, outbuf, datalen); if (error == 0) { outbuf += LINUX_CMSG_ALIGN(datalen); - outlen += LINUX_CMSG_LEN(datalen); + outlen += LINUX_CMSG_SPACE(datalen); } } err: From nobody Mon Aug 7 14:24:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJVH4LhCz4pj2D; Mon, 7 Aug 2023 14:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKJVH3FFKz4LgC; Mon, 7 Aug 2023 14:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pkiQeajNyPjmKx4H2nP1xK3G/rKN3nketHHsPaMO1M=; b=QC7lJVHppO6iaP81rPT5L87ybYlEaFHhY/mV0mxFScrjoYzpsncY14dVFtu8RCpaOciDlP v5EKvawWZJr+kIc+mPMGwQCi1XAqtV4qBWJDAV07Wcn3F9wC8Co7KIHVVqCuIrboWFy50A rzhIJ6UguJ9TcLw8li5tFnbKj1yQ6qw4/4tMLgdpf/Gq+Zq77TMhN9rTK2befCrJjNJLad l3UczX8j2zmrgTlcN9jMR4E+f5daXQgDuqqUGxEwkT5zgi0minjn5WZ8m5oIGKbPlYOxW3 JGQyTxjmsnly6ZIzjgMjBRGFhgIhwB5XqsNXCIcjpig7lR/3roVAJWmjM0uoxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4pkiQeajNyPjmKx4H2nP1xK3G/rKN3nketHHsPaMO1M=; b=YE6HXRk2CfyQ7IX+X+SCNbsCvp3KaqedFnUwpSv2bWNPV9GdjqCnR7E9EHSwQrTJHSXsbf PIM3VMyUWv3eF2sT6//iRHDKBG29ZbUTlb6A3JhDVMSgWXpiyq+P/3wlQjevxp5anB/KXA srdrOxK85v2GgannRol5IcPrb5SaR2kuGPFXuP6ds8vp4pM1yEl+Sx0R4XmDujAfTCG/Vr G496awjbLJLwGT3eot10Bbz1Bez6EEiVx6HWOl6end+eCQbn8BsSiMit5v6S8/ZVDsVjy0 2l6gPtZ26WslARnDdtRyp8GV08XqgPxWz8DrxquLedoTyYyAql+JaYOrQQ1fiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418263; a=rsa-sha256; cv=none; b=S86QoJVX5+ElV/OqNrgM4TCXh7aDtAt8y0HbrYZI+EQm/4WHKv9ZGowVhp1awvvAM9v6hX LVOQpLR0t9cfZOWNPxDpcfr/kmjH7IskTJ/LTkegcYvXDijSFic8lBxsfC8OJa+IbleUNx 1k+2/QBs9RT9k9cM6yQZqFpDGKsgIuZMQjC8mimmXJiV3fu8L0Qu6g0gXVdOuowVC7ZRPP 4iFMdaSRHJg38g7J1WmLFDNQMjA+EjO2aC/qXmgrJx2u2sdya0YSyVCoYpWKJXk3+mbhR4 9YykBVtffSESCF8RoJDdSnO07eAF+50wOHah1sP8lyqEfCdv4RAEHHn0a52mGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJVH20QWzvGW; Mon, 7 Aug 2023 14:24:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377EONI8025977; Mon, 7 Aug 2023 14:24:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EONQF025976; Mon, 7 Aug 2023 14:24:23 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:23 GMT Message-Id: <202308071424.377EONQF025976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 3b84bfafb98b - stable/13 - vfs: Deleting a doubled inclusion of sys/capsicum.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b84bfafb98beb33be1eeecb5d84f0d38de57b4a Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3b84bfafb98beb33be1eeecb5d84f0d38de57b4a commit 3b84bfafb98beb33be1eeecb5d84f0d38de57b4a Author: Dmitry Chagin AuthorDate: 2023-07-29 08:21:58 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 vfs: Deleting a doubled inclusion of sys/capsicum.h Reviewed by: Differential Revision: https://reviews.freebsd.org/D41223 MFC after: 1 week (cherry picked from commit dbac8474fe442a7fdbdcdc3ee4a9fe177b7bf46c) --- sys/kern/vfs_cache.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 36ac9c2ed6ab..acc09036742d 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -71,8 +71,6 @@ __FBSDID("$FreeBSD$"); #include #endif -#include - #include #include From nobody Mon Aug 7 14:36:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKJlh44bPz4pjml; Mon, 7 Aug 2023 14:36: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 4RKJlh3dyJz4QJw; Mon, 7 Aug 2023 14:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szkqcWq3iI9WjPmsIX7ENC68YOIrzlGPcLLIAdjCBdk=; b=coOoPF3weWw/8XwDi2ezGjVQ7LkIpCrGYF+P/cm1+hdDjTxxlgYfVK9G1Sk0AsN8YwyAz1 YbvxjrGseDf1eY2muLLG7aHlcG6uWedLaWi2+EXBADYyYoYDE6Ur5TzwcoXLkzySlIRzzL LdTwV1AzO3c/Tc/Brj4XUeTKox74WTK3Ki9vnbVDwIgCR2AWcgEIA+2R0pKPjYL/FgBy1x +2pozc/JSHLM6Z8spo8CVjmDO5pstEqqnfDebI8zyomSYY/+iW+2PsgD07GrwtKfDZB0iO FUmkY0BZwth4xnXdGvTnhDZ+c4kqUvcNiWLlHLxbVhDP5JgNNr7ZJMciMxAgXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=szkqcWq3iI9WjPmsIX7ENC68YOIrzlGPcLLIAdjCBdk=; b=CYL3772ZH3tOaaAa0IvYpCgMQvlnMS7mu43YSVOLPqfUx2effy2aweRjFIdvPK2HqZ+a/6 CZGJV7QrMv+UeErI/7oWP9vHROrXVBKJ6Y8CMJqGjZOxUfvfl9Pn4dpOX75fgODPPvAgNa oPijfETWbcWrFIKP49YQnrRbZ0twm6bwmeRH9ajeTjfWIT9HN35fCR+o5Q9CR2Raf0mc73 C61Fs+MQ8OZZSCqeXN+n1yN+p3QpP7zUhXeRM/OQE+of3Kg41coa4CaRcIOq9+h/9+OPcH WxYahg8xChdpVqRMB8GCYt/3sNxtTH7rYZB8YFCtrRbkujHWnYcUTPm2ipqx2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418960; a=rsa-sha256; cv=none; b=C7RUcFsnE+eKVA7RdifoiGZMf67HkdKnjNU7EeXTOtpupfgWGdNFMKbZF8OlxV7XS33N65 J0+LkU0OiKfRRwK74SyVBEARZ0BpiqMlkADuEM3cwy+SryGYfuby/1nqQqmS4WUdywK92j MOVoDIy1azmJionS7GQrHbnuHzGNmutyGnDoH0cxY7RlHHJ2SR+ZqKB8qJNMGCJgDtSyc7 UWO6gziHsXFbtPShY7hu+W3DeMfO78INJK7FIkwXLIY71OB+Jvjlf2lML7jcNOzIo+oPY6 hiR90ofYSEFGkCywvgT0r6Y7Ofl4+azW4CxihTmQiv44TaunrR3D9DzOCdNKZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKJlh2jw6zw0L; Mon, 7 Aug 2023 14:36: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 377Ea0PS043321; Mon, 7 Aug 2023 14:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Ea02j043320; Mon, 7 Aug 2023 14:36:00 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:36:00 GMT Message-Id: <202308071436.377Ea02j043320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: e9cd4a8fee58 - stable/13 - e1000: Fix lem(4)/em(4) TSO6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e9cd4a8fee5848adb7ba3dba70d3ad1db969263d Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=e9cd4a8fee5848adb7ba3dba70d3ad1db969263d commit e9cd4a8fee5848adb7ba3dba70d3ad1db969263d Author: Kevin Bowling AuthorDate: 2023-07-31 15:16:24 +0000 Commit: Kevin Bowling CommitDate: 2023-08-07 14:35:51 +0000 e1000: Fix lem(4)/em(4) TSO6 * Fix TSO6 by specializing IP checksum insertion and following Intel SDM values for IPv6. * Remove unnecessary 82544 IP-bit handling * Remove TSO6 from lem(4) capabilitities Reviewed by: erj (earlier version) Differential Revision: https://reviews.freebsd.org/D41170 (cherry picked from commit e1353dcb63bbdb33be6a907ed6236c120518129e) --- sys/dev/e1000/em_txrx.c | 40 ++++++++++++++++++++++++---------------- sys/dev/e1000/if_em.c | 9 ++++----- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index 0e433f388ac5..b90ab21cd825 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -141,7 +141,6 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, if_softc_ctx_t scctx = sc->shared; struct em_tx_queue *que = &sc->tx_queues[pi->ipi_qsidx]; struct tx_ring *txr = &que->txr; - struct e1000_hw *hw = &sc->hw; struct e1000_context_desc *TXD; int cur, hdr_len; uint32_t cmd_type_len; @@ -151,27 +150,39 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, E1000_TXD_DTYP_D | /* Data descr type */ E1000_TXD_CMD_TSE); /* Do TSE on this packet */ - /* IP and/or TCP header checksum calculation and insertion. */ - *txd_upper = (E1000_TXD_POPTS_IXSM | E1000_TXD_POPTS_TXSM) << 8; - cur = pi->ipi_pidx; TXD = (struct e1000_context_desc *)&txr->tx_base[cur]; /* - * Start offset for header checksum calculation. - * End offset for header checksum calculation. - * Offset of place put the checksum. + * ipcss - Start offset for header checksum calculation. + * ipcse - End offset for header checksum calculation. + * ipcso - Offset of place to put the checksum. */ + switch(pi->ipi_etype) { + case ETHERTYPE_IP: + /* IP and/or TCP header checksum calculation and insertion. */ + *txd_upper = (E1000_TXD_POPTS_IXSM | E1000_TXD_POPTS_TXSM) << 8; + + TXD->lower_setup.ip_fields.ipcse = + htole16(pi->ipi_ehdrlen + pi->ipi_ip_hlen - 1); + break; + case ETHERTYPE_IPV6: + /* TCP header checksum calculation and insertion. */ + *txd_upper = E1000_TXD_POPTS_TXSM << 8; + + TXD->lower_setup.ip_fields.ipcse = htole16(0); + break; + default: + break; + } TXD->lower_setup.ip_fields.ipcss = pi->ipi_ehdrlen; - TXD->lower_setup.ip_fields.ipcse = - htole16(pi->ipi_ehdrlen + pi->ipi_ip_hlen - 1); TXD->lower_setup.ip_fields.ipcso = pi->ipi_ehdrlen + offsetof(struct ip, ip_sum); /* - * Start offset for payload checksum calculation. - * End offset for payload checksum calculation. - * Offset of place to put the checksum. + * tucss - Start offset for payload checksum calculation. + * tucse - End offset for payload checksum calculation. + * tucso - Offset of place to put the checksum. */ TXD->upper_setup.tcp_fields.tucss = pi->ipi_ehdrlen + pi->ipi_ip_hlen; TXD->upper_setup.tcp_fields.tucse = 0; @@ -188,16 +199,13 @@ em_tso_setup(struct e1000_softc *sc, if_pkt_info_t pi, uint32_t *txd_upper, /* * "PCI/PCI-X SDM 4.0" page 45, and "PCIe GbE SDM 2.5" page 63 * - Set up basic TUCMDs - * - Enable IP bit on 82544 * - For others IP bit on indicates IPv4, while off indicates IPv6 */ cmd_type_len = sc->txd_cmd | E1000_TXD_CMD_DEXT | /* Extended descr */ E1000_TXD_CMD_TSE | /* TSE context */ E1000_TXD_CMD_TCP; /* Do TCP checksum */ - if (hw->mac.type == e1000_82544) - cmd_type_len |= E1000_TXD_CMD_IP; - else if (pi->ipi_etype == ETHERTYPE_IP) + if (pi->ipi_etype == ETHERTYPE_IP) cmd_type_len |= E1000_TXD_CMD_IP; TXD->cmd_and_length = htole32(cmd_type_len | (pi->ipi_len - hdr_len)); /* Total len */ diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index ad1780e03fc5..88738e5f0a08 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -786,8 +786,7 @@ em_set_num_queues(if_ctx_t ctx) #define LEM_CAPS \ IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ IFCAP_VLAN_HWCSUM | IFCAP_WOL | IFCAP_VLAN_HWFILTER | IFCAP_TSO4 | \ - IFCAP_LRO | IFCAP_VLAN_HWTSO| IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 | \ - IFCAP_TSO6 + IFCAP_LRO | IFCAP_VLAN_HWTSO | IFCAP_JUMBO_MTU | IFCAP_HWCSUM_IPV6 #define EM_CAPS \ IFCAP_HWCSUM | IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING | \ @@ -939,14 +938,14 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_segments_max = EM_MAX_SCATTER; scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; - scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; + scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; /* - * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} + * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} * by default as we don't have workarounds for all associated * silicon errata. TSO4 may work on > 82544 but its status * is unknown by the authors. Please report any success or failures. */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); + scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; From nobody Mon Aug 7 16:21:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKM5d0MVbz4TqpD; Mon, 7 Aug 2023 16:21: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 4RKM5c7306z4cbd; Mon, 7 Aug 2023 16:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691425301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6AfodNmodYnaRvKIthElNjCxPLQo5395y7iI7mtY3w=; b=CZUrhU5N0SghmwTBLvKPdGUl64mcPjelKfNLn+IMzXm4zo+Jo4YUVplilhryI1eeNwASpH fpNwPmf7Q5EjCmfs45Vii+e6rYnYVbNbcWSAgpMhWxT1dTD8ED0peK1OQh+HJWXCmOlCNL +z7xlDbXyhsPpCqYIBFhrbmblsJdbge70KrbpCVRmtQ0QuZeCu6NbXZgXADUDQlYejlj4q XLOtL7CsdhhluzCgAW4LYE2psVlSWMd7uxHajR7lR79ljkNrKzjJXJjhj2UDDIpwHWQAX+ 2lybdNxpnrPxPUcugMhuaIeai1o/fpXBFnlZ1LCJMtcKCRGa+i/E2DNZdQ3brA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691425301; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b6AfodNmodYnaRvKIthElNjCxPLQo5395y7iI7mtY3w=; b=hq6qdDOLpJyqFo9PgxEu/b91Wll5f07CXCI7j312xSxJVvPKQm/1c2xKfb1qyaspiATlNO 36iBXsPiQ15SgJXBYKUV7b+UwO/1ZfH/tDp1owa/zm7GrsX6oGnSkGRhIPOKpf7u7pbHfZ 23gI+QWuGpt2zFEZG4S0ohiJAAK9FJxcDBstg2kOwFcf08qjhgv35ISRRDwRotlp8XLWZd oLB39NattVxE286VxSbTdQe0yhBX7vUGILXwzW/27IJMpuwEK/mEBsfey9k1GmegXl4MAi fHb0JuGhuO8wB40MW++fkOMh7KebqZzF4u8wOPn0O1o6kb9A22UI9g3jqrG0gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691425301; a=rsa-sha256; cv=none; b=iiwCftOlLH17B28UpXBtt2pvOJGZXFgmI+cn3hVK9tLE+60yzgNj5+Tye5Yt0i4iKpfRg5 WPoIu2YszazllNtQEj+J/Tjn2cDsDvIyZUDvYNbzqu9OizCPvoCG1Y3oqfU4f0qn4U065R FeGHYJh2CV4Hf6PgProfh0siOd4jN7yBxE3gKEaY5scauFjkpa6Eaw5AwvcJMzuwWi7AxP ozzJU1NVIXbS8XkDBBNyqyyaWC4S/i+Uz8lsW//TEyLk8+2YOPgrFtU29SzCmR6IhWP6wY cGNDzD3v4J1Q7vtVu7/RC5ykM1PxX1IBIQGGLRx0mnYBRKTFcHZS1aPlmZ2WvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKM5c68M4zym3; Mon, 7 Aug 2023 16:21: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 377GLeMA023123; Mon, 7 Aug 2023 16:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377GLePP023122; Mon, 7 Aug 2023 16:21:40 GMT (envelope-from git) Date: Mon, 7 Aug 2023 16:21:40 GMT Message-Id: <202308071621.377GLePP023122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: ac4f03e03e6d - main - Firecracker: Make root disk configurable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac4f03e03e6d94ac46fed7c4f7801b522d290423 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4f03e03e6d94ac46fed7c4f7801b522d290423 commit ac4f03e03e6d94ac46fed7c4f7801b522d290423 Author: Colin Percival AuthorDate: 2023-07-14 22:11:22 +0000 Commit: Colin Percival CommitDate: 2023-08-07 16:21:08 +0000 Firecracker: Make root disk configurable Add a FCROOTFSSZ variable which defaults to "1g" which controls the size of the Firecracker root filesystem; it can be set as low as "300m" at present. Allow WITHOUTS to be overridden if users want to build a root disk with more -- or fewer -- parts of the FreeBSD base system. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41041 --- release/Makefile.firecracker | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile.firecracker b/release/Makefile.firecracker index bb54db7da5db..dc5506f364d2 100644 --- a/release/Makefile.firecracker +++ b/release/Makefile.firecracker @@ -17,7 +17,7 @@ WITHOUT_FC_ENOENT=WITHOUT_ACPI=YES WITHOUT_BOOT=YES WITHOUT_BHYVE=YES \ WITHOUT_FC_FEATURES=WITHOUT_DEBUG_FILES=YES WITHOUT_INCLUDES=YES \ WITHOUT_INSTALLLIB=YES WITHOUT_TESTS=YES WITHOUT_TOOLCHAIN=YES # All the excluded bits -WITHOUTS=${WITHOUT_VM_ENOENT} ${WITHOUT_FC_ENOENT} ${WITHOUT_FC_FEATURES} +WITHOUTS?=${WITHOUT_VM_ENOENT} ${WITHOUT_FC_ENOENT} ${WITHOUT_FC_FEATURES} firecracker: firecracker-freebsd-kern.bin firecracker-freebsd-rootfs.bin @@ -35,6 +35,7 @@ firecracker-freebsd-kern.bin: cp ${FCKDIR}/boot/kernel/kernel ${DESTDIR}/freebsd-kern.bin FCWDIR= ${.OBJDIR}/${TARGET}/firecracker-world +FCROOTFSSZ?= 1g firecracker-freebsd-rootfs.bin: mkdir -p ${FCWDIR} ${MAKE} -C ${WORLDDIR} DESTDIR=${FCWDIR} \ @@ -54,5 +55,5 @@ firecracker-freebsd-rootfs.bin: -u 1001 -g 1001 -G 0 -c "FreeBSD User" -d /home/freebsd -s /bin/sh pw -R ${FCWDIR} usermod root -w yes touch ${FCWDIR}/firstboot - makefs -s 1g -o label=rootfs -o version=2 -o softupdates=1 \ + makefs -s ${FCROOTFSSZ} -o label=rootfs -o version=2 -o softupdates=1 \ ${DESTDIR}/freebsd-rootfs.bin ${FCWDIR} From nobody Mon Aug 7 18:00:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKPHK5N63z4m3jN; Mon, 7 Aug 2023 18:00: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 4RKPHK4t67z3K5S; Mon, 7 Aug 2023 18:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691431213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmS9o+mVLoPU8fnZZE77RSlzpIU/1xAE2f4XGbxlaAA=; b=yL87TFl5c9pVGWnC7JJPdEk6PINuTUbsPrhwPERvUD1+DPdXCql2pmBCLenXQhaA67ZlHk eJWn2g3ZWi15Zu+f8gIch84UxEJjmNl3CJjjTPxuBEI0Mb/2nDXDrbmQxK0S9cMlLOHZrc a6wG79hy5U+atEoJ3BMTSqVX/8hepy9bSjMKSWIBdbNFwZvm3n83GVDNqDH6IcmYF0tDTe 4NXnC1AJfoFLfJRicidv511NvQOOaI5NZzem/IJlz09RPEIfn7DuU/nPQaKg2oGGoLsIfY Ki/i371Npjo3WHFtYOoA/b/jOnBH3lRbnaq+9CJm+m6vBPyt4WNzv7RWqutQ1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691431213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xmS9o+mVLoPU8fnZZE77RSlzpIU/1xAE2f4XGbxlaAA=; b=NQYrUOAz8p5ihUk/xqlBHC4dvEfqfVgaCgQbMBVvDLpbJz7dIfrWD2sGkisqV1mdKPJnhc +qq05JnJ9s0UPv1y4Iiajv1MMrpc2zmxPknFbwxSXh/9jC+SFgh5cZ/Bc526OZzAeeWxtE BcPPs0WbXKDL33lPXhBHqFyO0/zNHyRIkrgDAwQywuWRHxNXJhp+3d/NVK8dVMzx+NUU/3 MeaffvRGtAMkMbLqkIKPqy0r4XlIUWPJxz+FbuSNoSOQqwQsDCrwkkZItnnZG1tobhrkF9 OxQyZG5UDIN6Z39Z4Fjst+NXDojge6swrk6SII0jCgV0eIFwQAn1yXmPH/k/lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691431213; a=rsa-sha256; cv=none; b=m04cku+MQhJbIqfM32UPKCVyrXmFgIGEuXR1sr1Pq6jtuNX48aorKarEgerV0zt2fA0Dq/ MUkM+XjaC/W2JP/m0tRAXWswQPBueltOVm+ZzbYMmi5CEJrTyrzvL9M70j9nNeyYdlpsmi 4F4XdYoKZKOqtEbTrh0svdoY4IVjpQ62I7dYsfaPgwRgRjOZf7sXX8XCwvoiKXfk6LERuG TSZKibSRJZoKOVDnbGEaV6M674T+C8gb//7Iqk91X7bso/UGSavXUQ61cg0fjLSAdARZOa rvo5DhtmnGIiKSAn5N7h4I885pY5l6ki9Z0qlce1T6d2oPLwOLfph0h/BKamwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKPHK3xnFz129N; Mon, 7 Aug 2023 18:00: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 377I0Ddn083870; Mon, 7 Aug 2023 18:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377I0DdJ083864; Mon, 7 Aug 2023 18:00:13 GMT (envelope-from git) Date: Mon, 7 Aug 2023 18:00:13 GMT Message-Id: <202308071800.377I0DdJ083864@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: f8b4f9aab5b7 - main - pfctl: optionally clarify which anchors are layer 3 and which are Ethernet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8b4f9aab5b7119e8e26bc5f75931e89df00df39 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b4f9aab5b7119e8e26bc5f75931e89df00df39 commit f8b4f9aab5b7119e8e26bc5f75931e89df00df39 Author: Kristof Provost AuthorDate: 2023-08-07 17:45:22 +0000 Commit: Kristof Provost CommitDate: 2023-08-07 17:59:50 +0000 pfctl: optionally clarify which anchors are layer 3 and which are Ethernet When listing anchors pfctl lists both 'regular' layer 3 anchors and Ethernet anchors. It's possible to have the same anchor name in both, which can be confusing. Mitigate this a little by explicitly marking where the Ethernet anchors start. Avoid breaking scripts by only doing this at the second level of verbosity. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 09f29b1c601c..ea1812a3858d 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -3039,6 +3039,8 @@ main(int argc, char *argv[]) switch (*showopt) { case 'A': pfctl_show_anchors(dev, opts, anchorname); + if (opts & PF_OPT_VERBOSE2) + printf("Ethernet:\n"); pfctl_show_eth_anchors(dev, opts, anchorname); break; case 'r': From nobody Mon Aug 7 22:45:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcf0b8yz4mSxM; Mon, 7 Aug 2023 22:45: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 4RKWcf01Frz4NqJ; Mon, 7 Aug 2023 22:45:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0s8o3DTPK01NAVjU+LdnUfGcNK3Z9gY9NsFnAgzaTBk=; b=aQZG2+bgcsxyEwfUr2YAW+YJB0We9qz1yk8Rxg5I9VN/uuiMC7lKtkmv1zwnQwfAaamSAR OZhZUMpXBiK8Cc0cEvaEKUyrS5fTHUJqt+x+xMlijudzW8y8OcA6ThGYiyke0DjggxS83V hzB9NaH5kgCMkDgEikMxrVq5nLWXUz26z+tici5/qAAX8befthwZ6QFGtAcDrZBpVtvZYU bHFwnT1zG+zpfStz/GN5b0h1f+r4ILsFaD+eDIyBprsP+TYFAUJYFtnJ0kt+LfQfSF/eNz LisS811VCJQNNCh2zda7dvufa9FCpXKlY/C2nm0tSqf9SOK0ahJ1OxXjE2X04Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448338; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0s8o3DTPK01NAVjU+LdnUfGcNK3Z9gY9NsFnAgzaTBk=; b=RiESjHyGcAxDdhiP1louz31gLjfyhSshIxxE5WH7v+8LPB0yuI+WDQEdu8WeMR4x1N+4vc aivd87IvwevH9UC1jzPpLe/KU106MhPuTVAsm/ycDhdi0oJyXTY/GzqkCAhCHuqsKD/wjR kv55fwrCQGiRzdPtepWqTnu+B3cjuGFaCG6iomNOlBDxnefVgHXLRPeKX3RPXF1nbtXaGD mpHvbr4IM6a4hYGjmu0C3Gtxvnpi5nz8XPf8XMZDi0dUlLxNJ/mjPuqzYBM4aciZBfDRqv WyDnUuHHbb3dcewrI3vsguhcxUAssvbZYK/i6aUMfhOCbur2eENzsYEp88v8kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448338; a=rsa-sha256; cv=none; b=Y9vhlp90N22ra69UwJySYs9zecBLaErtdsIYCY33s4pOVb0Dti4nIHPNLwyl7/9DfvrJbu 1v8iH9mUj4nk049C90AdnqPmnugTicZrFBjT6wb8L6FBEDm8HQqa/6dVlXHk6XFTEvnodX Xvb8I4TC3EbuSgZNdgKES5rcyRW9rNpCISixSNtMXtZ4Vk9F6LCgDdLLu7MGYwEhGPxrAB 8SiXRmaCGvdDBNvxW/jqfStLiP5B13WINMEqX8rhFIZoHuFuwiGHQ9GjB0D4vVPoA+IyUu eXQETxfV38JApGjJxfVycbQMmUA5hKT6B1NcdiZGvPV1Hq0476kg4wwAzaZuyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcd67btz18jB; Mon, 7 Aug 2023 22:45:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377Mjb8u058590; Mon, 7 Aug 2023 22:45:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Mjbbv058589; Mon, 7 Aug 2023 22:45:37 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:37 GMT Message-Id: <202308072245.377Mjbbv058589@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: 6f76d493864b - main - nvme: Remove duplicate completion printing routine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f76d493864b976d1eaea22eba59407319f6e327 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6f76d493864b976d1eaea22eba59407319f6e327 commit 6f76d493864b976d1eaea22eba59407319f6e327 Author: Warner Losh AuthorDate: 2023-08-07 22:34:25 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:30 +0000 nvme: Remove duplicate completion printing routine Both nvme_dump_completion and nvme_qpair_print_completion print completions. The latter is better. Recode the two instances of nvme_dump_completion to use nvme_qpair_print_completion and delete the former. No sense having two nearly identical routines. A future commit will convert this to sbuf. Sponsored by: Netflix Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D41308 --- sys/dev/nvme/nvme.c | 21 --------------------- sys/dev/nvme/nvme_private.h | 3 ++- sys/dev/nvme/nvme_qpair.c | 13 +++++++------ sys/dev/nvme/nvme_sysctl.c | 2 +- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index 316cd8934036..22d197dc9367 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -95,27 +95,6 @@ nvme_dump_command(struct nvme_command *cmd) le32toh(cmd->cdw13), le32toh(cmd->cdw14), le32toh(cmd->cdw15)); } -void -nvme_dump_completion(struct nvme_completion *cpl) -{ - uint8_t p, sc, sct, crd, m, dnr; - uint16_t status; - - status = le16toh(cpl->status); - - p = NVME_STATUS_GET_P(status); - sc = NVME_STATUS_GET_SC(status); - sct = NVME_STATUS_GET_SCT(status); - crd = NVME_STATUS_GET_CRD( status); - m = NVME_STATUS_GET_M(status); - dnr = NVME_STATUS_GET_DNR(status); - - printf("cdw0:%08x sqhd:%04x sqid:%04x " - "cid:%04x p:%x sc:%02x sct:%x crd:%x m:%x dnr:%x\n", - le32toh(cpl->cdw0), le16toh(cpl->sqhd), le16toh(cpl->sqid), - cpl->cid, p, sc, sct, crd, m, dnr); -} - int nvme_attach(device_t dev) { diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 370bd0dccf20..95915902642e 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -444,7 +444,8 @@ void nvme_ns_destruct(struct nvme_namespace *ns); void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr); void nvme_dump_command(struct nvme_command *cmd); -void nvme_dump_completion(struct nvme_completion *cpl); +void nvme_qpair_print_completion(struct nvme_qpair *qpair, + struct nvme_completion *cpl); int nvme_attach(device_t dev); int nvme_shutdown(device_t dev); diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index dffbaba8deca..a09be6bba7d9 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -341,21 +341,22 @@ get_status_string(uint16_t sct, uint16_t sc) return (entry->str); } -static void +void nvme_qpair_print_completion(struct nvme_qpair *qpair, struct nvme_completion *cpl) { - uint8_t sct, sc, crd, m, dnr; + uint8_t sct, sc, crd, m, dnr, p; sct = NVME_STATUS_GET_SCT(cpl->status); sc = NVME_STATUS_GET_SC(cpl->status); crd = NVME_STATUS_GET_CRD(cpl->status); m = NVME_STATUS_GET_M(cpl->status); dnr = NVME_STATUS_GET_DNR(cpl->status); + p = NVME_STATUS_GET_P(cpl->status); - nvme_printf(qpair->ctrlr, "%s (%02x/%02x) crd:%x m:%x dnr:%x " + nvme_printf(qpair->ctrlr, "%s (%02x/%02x) crd:%x m:%x dnr:%x p:%d " "sqid:%d cid:%d cdw0:%x\n", - get_status_string(sct, sc), sct, sc, crd, m, dnr, + get_status_string(sct, sc), sct, sc, crd, m, dnr, p, cpl->sqid, cpl->cid, cpl->cdw0); } @@ -654,8 +655,8 @@ nvme_qpair_process_completions(struct nvme_qpair *qpair) nvme_printf(qpair->ctrlr, "cpl (cid = %u) does not map to outstanding cmd\n", cpl.cid); - /* nvme_dump_completion expects device endianess */ - nvme_dump_completion(&qpair->cpl[qpair->cq_head]); + nvme_qpair_print_completion(qpair, + &qpair->cpl[qpair->cq_head]); KASSERT(0, ("received completion for unknown cmd")); } diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index c238c86af5a2..a48dad04d90f 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -65,7 +65,7 @@ nvme_dump_queue(struct nvme_qpair *qpair) for (i = 0; i < qpair->num_entries; i++) { cpl = &qpair->cpl[i]; printf("%05d: ", i); - nvme_dump_completion(cpl); + nvme_qpair_print_completion(qpair, cpl); } printf("Submission queue:\n"); From nobody Mon Aug 7 22:45:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcg2YF0z4mT0c; Mon, 7 Aug 2023 22: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 4RKWcg1Mjxz4Nqf; Mon, 7 Aug 2023 22: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=1691448339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIDRkzHI4wmHypdO4JZpYkASnkJR0ZsNds7QTRbTpwU=; b=fti2HLXBROg90rN1sn5uwUHKJ1RmPUUCIKWO2KUerUFINgiApHf+lKcRpKf1UNbo+Jfj9K 1B0nQx4zxpAVFm4Yl/Iil3rI4JIgIZ4PDw+WNU6dnh/1Yb0/JNL01bgX/8MIPY6XIsNYqo 1q5T+BazYWRQ1weMyr6P9PsL3QlHnfSAKa0zQD3ZhEJT03aFYuTf+CngJAK7qwxnf60JVE zAOUSf5DxVIsnmwwpc3NQ7TLmhlqxKPjzlyiyZOEFmifWlz4eTRiUXJHSCsSDTD0MTEKwp kFNv5mtBAHIdp6fZq977+OLmAvIp306stt3iG9ldkvvwMceLGM7PebQVuUcU4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448339; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oIDRkzHI4wmHypdO4JZpYkASnkJR0ZsNds7QTRbTpwU=; b=IX7P4ZW/oPUPbhVJdoRw4o699fktBrsdOO5jtinWlzzp5X+GhjKpyxRS7h6z7uHtjISfp/ PrdQ/Ken4rojZf4e+/PTFEchcuYnVvhvi83VYAljIhW+SQXEYZF/cK007DT9sSrdk+la+L ofT0uvWV5gVkbNXyRXilhkHIaR1XjCEpZ2E4P+sVvmNCvcRcqePMGNQc/H66Vu4c64qhUL EycBCa9CAURFiKB7ya4XSnLrp/WvPDCHZXd4M5LAdkb3wd7IEepRdJ02ziQ43yx320I8yD OFJPqteeBr8Kk1QhxEEz5kAdiVpeCpY20HXn8Z6OxY8BW3DONuSyhChqG6+PRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448339; a=rsa-sha256; cv=none; b=YsRUbI2NQSmkGgQs+nwj2txR6wmfCKLjT1jc4kdZoZ6Ae6hzJ0fVMTJcyxEi9pq86HQ1S+ 5qScL7b13re9xxew5XoGpqrRN+KyDAL8haSJpbKGBMsu8sNBz4MO+zwhdxWBrlRYrCEBog bK+5IvhP/K5vXb5WiXfxD4IsMJp45jaQVIarWm/Szm4VjyjxKv8kqd8Q89ldnEeGXADJwn 8uE9au/3g6DnO6WnNgN0RmUZu4bMxwsNUmwwpREpZfya0m6vbGta877jFklQoAOFFkWF7U kr4bD4ayhPSYUO9X6GxLcO5RbHymhpe+ORr7LKHTgcDtWBoHwbrA0jODQA9P8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcf70lGz18jC; Mon, 7 Aug 2023 22:45: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 377Mjc5u058611; Mon, 7 Aug 2023 22:45:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjcuC058610; Mon, 7 Aug 2023 22:45:38 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:38 GMT Message-Id: <202308072245.377MjcuC058610@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: 7be0b0688538 - main - nvme: Remove duplicate command printing routine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7be0b0688538ced679254703076b34c4e9eb507c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7be0b0688538ced679254703076b34c4e9eb507c commit 7be0b0688538ced679254703076b34c4e9eb507c Author: Warner Losh AuthorDate: 2023-08-07 22:34:54 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:30 +0000 nvme: Remove duplicate command printing routine Both nvme_dump_command and nvme_qpair_print_command print nvme commands. The former latter better. Recode the one call to nvme_dump_command to use nvme_qpair_print_command and delete the former. No sense having two nearly identical routines. A future commit will convert to sbuf. Sponsored by: Netflix Reviewed by: chuck, mav, jhb Differential Revision: https://reviews.freebsd.org/D41309 --- sys/dev/nvme/nvme.c | 13 ------------- sys/dev/nvme/nvme_private.h | 3 ++- sys/dev/nvme/nvme_qpair.c | 2 +- sys/dev/nvme/nvme_sysctl.c | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c index 22d197dc9367..1b06e674551c 100644 --- a/sys/dev/nvme/nvme.c +++ b/sys/dev/nvme/nvme.c @@ -82,19 +82,6 @@ nvme_shutdown(device_t dev) return (0); } -void -nvme_dump_command(struct nvme_command *cmd) -{ - - printf( -"opc:%x f:%x cid:%x nsid:%x r2:%x r3:%x mptr:%jx prp1:%jx prp2:%jx cdw:%x %x %x %x %x %x\n", - cmd->opc, cmd->fuse, cmd->cid, le32toh(cmd->nsid), - cmd->rsvd2, cmd->rsvd3, - (uintmax_t)le64toh(cmd->mptr), (uintmax_t)le64toh(cmd->prp1), (uintmax_t)le64toh(cmd->prp2), - le32toh(cmd->cdw10), le32toh(cmd->cdw11), le32toh(cmd->cdw12), - le32toh(cmd->cdw13), le32toh(cmd->cdw14), le32toh(cmd->cdw15)); -} - int nvme_attach(device_t dev) { diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 95915902642e..9d82c8fba69c 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -443,7 +443,8 @@ void nvme_ns_destruct(struct nvme_namespace *ns); void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr); -void nvme_dump_command(struct nvme_command *cmd); +void nvme_qpair_print_command(struct nvme_qpair *qpair, + struct nvme_command *cmd); void nvme_qpair_print_completion(struct nvme_qpair *qpair, struct nvme_completion *cpl); diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index a09be6bba7d9..40c9f6053b95 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -174,7 +174,7 @@ nvme_io_qpair_print_command(struct nvme_qpair *qpair, } } -static void +void nvme_qpair_print_command(struct nvme_qpair *qpair, struct nvme_command *cmd) { if (qpair->id == 0) diff --git a/sys/dev/nvme/nvme_sysctl.c b/sys/dev/nvme/nvme_sysctl.c index a48dad04d90f..24c397973fbc 100644 --- a/sys/dev/nvme/nvme_sysctl.c +++ b/sys/dev/nvme/nvme_sysctl.c @@ -72,7 +72,7 @@ nvme_dump_queue(struct nvme_qpair *qpair) for (i = 0; i < qpair->num_entries; i++) { cmd = &qpair->cmd[i]; printf("%05d: ", i); - nvme_dump_command(cmd); + nvme_qpair_print_command(qpair, cmd); } } From nobody Mon Aug 7 22:45:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWch2X1Tz4mSxT; Mon, 7 Aug 2023 22:45: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 4RKWch1gcPz4Nnl; Mon, 7 Aug 2023 22:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LYb5teH3mS4yq3N3Wo0r4EpFQJCw23g9uOP5I9RklI=; b=mSM0Xw9o6e1qrrC46jjun0Db2RQRQG3er8vxVbsGp3FJOlMC2Rcgeys5K3Lvivbrqh4Ei0 zr+opGyY0L1c87764oJ0mCPGflTzNju7JkMYOKer9bZC1wutEAqRYAcYYGaIJhM+F8GpCQ 0wixEPe+GFi/hr8ZwEX+Xt5qviyShkb4rUz51OL900dUcHS1K1Qxm24HfCEowLaOwHe1Z2 g7yoL1L9B/rNwrk10iTjdghYPlkqNSHYnmkmCOUq7+e5wWhFjcr0UXFB4mNHPWlJt+0SxE JCWZ37ZF2VsnjoottjnIpYAIHviQK12FrVO1Bg8f666ZSEVI5Je6BHWL8eXnmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448340; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LYb5teH3mS4yq3N3Wo0r4EpFQJCw23g9uOP5I9RklI=; b=MR6AMIGyVTeYCxWC18pKkglV+2y/m/uL8M0UPAXFzN1xchDvmkXKS2ZIR/wwME2kHIFvRb oyb9/N+N1UVtFR2YgeAQ/CXanKR0JPSRSHWuLL7FmL+0BWsWKkXatO1u7vVrSoJ2bMoQ4d qq5d+VB5TPts/g4KwR1Rqv/jXUaD3xKiwqiT8qnrOFVYY3h1WGNl/N6tciobQeiY9lLzCd xr3+mRf8O30BHiWQ22H545T9I7N8S5mIq8K6I6G0McwaFkt9r577RCPR2QUN6knnI6/Nfz TeGHbpKOymQ4hLSM3hL+mSF3bcbUkSR6yodQldDB1hq+zWgwp1RAqqhaYuIzyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448340; a=rsa-sha256; cv=none; b=A4bHbSGbWFYnemkJ0Ov1yO7uuDCFPZ1uhGhtzygkKcFlzeTg7rynjEgmGNiC/9FmlJs6Z1 2ChndbaRrQTmmrOBtJMRKRiuWYHmuYZZQ4UFyYTnPXYCGsG5edyUM+D+lXd4vCq3nWDY+N 4pAmARqTvbW5Afc1/XTadNd7/h+fbD82QO7kLGGI+v/4RefvrJwQEJ/+4HKPzQ3ZSbxwHt TwkIdOoD90gyvp/Nmq4zygSTR7usMyWoKvUtojQ25sp7F5n2u/ufhE5bEH/ZlpooXJnjOI 5uPEKP8zAYizbVsF4ZW0acWUWb1ujRJQeit80Yjrd61ZoxAolulPArPNWfnA3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWch0nY4z19DS; Mon, 7 Aug 2023 22:45:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MjeZs058637; Mon, 7 Aug 2023 22:45:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjetB058636; Mon, 7 Aug 2023 22:45:40 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:40 GMT Message-Id: <202308072245.377MjetB058636@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: edd23e4dc013 - main - nvme: Eliminate redundant code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edd23e4dc013fe9603138271a2cfaa68732055ba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=edd23e4dc013fe9603138271a2cfaa68732055ba commit edd23e4dc013fe9603138271a2cfaa68732055ba Author: Warner Losh AuthorDate: 2023-08-07 22:35:15 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Eliminate redundant code get_admin_opcode_string and get_io_opcode_string are identical, but start with different tables. Use a helper routine that takes an argument to implement these instead. A future commit will refine this further. Sponsored by: Netflix Reviewed by: chuck, mav, jhb Differential Revision: https://reviews.freebsd.org/D41310 --- sys/dev/nvme/nvme_qpair.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 40c9f6053b95..988c82741592 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -99,12 +99,8 @@ static struct nvme_opcode_string io_opcode[] = { }; static const char * -get_admin_opcode_string(uint16_t opc) +get_opcode_string(struct nvme_opcode_string *entry, uint16_t opc) { - struct nvme_opcode_string *entry; - - entry = admin_opcode; - while (entry->opc != 0xFFFF) { if (entry->opc == opc) return (entry->str); @@ -114,18 +110,15 @@ get_admin_opcode_string(uint16_t opc) } static const char * -get_io_opcode_string(uint16_t opc) +get_admin_opcode_string(uint16_t opc) { - struct nvme_opcode_string *entry; - - entry = io_opcode; + return (get_opcode_string(admin_opcode, opc)); +} - while (entry->opc != 0xFFFF) { - if (entry->opc == opc) - return (entry->str); - entry++; - } - return (entry->str); +static const char * +get_io_opcode_string(uint16_t opc) +{ + return (get_opcode_string(io_opcode, opc)); } static void From nobody Mon Aug 7 22:45:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcj3Lvgz4mSZq; Mon, 7 Aug 2023 22:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWcj2jXnz4NxF; Mon, 7 Aug 2023 22:45:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l/h15wOesUxwEV9KhVKY7SPJpEHx6VfNx3Ar6AR5QNA=; b=yADyVgmBThfU2pDt4EP8Ypyjm62LHBPGnYCYnvL7GlTgFKF4V5bDL9j+XrAaW8/eA3Ez6j 4x2KgBDdumB9FVa9hJ/IupwwLfw5aPwseJV5DcHGKhpUSSi9I4JnzZVQZSRu1yLr6J4LQZ 4OQSDGtDepjeBQsWVgVSLK+QxdCnq1UIaaNqSPn3rLPe3duPewJRAAxciO8R7a3O3Q1ZT7 R1Bv0LoxrnUMtDu/48lSvOisoJq92v+0bW0EFtYhK1N2PhyxVDJozd2/oYHnSrdmtvGidI 1liAVuCGpXaQKSdzL5ileuFCGZz10b6FRS3SSkneR5nsDudpnNjWrD4Hb7AjjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l/h15wOesUxwEV9KhVKY7SPJpEHx6VfNx3Ar6AR5QNA=; b=wZ81vhs4EcajPtwHbPH16gxmMw9HFs5NdNy5Gb53N8L8d6PDfvZG3hqcqu3dw4cSAUHUft gkV0HlzhVYDeOrDvgqL/9NyOxFEctOycJUzQYKIa1X/Jdwyl6FBkdz4fQVIyAYooZyu68p kDOaahngLpYpmN7+KpSZ6qOhtJXQkxcOFIThoFfKq1EGsb8QHzERKPkdtVTh0jCmrYMECd fQEvVc5P78H9TPootIbxVmdvpxh186BBggqihLXYFFB5AOFQEI9+9+J9LODl8kH1CRWtAu 0cT7qguHAuu+fIwBPYE3XQqdybDRFQQ31M8dRBtdEnQO2dPiZeDiuOoPf2TEFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448341; a=rsa-sha256; cv=none; b=sUP0nHYtdJqJe14SK4sBXtf5ncJo6b9lXBCFwynsHfrQ/dbUTGYl456NJ2cDUIUbCp81i7 d3ChDKp7PxKDsHrs5lEbpFM+kEYZ7da0ZYa+/VCtgv3IHrNuT5uyN/ekV6SRdXHUUHOLeL CY0M6eUaJxoojRacnq/9H7IQt96439WBj8TfiOeKLVPUjITxD12nNmxjmoKl/USeKeuivV gamX1SLgnOl46ry2dveXv43MbEmNH0GOMQ7FCupaN9vUwmr2I3lxG9EzLcQFQlhOZ2iOV2 aiyN64owY7xH50X3npaO4ovNGyBSpr8Cr2KCdOt80kkUZAA5g+cbk8gJk7Zm1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcj1Tygz18jD; Mon, 7 Aug 2023 22:45: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 377Mjf9F058656; Mon, 7 Aug 2023 22:45:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjfGX058655; Mon, 7 Aug 2023 22:45:41 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:41 GMT Message-Id: <202308072245.377MjfGX058655@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: ac8c866fda40 - main - nvme: Add more NVME Base Spec 2.0 and NVME Command Set Spec 1.0a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac8c866fda40d55d6a602da76b665748738d1c79 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac8c866fda40d55d6a602da76b665748738d1c79 commit ac8c866fda40d55d6a602da76b665748738d1c79 Author: Warner Losh AuthorDate: 2023-08-07 22:35:38 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Add more NVME Base Spec 2.0 and NVME Command Set Spec 1.0a Add admin commands capacity management, lockdown and fabrics commands. Add I/O copy command. Sponsored by: Netflix Reviewed by: chuck, mav, jhb Differential Revision: https://reviews.freebsd.org/D41311 --- sys/dev/nvme/nvme.h | 10 +++++++++- sys/dev/nvme/nvme_qpair.c | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index b8e2813e977b..b63a7d0bf270 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -851,8 +851,14 @@ enum nvme_admin_opcode { NVME_OPC_VIRTUALIZATION_MANAGEMENT = 0x1c, NVME_OPC_NVME_MI_SEND = 0x1d, NVME_OPC_NVME_MI_RECEIVE = 0x1e, - /* 0x1f-0x7b - reserved */ + /* 0x1f - reserved */ + NVME_OPC_CAPACITY_MANAGEMENT = 0x20, + /* 0x21-0x23 - reserved */ + NVME_OPC_LOCKDOWN = 0x24, + /* 0x15-0x7b - reserved */ NVME_OPC_DOORBELL_BUFFER_CONFIG = 0x7c, + /* 0x7d-0x7e - reserved */ + NVME_OPC_FABRICS_COMMANDS = 0x7f, NVME_OPC_FORMAT_NVM = 0x80, NVME_OPC_SECURITY_SEND = 0x81, @@ -882,6 +888,8 @@ enum nvme_nvm_opcode { NVME_OPC_RESERVATION_ACQUIRE = 0x11, /* 0x12-0x14 - reserved */ NVME_OPC_RESERVATION_RELEASE = 0x15, + /* 0x16-0x18 - reserved */ + NVME_OPC_COPY = 0x19, }; enum nvme_feature { diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 988c82741592..34a3633fdb2e 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -73,7 +73,10 @@ static struct nvme_opcode_string admin_opcode[] = { { NVME_OPC_VIRTUALIZATION_MANAGEMENT, "VIRTUALIZATION MANAGEMENT" }, { NVME_OPC_NVME_MI_SEND, "NVME-MI SEND" }, { NVME_OPC_NVME_MI_RECEIVE, "NVME-MI RECEIVE" }, + { NVME_OPC_CAPACITY_MANAGEMENT, "CAPACITY MANAGEMENT" }, + { NVME_OPC_LOCKDOWN, "LOCKDOWN" }, { NVME_OPC_DOORBELL_BUFFER_CONFIG, "DOORBELL BUFFER CONFIG" }, + { NVME_OPC_FABRICS_COMMANDS, "FABRICS COMMANDS" }, { NVME_OPC_FORMAT_NVM, "FORMAT NVM" }, { NVME_OPC_SECURITY_SEND, "SECURITY SEND" }, { NVME_OPC_SECURITY_RECEIVE, "SECURITY RECEIVE" }, @@ -95,6 +98,7 @@ static struct nvme_opcode_string io_opcode[] = { { NVME_OPC_RESERVATION_REPORT, "RESERVATION REPORT" }, { NVME_OPC_RESERVATION_ACQUIRE, "RESERVATION ACQUIRE" }, { NVME_OPC_RESERVATION_RELEASE, "RESERVATION RELEASE" }, + { NVME_OPC_COPY, "COPY" }, { 0xFFFF, "IO COMMAND" } }; From nobody Mon Aug 7 22:45:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWck5lpCz4mSvh; Mon, 7 Aug 2023 22:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWck3bHNz4P3F; Mon, 7 Aug 2023 22:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OVC4XmmIh6kMpq9XDPrb8KKygfdwB1zxzV5UTU2Q4g=; b=JFkWhgMOxY+Peq6Fa38z3s571PmKAAjZx9E0b3hHv0qFkTxBRH8Hsij+9uHjq8K8CwcT1o m6MqyQ0RNLtTPPBqvrViEP+YAya4KqmG7b078HUKuVM/iZPArVJmIsWF0hkgXAFCFcDtjE 1mPFG4GM5JoEqK+IT+1CpcM79yl0nCOxrWeKcMcAMVtdw3r27/RJFL/uzcJyPX+6+3k0ZF GW79tlyajME/ClxglzTr22+feAcaRyvaVlLrObH8ZsxGVGWD6o87TSTQ/b++pk+Uwyk2tC 9nE0Q1PhTIoHo0akCSUq/yJEakw/BSn2jgsUXewSEIOVUlJyukqEfKMoTMe0Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/OVC4XmmIh6kMpq9XDPrb8KKygfdwB1zxzV5UTU2Q4g=; b=DtJKoB7iCHELBn84rCz7tGwMkYcGfz4yOzNKW8HhrCa/2b7xCawWjrw+4xNXo5QnCUcwM+ M0cHPHF4JoQ2RI52sDC9KnvcmjGjkjwvF5NFvWX5boxPFI7LZ/6KicwAJZQ5xak0WEdtyu /CN9+ja86i7MbcB09wi8sw/MBlv7SAOdrqhrQClPPjkIMSXO2N4lZI0QteVX2L0M8CJara p8pu5E2NgovjYmYZo2TZ4i4Mcck/ubl4+oGXhhKlOLRzUaklSTAhLNu10EElAF+SfLBTCr O2uC1sgLmB1sfaCcppcRJI+Fp+Umv7dpJvFt5w35ERSg7FA6UGB56xJD+brO1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448342; a=rsa-sha256; cv=none; b=nAmHdAIyPDwunnhrr2KnB9dEZ11NiuZNHYlcx0TuZ1YMX8zvc0fooZp3tnBzbVQNHf+gUz 1nDQdSJ+P2NgzxiBjjdBz+JvWUM6TiQp10CusLWTyG7HHdH7qF2IMk29nVCFo0bZS7IvKG rfvUFeJd94qS8PVbH6BlodX3aFoQkymvoQwNkQ/aW8GtvG2ScGC8D7TFLhq83LhwJ7WUB/ ozXnSc7sfwCzIcauLiCqELa/myKCuEsxVb7v+X2NPiY4U7xNwA6RPJlb9ST7iHKmuL8ez4 v/P8y67ug8UlSRUuWZ+FOMncVXQqel9iwvvNiE71vFduNqGr5T9JfgAO8udR8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWck2d5pz19DT; Mon, 7 Aug 2023 22:45:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MjgXU058676; Mon, 7 Aug 2023 22:45:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Mjgsp058675; Mon, 7 Aug 2023 22:45:42 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:42 GMT Message-Id: <202308072245.377Mjgsp058675@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: a510dbc848bb - main - nvme: Be less verbose when cancelling I/O or admin commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a510dbc848bbc89f4e686c15386b5eb4b35c8236 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a510dbc848bbc89f4e686c15386b5eb4b35c8236 commit a510dbc848bbc89f4e686c15386b5eb4b35c8236 Author: Warner Losh AuthorDate: 2023-08-07 22:35:48 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Be less verbose when cancelling I/O or admin commands When we're resetting, and there's outstanding I/O that we're cancelling, only report we're cancelling the I/O once rather than once per I/O. Likewise when we reschedule the I/O. We don't need to say for each one that we're cancelling/rescheduling something, and then report the I/O that we're doing. Likewise with cancelling admin commands (we never retry them here, so a similar change isn't needed). Sponsored by: Netflix Reviewed by: chuck, mav Differential Revision: https://reviews.freebsd.org/D41313 --- sys/dev/nvme/nvme_qpair.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 34a3633fdb2e..0a0115967eef 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -1244,19 +1244,25 @@ nvme_admin_qpair_enable(struct nvme_qpair *qpair) { struct nvme_tracker *tr; struct nvme_tracker *tr_temp; + bool rpt; /* * Manually abort each outstanding admin command. Do not retry - * admin commands found here, since they will be left over from - * a controller reset and its likely the context in which the - * command was issued no longer applies. + * admin commands found here, since they will be left over from + * a controller reset and its likely the context in which the + * command was issued no longer applies. */ - TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { + rpt = !TAILQ_EMPTY(&qpair->outstanding_tr); + if (rpt) nvme_printf(qpair->ctrlr, "aborting outstanding admin command\n"); + TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { nvme_qpair_manual_complete_tracker(tr, NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, DO_NOT_RETRY, ERROR_PRINT_ALL); } + if (rpt) + nvme_printf(qpair->ctrlr, + "done aborting outstanding admin\n"); mtx_lock(&qpair->lock); nvme_qpair_enable(qpair); @@ -1270,17 +1276,22 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) struct nvme_tracker *tr; struct nvme_tracker *tr_temp; struct nvme_request *req; + bool report; /* * Manually abort each outstanding I/O. This normally results in a - * retry, unless the retry count on the associated request has - * reached its limit. + * retry, unless the retry count on the associated request has + * reached its limit. */ - TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { + report = !TAILQ_EMPTY(&qpair->outstanding_tr); + if (report) nvme_printf(qpair->ctrlr, "aborting outstanding i/o\n"); + TAILQ_FOREACH_SAFE(tr, &qpair->outstanding_tr, tailq, tr_temp) { nvme_qpair_manual_complete_tracker(tr, NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, 0, ERROR_PRINT_NO_RETRY); } + if (report) + nvme_printf(qpair->ctrlr, "done aborting outstanding i/o\n"); mtx_lock(&qpair->lock); @@ -1289,13 +1300,17 @@ nvme_io_qpair_enable(struct nvme_qpair *qpair) STAILQ_INIT(&temp); STAILQ_SWAP(&qpair->queued_req, &temp, nvme_request); + report = !STAILQ_EMPTY(&temp); + if (report) + nvme_printf(qpair->ctrlr, "resubmitting queued i/o\n"); while (!STAILQ_EMPTY(&temp)) { req = STAILQ_FIRST(&temp); STAILQ_REMOVE_HEAD(&temp, stailq); - nvme_printf(qpair->ctrlr, "resubmitting queued i/o\n"); nvme_qpair_print_command(qpair, &req->cmd); _nvme_qpair_submit_request(qpair, req); } + if (report) + nvme_printf(qpair->ctrlr, "done resubmitting i/o\n"); mtx_unlock(&qpair->lock); } From nobody Mon Aug 7 22:45:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcl67Fgz4mT3F; Mon, 7 Aug 2023 22:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWcl4Qtxz4Nvr; Mon, 7 Aug 2023 22:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mzsLtFYMF5dwhSC9J4PfStSOe8uMCaiX0ymBEicAU9M=; b=NGGC3I6II/gt3EuBqgwFsWKc1ERZceqwS9s92eHNNwXWUTJetah9+LFmckCuozf7hJK6CJ LSFQvNMdZIR3jBY1UVbjQsubIlEFOWxwKo3ToG+rQyYNiCr2PFCwqn18eig3y8GEtO5lD3 TH9dFHABdDJv7OxmGtMMVD17cbF+iEhJMzb4yYSa4ZwG1hi5LHL2ZRRh8IWG6yOkvIJ02I 56bGnLl2PJUt4CmWKRJOyKcYLysm5G8TVtA4dAhURVTxPAbT+2qE5Cl4MGYK31j75AQYEa ELx4J8cIIElyjgwXpbyl8cSMQJKlEuGAn69rwH+6tifoEMRiNmO2hAhc8L6Vfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mzsLtFYMF5dwhSC9J4PfStSOe8uMCaiX0ymBEicAU9M=; b=Y+8aiZLjSjthnxMPoifDiXPK18EEJz0PsFgxKjN8zhLezpyoQYbc6DQczuG0x6G3R/rXyz BQQizM9Qi3gdr1ndpEN/6MCZ44qfWyFEiPPa12Am39+39pMaaDkeh2Zkh0vDEjPBGat0UI X3MktgYMv4r0DIRleGxWn+yRQlvZZUAkDAZBSHmKFAWiXAwA9zlpCBsYOzBBxSYtfLq26G CqP15PwKcn/jPcjRYZYWhGXC/N6g0kJb72dkha/0Z8BmCHQGswhQEIwgyLKALeG8ry24yo Cd8xjCub/u2Qf8NJNFm6Z73C8O28K5De+lbYHIiNIyhfwREFAOKEycndx7Iw9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448343; a=rsa-sha256; cv=none; b=eooOJ++/KUqVdG7Yot4pUBIviKAsYbmZBgpL6TVbNHE330/i/VAGKkuhdj6tF0GDubszah 8p+f9TXG+tO/gO8hfgJzrzRkuzp2WAKVghrbwL5HTawXj/eFjmPphjPCaGq5PWnIG9Gf7S aHkC2WlX4DM1p6vgO6SfoXtAMZsgqrKdj9SwZ+XZ9CriU+aUYEB2oDgT1FwTqNgmaADbG8 mNzGwkjOJyPjHrdTZxiqrvdIT7i3NMysZhIRMaQNkXIhoX0JvuUIN7A4LQpsPTSuYRRL6W iN7MKRDq2k0dvouJM76gA5nSpwEis29fC/iLh97VRr7Gewj/53+xSLK8vsDLyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcl3Xwxz195k; Mon, 7 Aug 2023 22:45:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MjhLZ058695; Mon, 7 Aug 2023 22:45:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377Mjh6j058694; Mon, 7 Aug 2023 22:45:43 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:43 GMT Message-Id: <202308072245.377Mjh6j058694@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: 95cd10f13971 - main - nvme: Add comments about other fields in status List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95cd10f13971ef2f035f07c9bda14fb094edc0b3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=95cd10f13971ef2f035f07c9bda14fb094edc0b3 commit 95cd10f13971ef2f035f07c9bda14fb094edc0b3 Author: Warner Losh AuthorDate: 2023-08-07 22:36:14 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Add comments about other fields in status When manually completing an I/O, we do so because we have no status back from the card. Note M, CRD and P are all 0 because this is an artificial event (and phase isn't checked when it's completed this way). There's no MORE information in the error log page and there's no delayed retry (CRD=0) and we don't currently request CRD to be set to anything other than 0 and thus don't implement delayed retry. Sponsored by: Netflix Reviewed by: chuck, mav, jhb Differential Revision: https://reviews.freebsd.org/D41314 --- sys/dev/nvme/nvme_qpair.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 0a0115967eef..878df6183eea 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -503,6 +503,9 @@ nvme_qpair_manual_complete_tracker( cpl.status |= (sct & NVME_STATUS_SCT_MASK) << NVME_STATUS_SCT_SHIFT; cpl.status |= (sc & NVME_STATUS_SC_MASK) << NVME_STATUS_SC_SHIFT; cpl.status |= (dnr & NVME_STATUS_DNR_MASK) << NVME_STATUS_DNR_SHIFT; + /* M=0 : this is artificial so no data in error log page */ + /* CRD=0 : this is artificial and no delayed retry support anyway */ + /* P=0 : phase not checked */ nvme_qpair_complete_tracker(tr, &cpl, print_on_error); } From nobody Mon Aug 7 22:45:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcm5xGpz4mSvq; Mon, 7 Aug 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWcm5Qm2z4PB8; Mon, 7 Aug 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGYS/s5ATbken+6Hle0AvYzfpYcY67gx81nVeSkHOBE=; b=SkKTNNdhGoyS4zC6CfnIzEX1SZjVxpx+gEGRDsQn9JMBW7Xe6LXED3bHFSmnrOkdrXE2Qa zC7W++FJtg5P420zdEmxGbNrB6mChCpAg8u8Ny22uSKFOGwhPC3OIfJmlEvjHriphNk9fX vv2cvEg9SOuyce8pF+xq56qZHqpyRXF6xqKJ4AQ767FGJAKsOE0Q2xpXZtdggjKGo7bgrn 0t+VvI0/f8s0pwJKiKvl+Dljzq4U4sG3bmrs7eDgs4HfElgT2e8SkVywRLLnN58S5KRnOr DRSMyuiaU6N9BkeB+Od24wuSgHS/yExWju/IlXm5JN4TYhrZigo4/6Z8YKElKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448344; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SGYS/s5ATbken+6Hle0AvYzfpYcY67gx81nVeSkHOBE=; b=UPo6DOn8JJzkMTk11oQFLNDfLMbkUIlMRu6OIfkZKZFuEN7T3KOJrO/JbzF2HrrR0LBF0G LxoIkmwDTAVQoI4ItAvadY962WD+cim1+KXiX4ELrVOHNp6qZ5iQ2pOb95GDox/aN1O+bj q+S2q2uIpGqyYu1wZ7xGa03lMkLfT4K/QoGXg68LRPMloGB+yRbLooC4+n4XuUStKy0b7b QTpcW+daJZkW2DXN4z9IEGk7RIn6KXOZSQ+31HmbxzGRc1cC0dnP3caqxX+w19DbKsO7Fr o5EE1r+Lfsib6e8Y9eFV1QIeepTXnqdkwgXVHdTD7ujM1qTSuVhGltO/jqpHnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448344; a=rsa-sha256; cv=none; b=GxjKEa0ebZgYcmyJQ0uEWXrx2MuyfE4WHs04A7R7874JVH64vjTMP03QqgyI3x0ZzG7MCy U+qWVLj0UlSwTsgI8tUMqnwG7BxM1ziyab/9mRg2zJ1ZW6+utl/iWaSMQ5lAI2GiYS1iC1 Z3HScihq1kqdqbXpvAYS+jFyeJcY3aP7gMruWmQv//3nSSEphnUExgMqZsN4ROrz1qx9Ky HL0BRSKozSCeZD1RvVDbMzSNztSiZUqclzSKF685Ln9ZO2Kjo5KHmGXsqv5qsr9a42F0zb AJ62yk3jqUGxozYdfgNwTm72CZxKtGnfRJmGWQDMGDuMvacaZNj8GQ+w47EK/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcm4TWtz18jF; Mon, 7 Aug 2023 22:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MjiTi058717; Mon, 7 Aug 2023 22:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjiBK058716; Mon, 7 Aug 2023 22:45:44 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:44 GMT Message-Id: <202308072245.377MjiBK058716@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: 63b0c00eb043 - main - nvme: Update comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63b0c00eb043cf8cfabeb63528eda3190608a805 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=63b0c00eb043cf8cfabeb63528eda3190608a805 commit 63b0c00eb043cf8cfabeb63528eda3190608a805 Author: Warner Losh AuthorDate: 2023-08-07 22:36:25 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:31 +0000 nvme: Update comment Fix comment to note we should grab additional data from the error log page, but don't currently (it's inclear if we should do that here and other places in nvd that want it, or if we should let nvd / the nda periph make the request). Sponsored by: Netflix Reviewed by: chuck, mav, jhb Differential Revision: https://reviews.freebsd.org/D41315 --- sys/dev/nvme/nvme_sim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index ad6783adf181..7478f70013e6 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -69,7 +69,9 @@ nvme_sim_nvmeio_done(void *ccb_arg, const struct nvme_completion *cpl) /* * Let the periph know the completion, and let it sort out what - * it means. Make our best guess, though for the status code. + * it means. Report an error or success based on SC and SCT. + * We do not try to fetch additional data from the error log, + * though maybe we should in the future. */ memcpy(&ccb->nvmeio.cpl, cpl, sizeof(*cpl)); ccb->ccb_h.status &= ~CAM_SIM_QUEUED; From nobody Mon Aug 7 22:45:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWcn6pdrz4mSZv; Mon, 7 Aug 2023 22:45: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 4RKWcn61Yrz4PKh; Mon, 7 Aug 2023 22:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOw5k/8PcbWi8AQvA4pzdCVA2RB8QgI9R6y1/VnGEMc=; b=JrFKgMBFwtwSj3cK2mWAdXwXrs0hhMdC9FN3qkLuZXYS8ba0VbAPgu0MuU4ZkErvoJLNt/ XSHuvjcAx5SgOMTrfhEuIsnBD9lsjaIUiARvNoG6KBmQa1LThsvSmfHsrGoZosHHK2a4It NEX628RkO0/A6RHafv/au4N9dQs4WINBUEOmIwWfhZUJ+TggfIjQEOFN9yx3MBCS9ZZLvH AKpA/EBqd0TpwHLTSrgl8SYVr/zymVUwCB9t/A5gIxV36a3icKXPIaxYu7O9v5xfsn1zQA BR9kLCkjLmMst78Tv1zZnGEMvozTew2HLZONVsRlQx6UqW+2roIuyKEnCJ6pAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EOw5k/8PcbWi8AQvA4pzdCVA2RB8QgI9R6y1/VnGEMc=; b=X8Tiel8Rs14G7eKtMtOgPJdq1BvA8OdQPlb4VpmI9Y6HZqYLRV8tk/3Wxm7wHg6R59Md9K Ez5PwsIRV/Zrk7XPp7vjIJVS+YDlZ4ad971KE73Kd7TcC91v6qW/JFHx6j6JnvuSkqBnpJ NP+hlp17sL6og//iFTYGVONuW9LlmrMS6ea2MRqYh9G4/ZhX1I6oogAbeoHetXd+xrH4Md jJhc8jVGGw/t4zGFs4nKOZmO8CRM2UTHGOqvGU947bPUyZfJLrQAW6yv1vyqa10xpTSRqM eI/4qd2k1v7U4GOjE7tjJmb+7pS20/+nc61ju8n0pRAakj/bJCP4d1qEFYPM+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448345; a=rsa-sha256; cv=none; b=YoGui5/iPdRIB89dJa0xyvzijl/TKHzsQRUCOld4VdO6QZXWUoplw5YSi+ZmjLBiWxtkN2 9LBUkFwe5PlDp7WkwPDPTQaxQIshU3vxOLc3RTsXxQ9wUfjUHQCF+XfjqX6E9AnnceQmHi AJfu5wsU3RBr3wCmskABH2BDZoC6LisTNHRSa73vsQ6FT/TTrJ6bQ7jWH2V7WRmJSw7BMF KcQYSLN+ehafwkKv/VrkFp8XxgSC6Ubdnaw/N9TLPytsvYGIiRutO0wmx5MHmXiFPFjJwS 3TfrxtpdV21HLqmbNDAYeWaQpFmZ3Y+ZDKpl7YQISl8WHU1wT/d9b4NhbfQORQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWcn55W1z18xr; Mon, 7 Aug 2023 22:45: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 377MjjeQ058737; Mon, 7 Aug 2023 22:45:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MjjU9058736; Mon, 7 Aug 2023 22:45:45 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:45:45 GMT Message-Id: <202308072245.377MjjU9058736@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: 2ad9a815fd58 - main - nvme: Directly lookup op code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a commit 2ad9a815fd588f26ecfbbadd77a10b7b6cf9a68a Author: Warner Losh AuthorDate: 2023-08-07 22:36:45 +0000 Commit: Warner Losh CommitDate: 2023-08-07 22:44:32 +0000 nvme: Directly lookup op code Rather than have a table to walk through, use a sparse array. Suggested by: jhb Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D41353 --- sys/dev/nvme/nvme_qpair.c | 114 ++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 59 deletions(-) diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c index 878df6183eea..9e15749d1bca 100644 --- a/sys/dev/nvme/nvme_qpair.c +++ b/sys/dev/nvme/nvme_qpair.c @@ -46,71 +46,67 @@ static void _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req); static void nvme_qpair_destroy(struct nvme_qpair *qpair); -struct nvme_opcode_string { - uint16_t opc; - const char * str; -}; - -static struct nvme_opcode_string admin_opcode[] = { - { NVME_OPC_DELETE_IO_SQ, "DELETE IO SQ" }, - { NVME_OPC_CREATE_IO_SQ, "CREATE IO SQ" }, - { NVME_OPC_GET_LOG_PAGE, "GET LOG PAGE" }, - { NVME_OPC_DELETE_IO_CQ, "DELETE IO CQ" }, - { NVME_OPC_CREATE_IO_CQ, "CREATE IO CQ" }, - { NVME_OPC_IDENTIFY, "IDENTIFY" }, - { NVME_OPC_ABORT, "ABORT" }, - { NVME_OPC_SET_FEATURES, "SET FEATURES" }, - { NVME_OPC_GET_FEATURES, "GET FEATURES" }, - { NVME_OPC_ASYNC_EVENT_REQUEST, "ASYNC EVENT REQUEST" }, - { NVME_OPC_NAMESPACE_MANAGEMENT, "NAMESPACE MANAGEMENT" }, - { NVME_OPC_FIRMWARE_ACTIVATE, "FIRMWARE ACTIVATE" }, - { NVME_OPC_FIRMWARE_IMAGE_DOWNLOAD, "FIRMWARE IMAGE DOWNLOAD" }, - { NVME_OPC_DEVICE_SELF_TEST, "DEVICE SELF-TEST" }, - { NVME_OPC_NAMESPACE_ATTACHMENT, "NAMESPACE ATTACHMENT" }, - { NVME_OPC_KEEP_ALIVE, "KEEP ALIVE" }, - { NVME_OPC_DIRECTIVE_SEND, "DIRECTIVE SEND" }, - { NVME_OPC_DIRECTIVE_RECEIVE, "DIRECTIVE RECEIVE" }, - { NVME_OPC_VIRTUALIZATION_MANAGEMENT, "VIRTUALIZATION MANAGEMENT" }, - { NVME_OPC_NVME_MI_SEND, "NVME-MI SEND" }, - { NVME_OPC_NVME_MI_RECEIVE, "NVME-MI RECEIVE" }, - { NVME_OPC_CAPACITY_MANAGEMENT, "CAPACITY MANAGEMENT" }, - { NVME_OPC_LOCKDOWN, "LOCKDOWN" }, - { NVME_OPC_DOORBELL_BUFFER_CONFIG, "DOORBELL BUFFER CONFIG" }, - { NVME_OPC_FABRICS_COMMANDS, "FABRICS COMMANDS" }, - { NVME_OPC_FORMAT_NVM, "FORMAT NVM" }, - { NVME_OPC_SECURITY_SEND, "SECURITY SEND" }, - { NVME_OPC_SECURITY_RECEIVE, "SECURITY RECEIVE" }, - { NVME_OPC_SANITIZE, "SANITIZE" }, - { NVME_OPC_GET_LBA_STATUS, "GET LBA STATUS" }, - { 0xFFFF, "ADMIN COMMAND" } +#define DEFAULT_INDEX 256 +#define DEFAULT_ENTRY(x) [DEFAULT_INDEX] = x +#define OPC_ENTRY(x) [NVME_OPC_ ## x] = #x + +static const char *admin_opcode[DEFAULT_INDEX + 1] = { + OPC_ENTRY(DELETE_IO_SQ), + OPC_ENTRY(CREATE_IO_SQ), + OPC_ENTRY(GET_LOG_PAGE), + OPC_ENTRY(DELETE_IO_CQ), + OPC_ENTRY(CREATE_IO_CQ), + OPC_ENTRY(IDENTIFY), + OPC_ENTRY(ABORT), + OPC_ENTRY(SET_FEATURES), + OPC_ENTRY(GET_FEATURES), + OPC_ENTRY(ASYNC_EVENT_REQUEST), + OPC_ENTRY(NAMESPACE_MANAGEMENT), + OPC_ENTRY(FIRMWARE_ACTIVATE), + OPC_ENTRY(FIRMWARE_IMAGE_DOWNLOAD), + OPC_ENTRY(DEVICE_SELF_TEST), + OPC_ENTRY(NAMESPACE_ATTACHMENT), + OPC_ENTRY(KEEP_ALIVE), + OPC_ENTRY(DIRECTIVE_SEND), + OPC_ENTRY(DIRECTIVE_RECEIVE), + OPC_ENTRY(VIRTUALIZATION_MANAGEMENT), + OPC_ENTRY(NVME_MI_SEND), + OPC_ENTRY(NVME_MI_RECEIVE), + OPC_ENTRY(CAPACITY_MANAGEMENT), + OPC_ENTRY(LOCKDOWN), + OPC_ENTRY(DOORBELL_BUFFER_CONFIG), + OPC_ENTRY(FABRICS_COMMANDS), + OPC_ENTRY(FORMAT_NVM), + OPC_ENTRY(SECURITY_SEND), + OPC_ENTRY(SECURITY_RECEIVE), + OPC_ENTRY(SANITIZE), + OPC_ENTRY(GET_LBA_STATUS), + DEFAULT_ENTRY("ADMIN COMMAND"), }; -static struct nvme_opcode_string io_opcode[] = { - { NVME_OPC_FLUSH, "FLUSH" }, - { NVME_OPC_WRITE, "WRITE" }, - { NVME_OPC_READ, "READ" }, - { NVME_OPC_WRITE_UNCORRECTABLE, "WRITE UNCORRECTABLE" }, - { NVME_OPC_COMPARE, "COMPARE" }, - { NVME_OPC_WRITE_ZEROES, "WRITE ZEROES" }, - { NVME_OPC_DATASET_MANAGEMENT, "DATASET MANAGEMENT" }, - { NVME_OPC_VERIFY, "VERIFY" }, - { NVME_OPC_RESERVATION_REGISTER, "RESERVATION REGISTER" }, - { NVME_OPC_RESERVATION_REPORT, "RESERVATION REPORT" }, - { NVME_OPC_RESERVATION_ACQUIRE, "RESERVATION ACQUIRE" }, - { NVME_OPC_RESERVATION_RELEASE, "RESERVATION RELEASE" }, - { NVME_OPC_COPY, "COPY" }, - { 0xFFFF, "IO COMMAND" } +static const char *io_opcode[DEFAULT_INDEX + 1] = { + OPC_ENTRY(FLUSH), + OPC_ENTRY(WRITE), + OPC_ENTRY(READ), + OPC_ENTRY(WRITE_UNCORRECTABLE), + OPC_ENTRY(COMPARE), + OPC_ENTRY(WRITE_ZEROES), + OPC_ENTRY(DATASET_MANAGEMENT), + OPC_ENTRY(VERIFY), + OPC_ENTRY(RESERVATION_REGISTER), + OPC_ENTRY(RESERVATION_REPORT), + OPC_ENTRY(RESERVATION_ACQUIRE), + OPC_ENTRY(RESERVATION_RELEASE), + OPC_ENTRY(COPY), + DEFAULT_ENTRY("IO COMMAND"), }; static const char * -get_opcode_string(struct nvme_opcode_string *entry, uint16_t opc) +get_opcode_string(const char *op[DEFAULT_INDEX + 1], uint16_t opc) { - while (entry->opc != 0xFFFF) { - if (entry->opc == opc) - return (entry->str); - entry++; - } - return (entry->str); + const char *nm = opc < DEFAULT_INDEX ? op[opc] : op[DEFAULT_INDEX]; + + return (nm != NULL ? nm : op[DEFAULT_INDEX]); } static const char * From nobody Mon Aug 7 22:47:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWfQ4XQgz4mT3r; Mon, 7 Aug 2023 22:47: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 4RKWfQ3Y1Xz4R9q; Mon, 7 Aug 2023 22:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GV1h/hPj7ExMZYDr+TgvLxldaPImYNcKpvf7NFRqtg=; b=osEmn9K8yyX3Dm7as2G2MCTV2YyuGC6qBFSxslbzPA2WdW3UvH4f0HglBJ25+co3O0XwW2 +IyiUw+eSP16aR+3AC8NwhwbaXdH8sQYX7gRL1hJx+3Pjo0vb4dqurCfC0pSLCwfCf1HNu ltbBIpzqrMovXh6dxA6PO3on80OVzqtV/F+SjtBKNu50LMitnV1mrEumcFCSaADeqW47Wj Uziuc7RIxsXsm6pRyFHRvtU9IHGa5QifSrjSwmKgPj0PnxnL8Kr0R1AvG6EJZ/rIs0JX9W UI+/YjFOQHQNXSKB7UvxZFzsLjWqjxeCEFVX5nb0zzasTXbFMkJrUrPsCkyCvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+GV1h/hPj7ExMZYDr+TgvLxldaPImYNcKpvf7NFRqtg=; b=vuUNbwZTCRKG/XdI0WHtjuMaFvZ/pAleb5QFmpnhsydn/Pcx+hi7YbkO0De6rmEISZ7cOk 65OGRHt/tidhDqrbnWXfTfxXs8NdH2P6zx/BFD+g7RkDqiADjvGZQ2ETATCzzW9ST0mY+l 8Z4+G50nbfbmm3Nwxl3/X2zEE5v5hWoQumNDNqk5WJrPqz8hcRGaewmlF6aoBBUgo0bH8A KXrIWruF2yChvvFbz4GCgwj2vKcnHebUAVi0GDxifc+9qSQ3XiJL+sZp4vjNIKP5a4bqoU VZpc5ae9Wo8ng0TygQmS/BAShnAWbbQzNVWxSmVeQWes3dxwhb/XmT7V1+Hzqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448430; a=rsa-sha256; cv=none; b=cVbDXr+D/wf1wfShQ0as5mYY9Rz0Gia2KQ9LzmzJ4He27cPrBByAU2+hsEUGXpD62jiRrp vUkRDJZFNDI5JfNSzHdlFvvOzaQFDDvT1ZU4nzqoTaJNihdH1qdXFayMbBMcdBwRQJLh1c Zv1/b45CluJkFIojmPMcUdj005J6LozYHp62VpVZqcR2tya2cBTF0mAerGaSjWUvjPoEQb vVjp6M8Q2ehVIn8NIUO3q4KQEEVrI5W40EZiPvw6EPfHxrycWgkN4Fow12FrxgNbPiAEnd rsy2teh8myGgb0IvcH+YKZpqff1ANT1du/U4D/NVxrpGB//savIMgFgKCFdXaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWfQ2Yzsz19Dl; Mon, 7 Aug 2023 22:47:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MlA99059116; Mon, 7 Aug 2023 22:47:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MlAsV059115; Mon, 7 Aug 2023 22:47:10 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:47:10 GMT Message-Id: <202308072247.377MlAsV059115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 7f527d48124b - main - iflib: Fix white space and reduce some line lengths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f527d48124bd03fcfb946ce2d5d0c7bc71e099d Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=7f527d48124bd03fcfb946ce2d5d0c7bc71e099d commit 7f527d48124bd03fcfb946ce2d5d0c7bc71e099d Author: Eric Joyner AuthorDate: 2023-08-04 17:53:29 +0000 Commit: Eric Joyner CommitDate: 2023-08-07 22:46:48 +0000 iflib: Fix white space and reduce some line lengths This helps align some of the code with the rest of the style used in iflib, but as marius@ points out, this is not style(9). Signed-off-by: Eric Joyner Reviewed by: kbowling@ MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41324 --- sys/net/iflib.c | 18 ++++++++++-------- sys/net/iflib.h | 7 +++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 9e6964d73764..f4c0e5d54cab 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -211,6 +211,7 @@ struct iflib_ctx { #define isc_legacy_intr ifc_txrx.ift_legacy_intr #define isc_txq_select ifc_txrx.ift_txq_select #define isc_txq_select_v2 ifc_txrx.ift_txq_select_v2 + eventhandler_tag ifc_vlan_attach_event; eventhandler_tag ifc_vlan_detach_event; struct ether_addr ifc_mac; @@ -1953,7 +1954,7 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) lowaddr = DMA_WIDTH_TO_BUS_LOWADDR(scctx->isc_dma_width); fl = rxq->ifr_fl; - for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { + for (int i = 0; i < rxq->ifr_nfl; i++, fl++) { fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */ /* Set up DMA tag for RX buffers. */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -6280,7 +6281,8 @@ iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, } void -iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name) +iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, + void *arg, int qid, const char *name) { device_t dev; struct grouptask *gtask; @@ -6777,16 +6779,16 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_ntxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_ntxqs, 0, - "# of txqs to use, 0 => use default #"); + "# of txqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_nrxqs", CTLFLAG_RWTUN, &ctx->ifc_sysctl_nrxqs, 0, - "# of rxqs to use, 0 => use default #"); + "# of rxqs to use, 0 => use default #"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "override_qs_enable", CTLFLAG_RWTUN, &ctx->ifc_sysctl_qs_eq_override, 0, "permit #txq != #rxq"); SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "disable_msix", - CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, - "disable MSI-X (default 0)"); + CTLFLAG_RWTUN, &ctx->ifc_softc_ctx.isc_disable_msix, 0, + "disable MSI-X (default 0)"); SYSCTL_ADD_U16(ctx_list, oid_list, OID_AUTO, "rx_budget", CTLFLAG_RWTUN, &ctx->ifc_sysctl_rx_budget, 0, "set the RX budget"); @@ -6798,8 +6800,8 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) CTLFLAG_RDTUN, &ctx->ifc_sysctl_core_offset, 0, "offset to start using cores at"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "separate_txrx", - CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, - "use separate cores for TX and RX"); + CTLFLAG_RDTUN, &ctx->ifc_sysctl_separate_txrx, 0, + "use separate cores for TX and RX"); SYSCTL_ADD_U8(ctx_list, oid_list, OID_AUTO, "use_logical_cores", CTLFLAG_RDTUN, &ctx->ifc_sysctl_use_logical_cores, 0, "try to make use of logical cores for TX and RX"); diff --git a/sys/net/iflib.h b/sys/net/iflib.h index 21630297981f..a97d243c0bb0 100644 --- a/sys/net/iflib.h +++ b/sys/net/iflib.h @@ -453,11 +453,14 @@ int iflib_device_iov_add_vf(device_t, uint16_t, const nvlist_t *); int iflib_device_register(device_t dev, void *softc, if_shared_ctx_t sctx, if_ctx_t *ctxp); int iflib_device_deregister(if_ctx_t); -int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, driver_intr_t, void *arg, const char *name); +int iflib_irq_alloc(if_ctx_t, if_irq_t, int, driver_filter_t, void *filter_arg, + driver_intr_t, void *arg, const char *name); int iflib_irq_alloc_generic(if_ctx_t ctx, if_irq_t irq, int rid, iflib_intr_type_t type, driver_filter_t *filter, void *filter_arg, int qid, const char *name); -void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, iflib_intr_type_t type, void *arg, int qid, const char *name); +void iflib_softirq_alloc_generic(if_ctx_t ctx, if_irq_t irq, + iflib_intr_type_t type, void *arg, int qid, + const char *name); void iflib_irq_free(if_ctx_t ctx, if_irq_t irq); From nobody Mon Aug 7 22:47:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKWfR6X5Wz4mT0r; Mon, 7 Aug 2023 22:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKWfR5MfFz4RJw; Mon, 7 Aug 2023 22:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKDbd8pD4sTrRBvvCVo4M/nfiWXcLmfmH/hy5YFv54I=; b=Xt1kqxkhvDQgeXd8B3nvz+3aYMEVOHcuBM01H2wCAhF3IFNDO4SlBpOAasVORTtUQ+6FLA y9MYZ9Z4lg48t55Rpj2r8Eym5IUUUXaN+K/d6i0ksplp1v8g92IV2Qk2yOdYUuYiDxDnbk 53c8dwej+8GRBb3HgygR1G+QZdZh3nqx2Dr5hXGWWOKLss0/tDQBDjfPDmTfdB5h0JqI7Y vF/EdpqkmFxZd0hHRx8F2IOrdS35iW4eXenz5NLhOThPxrcy6HxEgqhHiuzUVL2wv2jvsF SeeAUc68E13oi2n/4ObVlMNonbMtMmJXitEx7ZeDGMDT81suC7z7CqOLUdOR7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691448431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WKDbd8pD4sTrRBvvCVo4M/nfiWXcLmfmH/hy5YFv54I=; b=CfOCLFhmVcyV37HK2r9OkmW46fZE2WKQZHYq3AI+qFjLISnhp2Ad3IerejRctRR69EbdGs skjK18RtePy8GrxTNg9/e4qHpX+/DZp8rsRc0qpMTiKFdkzM4R8au/V+qx030wQ14dJeF/ DwlSGClsGHhYr/fj/B/9zOMKX5h82jaD410N3cJu6W2oZIcrHeYe30fcZLuNosDWDSOpye 9kHjOPNLIvIxENB+o6jV5EyJWE6UkMmvH3GrOq3ootdSAkJ9Ybhnjtu+wxDCqfb3ogPJYo ZuL8ptFoOua+A/Mc3y4ivF6sgaQmeIqVDH0Ox7nbK/BIrjbEzuUm+yOZW+DSHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691448431; a=rsa-sha256; cv=none; b=J/9YnOJrfCEnM1GW8ItWErgPMJihDiDA2+GG0PETnkO7ElXYPaDnCKMe9xSyNBRPKYcCHd W+S1hRLbARO9wyIAtgt6s4m/LrGjjx+2AnU3icv8X555S9JwniViEMk5tPHrpX57YQ3Cd+ N/xnih26MJu09GPHC0asA6cPVmeifmSSUrrnd5YVJtLRm7Ib6FPcplnan/wSVH1dSaIFFg TmATxJu/IfjCebhczZG5IkeaX+/9gYz3bgYeyYQzHhAdqdcEFmteHv1if56Er4nfNhlwSl O6XsdZcLAp1f7fewmdBlAX1qtrOtuy/eW9tS9VKwyFCB9Uf2YGbC7Rl++lDrHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKWfR4HH1z19Dm; Mon, 7 Aug 2023 22:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377MlBVm059138; Mon, 7 Aug 2023 22:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377MlBif059137; Mon, 7 Aug 2023 22:47:11 GMT (envelope-from git) Date: Mon, 7 Aug 2023 22:47:11 GMT Message-Id: <202308072247.377MlBif059137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: d2dd3d5a989d - main - iflib: Remove redundant variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2dd3d5a989d1a2c9ebfbb90a1e682d3ad9db3c3 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2dd3d5a989d1a2c9ebfbb90a1e682d3ad9db3c3 commit d2dd3d5a989d1a2c9ebfbb90a1e682d3ad9db3c3 Author: Eric Joyner AuthorDate: 2023-08-04 17:57:11 +0000 Commit: Eric Joyner CommitDate: 2023-08-07 22:46:48 +0000 iflib: Remove redundant variable In iflib_init_locked(), sctx and scctx both point to the same value, which is the ifc_softc_ctx field in the iflib softc. Remove the declaration and assignment to sctx since scctx can be used instead, and the name of scctx follows the naming convention used for local variables that point to ifc_softc_ctx. In theory there should be no functional impact with this change. Signed-off-by: Eric Joyner Reviewed by: kbowling@ MFC after: 3 days Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41325 --- sys/net/iflib.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index f4c0e5d54cab..ad2afa77b72c 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2476,7 +2476,6 @@ iflib_get_rx_mbuf_sz(if_ctx_t ctx) static void iflib_init_locked(if_ctx_t ctx) { - if_softc_ctx_t sctx = &ctx->ifc_softc_ctx; if_softc_ctx_t scctx = &ctx->ifc_softc_ctx; if_t ifp = ctx->ifc_ifp; iflib_fl_t fl; @@ -2506,7 +2505,7 @@ iflib_init_locked(if_ctx_t ctx) if (if_getcapenable(ifp) & IFCAP_TSO6) if_sethwassistbits(ifp, CSUM_IP6_TSO, 0); - for (i = 0, txq = ctx->ifc_txqs; i < sctx->isc_ntxqsets; i++, txq++) { + for (i = 0, txq = ctx->ifc_txqs; i < scctx->isc_ntxqsets; i++, txq++) { CALLOUT_LOCK(txq); callout_stop(&txq->ift_timer); #ifdef DEV_NETMAP @@ -2528,7 +2527,7 @@ iflib_init_locked(if_ctx_t ctx) #endif IFDI_INIT(ctx); MPASS(if_getdrvflags(ifp) == i); - for (i = 0, rxq = ctx->ifc_rxqs; i < sctx->isc_nrxqsets; i++, rxq++) { + for (i = 0, rxq = ctx->ifc_rxqs; i < scctx->isc_nrxqsets; i++, rxq++) { if (iflib_netmap_rxq_init(ctx, rxq) > 0) { /* This rxq is in netmap mode. Skip normal init. */ continue; @@ -2546,7 +2545,7 @@ done: if_setdrvflagbits(ctx->ifc_ifp, IFF_DRV_RUNNING, IFF_DRV_OACTIVE); IFDI_INTR_ENABLE(ctx); txq = ctx->ifc_txqs; - for (i = 0; i < sctx->isc_ntxqsets; i++, txq++) + for (i = 0; i < scctx->isc_ntxqsets; i++, txq++) callout_reset_on(&txq->ift_timer, iflib_timer_default, iflib_timer, txq, txq->ift_timer.c_cpu); From nobody Mon Aug 7 23:03:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKX1L2Lg3z4mVQt for ; Mon, 7 Aug 2023 23:03: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 4RKX1L1nBKz4SvL; Mon, 7 Aug 2023 23:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691449414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNC9QRHsecOSOppA8QVhIOuR8UP5i1GGPxv2jJkfoG0=; b=oAPMTIDE0WI0bFAFxpA+wWvXG4eYOVKY9uOcFII5o4ZEB1BrsfXcoTPoRakj2VKUKBDjaU bmfz01MjLf1uszcBQ4Aqv/WRqFz2cNtSjrhEQhT08E7VLj54ZqqiD+BQbfkwORa0MuspgY hs1kSruKXVLHHbZL/AAl0s+sJxdG4YAtFgEMjdShvf5gl8KzCyUtBnWxNVm3hVzzOZGGBv bfMykK56mP6JkzKzBuJqfdn2z1KAObXFsmuhH2cuA7baPggwlyzC66mSn+WXPY7Bo9Sfly nDtB99ncNbDutq9wkNV5OJAxXJld1UlpLnd9Br7RKXkOzqPFFZI9+yKCBcLl2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691449414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNC9QRHsecOSOppA8QVhIOuR8UP5i1GGPxv2jJkfoG0=; b=NbYwIUHkgVZGFS7uvBxgcMl3WnuEcjYvJ1ZNmpX4vZo+Xjn+uUDFeuJ8MA+H/WGChjG+5M Ummg4SXw4FzTy6NCvxtRsy03c/lSze+baexU6cYSfyvMqHNeuRc2C4yoHvtZBA4dvl+FM/ imqsbzYiHMz8FkOB7VxZ/QzR/bBxBvjIdlOllboWVM9jfAAcCI4kV8EvIWqQ0Eu1X9BLyx d7ohPB8iuqPGzkEC+f3aIjo2ke/iW66WGUFNUAhVlcJh/Vtds+wGDVWlQ66vg9mIXRGDs3 KWfM4dUPfHhpdvIo4vcQEVOtj1iwNoA6zEwKdRt7lpe6FDH7OuIMvzwvprPaGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691449414; a=rsa-sha256; cv=none; b=WWTD2yShXaU93M59bnGuLcK1BZrlfE3Chi0OVnqxpaUX8l7vx9EUUikUEvXTwnnahEi7Hd U19C2hkZxvZJeQo7OEWWNqk6u1wpaRdlZDNCfJfgjqXdjpkyF9qg9jpyud9mcgRAAE7hj4 4fktt5kC8jKN6oexzl0BYTM7/7rJ6u5orIiQlhMVqH4/sbDqUWK/hZuYp/Gix/uvPIEZpJ jdn0ObzvcD1vw4ttBhm/Wi5BFDW45ovy74bA17nUbQlOemTyFTUJuGWNC6k0Z9w3oB3qlO 932Hs2Nmjqh9G92PAUloaTWrA927k3Y4LlH2cAA+XK5QeiD1wCuOpcktYTcmlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKX1L0Yvnz19T0; Mon, 7 Aug 2023 23:03: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 377N3Xnh092887; Mon, 7 Aug 2023 23:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377N3XAC092886; Mon, 7 Aug 2023 23:03:33 GMT (envelope-from git) Date: Mon, 7 Aug 2023 23:03:33 GMT Message-Id: <202308072303.377N3XAC092886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 1774e46c372e..8ef491440fca - vendor/google/googletest - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/vendor/google/googletest X-Git-Reftype: branch X-Git-Commit: 8ef491440fcaec96f899d73e08873426c78583a4 X-Git-Oldrev: 1774e46c372e2c1e16d4bc78f81359605e15b1b6 X-Git-Newrev: 8ef491440fcaec96f899d73e08873426c78583a4 Auto-Submitted: auto-generated The branch vendor/google/googletest has been updated by ngie: URL: https://cgit.FreeBSD.org/src/log/?id=1774e46c372e..8ef491440fca 8ef491440fca Import GoogleTest v1.14.0 From nobody Mon Aug 7 23:28:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKXZH3CJlz4mWmV; Mon, 7 Aug 2023 23:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKXZH2mXKz4V2S; Mon, 7 Aug 2023 23:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691450919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JO24kFJa/Pksdu+S9FbIZJPh7g8YkO1i3NoDaWnccOQ=; b=XBQWuGgQlHN6Ckh1DLbvfAwAruqgpDgthc+JZKBwpnPKQLcLlzrO2f1abGGE83z2B0Q18l YV9FcdFaK6X4IgsJH3AQCLe4QImeBY5zyMkefRzYEqs/iIRDIK7ijZQMFdzsWTU3R4zoLJ e+tr4YasZolYv2sLe1VGG1bLn0/Kv92o7ixzBX1UFk6CDUeOZqLZHjhNjW/blBDU7B7OgP adivuJNMqi/bxzZJShfynJUHMoW6X4/nQ3X4U29NEf+SML8TOpi/4gzYHSHhLMr9eelR9p f7U960e5DMd3rDsLTFsDRagkN57VhDMKkyTzegXhaHM9TUJh4wR0EkzhpofNng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691450919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JO24kFJa/Pksdu+S9FbIZJPh7g8YkO1i3NoDaWnccOQ=; b=BB+q3kzto95X77sSgRljZir5YHssAzfm86yt2JVYpnLaXfm0uX080BNH0/ivHw8oK0vQX+ 7lQ91nXCT3FGtBhphc9TNHlXIUWxnLyWiEgi6mVNc+tugWvKt1jLQkVG8Or+VSf5m1w0jx vAbgXsRn/nY5eNHdyWLwtz6KvEbXL0vl5zfB4/E/xnSOULvQl4UyCeWfMcdKgPcYU605S+ nGr+y27lpdNWpfjdfdZCEJCAC+hSy78E35LsOXNuPc+qtrWoKVuebbx/az9JlQgXA3hoPr nTbRMCnRaKBbsv3ZQsIpI6MwydMgD8XyKavP4iQAXbZBVhR1kBfUBuNLv/xhVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691450919; a=rsa-sha256; cv=none; b=wcxb3FCfBUj3+2D3rMuQNm/dWD+8Klbsq6jTx+jfwxTyZ/26W3gf5S2M7W/jIkm/omq3Q5 3j3cBJ5T+BrIKM7m5AAK2mQSIlPkYyD7rOmRKvY3UqWfQQzdBDaXWhBa8OEKvf1jOZPA+/ 0srO5tpk/aPRcMuQi7OqIappWrC5K2ah8sVpFgwgpYhhA1JR55wd1uJjuEiwaASG4V5tBs Pj/QDsYxoK7/AgR1XZUZYIuZ8SSeV36FcrdxpI+HB5L1fI9zYroZePsLJbpjmVfyeDYrMv i46AdEwE/w9MwjIeekP0PhXEUUVz7IEPIArBKFuVDMsQhrkbIWRmDQQhaHpeTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKXZH1qGpz1B9N; Mon, 7 Aug 2023 23:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 377NSdsq026542; Mon, 7 Aug 2023 23:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377NSdc6026541; Mon, 7 Aug 2023 23:28:39 GMT (envelope-from git) Date: Mon, 7 Aug 2023 23:28:39 GMT Message-Id: <202308072328.377NSdc6026541@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: d4a8f5bf1339 - main - Handle UFS/FFS file deletion from cylinder groups with check-hash failure. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4a8f5bf133956e71c05edff6fa20b156e5f1bbf Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=d4a8f5bf133956e71c05edff6fa20b156e5f1bbf commit d4a8f5bf133956e71c05edff6fa20b156e5f1bbf Author: Kirk McKusick AuthorDate: 2023-08-07 23:27:39 +0000 Commit: Kirk McKusick CommitDate: 2023-08-07 23:28:11 +0000 Handle UFS/FFS file deletion from cylinder groups with check-hash failure. When a file is deleted, its blocks need to be put back in the free block list and its inode needs to be put back in the inode free list. These lists reside in cylinder-group maps. If either some of its blocks or its inode reside in a cylinder-group map with a bad check hash it is not possible to free the associated resource. Since the cylinder group cannot be repaired until the filesystem is unmounted these resources cannot be freed. They simply accumulate in memory. And any attempt to unmount the filesystem loops forever trying to flush them. With this change, the resource update claims to succeed so that the file deletion can successfully complete. The filesystem is marked as requiring an fsck so that before the next time that the filesystem is mounted, the offending cylinder groups are reconstructed causing the lost resources to be reclaimed. A better solution would be to downgrade the filesystem to read-only, but that capability is not currently implemented. Reported-by: Peter Holm Tested-by: Peter Holm MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 27 ++++++++++++++------ sys/ufs/ffs/ffs_extern.h | 4 +-- sys/ufs/ffs/ffs_softdep.c | 65 +++++++++++++++++++++++++---------------------- 3 files changed, 55 insertions(+), 41 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index c5e2a706a128..e173253720c6 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -2295,9 +2295,14 @@ ffs_blkfree_cg(struct ufsmount *ump, return; } if ((error = ffs_getcg(fs, devvp, cg, GB_CVTENXIO, &bp, &cgp)) != 0) { - if (!ffs_fsfail_cleanup(ump, error) || - !MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) + if (!MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) return; + /* + * Would like to just downgrade to read-only. Until that + * capability is available, just toss the cylinder group + * update and mark the filesystem as needing to run fsck. + */ + fs->fs_flags |= FS_NEEDSFSCK; if (devvp->v_type == VREG) dbn = fragstoblks(fs, cgtod(fs, cg)); else @@ -2305,7 +2310,7 @@ ffs_blkfree_cg(struct ufsmount *ump, error = getblkx(devvp, dbn, dbn, fs->fs_cgsize, 0, 0, 0, &bp); KASSERT(error == 0, ("getblkx failed")); softdep_setup_blkfree(UFSTOVFS(ump), bp, bno, - numfrags(fs, size), dephd); + numfrags(fs, size), dephd, true); bp->b_flags |= B_RELBUF | B_NOCACHE; bp->b_flags &= ~B_CACHE; bawrite(bp); @@ -2380,7 +2385,7 @@ ffs_blkfree_cg(struct ufsmount *ump, mp = UFSTOVFS(ump); if (MOUNTEDSOFTDEP(mp) && devvp->v_type == VCHR) softdep_setup_blkfree(UFSTOVFS(ump), bp, bno, - numfrags(fs, size), dephd); + numfrags(fs, size), dephd, false); bdwrite(bp); } @@ -2841,16 +2846,21 @@ ffs_freefile(struct ufsmount *ump, panic("ffs_freefile: range: dev = %s, ino = %ju, fs = %s", devtoname(dev), (uintmax_t)ino, fs->fs_fsmnt); if ((error = ffs_getcg(fs, devvp, cg, GB_CVTENXIO, &bp, &cgp)) != 0) { - if (!ffs_fsfail_cleanup(ump, error) || - !MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) + if (!MOUNTEDSOFTDEP(UFSTOVFS(ump)) || devvp->v_type != VCHR) return (error); + /* + * Would like to just downgrade to read-only. Until that + * capability is available, just toss the cylinder group + * update and mark the filesystem as needing to run fsck. + */ + fs->fs_flags |= FS_NEEDSFSCK; if (devvp->v_type == VREG) dbn = fragstoblks(fs, cgtod(fs, cg)); else dbn = fsbtodb(fs, cgtod(fs, cg)); error = getblkx(devvp, dbn, dbn, fs->fs_cgsize, 0, 0, 0, &bp); KASSERT(error == 0, ("getblkx failed")); - softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd); + softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd, true); bp->b_flags |= B_RELBUF | B_NOCACHE; bp->b_flags &= ~B_CACHE; bawrite(bp); @@ -2880,7 +2890,7 @@ ffs_freefile(struct ufsmount *ump, ACTIVECLEAR(fs, cg); UFS_UNLOCK(ump); if (MOUNTEDSOFTDEP(UFSTOVFS(ump)) && devvp->v_type == VCHR) - softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd); + softdep_setup_inofree(UFSTOVFS(ump), bp, ino, wkhd, false); bdwrite(bp); return (0); } @@ -2888,6 +2898,7 @@ ffs_freefile(struct ufsmount *ump, /* * Check to see if a file is free. * Used to check for allocated files in snapshots. + * Return 1 if file is free. */ int ffs_checkfreefile(struct fs *fs, diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index 46f1a71ed585..97213bc20d7c 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -194,9 +194,9 @@ void softdep_setup_allocindir_meta(struct buf *, struct inode *, void softdep_setup_allocindir_page(struct inode *, ufs_lbn_t, struct buf *, int, ufs2_daddr_t, ufs2_daddr_t, struct buf *); void softdep_setup_blkfree(struct mount *, struct buf *, ufs2_daddr_t, int, - struct workhead *); + struct workhead *, bool); void softdep_setup_inofree(struct mount *, struct buf *, ino_t, - struct workhead *); + struct workhead *, bool); void softdep_setup_sbupdate(struct ufsmount *, struct fs *, struct buf *); void softdep_fsync_mountdev(struct vnode *); int softdep_sync_metadata(struct vnode *); diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index 2606c17f7295..f671f529a04b 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -300,7 +300,8 @@ softdep_setup_blkfree(struct mount *mp, struct buf *bp, ufs2_daddr_t blkno, int frags, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { panic("%s called", __FUNCTION__); @@ -310,7 +311,8 @@ void softdep_setup_inofree(struct mount *mp, struct buf *bp, ino_t ino, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { panic("%s called", __FUNCTION__); @@ -10926,30 +10928,26 @@ void softdep_setup_inofree(struct mount *mp, struct buf *bp, ino_t ino, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { struct worklist *wk, *wkn; - struct inodedep *inodedep; struct ufsmount *ump; - uint8_t *inosused; - struct cg *cgp; - struct fs *fs; +#ifdef INVARIANTS + struct inodedep *inodedep; +#endif KASSERT(MOUNTEDSOFTDEP(mp) != 0, ("softdep_setup_inofree called on non-softdep filesystem")); ump = VFSTOUFS(mp); ACQUIRE_LOCK(ump); - if (!ffs_fsfail_cleanup(ump, 0)) { - fs = ump->um_fs; - cgp = (struct cg *)bp->b_data; - inosused = cg_inosused(cgp); - if (isset(inosused, ino % fs->fs_ipg)) - panic("softdep_setup_inofree: inode %ju not freed.", - (uintmax_t)ino); - } - if (inodedep_lookup(mp, ino, 0, &inodedep)) - panic("softdep_setup_inofree: ino %ju has existing inodedep %p", - (uintmax_t)ino, inodedep); + KASSERT(doingrecovery || ffs_fsfail_cleanup(ump, 0) || + isclr(cg_inosused((struct cg *)bp->b_data), + ino % ump->um_fs->fs_ipg), + ("softdep_setup_inofree: inode %ju not freed.", (uintmax_t)ino)); + KASSERT(inodedep_lookup(mp, ino, 0, &inodedep) == 0, + ("softdep_setup_inofree: ino %ju has existing inodedep %p", + (uintmax_t)ino, inodedep)); if (wkhd) { LIST_FOREACH_SAFE(wk, wkhd, wk_list, wkn) { if (wk->wk_type != D_JADDREF) @@ -10980,7 +10978,8 @@ softdep_setup_blkfree( struct buf *bp, ufs2_daddr_t blkno, int frags, - struct workhead *wkhd) + struct workhead *wkhd, + bool doingrecovery) { struct bmsafemap *bmsafemap; struct jnewblk *jnewblk; @@ -11027,18 +11026,22 @@ softdep_setup_blkfree( KASSERT(jnewblk->jn_state & GOINGAWAY, ("softdep_setup_blkfree: jnewblk not canceled.")); #ifdef INVARIANTS - /* - * Assert that this block is free in the bitmap - * before we discard the jnewblk. - */ - cgp = (struct cg *)bp->b_data; - blksfree = cg_blksfree(cgp); - bno = dtogd(fs, jnewblk->jn_blkno); - for (i = jnewblk->jn_oldfrags; - i < jnewblk->jn_frags; i++) { - if (isset(blksfree, bno + i)) - continue; - panic("softdep_setup_blkfree: not free"); + if (!doingrecovery && !ffs_fsfail_cleanup(ump, 0)) { + /* + * Assert that this block is free in the + * bitmap before we discard the jnewblk. + */ + cgp = (struct cg *)bp->b_data; + blksfree = cg_blksfree(cgp); + bno = dtogd(fs, jnewblk->jn_blkno); + for (i = jnewblk->jn_oldfrags; + i < jnewblk->jn_frags; i++) { + if (isset(blksfree, bno + i)) + continue; + panic("softdep_setup_blkfree: block " + "%ju not freed.", + (uintmax_t)jnewblk->jn_blkno); + } } #endif /* From nobody Tue Aug 8 08:06:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKm421G84z4TsZZ; Tue, 8 Aug 2023 08:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKm420GFdz4J8B; Tue, 8 Aug 2023 08:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691482002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkbXIYrgrxz51kzJviERiiYE98uRUQ9zP185DLQG9hY=; b=Lk93S5v4gsAUFQVjUjV1KMGf3S/mfYMSS1QmLMQ2/zJ/bJsNK5S+L8tMH1SEdkHQC2IepR BhIeyX8RfEldnC71fJBEaZE9vJ8aPucoRW/6pk9ud6VZDahyINauYLU9yEUcP1/G0ykcYF jwmUt/CWj/XX6zovQtk6oGNkd1vjj0GB8qh7WTKE/Ju61pCwGZaASvxCxBbMhTGMULZIve ChzK+KQdElpwKHCBZjSKDHtoPRNWHFWTZuIPrT+muuK2MAyMJnJ2koyavMkihWtA5MUpck tGVOemZheXBVymuNPv3M7lcOY0KkYRO8v9woT1VgXsFtkj+lV8ua8bmQqr43tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691482002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkbXIYrgrxz51kzJviERiiYE98uRUQ9zP185DLQG9hY=; b=uKJeYduxo7w+3ktb+9SRlu2Gcn9NJt789xcNOQJMr2iiMkqxtZrbd09CsCT9iBfYqGLZlv nYZgGApu7oZx1MfEZ9xR78hpJM7JDLjuIejlfmx5/MCy5BPuMUw9mmW9J8b1TCTjzjA//Q m2V+gUlH4qyL9BpKmFWw4y4FG4RIlyGHSy2leU8Ck9uq1LZCwP4Ri3XZwg9DjY2vv7xX1c 8up/dXLGDJb6bUfpqBDyBRzRS98HRsw/If9i2KkHOtfPTbiQSFQPNezQXSq36BTm68YnKW 0nmZzR0poEhvtdsuXDi30nYIO/kqa4LstVj4NuNhGr917AeNIsebbsMTSz2zsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691482002; a=rsa-sha256; cv=none; b=R+/7bOxjBUJO7PGg527zLte4wCqC7ELENr1EYHAq7Nz7cyMHsr2VpvSZxkgUiZS87/cH9v cakyZxA7b4PK/k/sUxBBZj2w+C7LFx3rhqDWU4yaDYe1767pO8RM1epN7ym5BGhZeSRLw9 +oLm6X315UgvP5iaaeu0U+jwcCdMhcaZmXwlJt8frJQBGrKkJl/ImgNA6zTj5a0iL6VArd D9oLEZ6Aqrk10DF1xqD73Bs8nKXb8ZbigaOhHh26FDBp1KrQnxjxwDElCHC25JG96n+qBF O3hzV3GE1MrlBsVDqkXeU1UpF5dfeUsmEN4cMOrCXiwsMVrMEtQDunl7AAmyug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKm416KF5zBNn; Tue, 8 Aug 2023 08:06: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 37886fRa092162; Tue, 8 Aug 2023 08:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37886fdo092161; Tue, 8 Aug 2023 08:06:41 GMT (envelope-from git) Date: Tue, 8 Aug 2023 08:06:41 GMT Message-Id: <202308080806.37886fdo092161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Zhilin Subject: git: e0bc8f8da2b3 - main - etherswitch/arswitch: correct version detection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mizhka X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f Auto-Submitted: auto-generated The branch main has been updated by mizhka: URL: https://cgit.FreeBSD.org/src/commit/?id=e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f commit e0bc8f8da2b3f40b74925a28c2c7f4236bd94c3f Author: Michael Zhilin AuthorDate: 2023-08-08 08:02:09 +0000 Commit: Michael Zhilin CommitDate: 2023-08-08 08:02:09 +0000 etherswitch/arswitch: correct version detection During porting of etherswitch to NetBSD mistypo was discovered in Atheros switch version detection. Reported by: Hiroki Mori yamori813@yahoo.co.jp MFC after: 1 week --- sys/dev/etherswitch/arswitch/arswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c index f22b8da55288..6a95c7a8ad80 100644 --- a/sys/dev/etherswitch/arswitch/arswitch.c +++ b/sys/dev/etherswitch/arswitch/arswitch.c @@ -126,7 +126,7 @@ arswitch_probe(device_t dev) /* AR8xxx probe */ id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL); sc->chip_rev = (id & AR8X16_MASK_CTRL_REV_MASK); - sc->chip_ver = (id & AR8X16_MASK_CTRL_VER_MASK) > AR8X16_MASK_CTRL_VER_SHIFT; + sc->chip_ver = (id & AR8X16_MASK_CTRL_VER_MASK) >> AR8X16_MASK_CTRL_VER_SHIFT; switch (id & (AR8X16_MASK_CTRL_VER_MASK | AR8X16_MASK_CTRL_REV_MASK)) { case 0x0101: chipname = "AR8216"; From nobody Tue Aug 8 10:26:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKq9s3B1cz4m7yT; Tue, 8 Aug 2023 10:26: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 4RKq9s2hrMz4W0h; Tue, 8 Aug 2023 10:26:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691490417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/L5o17F+A2EnWiFjHIfVoPyJ0N9HOZHN1j1bmCaWJJM=; b=PSftn45S2FCljmcOKEWwxcR4eJTz1SR831kHGA98xIM0F1aSyn9zfs+Uat7FHQ8qOGGeRW Hjot/E0rVrHbHUiFE5NOU1GoasAT4PUpoWt6aSfFwapS38KRSASwU87QfNzE5d+/+c6314 B2RWRx1Kg3ScRnmxfKFgN/GqQeSBKZ6qaWyQ1i5xNCd4U4k/SRGW6kg0Y+lnyynMAolxXC XPRTq5lPgZnGHJhWuO8dQshcmE6yOcefnj02w7uxHP8Ro22KlvL2fTaxejQG5O75g8un5R fcPO9uIDb9pOL5IdHyGxbJn/kHb1HPwXa9LxTUbw7rbqtUb5HgP6Zfds3tdOIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691490417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/L5o17F+A2EnWiFjHIfVoPyJ0N9HOZHN1j1bmCaWJJM=; b=MnFMJi0UPQmIr/zn48D0VkUjH3qDp6h65qHGPGkzrgs2BNI1Dh6Pqn5bWluXiYdSfG38pu EoLefljzIKSG3IicgljKRx6ALLUnIw8blEnP6s4ydFIhrCSDJafdo/hvtam4JKbGgdzZ/b 2M4yFZ47p+CDf0By4dztkx4UXva7MiSC8ORXE4WyWU8a0Du7FXwemJa5RhyV+OeEqN6j4S HigGEDidtvDWGWPlD+wJvPaYh5YqJFVtfwGn1Md9zW9k1lOqu4BG+OwdGa4uzA10bAKkeo k3zO6tl9+Iy4AZAeBCeAfd3kw0QIHs92ImqsA31rGVGNlY30733CYuAIRXgtdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691490417; a=rsa-sha256; cv=none; b=v+DMzPkoz+sjp2AWYlP+CkTSWpYNQf2rDjdgMQz2oQt2fh3n3UUsE0TPdJFJpksM+PY3IF /6GYZA6R2WigdJP44fvyKzL6UuvDKSF9EuFBnihvg162FsGTwkNPhFGIueN6snF4YKuC+4 KBNZyuSIVNTR73QUmKw6CEOYvbRNSpvUuCbRZJJ6orOUh3NZx7NjiDwffKmGsAuAdG8Gz/ pWfgkA4bCojTQyLuS4sfWVvmi+ysG9k8E77WY2cUg4Z/6TqJ3tCBF5vc+tTRC0sorYbyej qL7prIGHkWMpBOdjZhAzpjvRk55z/Nyt6Lum4BWPCepfBQhJjOhLUeg9VNsr1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKq9s1mZnzWVp; Tue, 8 Aug 2023 10:26: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 378AQvFc026008; Tue, 8 Aug 2023 10:26:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378AQvwI026007; Tue, 8 Aug 2023 10:26:57 GMT (envelope-from git) Date: Tue, 8 Aug 2023 10:26:57 GMT Message-Id: <202308081026.378AQvwI026007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 600bf006d3f1 - main - carp: delete interface routes on link loss. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 600bf006d3f15f170b9209d5d3a37437bfe0850e Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=600bf006d3f15f170b9209d5d3a37437bfe0850e commit 600bf006d3f15f170b9209d5d3a37437bfe0850e Author: Andrey V. Elsukov AuthorDate: 2023-08-02 07:40:34 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-08-08 10:22:10 +0000 carp: delete interface routes on link loss. Obtained from: Yandex LLC MFC after: 10 days Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D41290 --- sys/netinet/ip_carp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 935e7eaf92f5..d1a41e10115f 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -2159,6 +2159,7 @@ carp_sc_state(struct carp_softc *sc) #endif carp_set_state(sc, INIT, "hardware interface down"); carp_setrun(sc, 0); + carp_delroute(sc); if (!sc->sc_suppress) carp_demote_adj(V_carp_ifdown_adj, "interface down"); sc->sc_suppress = 1; From nobody Tue Aug 8 10:43:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKqXW4HtXz4m8tb; Tue, 8 Aug 2023 10:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKqXW3Z2zz4XT1; Tue, 8 Aug 2023 10:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691491387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YUmRKm5szUcYGVVnJ37dd9Xcvlg7xY2gaz+lNcVQn8I=; b=RFBsC6I1ixT8CrVut/4223DlLowf0sPgzz8MBNIvGGHMg7zkFK+rffX3+zEkC3Fb0ax8b0 0jHD6JhaZORAYHsOkEAPBy/GNu2zhMzKQCk+dY1XGj4p12qAoj9ocFVSWzxmxHadQ9Iya7 swsaK129Bg0kJph1qUJY2XZ/zAuEMlPdHw6E6lNy6bHAQOu93HTbjzgRXz1KX7iE61BM0G vhdc0x0rNS5IN9u5vB55AvfXAD49xXNKuC+1xM1ERO2rgOIOj2VJxJz8OMGIVJYCLqT719 viuiDfckhJV5ecjcC3jfthwiTkGvoaGl2MTDuvRpytCfwb35FbXne8oFuI02Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691491387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YUmRKm5szUcYGVVnJ37dd9Xcvlg7xY2gaz+lNcVQn8I=; b=SaCSyXA7GCMG5jScrCVKXqqHQQ7gGpaR2t9h8x4rN0ZfkpKfJmJ5+5TWANI+oo28wlTWgS 6RG77EWjNEXDZW1bO6aj5Op2Yz1WVK7yqqJ4WOHfZTvWRyHPfYHf1KleoRBMG8R3/AnLjE HuTyzPYitZlny/a+GC5Aa1l9wMj13VxEMBYpFZEh4ned2tFNXfHymwrFLdK8kw81yBzuVE yex13F4VxsxiJ9hdhq4VKo+THoItP1D4iqQcfIGu/EwrQKSLIWodVQU4FdANesJ72QBXW0 9gkvFUx1O2ylvB1DTqwSDE9WlHQTyLkSXSznRcIFFizJu6Uzg76cQFjtXReReQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691491387; a=rsa-sha256; cv=none; b=DRpUVqzqi1MHjgcKWH1CQDfGQBgpHXLcubsQU7y8kwdHXYCe4IOM8wj9drvOjKrKm+Vlx8 R5WAvkrD+gyQvIgxT5u5NMvrgUqABOitVznw18y2hmg4oANaP8hF7cG2EZrMB61Jjhgpm8 woU9gjnV81h6JC651En7HgNny5xNNyJU3B/oeI1qIB7JRZCik+gS/BnlIBwKm/1nValwLZ iatac8bGkPR07GOIGGphmtvlfCJZIQzBuelYaV/bd43RTB/c1BiFIE/Y17bLclZrfpQ4PF 26i2Z0afsCBWqsuEZS37/38zk4n15wT/0O7PKKPiIP30Fkj6fExobEgRkiJbWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKqXW2d1yzX0f; Tue, 8 Aug 2023 10:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378Ah712058000; Tue, 8 Aug 2023 10:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Ah7Oh057999; Tue, 8 Aug 2023 10:43:07 GMT (envelope-from git) Date: Tue, 8 Aug 2023 10:43:07 GMT Message-Id: <202308081043.378Ah7Oh057999@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c7587f7a3f8d - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec commit c7587f7a3f8ddcc8dd209c9cff7b9ec3bf353dec Author: Michael Tuexen AuthorDate: 2023-08-08 10:40:51 +0000 Commit: Michael Tuexen CommitDate: 2023-08-08 10:40:51 +0000 sctp: cleanup No functional change intended. MFC after: 1 week --- sys/netinet6/sctp6_usrreq.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 4e8bfaa191eb..a105b2897c6c 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -632,13 +632,6 @@ sctp6_close(struct socket *so) /* This could be made common with sctp_detach() since they are identical */ -static -int -sctp6_disconnect(struct socket *so) -{ - return (sctp_disconnect(so)); -} - int sctp_sendm(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr, struct mbuf *control, struct thread *p); @@ -1184,7 +1177,7 @@ sctp6_getpeeraddr(struct socket *so, struct sockaddr **nam) .pr_detach = sctp6_close, \ .pr_sopoll = sopoll_generic, \ .pr_flush = sctp_flush, \ - .pr_disconnect = sctp6_disconnect, \ + .pr_disconnect = sctp_disconnect, \ .pr_listen = sctp_listen, \ .pr_peeraddr = sctp6_getpeeraddr, \ .pr_send = sctp6_send, \ From nobody Tue Aug 8 11:07:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKr4z4bXRz4mBMl; Tue, 8 Aug 2023 11:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKr4z27w0z4Yhx; Tue, 8 Aug 2023 11:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691492867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHgETEtsCHSTHQ3plGmGe/BdhoOGh3Pku1SZ8E6t8qM=; b=mvuKaTafPAHY4hb8My/1IwpbSJCC/7O57Dfg/VGdrn4FSYMXFQwpdbjrVDp2ikDkZmwWtZ QzZ5OIMBVKhsvewn6J0t3tuABKBiBFzT+f/W+HCtFetk4h7e35bzLeLodPJfZ8Wchb7qy+ uj0I8ct09DgV2hQ3FAdTAHQOv0CRWbYZ1SltuHUjv/RaHi1ScRFV36b+YGhQHnsmKlt0Je UCI1ZhWQeh85dvgckIZB0adeAXUSQVPDqnfaFjVWx2SzyTq70KCQ+FPM8ZF7AHgdBPzvnK kgc1PSKFreVlCZPTpTaEApWP4V0zBKdSlNdPp7f2PXLDKjQCjiTCbU0LpUiwlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691492867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oHgETEtsCHSTHQ3plGmGe/BdhoOGh3Pku1SZ8E6t8qM=; b=ho2Okod90vdjrPGaJXDBSQM66Q61mOdFqvSXpCq/f9gZN/sswnNyEW5rv5PHXfHfoeiWvS SkRg3PKuspEpGqoi3TTDLku43uONSQhEMiomT6cma1vN0PAsjFARubBjThLCUfYIy53ZN7 keHleJ0oUcBg5M+pkf3m/3BEYjAqcW7knT1suZ2QfxexnUtvWUz95mmvJC5uzvCj3CPJsX otTq0XEqngoDpYt9bOGyN+d36mWvwf8WGZVhYqQKdw2x/2tdP6792xPyBHszFkNaeYybVj DIqSDnRlv8HcJy2rMjvVGkEI5wj0q7jM0scu7v/8OWBdK0M+dYUZQsF4gsqu4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691492867; a=rsa-sha256; cv=none; b=m8XA6wulK65mz8FuT7RS2n/OKkUTbkqkPX+0LpQxwOxlMV3iuu/c7Eu3D6Q/VZmfCO18f1 i+SoK0lb97/0yrVV2KzrLn7EtVquqt9jKOoM3erhMxpNnYzaxHt4VlvTy5E1r9ynVEKdJI R1+NEzzhlhJl+vgKkpO3Mx/VxtJu8TNWfgmUsug4CVXZKF8ixEOcMbPmitEnYmw7xXpuY5 xz+RiGWw2hb6K0OJUvg6hfza9vZtRX0EbMiGMoadiSZuRviFyPe/BfcWFSOUKkNaDIjNtm 8zCAtrCPIOtr2dSCotASqvQ+8IUl53T305gvDDYcw5DarJV8PGcgdrPJuLPiaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKr4z1DL3zXYp; Tue, 8 Aug 2023 11:07: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 378B7ldJ092780; Tue, 8 Aug 2023 11:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378B7lf8092779; Tue, 8 Aug 2023 11:07:47 GMT (envelope-from git) Date: Tue, 8 Aug 2023 11:07:47 GMT Message-Id: <202308081107.378B7lf8092779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 9ade2745db8b - main - sctp: remove duplicate code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ade2745db8be213e9da2225795cafb8e7575e29 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=9ade2745db8be213e9da2225795cafb8e7575e29 commit 9ade2745db8be213e9da2225795cafb8e7575e29 Author: Michael Tuexen AuthorDate: 2023-08-08 11:05:39 +0000 Commit: Michael Tuexen CommitDate: 2023-08-08 11:05:39 +0000 sctp: remove duplicate code No functional change intended. MFC after: 1 week --- sys/netinet/sctp_usrreq.c | 4 ++-- sys/netinet/sctp_var.h | 1 + sys/netinet6/sctp6_usrreq.c | 48 +-------------------------------------------- 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index aa957ffa9f96..5bbb32534ff0 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -414,8 +414,7 @@ SYSCTL_PROC(_net_inet_sctp, OID_AUTO, getcred, 0, 0, sctp_getcred, "S,ucred", "Get the ucred of a SCTP connection"); -#ifdef INET -static void +void sctp_abort(struct socket *so) { struct epoch_tracker et; @@ -453,6 +452,7 @@ sctp_abort(struct socket *so) NET_EPOCH_EXIT(et); } +#ifdef INET static int sctp_attach(struct socket *so, int proto SCTP_UNUSED, struct thread *p SCTP_UNUSED) { diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h index ef01b0b6c3bd..1dd748b8c798 100644 --- a/sys/netinet/sctp_var.h +++ b/sys/netinet/sctp_var.h @@ -321,6 +321,7 @@ struct sctp_tcb; struct sctphdr; void sctp_close(struct socket *so); +void sctp_abort(struct socket *so); int sctp_disconnect(struct socket *so); ipproto_ctlinput_t sctp_ctlinput; int sctp_ctloutput(struct socket *, struct sockopt *); diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index a105b2897c6c..8e5476c2cae3 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -434,52 +434,6 @@ SYSCTL_PROC(_net_inet6_sctp6, OID_AUTO, getcred, 0, 0, sctp6_getcred, "S,ucred", "Get the ucred of a SCTP6 connection"); -/* This is the same as the sctp_abort() could be made common */ -static void -sctp6_abort(struct socket *so) -{ - struct epoch_tracker et; - struct sctp_inpcb *inp; - uint32_t flags; - - inp = (struct sctp_inpcb *)so->so_pcb; - if (inp == NULL) { - SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, EINVAL); - return; - } - NET_EPOCH_ENTER(et); -sctp_must_try_again: - flags = inp->sctp_flags; -#ifdef SCTP_LOG_CLOSING - sctp_log_closing(inp, NULL, 17); -#endif - if (((flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) && - (atomic_cmpset_int(&inp->sctp_flags, flags, (flags | SCTP_PCB_FLAGS_SOCKET_GONE | SCTP_PCB_FLAGS_CLOSE_IP)))) { -#ifdef SCTP_LOG_CLOSING - sctp_log_closing(inp, NULL, 16); -#endif - sctp_inpcb_free(inp, SCTP_FREE_SHOULD_USE_ABORT, - SCTP_CALLED_AFTER_CMPSET_OFCLOSE); - SOCK_LOCK(so); - SCTP_SB_CLEAR(so->so_snd); - /* - * same for the rcv ones, they are only here for the - * accounting/select. - */ - SCTP_SB_CLEAR(so->so_rcv); - /* Now null out the reference, we are completely detached. */ - so->so_pcb = NULL; - SOCK_UNLOCK(so); - } else { - flags = inp->sctp_flags; - if ((flags & SCTP_PCB_FLAGS_SOCKET_GONE) == 0) { - goto sctp_must_try_again; - } - } - NET_EPOCH_EXIT(et); - return; -} - static int sctp6_attach(struct socket *so, int proto SCTP_UNUSED, struct thread *p SCTP_UNUSED) { @@ -1167,7 +1121,7 @@ sctp6_getpeeraddr(struct socket *so, struct sockaddr **nam) #define SCTP6_PROTOSW \ .pr_protocol = IPPROTO_SCTP, \ .pr_ctloutput = sctp_ctloutput, \ - .pr_abort = sctp6_abort, \ + .pr_abort = sctp_abort, \ .pr_accept = sctp_accept, \ .pr_attach = sctp6_attach, \ .pr_bind = sctp6_bind, \ From nobody Tue Aug 8 13:14:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKttd4zfkz4mKn5; Tue, 8 Aug 2023 13:14: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 4RKttd40Q5z3HNH; Tue, 8 Aug 2023 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YmjmJTc4AFRfv9xoNAJZf3sPakxws3eCGu9IOZLcNY=; b=ARV26ZJo0fl0B+eBZH3YWAiIoCBPZ+sAFpw97sYryeedmBF13NyoxdFtTgcWe94FrL8g8C dEdjqjL0wKDqeyo09rDOo1AWGw/QecZnhowfuUSIALxn3pwiLjfgM7+Uc6k9vKMZ2EXAQQ CIZCW58QUPe6ZLoMPzoicEESZL4aZo+w+YMEhELmxPZMroln/Ma0NQC/soxLR/fiPO7jGK buKFjwDER7ay9j1SBXu8jXLQhbmom+sQEBr53OqItnFzIWEHK4Dpi3Dfi589CU3HJ8dUoI 3Fbe6C6c4QfPY6p1UWd/BiEMSNMjRsT8ieK9eKnlEKAG2PUmK+47jJc2GpFgJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6YmjmJTc4AFRfv9xoNAJZf3sPakxws3eCGu9IOZLcNY=; b=Jh4hP+FvjyEPsO5fWDePgB/dBIA+fhJBFF7eyzH6YHZsvSUqzQzK9/44xTczwKcG/3JHYm +HJ3dshyJOBkkiqRHqUlIRwBa4J63spQkOwy7c4rEK4mFcEZoHOA6FzFAMw7ZhJb8wr2dv Gp4xLOW63pI2PagnImlfTu5UxEdbCKY1wev91XSJGrTmABlJiQbz7dSzVlORBgZDf8sn6c Sbbpck1JmptoZMyST68VnZgeL2yCUjWzVgmmfrXYBkcEZ2tjL7iPCuN8uCss5km15TRRJY 6H7IwDvILHuMkKKEKCE09uOoAqfUTc2ROuLzI4Z7c873XSvNPrbUXRungiP9nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691500441; a=rsa-sha256; cv=none; b=jlDWshPigzp9xVuMtFoeS0v0LroBDTdGpqG0Ir1LeAnDu3dFgCxxwQ7DJ7rin8TFCfE653 4/tWHUpql0YkNA+Ln3zLs8Q5nedu4ZHe14l7N29NIPyu+ht72I7tXR6E66w70BFRze6DJq ks+Wou8UR4A20MxcxxTbANi4AxzI0XeNufv42skpNbMyi/MM9lXodnYTAvFqOsPav0kcVQ bcY/qmLGDkNIY3woTLTzlRNDp6W8JrFZ07NvYdb68vTab/7lWjdmkpQotM4Gg9l2k/LdFO TkMNewfrx1zmvCxELlg/QiRN8FqZ9CIf96q79NeU3oU9YoM83WhvdqBdy7ro5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKttd34sVzbbv; Tue, 8 Aug 2023 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378DE1Rw008014; Tue, 8 Aug 2023 13:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378DE1a1008013; Tue, 8 Aug 2023 13:14:01 GMT (envelope-from git) Date: Tue, 8 Aug 2023 13:14:01 GMT Message-Id: <202308081314.378DE1a1008013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: fdfd3a90b6ce - main - ofw: Add a ofw_firmware driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdfd3a90b6ceba838a40c3c51472883e7de8a440 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=fdfd3a90b6ceba838a40c3c51472883e7de8a440 commit fdfd3a90b6ceba838a40c3c51472883e7de8a440 Author: Emmanuel Vadot AuthorDate: 2022-12-06 10:57:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-08 13:13:31 +0000 ofw: Add a ofw_firmware driver Some SoCs have an external firmware doing power management, clock and other stuffs. (Xilinx, ARM Juno etc ...) The way it is represent in the DTB is usually having a 'firmware' node under the root node and have some nodes under it with the correct compatible strings. The firmware node itself doesn't have any compatible strings. This driver is simple subclassed from simplebus and attaches at BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE so early drivers (like clock drivers) can still have a change to attach early. Reviewed by: andrew Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37612 --- sys/conf/files | 1 + sys/dev/ofw/ofw_firmware.c | 161 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 8838137f6989..3d405b3d86b5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2579,6 +2579,7 @@ dev/ofw/ofw_bus_if.m optional fdt dev/ofw/ofw_bus_subr.c optional fdt dev/ofw/ofw_cpu.c optional fdt dev/ofw/ofw_fdt.c optional fdt +dev/ofw/ofw_firmware.c optional fdt dev/ofw/ofw_if.m optional fdt dev/ofw/ofw_graph.c optional fdt dev/ofw/ofw_subr.c optional fdt diff --git a/sys/dev/ofw/ofw_firmware.c b/sys/dev/ofw/ofw_firmware.c new file mode 100644 index 000000000000..faba123c3e09 --- /dev/null +++ b/sys/dev/ofw/ofw_firmware.c @@ -0,0 +1,161 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +struct ofw_firmware_softc { + struct simplebus_softc sc; + device_t dev; +}; + +static struct simplebus_devinfo * +ofw_firmware_setup_dinfo(device_t dev, phandle_t node, + struct simplebus_devinfo *di) +{ + struct simplebus_softc *sc; + struct simplebus_devinfo *ndi; + + sc = device_get_softc(dev); + if (di == NULL) + ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO); + else + ndi = di; + if (ofw_bus_gen_setup_devinfo(&ndi->obdinfo, node) != 0) { + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + + /* reg resources is from the parent but interrupts is on the node itself */ + resource_list_init(&ndi->rl); + ofw_bus_reg_to_rl(dev, OF_parent(node), sc->acells, sc->scells, &ndi->rl); + ofw_bus_intr_to_rl(dev, node, &ndi->rl, NULL); + + return (ndi); +} + +static device_t +ofw_firmware_add_device(device_t dev, phandle_t node, u_int order, + const char *name, int unit, struct simplebus_devinfo *di) +{ + struct simplebus_devinfo *ndi; + device_t cdev; + + if ((ndi = ofw_firmware_setup_dinfo(dev, node, di)) == NULL) + return (NULL); + cdev = device_add_child_ordered(dev, order, name, unit); + if (cdev == NULL) { + device_printf(dev, "<%s>: device_add_child failed\n", + ndi->obdinfo.obd_name); + resource_list_free(&ndi->rl); + ofw_bus_gen_destroy_devinfo(&ndi->obdinfo); + if (di == NULL) + free(ndi, M_DEVBUF); + return (NULL); + } + device_set_ivars(cdev, ndi); + + return(cdev); +} + +static int +ofw_firmware_probe(device_t dev) +{ + const char *name; + + name = ofw_bus_get_name(dev); + if (name == NULL || strcmp(name, "firmware") != 0) + return (ENXIO); + + device_set_desc(dev, "OFW Firmware Group"); + return (0); +} + +static int +ofw_firmware_attach(device_t dev) +{ + struct ofw_firmware_softc *sc; + phandle_t node, child; + device_t cdev; + + sc = device_get_softc(dev); + sc->dev = dev; + node = ofw_bus_get_node(dev); + + if (OF_getencprop(node, "#address-cells", &sc->sc.acells, + sizeof(sc->sc.acells)) == -1) { + if (OF_getencprop(OF_parent(node), "#address-cells", &sc->sc.acells, + sizeof(sc->sc.acells)) == -1) { + sc->sc.acells = 2; + } + } + if (OF_getencprop(node, "#size-cells", &sc->sc.scells, + sizeof(sc->sc.scells)) == -1) { + if (OF_getencprop(OF_parent(node), "#size-cells", &sc->sc.scells, + sizeof(sc->sc.scells)) == -1) { + sc->sc.scells = 1; + } + } + + for (child = OF_child(node); child != 0; child = OF_peer(child)) { + cdev = ofw_firmware_add_device(dev, child, 0, NULL, -1, NULL); + if (cdev != NULL) + device_probe_and_attach(cdev); + } + + return (bus_generic_attach(dev)); +} + +static device_method_t ofw_firmware_methods[] = { + /* device_if */ + DEVMETHOD(device_probe, ofw_firmware_probe), + DEVMETHOD(device_attach, ofw_firmware_attach), + + DEVMETHOD_END +}; + +DEFINE_CLASS_1(ofw_firmware, ofw_firmware_driver, ofw_firmware_methods, + sizeof(struct ofw_firmware_softc), simplebus_driver); + +EARLY_DRIVER_MODULE(ofw_firmware, simplebus, ofw_firmware_driver, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); +MODULE_VERSION(ofw_firmware, 1); From nobody Tue Aug 8 13:14:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKttf66cJz4mKt1; Tue, 8 Aug 2023 13:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKttf5dB1z3HnZ; Tue, 8 Aug 2023 13:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezfuc+vOksusC5rNv4cmNZ2K8/ExN5tiwFrF6xc8Lnw=; b=AWdLt9wdLHNG+NGwzUVQxydln3MZ2W408nQWqFGCWvxfRypohcy4K/Szpu4jubI272HDfJ +5wpN1RdxsUH8qezYFIEnBXmoFoAZ0Kubl/bJKHV+tS3FTq4xzhBKVrj5PUpPr1ZPQGWdQ RTCxphEbX5XRP3r5KCjXZcFXHtt1R/xsj3BZECbv6PTUS657YSG4PiMbpiJm1cs9KmqEei FFSHouxoC/minWORHxw279XkrjD8smPxeV5HoYxPDuk5A4E9jfj6jupT+1tJj0lie3pKX4 3ze6g0fJHXGfJQ+FtHz0iMlbqDXR9ruuxDIoPrBmTs2xEjdrEIwyZtb5CUYT2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691500442; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ezfuc+vOksusC5rNv4cmNZ2K8/ExN5tiwFrF6xc8Lnw=; b=P4DbFptWVHHz03Fs8isGlmDNFavmgJt3YfhAn5tw+C8oT2PvdLPYZE8kZ88Cto9KiCOaKu 3WACBnseHaF1qpTTAuqYl635ksRBwvr0P6167/DBEaMZyA/PS/fnK13P3eW/heFdgshvIW U8STQyLRn0D9WE7jRBNnVNjarqHah319k3kwTFho8G9VUuMXL2f+X5rZQHdNe0JrRHa2V0 3anYYP509tJu/IwnvO29noOyFpjUbB1hRsRZFHfNWjypMeBRcRDvIgGCXHOKUQ59KeSXqM sT+OJ3Oz9BtQXxwrLO84sfVzgYOh9yNJXfFNz17oSyd/v6TXmVNh2oYYVuvq0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691500442; a=rsa-sha256; cv=none; b=I+RF/JEpj3/aBYFMgUPOfdMFg0omeLDitwv7wrP9mXvS8uObj0DXVvKGGcwesskXF1wC76 /FvjmrbIl4ykzaHvWw9XbMKCStosUOn24Kf/U6LayY1GN7M1h8W6+i29MASv1oruI+iusd vvC37K5hXJL/Fge2pk2VYOJdExcRhSntIC/5eL4H//hZ8nr3Go3X0AWjVw2CkyPcMB/3Re +vtGsM9igOsswKPC//EtnqcfkwCBoa2QBfVJPSeJOlot0ke/WFzuYFJaJNFSKijKEKrKKB pXQgLEaHuSuRSJzJuXQ3bivzsEYmlVtYc85S7jmv9S0aMeosnF1B85257ZlSxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKttf41qmzbGR; Tue, 8 Aug 2023 13:14: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 378DE2lV008037; Tue, 8 Aug 2023 13:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378DE2jY008036; Tue, 8 Aug 2023 13:14:02 GMT (envelope-from git) Date: Tue, 8 Aug 2023 13:14:02 GMT Message-Id: <202308081314.378DE2jY008036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 4b5f5fe78f90 - main - arm64: intel: Remove firmware driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b5f5fe78f901007b19027be31b32666ba52a8b4 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=4b5f5fe78f901007b19027be31b32666ba52a8b4 commit 4b5f5fe78f901007b19027be31b32666ba52a8b4 Author: Emmanuel Vadot AuthorDate: 2022-12-06 11:07:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-08 13:13:33 +0000 arm64: intel: Remove firmware driver This is now covered by ofw_firmware. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D37613 --- sys/arm64/intel/firmware.c | 120 ---------------------------------------- sys/arm64/intel/stratix10-svc.c | 2 +- sys/conf/files.arm64 | 1 - 3 files changed, 1 insertion(+), 122 deletions(-) diff --git a/sys/arm64/intel/firmware.c b/sys/arm64/intel/firmware.c deleted file mode 100644 index 5c4470fa4a98..000000000000 --- a/sys/arm64/intel/firmware.c +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2019 Ruslan Bukin - * - * This software was developed by SRI International and the University of - * Cambridge Computer Laboratory (Department of Computer Science and - * Technology) under DARPA contract HR0011-18-C-0016 ("ECATS"), as part of the - * DARPA SSITH research programme. - * - * 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 -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include - -#include -#include -#include - -struct firmware_softc { - struct simplebus_softc simplebus_sc; - device_t dev; -}; - -static int -firmware_probe(device_t dev) -{ - phandle_t node; - - node = ofw_bus_get_node(dev); - - /* - * The firmware node has no property compatible. - * Look for a known child. - */ - if (!fdt_depth_search_compatible(node, "intel,stratix10-svc", 0)) - return (ENXIO); - - if (!ofw_bus_status_okay(dev)) - return (ENXIO); - - device_set_desc(dev, "Firmware node"); - - return (BUS_PROBE_DEFAULT); -} - -static int -firmware_attach(device_t dev) -{ - struct firmware_softc *sc; - phandle_t node; - - sc = device_get_softc(dev); - sc->dev = dev; - - node = ofw_bus_get_node(dev); - if (node == -1) - return (ENXIO); - - simplebus_init(dev, node); - - /* - * Allow devices to identify. - */ - bus_generic_probe(dev); - - /* - * Now walk the OFW tree and attach top-level devices. - */ - for (node = OF_child(node); node > 0; node = OF_peer(node)) - simplebus_add_device(dev, node, 0, NULL, -1, NULL); - - return (bus_generic_attach(dev)); -} - -static int -firmware_detach(device_t dev) -{ - - return (0); -} - -static device_method_t firmware_methods[] = { - DEVMETHOD(device_probe, firmware_probe), - DEVMETHOD(device_attach, firmware_attach), - DEVMETHOD(device_detach, firmware_detach), - DEVMETHOD_END -}; - -DEFINE_CLASS_1(firmware, firmware_driver, firmware_methods, - sizeof(struct firmware_softc), simplebus_driver); - -EARLY_DRIVER_MODULE(firmware, simplebus, firmware_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); -MODULE_VERSION(firmware, 1); diff --git a/sys/arm64/intel/stratix10-svc.c b/sys/arm64/intel/stratix10-svc.c index 900cc00567f2..5e3cb3cf1dc4 100644 --- a/sys/arm64/intel/stratix10-svc.c +++ b/sys/arm64/intel/stratix10-svc.c @@ -265,5 +265,5 @@ static driver_t s10_svc_driver = { sizeof(struct s10_svc_softc), }; -EARLY_DRIVER_MODULE(s10_svc, firmware, s10_svc_driver, 0, 0, +EARLY_DRIVER_MODULE(s10_svc, simplebus, s10_svc_driver, 0, 0, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index f3cfab68538a..7eb0c0d04367 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -468,7 +468,6 @@ arm/allwinner/h6/h6_r_padconf.c optional soc_allwinner_h6 fdt # Altera/Intel dev/altera/dwc/if_dwc_socfpga.c optional fdt dwc_socfpga -arm64/intel/firmware.c optional soc_intel_stratix10 fdt arm64/intel/stratix10-soc-fpga-mgr.c optional soc_intel_stratix10 fdt arm64/intel/stratix10-svc.c optional soc_intel_stratix10 fdt From nobody Tue Aug 8 13:59:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKvtn0LL0z4mNVL; Tue, 8 Aug 2023 13:59: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 4RKvtm6R22z3Mj6; Tue, 8 Aug 2023 13:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0sJ6++7b92ttyOSIXCVhn0+o6ZD3aIoiconx4bbxeg=; b=n26gsR0PivjOyMPd0qXt+AuXRwbMP8xAAtH20xKd6U3VDwC/MHc7TJTKnik2jfHEikeuhY Fehbg8i126qKDcA5l3/+c34UEoughqJecWD0DdshejuDKHWY3djObbEqz4Q9VsGZSQEm1W v3FfYWejQ/gfg7lUHQ5a+Iab0+sWv7sd3Bss9vFGdxFp4FHz3p81EhmELeZvOt5K9QuJWW QSwFaglZAoodJ4a0YM0lr+4ZrAyEtN7WSNanXCdFCGdDQplP36IOrUwMvA/V+vu5kxifvk UdsmXvyg7YpUkmOAOe6142cgsMocLa/Qnr0f8aRd0LwCRxU9hn3pQh6LwO2DQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B0sJ6++7b92ttyOSIXCVhn0+o6ZD3aIoiconx4bbxeg=; b=suOagOQYe4YQxR9JYQVbTaOPfvB7dNjrZOs9gQPvXlHiY+2E7BAlmfC9dzruBQgV/6ew5I ryBbJATikcg/SaZpXY1x3vS3rzamgoZCLkK3ogSfGQMP4FAbDOaLULb3nXws7+j1Bx0h1x Ehw6EGAok9m/WbjKs4yvayHsxODNkvkkQCcfFj6Ls7SY4KCXtZZjDDG1PXpx2TdmTOnVbq pTcNdvUi6sCQkxBBR4rJA0xqN1t7WCpW6crlOXtt1y39e23VpK708Nih8fUscv5j6ADTRS w3RET7co7iDihUJLSMBRXdC3URPgjFIkKHgUoJ5NyfHtp1l4PGVsu38eQJt68g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691503152; a=rsa-sha256; cv=none; b=ea2X5ygP1XV4FQtA0H4iM4aTfgjiNxlG6SXpzMtjx0dP/p+6aEbK0PwFYz1Sp8oov9oZH6 6tLSF0o60NfgQkZuKSWdXTar8eZ2VyHzRCN97b/QtDO/GrIeuo6x5Pn5elGF2ryCV830M8 GQEbkRhCrm3Ba8yaj6NWiGBxFc/6DCs6HnPbsdF4Dd/BV6ddEpSg//s9KqtFHZ5RdaZFna S34ejLDy1LcxyL/kCExn8Ep9KCWIhhsbv0yk3IVg4IVtAu4aET35EhWm9NTACHmxsirU7U pofqxMTH6ylu3plJ16UDa4M8jVJ0UzjEjJiD2rkRcpC9/O5aVvOQZWwMznlpLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKvtm5M0Lzcdl; Tue, 8 Aug 2023 13:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378DxCDj074268; Tue, 8 Aug 2023 13:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378DxCEu074267; Tue, 8 Aug 2023 13:59:12 GMT (envelope-from git) Date: Tue, 8 Aug 2023 13:59:12 GMT Message-Id: <202308081359.378DxCEu074267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ddefad7c4f48 - main - arm64: rockchip: Tweak i2c, pmic and iodomain order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddefad7c4f48e5107aec1e92db620196c0d04101 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=ddefad7c4f48e5107aec1e92db620196c0d04101 commit ddefad7c4f48e5107aec1e92db620196c0d04101 Author: Emmanuel Vadot AuthorDate: 2023-08-08 13:24:33 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-08 13:58:26 +0000 arm64: rockchip: Tweak i2c, pmic and iodomain order We need i2c first to set it to MIDDLE, then we need one of the pmics so set them to LATE, only then we can attach iodomain which needs some regulators exposed by the pmic so set it to LAST. Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/arm64/rockchip/rk_i2c.c | 4 ++-- sys/arm64/rockchip/rk_iodomain.c | 2 +- sys/dev/iicbus/pmic/rockchip/rk805.c | 4 ++-- sys/dev/iicbus/pmic/rockchip/rk808.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index e3824ba843fe..b9f0fd592122 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -727,8 +727,8 @@ static driver_t rk_i2c_driver = { }; EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); MODULE_DEPEND(rk_i2c, iicbus, 1, 1, 1); MODULE_VERSION(rk_i2c, 1); diff --git a/sys/arm64/rockchip/rk_iodomain.c b/sys/arm64/rockchip/rk_iodomain.c index 2bbd1e49586b..3b85192eb333 100644 --- a/sys/arm64/rockchip/rk_iodomain.c +++ b/sys/arm64/rockchip/rk_iodomain.c @@ -301,4 +301,4 @@ static driver_t rk_iodomain_driver = { }; EARLY_DRIVER_MODULE(rk_iodomain, simplebus, rk_iodomain_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); diff --git a/sys/dev/iicbus/pmic/rockchip/rk805.c b/sys/dev/iicbus/pmic/rockchip/rk805.c index 4ba4ca666103..9910515412a3 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk805.c +++ b/sys/dev/iicbus/pmic/rockchip/rk805.c @@ -193,8 +193,8 @@ DEFINE_CLASS_1(rk805_pmu, rk805_driver, rk805_methods, sizeof(struct rk8xx_softc), rk8xx_driver); EARLY_DRIVER_MODULE(rk805_pmu, iicbus, rk805_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(iicbus, rk805_pmu, iicbus_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk805_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk805_pmu, 1); diff --git a/sys/dev/iicbus/pmic/rockchip/rk808.c b/sys/dev/iicbus/pmic/rockchip/rk808.c index 13ba44158447..f6797fe4bf57 100644 --- a/sys/dev/iicbus/pmic/rockchip/rk808.c +++ b/sys/dev/iicbus/pmic/rockchip/rk808.c @@ -268,8 +268,8 @@ DEFINE_CLASS_1(rk808_pmu, rk808_driver, rk808_methods, sizeof(struct rk8xx_softc), rk8xx_driver); EARLY_DRIVER_MODULE(rk808_pmu, iicbus, rk808_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(iicbus, rk808_pmu, iicbus_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LAST); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk808_pmu, iicbus, IICBUS_MINVER, IICBUS_PREFVER, IICBUS_MAXVER); MODULE_VERSION(rk808_pmu, 1); From nobody Tue Aug 8 14:10:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKw8214tQz4mPVc; Tue, 8 Aug 2023 14:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKw820f2Vz3Px3; Tue, 8 Aug 2023 14:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNSFIf4RWi0tEaa/C9tcQfXXxaUugOPLUDW1CedmJhE=; b=M7V3egbTNhyvX7RxxeUX6I17jcQWE81ndg5c1wOxjln1SoM3eE0vQqUEt8EtClCuDLk2aq EUvhPwxz90l66Fh/h3teYL4JrR8iivVDpalbKsYxvSJCxm6J3k13SsOBTEl4dmJ47g6wAr 6NN5oOhcGwdtsr166MfunNXhidC2mtiUMsAfeHGNAMN5n7+36vtcN37/Wf60tDcDwGH0eW xGlEEaMogXfPen+JxoltIOjmgOqToAH7ljcYIVi1PgvENjucIiHlV/PEDMeZhy6SDIb3bk cREjus/svIzSesI5lA+ZR2sRR3xba0u7hNpuNF0+2XEK8Gtk9c2MpJThDN0QmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691503842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNSFIf4RWi0tEaa/C9tcQfXXxaUugOPLUDW1CedmJhE=; b=pFabr+1Q1Ih/WDbdAMS7ZCCt/3YlkzpMjvpadNBNzrE1u/d4bYqHum4onvOd62jikaeeIm HJldAh+ZGtbsiTFSRf+zGQyDgCJz1OIDJeFU3l38X5oCJJ7nlSwZXjruXDYKcLJ/csiJOG b7c1jlksumKdK5SvBB0owid5yzyizDvwW/yb4I/eQYKmI4dzilJ+e4RGYpuQBhfQZDatnc +x88EZP3DqjFWgZ6K4or7oG58opZx6uOY4GRL7k6BS1G1BZe4pySvRzmGVpXQFmUwTJtvQ yBPSBQQf3BzTuWiqE0lu+NKzZ0G5Sse99tx8TWodcCoWEaO5GIRDbBLNOHgaZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691503842; a=rsa-sha256; cv=none; b=orDPM8ctxgcpAnIxSWN5xH/P6SW/kLhOby8HE/TN32tQtTluAldNAjmXwgx+dfSvfwgB33 P0oXFOCcQ9ioOcAKi+NheMBwO2PiCZPsgp7/tTvC20R0UunLQ7/qn6+i7Rz0kra0Uf8Sn/ wwRVOd6PnbaGA/g1hZOxqaeZQWtEcTvT3KdrcKtQ7L7SZsPNQ6bZpZumN6g5gTWiYBS9Fk v2yzlBAizXNZfaPbDDZGikuOnYnFhgF+7jx1zmdqwrSnRHzmU3sXKxUlstUEwwRVBxoDrq QASeJlpwzepN67JP7e1s0KU4dHqZ0zZM40e58SJsj1GT0VYzMm08OSOys72+rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKw816kMnzd3K; Tue, 8 Aug 2023 14:10: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 378EAfWi000261; Tue, 8 Aug 2023 14:10:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378EAfmJ000260; Tue, 8 Aug 2023 14:10:41 GMT (envelope-from git) Date: Tue, 8 Aug 2023 14:10:41 GMT Message-Id: <202308081410.378EAfmJ000260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 58a46cfd751a - main - md driver compat32: fix structure padding for arm, powerpc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58a46cfd751ac726ddca8544bf73a290b0154a57 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=58a46cfd751ac726ddca8544bf73a290b0154a57 commit 58a46cfd751ac726ddca8544bf73a290b0154a57 Author: Mike Karels AuthorDate: 2023-08-08 14:09:03 +0000 Commit: Mike Karels CommitDate: 2023-08-08 14:09:03 +0000 md driver compat32: fix structure padding for arm, powerpc Because the 32-bit md_ioctl structure contains 64-bit members, arm and powerpc add padding to a multiple of 8. i386 doesn't do this. The md_ioctl32 definition was correct for amd64/i386 without padding, but wrong for arm64 and powerpc64. Make __packed__ conditional on __amd64__, and test for the expected size on non-amd64. Note that mdconfig is used in the ATF test suite. Note, I verified the structure size for powerpc, but was unable to test. MFC after: 1 week Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D41339 Discussed with: jhibbits --- sys/dev/md/md.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index a719dccb1955..8215995a3455 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -147,8 +147,16 @@ struct md_ioctl32 { int md_fwsectors; uint32_t md_label; int md_pad[MDNPAD]; -} __attribute__((__packed__)); +} +#ifdef __amd64__ +__attribute__((__packed__)) +#endif +; +#ifndef __amd64__ +CTASSERT((sizeof(struct md_ioctl32)) == 440); +#else CTASSERT((sizeof(struct md_ioctl32)) == 436); +#endif #define MDIOCATTACH_32 _IOC_NEWTYPE(MDIOCATTACH, struct md_ioctl32) #define MDIOCDETACH_32 _IOC_NEWTYPE(MDIOCDETACH, struct md_ioctl32) From nobody Tue Aug 8 15:12:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKxWD3Qbrz4mTNj; Tue, 8 Aug 2023 15:12: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 4RKxWD30dJz3Xkd; Tue, 8 Aug 2023 15:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691507544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4aXqUlQtSEf6nIWQFfBRsOyEkEsefuE+XGtO2n/fJA=; b=yyNFTLCojVUq2QQiDut87jQuHMfJtHuAW9m7VzLqNtAir5XZNL3V618JC45/+0JqPblu/S dB9sKmGSQGWb63cI2ri4vn6nBEOdGZKODKT7oSjUhbHsAT1u8vJBZ4mDocBT3WvYp1a3li BJO+QXZeDaKm/zX/Uh+2CzW0Ab2nnBiOyFyzN2xF0x4Kauz0JKHJfYyJx8OHd6nNadL6ql /bOw7zOmsVqPt9iwDGPAC+lnHDHKhjmx7OrUlC9kE9TLOC6PXgGxXiDytO/UxiuawNW08y HqOvYaz4NdB4Yr1Tm1tJkITPi+hnmhactJGbI88MIYCruJY0wXO24ET5gAuGcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691507544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d4aXqUlQtSEf6nIWQFfBRsOyEkEsefuE+XGtO2n/fJA=; b=MrdIEuuEv4PAGVF7FvIPV3+czkwdVaYkBmMSMt05RCFTmot3VXZnivlB2ngdEewAxrPDyQ 65g5iSb9eYzvo6UiGaCAZlB46n7LlPsmCeHd86MoijupsjLGIEH58jqP/MpUuxeGDYwmJp LyuQTH69b7MvHbY4QSkkjYDwzDbMXz/X7nA74You8Jzr+aEcVuP49BkusCJS9S+cXIbbHP 1y4REG0x+YFIN6MRbtdwKLzBgnXP5GtnUM4YZ4xdKxQ8kSpOTTgo2fWhTXVYRDdf5xII46 3VZnUiCmJ4QPIJaJgY5qGu3pZmmfmFdDxN+X3slnm+eiwNdHJdhMzedMA/bReg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691507544; a=rsa-sha256; cv=none; b=vUx7ZRuJwguJGc79t7Btht9+zR1qOgm/wsLyDaCNkO6HCTNaMmuyYr+2rorX2x3b2TFyFU OhHP8iG9Ei6IahIS+8gkrLEd1DUWmxVHzFEBif2Nj9RMUAp6qOIBO2IPjBWxOg/XRVV5yh vP9ZL7XUOK1R+wiSZmj13hqhDsQqX3yH3P1dFqIKnpjqlfvWIeh1RgZhyrwYhoSAzzOet/ F4qxQu1lqwGc9oRGkmp4lfhhR1+jrQ8DizCyZGn8lf6IamhxbdDM+etyqhovWPdcc9yFE5 8e1c7g8kkdAO3F7BYhlYNckjOhTYy8OE+39jkL30NWE8p8Oc4eySFScrOpgiYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKxWD21bJzfYk; Tue, 8 Aug 2023 15:12: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 378FCOck007497; Tue, 8 Aug 2023 15:12:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378FCOj5007496; Tue, 8 Aug 2023 15:12:24 GMT (envelope-from git) Date: Tue, 8 Aug 2023 15:12:24 GMT Message-Id: <202308081512.378FCOj5007496@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 8920c5f2a117 - main - tests: Add stack grows tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8920c5f2a1175c22631780bd236026d15e2d3d72 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8920c5f2a1175c22631780bd236026d15e2d3d72 commit 8920c5f2a1175c22631780bd236026d15e2d3d72 Author: Dmitry Chagin AuthorDate: 2023-08-08 15:12:09 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-08 15:12:09 +0000 tests: Add stack grows tests Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41320 MFC after: 2 weeks --- etc/mtree/BSD.tests.dist | 2 + tests/sys/vm/Makefile | 5 +++ tests/sys/vm/soxstack/Makefile | 17 +++++++ tests/sys/vm/soxstack/soxstack.c | 51 +++++++++++++++++++++ tests/sys/vm/stack/Makefile | 15 +++++++ tests/sys/vm/stack/stack_dlopen_exec_test.c | 64 +++++++++++++++++++++++++++ tests/sys/vm/stack/stack_dt_need_exec_test.c | 50 +++++++++++++++++++++ tests/sys/vm/stack/stack_mprotect_exec_test.c | 48 ++++++++++++++++++++ 8 files changed, 252 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 943924c56bae..b1ce1117071b 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -897,6 +897,8 @@ vfs .. vm + stack + .. .. vmm .. diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index 9aac49bc5320..44ffb9ae7d7b 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -17,4 +17,9 @@ ATF_TESTS_SH+= mmap_map_32bit_test PROGS+= mmap_map_32bit_helper .endif +SUBDIR= soxstack +TESTS_SUBDIRS+= stack + +SUBDIR_DEPENDS_stack=soxstack + .include diff --git a/tests/sys/vm/soxstack/Makefile b/tests/sys/vm/soxstack/Makefile new file mode 100644 index 000000000000..70a22fd278b1 --- /dev/null +++ b/tests/sys/vm/soxstack/Makefile @@ -0,0 +1,17 @@ +# $FreeBSD$ + +SHLIB= soxstack +SHLIB_NAME= libsoxstack.so +SHLIB_MAJOR= 1 + +WITHOUT_STATIC= +WITHOUT_PROFILE= +WITHOUT_PIC= + +SRCS= soxstack.c +LDFLAGS+= -Wl,-z,execstack +LIBADD+= procstat + +LIBDIR= ${TESTSBASE}/sys/vm/stack + +.include diff --git a/tests/sys/vm/soxstack/soxstack.c b/tests/sys/vm/soxstack/soxstack.c new file mode 100644 index 000000000000..fe3eb1c03a29 --- /dev/null +++ b/tests/sys/vm/soxstack/soxstack.c @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +#include +#include +#include +#include +#include + +int checkstack(void); + +#define _STACK_FLAG_GROWS KVME_FLAG_GROWS_UP | KVME_FLAG_GROWS_DOWN +int +checkstack(void) +{ + struct kinfo_vmentry *freep, *kve; + struct kinfo_proc *p; + struct procstat *prstat; + uint64_t stack; + int i, cnt; + + prstat = procstat_open_sysctl(); + assert(prstat != NULL); + p = procstat_getprocs(prstat, KERN_PROC_PID, getpid(), &cnt); + assert(p != NULL); + freep = procstat_getvmmap(prstat, p, &cnt); + assert(freep != NULL); + + stack = (uint64_t)&i; + for (i = 0; i < cnt; i++) { + kve = &freep[i]; + if (stack < kve->kve_start || stack > kve->kve_end) + continue; + if ((kve->kve_flags & _STACK_FLAG_GROWS) != 0 && + (kve->kve_protection & KVME_PROT_EXEC) != 0) + stack = 0; + break; + } + + free(freep); + procstat_freeprocs(prstat, p); + procstat_close(prstat); + return (stack != 0); +} diff --git a/tests/sys/vm/stack/Makefile b/tests/sys/vm/stack/Makefile new file mode 100644 index 000000000000..2d56a6231e24 --- /dev/null +++ b/tests/sys/vm/stack/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PACKAGE= tests + +TESTSDIR= ${TESTSBASE}/sys/vm/stack + +ATF_TESTS_C+= stack_dt_need_exec_test +ATF_TESTS_C+= stack_dlopen_exec_test +ATF_TESTS_C+= stack_mprotect_exec_test + +LDFLAGS.stack_dt_need_exec_test+= -Wl,-rpath,${TESTSDIR} -L${.OBJDIR:H}/soxstack +LDADD.stack_dt_need_exec_test+= -lsoxstack +LDFLAGS.stack_dlopen_exec_test+= -Wl,-rpath,${TESTSDIR} + +.include diff --git a/tests/sys/vm/stack/stack_dlopen_exec_test.c b/tests/sys/vm/stack/stack_dlopen_exec_test.c new file mode 100644 index 000000000000..d4d5fc7c5cf0 --- /dev/null +++ b/tests/sys/vm/stack/stack_dlopen_exec_test.c @@ -0,0 +1,64 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include + +static int jumpstack0(void) __noinline; +static int jumpstack1(void) __noinline; + +static int (*socheckstack)(void) = NULL; + +static int +checkstack(void) +{ + void *fh; + + if (socheckstack == NULL) { + fh = dlopen("libsoxstack.so", RTLD_LAZY); + ATF_REQUIRE(fh != NULL); + socheckstack = dlsym(fh, "checkstack"); + ATF_REQUIRE(socheckstack != NULL); + } + return (socheckstack()); +} + +static int +jumpstack0(void) +{ + char stack[SGROWSIZ]; + + explicit_bzero(stack, sizeof(stack)); + return (checkstack()); +} + +static int +jumpstack1(void) +{ + char stack[SGROWSIZ * 2]; + + explicit_bzero(stack, sizeof(stack)); + return (checkstack()); +} + +ATF_TC_WITHOUT_HEAD(dlopen_test); +ATF_TC_BODY(dlopen_test, tc) +{ + + ATF_REQUIRE(jumpstack0() == 0); + ATF_REQUIRE(jumpstack1() == 0); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dlopen_test); + + return (atf_no_error()); +} diff --git a/tests/sys/vm/stack/stack_dt_need_exec_test.c b/tests/sys/vm/stack/stack_dt_need_exec_test.c new file mode 100644 index 000000000000..8a234abe3da5 --- /dev/null +++ b/tests/sys/vm/stack/stack_dt_need_exec_test.c @@ -0,0 +1,50 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +extern int checkstack(void); + +static int jumpstack0(void) __noinline; +static int jumpstack1(void) __noinline; + + +static int +jumpstack0(void) +{ + char stack[SGROWSIZ]; + + explicit_bzero(stack, sizeof(stack)); + return (checkstack()); +} + +static int +jumpstack1(void) +{ + char stack[SGROWSIZ * 2]; + + explicit_bzero(stack, sizeof(stack)); + return (checkstack()); +} + +ATF_TC_WITHOUT_HEAD(dt_need_test); +ATF_TC_BODY(dt_need_test, tc) +{ + + ATF_REQUIRE(jumpstack0() == 0); + ATF_REQUIRE(jumpstack1() == 0); +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, dt_need_test); + + return (atf_no_error()); +} diff --git a/tests/sys/vm/stack/stack_mprotect_exec_test.c b/tests/sys/vm/stack/stack_mprotect_exec_test.c new file mode 100644 index 000000000000..d12d99ea39ee --- /dev/null +++ b/tests/sys/vm/stack/stack_mprotect_exec_test.c @@ -0,0 +1,48 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + * + * PR: 272585 + * Test provided by John F. Carr + */ + +#include +#include +#include + +#include +#include + + +ATF_TC_WITHOUT_HEAD(mprotect_exec_test); +ATF_TC_BODY(mprotect_exec_test, tc) +{ + long pagesize; + char *addr, *guard; + size_t alloc_size; + + pagesize = sysconf(_SC_PAGESIZE); + ATF_REQUIRE(pagesize > 0); + + alloc_size = SGROWSIZ * 2; + addr = mmap(NULL, alloc_size, PROT_READ | PROT_WRITE, + MAP_STACK | MAP_PRIVATE | MAP_ANON, -1, 0); + ATF_REQUIRE(addr != MAP_FAILED); + + /* + * Change prot of the last page in the mmaped stack area. + */ + guard = addr + alloc_size - SGROWSIZ; + ATF_REQUIRE(mprotect(guard, pagesize, PROT_NONE) == 0); + + ((volatile char *)guard)[-1]; +} + +ATF_TP_ADD_TCS(tp) +{ + + ATF_TP_ADD_TC(tp, mprotect_exec_test); + + return (atf_no_error()); +} From nobody Tue Aug 8 16:43:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKzWs6Ljrz4pp2j; Tue, 8 Aug 2023 16:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKzWs5ZnGz4GhF; Tue, 8 Aug 2023 16:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691512985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rktFtQy1Htk/Mmg9CuzXWTSpsdr2eiue+6FWgSA6CEs=; b=bNy3EHrlVPMO/MAu5o7iY0EBQoITy/n47f55vB4ToRpageZz30s1re1osIr0hT2pKJUpR8 zes6cHSaCROV4UqQimgyBZ9pZc+V6KC7FiG75zvMHAf8sfAWqhU2ZcCRMhWrh0r4AED/8B qfdqlOucpVuzCDD9/BO6lnUkCzeiDCZLcX9krkEKfj7wayl7HMW11Q7RQdvXkLhjHLl3LN pW2AOQjU7h4JPj7lamZal7yAjYr4y8ZlnTWBafXVf7ahHEaUAMzPc6nLv5D6JbbtYL60MU rJHOWjjFVuNkbwRPNAVigLTCVw7FXrChzx/LbnBmQy2+BILYamOTRzxug0UJ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691512985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rktFtQy1Htk/Mmg9CuzXWTSpsdr2eiue+6FWgSA6CEs=; b=D04DIOUoG3dUnHzk7Zmlnf3qqLx5V3R5ycnJkLh7TtM1SPnbFfEbtDjB9FfUXovURU0dVS F+GA8OGSRoB33PoKqBQpkrEqIdB24zXt6V0PkfJoUjQadj876kIlhEF0/Vdir5rEHeQ/j/ KseqR7wr4sm9o80pyq8XmPeV17Vykl8FwWtNFR941WL7kXB2cgG8gYB+hQVVzSLmdGnJeY d/phforZ4eywwSFBsH6KKo2N6TRgUpuAsDpbx2SEbJIPoT0MmR5FtNrdGLcBdJ/dHQrZCj O4TCKmANl073QKVRM4QtjZaOJ3sm/SWayr/VVzyNB+pQweeg4/UD+vwOLbL9Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691512985; a=rsa-sha256; cv=none; b=eIjUxbsTtzUmv1z1QE0pPmZimiFvW3x3gyT93wQgmP19MM39/FTznJGOkwhr61u5Xg5ItT aCTL0dEOAEAPkEIlSrD7imHU6t/1E8YGeG+r9PGA0Wtu4Nc2PyfUYirQgqRnS6KqhLHVpm P2cDPBpgBNh6zHYeTMe7d0RWJfnukZXMTxXkjpOnUtU6eF8BLYl8Eu2xLH2h/ReUDxZkGs tn38apMCy1E2T1nmW/xgc3+YLlo/7RMWSc3tDOx+IBHcs5zs1nm9tWyesznSKvcW9MVlCF 4ziY8tF5vCAG9F7/7/WYh7/wXofra+c3XtbkAF8kVM5jUDgtBadzOD6+6UUpOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKzWs4LwTzh8R; Tue, 8 Aug 2023 16:43:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378Gh54k056661; Tue, 8 Aug 2023 16:43:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Gh5iS056660; Tue, 8 Aug 2023 16:43:05 GMT (envelope-from git) Date: Tue, 8 Aug 2023 16:43:05 GMT Message-Id: <202308081643.378Gh5iS056660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: edd0014a6e34 - stable/13 - ssh: comment deprecated option handling for retired local patches List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: edd0014a6e3447a628c7167daa9f0c9b9beda9d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=edd0014a6e3447a628c7167daa9f0c9b9beda9d8 commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8 Author: Ed Maste AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste CommitDate: 2023-08-08 16:42:01 +0000 ssh: comment deprecated option handling for retired local patches Older versions of FreeBSD included the HPN patch set and provided client-side VersionAddendum. Both of these changes have been retired but we've retained the option parsing for backwards compatibility to avoid breaking upgrades. Add comment references to the relevant commits. Sponsored by: The FreeBSD Foundation (cherry picked from commit a93cbba2deed209a30da1ecffa637bf5c61b7641) --- crypto/openssh/readconf.c | 2 ++ crypto/openssh/servconf.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 8c1328da5dfa..318729263ee6 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -325,12 +325,14 @@ static struct { { "requiredrsasize", oRequiredRSASize }, { "enableescapecommandline", oEnableEscapeCommandline }, + /* HPN patch - retired in 60c59fad8806 */ { "hpndisabled", oDeprecated }, { "hpnbuffersize", oDeprecated }, { "tcprcvbufpoll", oDeprecated }, { "tcprcvbuf", oDeprecated }, { "noneenabled", oUnsupported }, { "noneswitch", oUnsupported }, + /* Client VersionAddendum - retired in main in bffe60ead024 */ { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 5e6b496dd3af..840aa09b2fd8 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -707,10 +707,13 @@ static struct { { "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL }, { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ + + /* HPN patch - retired in 60c59fad8806 */ { "noneenabled", sUnsupported, SSHCFG_ALL }, { "hpndisabled", sDeprecated, SSHCFG_ALL }, { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, + { NULL, sBadOption, 0 } }; From nobody Tue Aug 8 16:49:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKzfx6GlFz4pp1h; Tue, 8 Aug 2023 16:49: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 4RKzfx5qWnz4H7B; Tue, 8 Aug 2023 16:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrxf5d0PZRvvCAQ6dPTBXMorpUtcMo6wtzQZYzMMR4=; b=J/Jwi75mbvehU1Vh/yIrxZBY0jjiC6oI0B7zuth/RFunooXsZHKZ3qtPNdX3kd3eW5TB5C mMBEkQFAX3sXx7GKibDRQEQ6sGypWEpRH4V5yR8BQ74b1KKGPL7wpAHuFLPzydulVcnPmJ sS4gVh4NqbiFpFz0t2sg9R3LSGsG9Rnpl1cihqbWtxu73JwrMVb92qFfJnKmy3z2ugtnB9 famqDO+PPuspnyxfQYCbMzkreuykjefU9k4C8hTFK8gARlFGVGCXREUFIRCmrCeKedJwOE kvqMK+cCHQ3La6FRe8aZoJ5t4rmZ3n/mf+W70OFSRDYS7UNnxjvFtZwNWBMy2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utrxf5d0PZRvvCAQ6dPTBXMorpUtcMo6wtzQZYzMMR4=; b=JtFyvt7VeDdVkt3q5rE3tp7leDUxaevSHriZZt6QL9GPonZ+oAIjBTratT94QF92gXfWpT U4LAytOCu6AtICWePxjJeclFHFoafX3hY7VmjINrUz05ZLgDuXsy3EGdyUxV5j0wWOEnMw sfYivSMePDtqsnP9pSUqwfZTwuE4aREHP2OyWsQ+haVU6Cmhoc2Dv72HpNZD7sTJOWIHys NJE4HnEkvqIpyBrRdppCsZZfllZfjFohv0O+/3StqIJar2nOL+JpXDRkav/rRdaSnsnuQl S+v/uGq0s/E92jIp5YvmIWsvM0nAAKCDcinecYMmhwmGB0xk47tdQVE2Kn8KYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691513353; a=rsa-sha256; cv=none; b=XxvkAFblKDDFAOT5TkvK5+8xv6OJgQi8E9geAcdJ6hwl5lTiaa6GgqfZzMMb+etmctgcug H1oYFdKGDaaAPyu25bMp4FtHZgvYjiiLmLn8wp9+QB4AoYRy0i4MxY2azRn1HaRmJc9suQ 8f+W3HzjEw5rADKESJ9ubuq/xEvWLq3nVn8JWk8D1JfqJO9NAsEeCeBAnlFJyqPf9c73Et AcIxvgO8dzZ5dYstRbbjjjnmKiRD8lUjpH7C0/Wfc8M5xvScUJ4hjpIW8ayI9ijCUKGIZM AzCbkHNZ+5pjQZsqCPgoNrPGkiwEksqq/NgeR9nOSy0Y57Su0fCqueJ+U1Vnzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKzfx4vRpzhR0; Tue, 8 Aug 2023 16:49: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 378GnD0V057638; Tue, 8 Aug 2023 16:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378GnDFm057637; Tue, 8 Aug 2023 16:49:13 GMT (envelope-from git) Date: Tue, 8 Aug 2023 16:49:13 GMT Message-Id: <202308081649.378GnDFm057637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 41b96792050e - stable/12 - ssh: remove pre- and post-merge update steps List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 41b96792050ec9bf5069f451732c29d20275c461 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=41b96792050ec9bf5069f451732c29d20275c461 commit 41b96792050ec9bf5069f451732c29d20275c461 Author: Ed Maste AuthorDate: 2022-10-06 14:57:41 +0000 Commit: Ed Maste CommitDate: 2023-08-08 16:46:47 +0000 ssh: remove pre- and post-merge update steps We no longer use the pre- and post-merge scripts to strip/add RCS tags. The tags have been removed from main, but persist on older branches. While here renumber the steps in the update documentation using a more conventional scheme. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36904 (cherry picked from commit fca7ac55f8db80b5250bd80a83e1368fe0c39ae5) (cherry picked from commit b9622c483be52dd4cd7411da91b23d9f7e761130) --- crypto/openssh/FREEBSD-upgrade | 48 +++++++++++++----------------------- crypto/openssh/freebsd-post-merge.sh | 14 ----------- crypto/openssh/freebsd-pre-merge.sh | 16 ------------ 3 files changed, 17 insertions(+), 61 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 50ef62d3fec6..bf3cf44d1670 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -6,36 +6,36 @@ src/freebsd/vendor/. In addition, this assumes there is a "freebsd" origin pointing to git(repo).freebsd.org/src.git. -00) Make sure your mail spool has plenty of free space. It'll fill up +01) Make sure your mail spool has plenty of free space. It'll fill up pretty fast once you're done with this checklist. -01) Download the latest OpenSSH-portable tarball and signature from +02) Download the latest OpenSSH-portable tarball and signature from OpenBSD (https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/). -02) Verify the signature: +03) Verify the signature: $ gpg --verify openssh-X.YpZ.tar.gz.asc -03) Unpack the tarball in a suitable directory: +04) Unpack the tarball in a suitable directory: $ tar xf openssh-X.YpZ.tar.gz -04) Copy to a vendor branch: +05) Copy to a vendor branch: $ cd src/freebsd/main $ git worktree add ../vendor/openssh freebsd/vendor/openssh $ cd ../vendor/openssh $ rsync --archive --delete --exclude=.git /path/to/openssh-X.YpZ/ ./ -05) Take care of added / deleted files: +06) Take care of added / deleted files: $ git add -A -06) Commit: +07) Commit: $ git commit -m "Vendor import of OpenSSH X.YpZ" -07) Tag: +08) Tag: $ git tag -a -m "Tag OpenSSH X.YpZ" vendor/openssh/X.YpZ @@ -46,12 +46,6 @@ (It could also be pushed later on, along with the merge to main, but pushing now allows others to collaborate.) -08) Check out head and run the pre-merge script, which strips our RCS - tags from files that have them: - - $ cd src/freebsd/main/crypto/openssh - $ sh freebsd-pre-merge.sh - 09) Merge from the vendor branch: $ git subtree merge -P crypto/openssh vendor/openssh @@ -61,11 +55,11 @@ git prompts for these deleted files during the merge, choose 'd' (leaving them deleted). -0A) Resolve conflicts. Remember to bump the version addendum in +10) Resolve conflicts. Remember to bump the version addendum in version.h, and update the default value in ssh{,d}_config and ssh{,d}_config.5. -0B) Diff against the vendor branch: +11) Diff against the vendor branch: $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh @@ -74,40 +68,32 @@ FreeBSD=%H and be listed in the 'keywords' file created by the pre-merge script. -0C) Run the post-merge script, which re-adds RCS tags to files that - need them: - - $ sh freebsd-post-merge.sh - - These tags are not used with git, but we will leave them in place as - long as svn-based FreeBSD 12.x is supported. - -0D) Run the configure script: +12) Run the configure script: $ sh freebsd-configure.sh -0E) Review changes to config.h very carefully. +13) Review changes to config.h very carefully. Note that libwrap should not be defined in config.h; as of r311585 (233932cc2a60) it is conditional on MK_TCP_WRAPPERS. -0F) If source files have been added or removed, update the appropriate +14) If source files have been added or removed, update the appropriate makefiles to reflect changes in the vendor's Makefile.in. -10) Update ssh_namespace.h: +15) Update ssh_namespace.h: $ sh freebsd-namespace.sh -11) Build and install world, reboot, test. Pay particular attention +16) Build and install world, reboot, test. Pay particular attention to pam_ssh(8), which gropes inside libssh and will break if something significant changes or if ssh_namespace.h is out of whack. -12) Check for references to obsolete configuration options +17) Check for references to obsolete configuration options (e.g., ChallengeResponseAuthentication in sshd_config) which may exist in release/ scripts. -13) Commit, and hunker down for the inevitable storm of complaints. +18) Commit, and hunker down for the inevitable storm of complaints. diff --git a/crypto/openssh/freebsd-post-merge.sh b/crypto/openssh/freebsd-post-merge.sh deleted file mode 100755 index b9e4cbddc7e8..000000000000 --- a/crypto/openssh/freebsd-post-merge.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -xargs perl -n -i -e ' - print; - s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print; -' keywords -:>rcsid -git ls-files | \ -while read f ; do - egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords - egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid -done -sort -u keywords rcsid | xargs perl -n -i -e ' - $strip = $ARGV if /\$(Id|OpenBSD):.*\$/; - print unless (($strip eq $ARGV || /__RCSID/) && /\$FreeBSD[:\$]/); -' From nobody Tue Aug 8 16:49:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKzfz19kcz4pp4C; Tue, 8 Aug 2023 16:49: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 4RKzfy6pTvz4H9q; Tue, 8 Aug 2023 16:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgu/uWiUovotnd4aqatVMDBpp3nsQL+YK+xj5ir/7Wg=; b=gi1OChInL4D/GCJClkVIQv8YGzty3D24VzTpXowk8f+kmS8pkheGseAffvz08japyGPQtF WZVNTQ2xjP7/gs1y3Ddaba/CZ3+kV6pnbV1dwopGTjc4t6TiI/aBILufz9p4u5Ntm8gnsa arFyU2hbVA7YiQILBlayphNBGnKRuGKPCUE8p8UbmtSsN5sjI2bKwrKsm05MQOaJpjBIPe udMTCbnDyCPq2KapF4c2AZgbqGBnrE+0RZvqY7REeoftaBbY58fTKF+5kW00PdZH9ks5iL n1SAVJY1FMhLxj6ysx/CMGc6WYTp8QfBT0ModBpxc7lpDBZ77QIwu0DIXXONXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691513355; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hgu/uWiUovotnd4aqatVMDBpp3nsQL+YK+xj5ir/7Wg=; b=LBkrcF9ypQNnw4CpOp8rB1h2kUeVkHaM8IN2QoPNwyGmBbozv+/zOLi8mnFoBvzh1JThZx n9dfAGbBj3caSEEeOeOjOsawsNWxEM+UN6QrsedhEqK9fi01CbnFsCSe1Yr3q/YjDvs6m3 u24rb/Q5pm5TRx/xJp3BjBJ7COTlG90WbY7ZmWvEVi+eURkIBivQvoJr+LuQ88kI9Abvpk NXIyBQUnTUN0qVBjcWzAv7FPGZ4h1uJbJoWxD+FqBWoqZ0pIc4PqWiKcOOO2JLR6lGKbVK ULZZBZO3/obiTWPngvKfgEMf168J/1XziguRFLM3Z8QwXelEqCY69msCVLdNZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691513355; a=rsa-sha256; cv=none; b=WP1zKxnVVVJneVCN6GaoW6EUMWyCTAhzkL8p3veMoVbsMSyNJoYNr4TWAn0TB2MaGgjq/o Ljv2QOW8ukB4g5035vNz7vq4meNrtx2X6G3loLuW5yLWcV2Atkce7XBOGcmhTLqycBtUhH fLdxVN9KKWE6qlHnmL6fD4z+UBs5O63/zFNLr/zoYstL3fnaBjxtH3AyCPYfNKWE67yCn4 ipJR8Kd1phvRXBSfD4n323eoAcG1ojgNZijDypYxHXjs6jRSvNjJaqSW2+xSpkYWh5E15d nvOb9oIJ+u5Z9xh5CEdm0Hx+5oZaIzmVQtfUeuDGGFLF6pWCDTCfcySnFdwCxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKzfy5ZBQzhR1; Tue, 8 Aug 2023 16:49: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 378GnEew057658; Tue, 8 Aug 2023 16:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378GnETm057657; Tue, 8 Aug 2023 16:49:14 GMT (envelope-from git) Date: Tue, 8 Aug 2023 16:49:14 GMT Message-Id: <202308081649.378GnETm057657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c734abca9540 - stable/12 - ssh: comment deprecated option handling for retired local patches List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c734abca9540fc8af5c790e9d05fc0dcb77d78eb Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c734abca9540fc8af5c790e9d05fc0dcb77d78eb commit c734abca9540fc8af5c790e9d05fc0dcb77d78eb Author: Ed Maste AuthorDate: 2023-08-02 14:18:33 +0000 Commit: Ed Maste CommitDate: 2023-08-08 16:48:45 +0000 ssh: comment deprecated option handling for retired local patches Older versions of FreeBSD included the HPN patch set and provided client-side VersionAddendum. Both of these changes have been retired but we've retained the option parsing for backwards compatibility to avoid breaking upgrades. Add comment references to the relevant commits. Sponsored by: The FreeBSD Foundation (cherry picked from commit a93cbba2deed209a30da1ecffa637bf5c61b7641) (cherry picked from commit edd0014a6e3447a628c7167daa9f0c9b9beda9d8) --- crypto/openssh/readconf.c | 2 ++ crypto/openssh/servconf.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index 2bb38ff70a19..798a170c4604 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -325,12 +325,14 @@ static struct { { "knownhostscommand", oKnownHostsCommand }, { "requiredrsasize", oRequiredRSASize }, + /* HPN patch - retired in 60c59fad8806 */ { "hpndisabled", oDeprecated }, { "hpnbuffersize", oDeprecated }, { "tcprcvbufpoll", oDeprecated }, { "tcprcvbuf", oDeprecated }, { "noneenabled", oUnsupported }, { "noneswitch", oUnsupported }, + /* Client VersionAddendum - retired in main in bffe60ead024 */ { "versionaddendum", oVersionAddendum }, { NULL, oBadOption } diff --git a/crypto/openssh/servconf.c b/crypto/openssh/servconf.c index 1dd313005089..2b0dd936bc78 100644 --- a/crypto/openssh/servconf.c +++ b/crypto/openssh/servconf.c @@ -695,10 +695,13 @@ static struct { { "requiredrsasize", sRequiredRSASize, SSHCFG_ALL }, { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL }, /* alias */ + + /* HPN patch - retired in 60c59fad8806 */ { "noneenabled", sUnsupported, SSHCFG_ALL }, { "hpndisabled", sDeprecated, SSHCFG_ALL }, { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, + { NULL, sBadOption, 0 } }; From nobody Tue Aug 8 17:02:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RKzxp2zYhz4pq77; Tue, 8 Aug 2023 17:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RKzxp2Ylzz4K8f; Tue, 8 Aug 2023 17:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691514126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kScV6cQpexuqzYeWBBWszbHOpX9bCOmclkPTpGocx9Q=; b=GTtTDg2q7SiaQR+VOzjt7UyqRBa3dd85EE/sVHbNqCrSxK6gyJqLuMhwLcohQO9J+XpbI0 9bpWngetuHRN+yacJs7I0nGYQaNWEPyQXsBpDkQX7C6QUsA98naRVlW7p7noWDsKm89hcE peltppTnEoI1UrBhuqYJf0QsZpNvfhU758v1Undxgk97j+W52fmfp2iTSYGu0PkwloyYyZ HvqGwtOArJwQaa8O9OETXkLTh4ch0F3s7yxQU51UNoYhFXeVbm4x6S+VKla9RYxVID0Na2 T35PqnUFH/XtYDPQJoUQjywyZ38UwSbof8P9A4yygUGPxSy3R2MBvlq7G7PFbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691514126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kScV6cQpexuqzYeWBBWszbHOpX9bCOmclkPTpGocx9Q=; b=ePwqQZrdydLuOmqLrC1kghHQfrOPWCVmsRoci1OnAlKW+AsBhyZjBvzIesB6Ldbi3evVlm 5//9g7GKaFa7RA1DEu4jYEx309mUWuny+g1oDwGwC7shEc9staM08IWGvGaFGuUeMcQYqM jzdNmZju0V4PQMHm6sxTXSprVF2a9rfSvbpIHxAW9y6WSB1O9msZ5DI+n7JCxXBK9KLTlx e9mbO226FBv+av90eK8bolsQPXuDEjd5JEb9mEUwXkW3yviVz89vXtMEg4+iv4H/bKBSTO zgX5QbHFNXqFwjTTqLXtV1iwDwv5xHuahl/AOEGxRXXxjG5KhPwFaw73i/i1eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691514126; a=rsa-sha256; cv=none; b=Yg2+Xa9yhcaZTyoclXdtQhkVH5ckEEbH868yW35pWnBcKlDkNIwbDl4zwc68phWwLaqaKt o+VfdaPPJu5vIq9Q9VohYm3d2WPrdyglwt1Dw7ehCgEuHDrX7F5Y6hnK/ImlpMAKrluJVt Hyb/EI90uEcZ0iS565NIFOROGemeMKZZViKzEnKYP7fW7e4w1p87s6twk7GJqL3T8DDJMV 6AneXDcQzx9wZ7d/UDJehi1flfO8DSoQFDB24rlWVTo/KiHf7Slifw4mizmILr2sGf2sdK 6xcAx0zknnar2g+E2MhTddmKP1ssqDTtym7OtDY+ulylW3kzdyW+8fIAGmE2hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RKzxp1XtCzhdl; Tue, 8 Aug 2023 17:02:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378H264a090397; Tue, 8 Aug 2023 17:02:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378H26N9090396; Tue, 8 Aug 2023 17:02:06 GMT (envelope-from git) Date: Tue, 8 Aug 2023 17:02:06 GMT Message-Id: <202308081702.378H26N9090396@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: 2f489a509e61 - main - libc: fix some overflow scenarios in vis(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f489a509e615c46be6f7c6aa7cea161f50f18af Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2f489a509e615c46be6f7c6aa7cea161f50f18af commit 2f489a509e615c46be6f7c6aa7cea161f50f18af Author: Kyle Evans AuthorDate: 2023-08-08 17:01:28 +0000 Commit: Kyle Evans CommitDate: 2023-08-08 17:01:52 +0000 libc: fix some overflow scenarios in vis(3) The previous incarnation of this would call wcrtomb() on the destination buffer, and only check for overflow *after* it's happened. Additionally, the conversion error / VIS_NOLOCALE path also didn't check for overflow, and the overflow check at the end didn't account for the fact that we still need to write a NUL terminator afterward. Start by only doing the multibyte conversion into mbdst directly if we have enough buffer space to guarantee it'll fit. An additional MB_CUR_MAX buffer has been stashed on the stack to write into if we're cutting it close at the end of the buffer, since we don't really have a good way to determine the length of the wchar_t without just doing the conversion. We'll do the conversion into the buffer that's guaranteed to fit, then copy it over if the copy won't overflow. The byte-for-byte overflow is a little bit easier, as we simply check for overflow with each byte written and make sure we can still NUL terminate after. Tests added to exercise these edge cases. Reviewed by: des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41328 --- contrib/libc-vis/vis.c | 54 +++++++++++++++++++++---- contrib/netbsd-tests/lib/libc/gen/t_vis.c | 66 +++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 8 deletions(-) diff --git a/contrib/libc-vis/vis.c b/contrib/libc-vis/vis.c index c43186a44b51..fe3939448087 100644 --- a/contrib/libc-vis/vis.c +++ b/contrib/libc-vis/vis.c @@ -395,14 +395,16 @@ static int istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength, int flags, const char *mbextra, int *cerr_ptr) { + char mbbuf[MB_CUR_MAX]; wchar_t *dst, *src, *pdst, *psrc, *start, *extra; size_t len, olen; uint64_t bmsk, wmsk; wint_t c; visfun_t f; int clen = 0, cerr, error = -1, i, shft; - char *mbdst, *mdst; - ssize_t mbslength, maxolen; + char *mbdst, *mbwrite, *mdst; + ssize_t mbslength; + size_t maxolen; mbstate_t mbstate; _DIAGASSERT(mbdstp != NULL); @@ -541,8 +543,33 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength, olen = 0; bzero(&mbstate, sizeof(mbstate)); for (dst = start; len > 0; len--) { - if (!cerr) - clen = wcrtomb(mbdst, *dst, &mbstate); + if (!cerr) { + /* + * If we have at least MB_CUR_MAX bytes in the buffer, + * we'll just do the conversion in-place into mbdst. We + * need to be a little more conservative when we get to + * the end of the buffer, as we may not have MB_CUR_MAX + * bytes but we may not need it. + */ + if (maxolen - olen > MB_CUR_MAX) + mbwrite = mbdst; + else + mbwrite = mbbuf; + clen = wcrtomb(mbwrite, *dst, &mbstate); + if (clen > 0 && mbwrite != mbdst) { + /* + * Don't break past our output limit, noting + * that maxolen includes the nul terminator so + * we can't write past maxolen - 1 here. + */ + if (olen + clen >= maxolen) { + errno = ENOSPC; + goto out; + } + + memcpy(mbdst, mbwrite, clen); + } + } if (cerr || clen < 0) { /* * Conversion error, process as a byte(s) instead. @@ -557,16 +584,27 @@ istrsenvisx(char **mbdstp, size_t *dlen, const char *mbsrc, size_t mblength, shft = i * NBBY; bmsk = (uint64_t)0xffLL << shft; wmsk |= bmsk; - if ((*dst & wmsk) || i == 0) + if ((*dst & wmsk) || i == 0) { + if (olen + clen + 1 >= maxolen) { + errno = ENOSPC; + goto out; + } + mbdst[clen++] = (char)( (uint64_t)(*dst & bmsk) >> shft); + } } cerr = 1; } - /* If this character would exceed our output limit, stop. */ - if (olen + clen > (size_t)maxolen) - break; + + /* + * We'll be dereferencing mbdst[clen] after this to write the + * nul terminator; the above paths should have checked for a + * possible overflow already. + */ + assert(olen + clen < maxolen); + /* Advance output pointer by number of bytes written. */ mbdst += clen; /* Advance buffer character pointer. */ diff --git a/contrib/netbsd-tests/lib/libc/gen/t_vis.c b/contrib/netbsd-tests/lib/libc/gen/t_vis.c index adb0930a300a..80800bf8b31f 100644 --- a/contrib/netbsd-tests/lib/libc/gen/t_vis.c +++ b/contrib/netbsd-tests/lib/libc/gen/t_vis.c @@ -175,6 +175,68 @@ ATF_TC_BODY(strvis_locale, tc) } #endif /* VIS_NOLOCALE */ +#ifdef __FreeBSD__ +#define STRVIS_OVERFLOW_MARKER 0xff /* Arbitrary */ + +ATF_TC(strvis_overflow_mb); +ATF_TC_HEAD(strvis_overflow_mb, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strvis(3) multi-byte overflow"); +} + +ATF_TC_BODY(strvis_overflow_mb, tc) +{ + const char src[] = "\xf0\x9f\xa5\x91"; + /* Extra byte to detect overflow */ + char dst[sizeof(src) + 1]; + int n; + + setlocale(LC_CTYPE, "en_US.UTF-8"); + + /* Arbitrary */ + memset(dst, STRVIS_OVERFLOW_MARKER, sizeof(dst)); + + /* + * If we only provide four bytes of buffer, we shouldn't be able encode + * a full 4-byte sequence. + */ + n = strnvis(dst, 4, src, VIS_SAFE); + ATF_REQUIRE(dst[4] == STRVIS_OVERFLOW_MARKER); + ATF_REQUIRE(n == -1); + + n = strnvis(dst, sizeof(src), src, VIS_SAFE); + ATF_REQUIRE(n == sizeof(src) - 1); +} + +ATF_TC(strvis_overflow_c); +ATF_TC_HEAD(strvis_overflow_c, tc) +{ + atf_tc_set_md_var(tc, "descr", "Test strvis(3) C locale overflow"); +} + +ATF_TC_BODY(strvis_overflow_c, tc) +{ + const char src[] = "AAAA"; + /* Extra byte to detect overflow */ + char dst[sizeof(src) + 1]; + int n; + + /* Arbitrary */ + memset(dst, STRVIS_OVERFLOW_MARKER, sizeof(dst)); + + /* + * If we only provide four bytes of buffer, we shouldn't be able encode + * 4 bytes of input. + */ + n = strnvis(dst, 4, src, VIS_SAFE | VIS_NOLOCALE); + ATF_REQUIRE(dst[4] == STRVIS_OVERFLOW_MARKER); + ATF_REQUIRE(n == -1); + + n = strnvis(dst, sizeof(src), src, VIS_SAFE | VIS_NOLOCALE); + ATF_REQUIRE(n == sizeof(src) - 1); +} +#endif /* __FreeBSD__ */ + ATF_TP_ADD_TCS(tp) { @@ -185,6 +247,10 @@ ATF_TP_ADD_TCS(tp) #ifdef VIS_NOLOCALE ATF_TP_ADD_TC(tp, strvis_locale); #endif /* VIS_NOLOCALE */ +#ifdef __FreeBSD__ + ATF_TP_ADD_TC(tp, strvis_overflow_mb); + ATF_TP_ADD_TC(tp, strvis_overflow_c); +#endif return atf_no_error(); } From nobody Tue Aug 8 17:49:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL10x4ZNyz4psyx; Tue, 8 Aug 2023 17:49: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 4RL10x40xxz4T55; Tue, 8 Aug 2023 17:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+HNAH49Mbyg6/TP/CRJ6hOVlNy9Ick2Tcb2cqCo8Og=; b=HiZdADKcGI5RZbXWmli83QDvBqIquIYufHK85yvVy48lc1R0Tujv23wqQd83sfNK6tcUGw IGhotokr8yytFZHMsN6YcAhVQR63/4O6QahEVnfmpGGQfHVfZG94JTgnCKhoo8DjB5WeXA WLhDbcAsMu2VPiAKqlhAkAbh7mFoTuLw5bG3N2qA2S/1xr/YGjvd9ol1AHlZyzL9rqf2Ky p7mHRFcRKPCHFGJiy/sU7Zq/Fhkk44seXfFVujE+iJ42xoV8Jibb8Q6MDa3nKf9bVN24gl ZXxqtF9YKLftMj1Oc3iJrkN2BTkBZFFEi37T3oSXtZJZ9eSBokZhoDuv08myVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o+HNAH49Mbyg6/TP/CRJ6hOVlNy9Ick2Tcb2cqCo8Og=; b=moUEgYI4UxkE33Lst8yPRupkS6+Iq/GGbsEW079xBtct36EyRkFITfqKE7tjnLg4/xLzlD Kfi781L9w/ZJd7oxtJ5NmXjhdkP8ScykYFUePaVXWmCAycNlGIuBLXiwSMY13/0RuvSsEB 4COgN9F40GFfGJJk59ok+OGmjPp33ImirK6jHG/t5LiF2uh6UU9DBbKy7vrAdGbkNH5FJu 0dhBB7P5NS+qabKA+mW3ule5Zx+RIpxCT+aeedd42sN1pIjNava/b9Zqfeom6hFD0ClCmV UL2D+tMEchCN4HSo5zWXBq5xFHzWrQOgPVhBX8Gh7XV5mNuVxLI+sJOqIXoNsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691516993; a=rsa-sha256; cv=none; b=aybqSXG9D/9dYlf3nT7YmZVMNjPdR5no0r3Mm0HBbvOa36xfTdwAiokr28Rk3wbN8JHygN PRHTl0IOJ78t2k/vRmIXTqY0RUHS9hJhgN5kJbreIl6kM2/QFgH3405rn4CyYbyYRZE9Mg RFsvlauFDjUmmYm/6y+UZG5VfJ0EtRh/uqbIv5Pf8Px/lSS+1DZnF4+UI81p4fqQ3sTSR5 N1qqEJnGbR532pMnjJnNzveQ2y9qMETxBxeG2C0lAMCK+eGo8ECI3On4QglgUopbMoilMM va9wJaJJ/Q4ja2TLsEaVL61cg2bF7Ut2S4y9ggELBW3mJ421tqid2LONn/6zsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL10x33XHzj9y; Tue, 8 Aug 2023 17:49: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 378Hnru8057048; Tue, 8 Aug 2023 17:49:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378HnrQX057046; Tue, 8 Aug 2023 17:49:53 GMT (envelope-from git) Date: Tue, 8 Aug 2023 17:49:53 GMT Message-Id: <202308081749.378HnrQX057046@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: 3e1f69523bf0 - main - modules: Use MACHINE_CPUARCH more List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 commit 3e1f69523bf00ecf89f21c015e2a7bc2a36104e3 Author: Warner Losh AuthorDate: 2023-08-08 16:50:39 +0000 Commit: Warner Losh CommitDate: 2023-08-08 17:44:51 +0000 modules: Use MACHINE_CPUARCH more Replace two cases of MACHINE_ARCH with MACHINE_CPUARCH and also use `aarch64` instead of the improper `arm64` for that test. Noticed by: Mark Millard Sponsored by: Netflix --- sys/modules/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2f9e9ec0f931..0ef69528b45e 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -634,11 +634,12 @@ _cxgbe= cxgbe .endif # This has only been tested on amd64 and arm64 -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" _mpi3mr=mpi3mr .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm64" || ${MACHINE_ARCH:Mpowerpc64*} +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" || \ + ${MACHINE_ARCH:Mpowerpc64*} _ice= ice .if ${MK_SOURCELESS_UCODE} != "no" _ice_ddp= ice_ddp From nobody Tue Aug 8 17:49:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL10y5bGgz4psyy; Tue, 8 Aug 2023 17:49: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 4RL10y5781z4SrS; Tue, 8 Aug 2023 17:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PELvneb5RXObUp7c/NMciF/1pSjVjSyIXpGj+oslSKs=; b=izFojJbtrTm4TpeRyqtBurxyUe4NUdS78yP7pDjF0MzCYru247JbVr1Fois+CCbbIUh5kg NanvhgvKe7otwkCv0AxuPL4u8MabqQTJdeWfr5mgVkCJHNBSnFkXB/pwIneYuqganiKfwp F19chAwo0ILpmWOPbN3s9JoYonZ8ow6dCp3Eox5qVBIUohGzgse/cRs91NEgtLZzOcT0kR fVubwHqK5idzKqngRpwM5uJsys1rd1DbE92RCoHYoBpmMYCgxM8OY9c16MNuGsJycui/Gj bNhQo8viu/j8T2jGRfb2mK6RMiCjCxRdMV0hPwS3PQUKbDLmlsunEvHXEiMbKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691516994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PELvneb5RXObUp7c/NMciF/1pSjVjSyIXpGj+oslSKs=; b=KjaP887pFxpRikp1FR7X+iF3kTvoA+0KtvVTl3KAU1uYy6ATRLHebo4de/jYPiDEFAecpf D+8TZjaLlWncnV2+knikdwRo6/EXbifjSECBmqOd4q0P3TEMlzjDJ7r2IQ1NLeWfi6NBh/ JgGAXd4zayLzPqaDE7U5GfFWlb1QjsITtKyjni015NVE9BqgLzcBtZn7QndDdz4hABGK3X D/iLgg4KfpLyPjWamBCKhNL8zb4t3az1ZPSMW4yZurgPCzo5ZhHg2EWl2YFJMo8JCxBEVQ OXVTpLlVuqa1mob6byuTPdyjCLp2UBHRmRbOdKdC13oEEaj3V5x0deURxz6Lgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691516994; a=rsa-sha256; cv=none; b=E3zVlP7PWMJrX+nN/0jPilqzn8NjSZzP12Zz5NOYGV80y/mLeJc1QqCz7L3hptboFGh35P LVTX6aBaWzQqDU/Hj59AB6sfMaql/rbfvOtoKjaS8bx3QoHccke8FUN0Pf/ZJOolMDn9R6 eH8j8Dvox5seYY+z7en4uyH0BJJR8d4gwtxZLpryv5HKeuIoJ2MgmQ6rYS6iMSRaNMpCqN 2tj/GIal6pJRTsCRzZRJjpJvbx0S2wcBtiAEPp4cb+TYB7ZX0U/8psC5ko+FX/Ht6HgkQE hlonkKJTCpXOyFewmZ5MporAIIiVb9/iI1ibxVC4NpvdyjX91mLAZdSf1PmYvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL10y3qFKzjB0; Tue, 8 Aug 2023 17:49: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 378HnsgC057069; Tue, 8 Aug 2023 17:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Hnspq057068; Tue, 8 Aug 2023 17:49:54 GMT (envelope-from git) Date: Tue, 8 Aug 2023 17:49:54 GMT Message-Id: <202308081749.378Hnspq057068@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: 09c20a293280 - main - nvme: Move bools to fill hole List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09c20a293280eaed9b4342e08112089f449fd605 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=09c20a293280eaed9b4342e08112089f449fd605 commit 09c20a293280eaed9b4342e08112089f449fd605 Author: Warner Losh AuthorDate: 2023-08-08 16:55:43 +0000 Commit: Warner Losh CommitDate: 2023-08-08 17:44:51 +0000 nvme: Move bools to fill hole The two bools in nvme_request create a 6 byte hole today. Move them to after retires to fill the 4 byte hole there and add a spare[2] to make nvme_request 8 bytes smaller. spare[2] isn't strictly necessary, but documents how many bytes we have left in that hole, as the number of booleans will increase shortly. Suggested by: chuck Sponsored by: Netflix --- sys/dev/nvme/nvme_private.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 9d82c8fba69c..b35e14cb8d0c 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -119,11 +119,12 @@ struct nvme_request { struct nvme_command cmd; struct nvme_qpair *qpair; struct memdesc payload; - bool payload_valid; - bool timeout; nvme_cb_fn_t cb_fn; void *cb_arg; int32_t retries; + bool payload_valid; + bool timeout; + bool spare[2]; /* Future use */ STAILQ_ENTRY(nvme_request) stailq; }; From nobody Tue Aug 8 18:13:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL1Wz5C0Hz4pvJh; Tue, 8 Aug 2023 18:13: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 4RL1Wz4jhjz4ZJB; Tue, 8 Aug 2023 18:13:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691518399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ld7SdPvd6kwzTLkfceTt9myLzDU5CI0SELAbashFPvY=; b=EtoO4LGwm9qWLLHxiu+sye2mh1cy8t9xZyrHGrDUoV7K5Z6PcAW4nT05tjinHX8fPHQ7Kx yMRepoi+ojH2Sj8DiQQPpWNyUHqtOgQtnOhkNuazxxJTm9qwxgN+jmw7WmsHMpOQKeuJXi 58VI+QSD/cGbiNfKhuFM8UerRzCO36VqXdYBDxHwmY47RJATSnHIq/sYkK2wzzsjEPcsBL kdMEqaIj9GnsPy/FUC40BCBL5HgD6AScIoT/eDA9641VUWVj8KwBMIyAW3cd2Lx5arwwnf FL9bPgpTDykNynaubuq650/8r7Gzh55yFyuU0FUsNVIhwnMUC1O7EkEjcbx+dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691518399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ld7SdPvd6kwzTLkfceTt9myLzDU5CI0SELAbashFPvY=; b=Io0oVOUOhgBM/+QJeefRpSI1WCkQfNahluvNKqYL0i3iAd+FZOJxFmOKWYtXQ+WfXiXhi3 Wo1iVkBM/j4dhqQJsiIP9PyrF23gA+WXqL2os0VYm3xEfc7ASbd9nZyDC2zFoxRbLEZpkU kaCRPpIvvLZXFOfqPA+SYrPLzhoyHifgGSGNVoQWI3g6BfDkekb/q4HbP2QHmjkW/dahYM 8hXXCos989GtH2igQxYIlWWmrJ6WPxSmHmqX3W9HtNRGbAA+DkvU4K7PYf5DRVajPmSpwC fQwxKM5VJRRCIV+k8/yD6oAk5bByH+CfFwWWsoGmAyq8h2K28IMovC/BBdsGAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691518399; a=rsa-sha256; cv=none; b=rfYZafmNfmILy9P9cYZ5jUADP0d63zE4lLvxdU4fCbj4tRqlQQZ4WfNA2c661fguJUyyg8 w9etdRZAhtGz5ZD5TEIG8jIkc9SO2qSIOGzfeOSRFxYTZ7CiLp7inXlyOz+t506OpdYm++ 7DAy9xGFo6T5X2CpL26vTX1swekGTk0qEdZNB35CqIDf9SGpwXbFBiNieZjd5Uy2JQTvAo WjWxhVzE4SssnIa7+HDu7LD4d68YTu07xuACTGBUuoDraHYKi8k3W2Pk1lmA2rYhfeISpR Fotgo5HUZRyMw47tZY2E5r4FesKw56kWDGhEVXeb3shsd1Y1T8WSp7GUs1IN8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL1Wz3nvzzkxp; Tue, 8 Aug 2023 18:13: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 378IDJQB006895; Tue, 8 Aug 2023 18:13:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378IDJCo006894; Tue, 8 Aug 2023 18:13:19 GMT (envelope-from git) Date: Tue, 8 Aug 2023 18:13:19 GMT Message-Id: <202308081813.378IDJCo006894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2030f99a9aac - stable/12 - cd9660: do not leak buffers in cd9660_rrip_loop() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2030f99a9aac92b06e16f0f21a3307df8ee90acd Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2030f99a9aac92b06e16f0f21a3307df8ee90acd commit 2030f99a9aac92b06e16f0f21a3307df8ee90acd Author: Konstantin Belousov AuthorDate: 2023-07-31 22:55:13 +0000 Commit: Ed Maste CommitDate: 2023-08-08 18:12:29 +0000 cd9660: do not leak buffers in cd9660_rrip_loop() PR: 272856 (cherry picked from commit fa3cf6cdc68cb6d6f2c440f2653258d68eae1015) (cherry picked from commit 746c8f0cd7061bcda4bb68cb612827288459bee6) --- sys/fs/cd9660/cd9660_rrip.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 55833ea73dd5..1cae8463e8f6 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -553,12 +553,18 @@ cd9660_rrip_loop(isodir,ana,table) } if (ana->fields && ana->iso_ce_len) { - if (ana->iso_ce_blk >= ana->imp->volume_space_size - || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size - || bread(ana->imp->im_devvp, - ana->iso_ce_blk << - (ana->imp->im_bshift - DEV_BSHIFT), - ana->imp->logical_block_size, NOCRED, &bp)) + if (ana->iso_ce_blk >= ana->imp->volume_space_size || + ana->iso_ce_off + ana->iso_ce_len > + ana->imp->logical_block_size) + break; + if (bp != NULL) { + brelse(bp); + bp = NULL; + } + if (bread(ana->imp->im_devvp, + ana->iso_ce_blk << + (ana->imp->im_bshift - DEV_BSHIFT), + ana->imp->logical_block_size, NOCRED, &bp) != 0) /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)(bp->b_data + ana->iso_ce_off); From nobody Tue Aug 8 20:14:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL4CV5XW6z4q2l4; Tue, 8 Aug 2023 20:14: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 4RL4CV4yxkz4kZG; Tue, 8 Aug 2023 20:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691525654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyI6wJRrn8Jpp5rrc28CJhP7rwbxFfIp1i9aFENsK4U=; b=HUCmSeabjfyVSdNOzN+QMLDBtOUe30pme3+AR7namxJxynmapTKS8ZU0gwb5hj6z6alfeL whdUDQoB8mhRgTheR4JWuIy9K7DRFx0CWZOjrX+zYbq0w8N+naa+PGHdiVAcyxXgUhr8zV 3WER3RjtAsEQBMjnqstX/f+g1TtPgNl5QemNMRibjMv2UTHRBWzQ8P2OoUDJdnKMt9vuTE 4t7rD8UZRtKsqgSxXj3kxs0lbo4SWIDSKQeJJtJ2NyNtw4AGBE9gOImQRpiMpellcZV5Zb +gBiydtJaPur2CUdrgTk/+TEX6ann2r1SDDc8TO1lBXB1mGuIk1P+XmgETTgNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691525654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QyI6wJRrn8Jpp5rrc28CJhP7rwbxFfIp1i9aFENsK4U=; b=jAVYDELbMoV2lMu1MH4qM2yLL6uxDbNAPJ8kcKBuixNnpEs6jx5J/xECRz7t6Wt609jMe7 lZU8hwRscPn3OdicCl82IEr5jXQ+kkB+Pfihc26x8zFFuN+ZpIJfezZDsema81ygawigJa oSER7//G8PItATX/haHNv/XDa1kkVzHsKVmi+2VLM3lVlvX34eVl/m1fWZd8FSRNq/uvhb 7xs5f6a3j7m0dukxHP/6N+bfG1FrgX4TIAQy3V6w01rnpn+Mx335WYrrWVXu/OwJYJIxbX FteCmIrIMPIZJHi1BL5VmPam+uOq7yWUidBy/k/gC/t2lJWlXQmfkH0nuY5AAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691525654; a=rsa-sha256; cv=none; b=lsai5XIWuN64WhGhRD2/SpXFeAj5bNfKvlbYqWcqvsDMoT3p1l1zxpx+11mLnZ7JCrU6mg se5lNOsoWkwJQ4FnmnDqqyvr3SGsgWNvjBdYxtxRG4Hy4MZRgpXzp9hAtRytl78FZvvd9T MqHMNb8ncn83GTk2nt+nYtWYpREbjtjpmc4PLVbq1Mb8E5COtw/ZbHT1ZdnoA7FGpQm+dR gZMdkl3MfLYUMj8VXOP6NEPVlMzFsOmWvRQGnwHQ/PTIhH50kdiJHXYaWtHKFXSs7HrQOA 9X1y0fMWGlYB0CMuCCbNwVvXnYY4WbT5uJ8UZaBETwObXLuu92NsZ4eHxzobFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL4CV44H5zn3q; Tue, 8 Aug 2023 20:14: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 378KEED4007089; Tue, 8 Aug 2023 20:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378KEEkC007088; Tue, 8 Aug 2023 20:14:14 GMT (envelope-from git) Date: Tue, 8 Aug 2023 20:14:14 GMT Message-Id: <202308082014.378KEEkC007088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 458e0c1b6673 - main - local.sys.dirdeps.mk: Allow CROSS_TARGET_FLAGS to be overridden List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 458e0c1b667354a45cb233ea7fc0256934e15301 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=458e0c1b667354a45cb233ea7fc0256934e15301 commit 458e0c1b667354a45cb233ea7fc0256934e15301 Author: Stephen J. Kiernan AuthorDate: 2023-08-08 20:11:27 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-08-08 20:11:27 +0000 local.sys.dirdeps.mk: Allow CROSS_TARGET_FLAGS to be overridden Use ?= when setting CROSS_TARGET_FLAGS so we do not override it if another file already has set it. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- share/mk/local.sys.dirdeps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.sys.dirdeps.mk b/share/mk/local.sys.dirdeps.mk index f06b4a33f1f7..9fdfab588035 100644 --- a/share/mk/local.sys.dirdeps.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -122,7 +122,7 @@ ${var}= ${HOST_${var}} FREEBSD_REVISION!= sed -n '/^REVISION=/{s,.*=,,;s,",,g;p; }' ${SRCTOP}/sys/conf/newvers.sh .export FREEBSD_REVISION .endif -CROSS_TARGET_FLAGS= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} +CROSS_TARGET_FLAGS?= -target ${MACHINE_ARCH}-unknown-freebsd${FREEBSD_REVISION} CFLAGS+= ${CROSS_TARGET_FLAGS} ACFLAGS+= ${CROSS_TARGET_FLAGS} .endif From nobody Tue Aug 8 20:32:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL4cd4WN2z4q3WZ; Tue, 8 Aug 2023 20:32: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 4RL4cd2v7Tz4mFZ; Tue, 8 Aug 2023 20:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691526753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWWTMug05n5ubIzUYVGVaxLT6awNqC3nuiCzk67Ca8U=; b=ZwLj/Nvbs9hFuZtoUv07xzzkW1k/51UpeiA5aLjhQVpdrJ8yAKQur27jOdvGPnk/+fxmPW NG93cUixcnD7xB8zS1/g80sJxxfk/W6Txsrx7qZA57QwPwiEq+pFX71oDGPErLCJ/1cmE9 ndSgYWRo3kUwFXwuTOIdpz68+2Qct0Fc4hfSEMmkCdvjRhO65R1C6Wj0US5V8RILM7jhTv Tdr1dI6RyglNOgrk/FdHRvLYOIuNlM08SUeoWB+D4NeHngfOqW+c/wwws66srJZpKlOjac Y9/+x1EBQXdk7TAqeyL04RE0Wljtz+yKZ/JbduvQh6u5jDg/wueGLtjJzMcGVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691526753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GWWTMug05n5ubIzUYVGVaxLT6awNqC3nuiCzk67Ca8U=; b=c1OeSBIY/pklHATGq+1tp+KLSJJdB/b3SkWqov7a5LXNIxlYB5bYoXvnj5uElb3xas5jyA h4bPNi6lkybonkFCT3Po9tKizDCq/Q3kzWzmlYvM2Czu7AdyEa/N0H5odbZFGKnjVmqZoW sbZSiCCaraPFdCWf8idSg3Jlzfyc65A4DViIfKmgVBmC+EaB73cLK/ze1Uo0rdkNad0rP2 oNamo5QS3VT0Hb9P/ZGrrcOuZ+4m3J4uXWdCgMY40Tcz8Aj0CxpFp8PILJpi284qlszK1H CSIf5dkSV8fRIYkcAVDpB2tttgM1/16J2SDsJnYz64EmE3ifp6leY4h12Yi7/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691526753; a=rsa-sha256; cv=none; b=ikvlB9kCPP9NFhn+jWbR3ilT63QzbxXS2GSG0isX3iK3Xt+Ep3z4UhtcCcLZVkEF3xWVdV A0gdkFYGtgUxw6hLTOm7sm++Y/em2pIzmjFzWYN+Y4+QqCKOTsXM56YCbwUtZ0Es9waz1m FHkgsDXnHjWd6GHJHba7YWX35z07RUgLg1YfRSEpZgnwQFjN6GhsvNXZyazKZxns8hHIqi I98MAZYHte5LV7gWlZFqz4d3coNjAIwPWVi61kFYmQr0DgC+Ya6tVOpJsU8w/DTfKkfcrw heuOgUPbzba/P80dRx3E04DUCsglWVqZsR8qUhDvFgsfrQhgYVCOy9LGwEljng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL4cd1ycpzp8v; Tue, 8 Aug 2023 20:32: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 378KWX9j039117; Tue, 8 Aug 2023 20:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378KWX9Q039114; Tue, 8 Aug 2023 20:32:33 GMT (envelope-from git) Date: Tue, 8 Aug 2023 20:32:33 GMT Message-Id: <202308082032.378KWX9Q039114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 37c8ee8847fa - main - ath(4): Remove MIPS AHB frontend and join PCI one w/ main support again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37c8ee8847faa53432809cae2ecc11b80c4eab2f Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=37c8ee8847faa53432809cae2ecc11b80c4eab2f commit 37c8ee8847faa53432809cae2ecc11b80c4eab2f Author: Marius Strobl AuthorDate: 2023-08-07 16:39:24 +0000 Commit: Marius Strobl CommitDate: 2023-08-08 20:30:13 +0000 ath(4): Remove MIPS AHB frontend and join PCI one w/ main support again Following the removal of general MIPS support, there's no longer a need to have the AHB bus-frontend in place, which according to Linux sources also isn't used with any non-MIPS SoCs. For simplicity, PCI bus support is only made conditional on the main one again, i. e. device ath_pci is removed, and built into the main module, i. e. if_ath_pci.ko obsoleted, respectively. Effectively, this reverts the following commits and associated changes: dba9c8597747c6c9bf3d2ec68f7eb90552878dc7 e849bb3ecbb1963344a22ae77fc96f89fbebf40c Approved by: adrian Relnotes: yes Differential Revision: https://reviews.freebsd.org/D41354 --- ObsoleteFiles.inc | 4 + UPDATING | 7 + share/man/man4/Makefile | 2 - share/man/man4/ath.4 | 17 +- share/man/man4/ath_ahb.4 | 60 ------- share/man/man4/ath_pci.4 | 57 ------- sys/amd64/conf/GENERIC | 5 +- sys/arm/conf/ARMADA38X | 3 +- sys/conf/files | 8 +- sys/dev/ath/if_ath_ahb.c | 353 ------------------------------------------ sys/i386/conf/GENERIC | 5 +- sys/modules/Makefile | 1 - sys/modules/ath_ahb/Makefile | 43 ----- sys/modules/ath_main/Makefile | 1 + sys/modules/ath_pci/Makefile | 43 ----- sys/powerpc/conf/GENERIC64 | 5 +- sys/powerpc/conf/GENERIC64LE | 5 +- 17 files changed, 24 insertions(+), 595 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d77ced3c817d..8ca4c98d6a6d 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20230807: Removal of the ath(4) AHB bus-frontend or MIPS +OLD_FILES+=usr/share/man/man4/ath_ahb.4 +OLD_FILES+=usr/share/man/man4/ath_pci.4 + # 20230803: Removal of support for cloning pseudo interfaces from iflib(9) OLD_FILES+=usr/include/net/iflib_private.h diff --git a/UPDATING b/UPDATING index 5889c0ac9903..fbe932db2aa9 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230807: + Following the general removal of MIPS support, the ath(4) AHB bus- + frontend has been removed, too, and building of the PCI support is + integrated with the ath(4) main module again. As a result, there's + no longer a need for if_ath_pci_load="YES" in /boot/loader.conf or + "device ath_pci" in the kernel configuration. + 20230803: MAXCPU has been increased to 1024 in the amd64 GENERIC kernel config. Out-of-tree kernel modules will need to be rebuilt. diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 047f3b1aeba7..91df1f3b94c0 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -55,9 +55,7 @@ MAN= aac.4 \ at45d.4 \ ata.4 \ ath.4 \ - ath_ahb.4 \ ath_hal.4 \ - ath_pci.4 \ atkbd.4 \ atkbdc.4 \ atp.4 \ diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index 564238fd396e..59814e9973ff 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd June 16, 2020 +.Dd August 7, 2023 .Dt ATH 4 .Os .Sh NAME @@ -40,7 +40,6 @@ place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device ath" -.Cd "device ath_pci" .Cd "device ath_hal" .Cd "device ath_rate_sample" .Cd "device wlan" @@ -51,7 +50,6 @@ module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_ath_load="YES" -if_ath_pci_load="YES" .Ed .Sh DESCRIPTION The @@ -65,19 +63,6 @@ Supported features include 802.11 and 802.3 frames, power management, BSS, IBSS, MBSS, WDS/DWDS TDMA, and host-based access point operation modes. All host/device interaction is via DMA. .Pp -Please note that from FreeBSD-9.0, the -.Nm -driver does not include the PCI/PCIe bus glue. -The same driver supports multiple underlying bus types, including PCI/PCIe, -but also embedded (AHB) and USB in the future. -.Pp -To enable use for PCI/PCIe systems, see the -.Xr ath_pci 4 -driver. -For embedded systems which use the AHB to connect the wireless MAC, see the -.Xr ath_ahb 4 -driver. -.Pp The .Nm driver encapsulates all IP and ARP traffic as 802.11 frames, however diff --git a/share/man/man4/ath_ahb.4 b/share/man/man4/ath_ahb.4 deleted file mode 100644 index 52aceb760657..000000000000 --- a/share/man/man4/ath_ahb.4 +++ /dev/null @@ -1,60 +0,0 @@ -.\"- -.\" Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd -.\" All rights reserved. -.\"" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer, -.\" without modification. -.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer -.\" similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any -.\" redistribution must be conditioned upon including a substantially -.\" similar Disclaimer requirement for further binary redistribution. -.\" -.\" NO WARRANTY -.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -.\" LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY -.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -.\" THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. -.\" -.\" $FreeBSD$ -.\"/ -.Dd May 30, 2011 -.Dt ATH_AHB 4 -.Os -.Sh NAME -.Nm ath_ahb -.Nd "Atheros AHB device glue" -.Sh SYNOPSIS -.Cd "device ath_ahb" -.Sh DESCRIPTION -This module provides the AHB bus glue needed for the devices supported -by the -.Xr ath 4 -and -.Xr ath_hal 4 -drivers. -.Pp -This is only relevant for embedded System-on-Chip (SoC) devices such as -the Atheros AR913x series, which include an Atheros wireless MAC on-die. -.Sh SEE ALSO -.Xr ath 4 , -.Xr ath_hal 4 -.Sh HISTORY -The -.Nm -module first appeared in -.Fx 9.0 . -.Sh BUGS -See -.Xr ath 4 -for known bugs. diff --git a/share/man/man4/ath_pci.4 b/share/man/man4/ath_pci.4 deleted file mode 100644 index 0cc36d7268f3..000000000000 --- a/share/man/man4/ath_pci.4 +++ /dev/null @@ -1,57 +0,0 @@ -.\"- -.\" Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd -.\" All rights reserved. -.\"" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer, -.\" without modification. -.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer -.\" similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any -.\" redistribution must be conditioned upon including a substantially -.\" similar Disclaimer requirement for further binary redistribution. -.\" -.\" NO WARRANTY -.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -.\" LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY -.\" AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -.\" THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. -.\" -.\" $FreeBSD$ -.\"/ -.Dd May 30, 2011 -.Dt ATH_PCI 4 -.Os -.Sh NAME -.Nm ath_pci -.Nd "Atheros PCI device glue" -.Sh SYNOPSIS -.Cd "device ath_pci" -.Sh DESCRIPTION -This module provides the PCI/PCIe bus glue needed for the devices supported -by the -.Xr ath 4 -and -.Xr ath_hal 4 -drivers. -.Sh SEE ALSO -.Xr ath 4 , -.Xr ath_hal 4 -.Sh HISTORY -The -.Nm -module first appeared in -.Fx 9.0 . -.Sh BUGS -See -.Xr ath 4 -for known bugs. diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index feec1d5dd3c8..822567ebe4bd 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -303,9 +303,8 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device ath # Atheros NICs -device ath_pci # Atheros pci/cardbus glue -device ath_hal # pci/cardbus chip support +device ath # Atheros CardBus/PCI NICs +device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index 17ba80095531..ec216d67cbb7 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -88,8 +88,7 @@ device mv_spi # Wireless NIC cards device wlan # 802.11 support -device ath # Atheros NIC's -device ath_pci # Atheros pci/cardbus glue +device ath # Atheros CardBus/PCI NICs device ath_hal device ath_rate_sample options ATH_ENABLE_11N diff --git a/sys/conf/files b/sys/conf/files index 3d405b3d86b5..5d75f819a5f5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -892,12 +892,6 @@ dev/ata/chipsets/ata-siliconimage.c optional ata pci | atasiliconimage | ataati dev/ata/chipsets/ata-sis.c optional ata pci | atasis dev/ata/chipsets/ata-via.c optional ata pci | atavia # -dev/ath/if_ath_pci.c optional ath_pci pci \ - compile-with "${ATH_C}" -# -dev/ath/if_ath_ahb.c optional ath_ahb \ - compile-with "${ATH_C}" -# dev/ath/if_ath.c optional ath \ compile-with "${ATH_C}" dev/ath/if_ath_alq.c optional ath \ @@ -920,6 +914,8 @@ dev/ath/if_ath_led.c optional ath \ compile-with "${ATH_C}" dev/ath/if_ath_lna_div.c optional ath \ compile-with "${ATH_C}" +dev/ath/if_ath_pci.c optional ath pci \ + compile-with "${ATH_C}" dev/ath/if_ath_tx.c optional ath \ compile-with "${ATH_C}" dev/ath/if_ath_tx_edma.c optional ath \ diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c deleted file mode 100644 index fe002ae7ffd7..000000000000 --- a/sys/dev/ath/if_ath_ahb.c +++ /dev/null @@ -1,353 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2002-2008 Sam Leffler, Errno Consulting - * Copyright (c) 2010-2011 Adrian Chadd, Xenion Pty Ltd - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any - * redistribution must be conditioned upon including a substantially - * similar Disclaimer requirement for further binary redistribution. - * - * NO WARRANTY - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. - */ - -#include -__FBSDID("$FreeBSD$"); - -/* - * AHB bus front-end for the Atheros Wireless LAN controller driver. - */ - -#include "opt_ath.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include - -/* For EEPROM firmware */ -#ifdef ATH_EEPROM_FIRMWARE -#include -#include -#endif /* ATH_EEPROM_FIRMWARE */ - -/* - * bus glue. - */ - -/* number of 16 bit words */ -#define ATH_EEPROM_DATA_SIZE 2048 - -struct ath_ahb_softc { - struct ath_softc sc_sc; - struct resource *sc_sr; /* memory resource */ - struct resource *sc_irq; /* irq resource */ - void *sc_ih; /* interrupt handler */ -}; - -#define VENDOR_ATHEROS 0x168c -#define AR9130_DEVID 0x000b - -static int -ath_ahb_probe(device_t dev) -{ - int vendor_id, device_id; - const char* devname; - - /* - * Check if a device/vendor ID is provided in hints. - */ - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "vendor_id", &vendor_id) != 0) { - vendor_id = VENDOR_ATHEROS; - } - - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "device_id", &device_id) != 0) { - device_id = AR9130_DEVID; - } - - device_printf(dev, "Vendor=0x%04x, Device=0x%04x\n", - vendor_id & 0xffff, - device_id & 0xffff); - - /* Attempt to probe */ - devname = ath_hal_probe(vendor_id, device_id); - - if (devname != NULL) { - device_set_desc(dev, devname); - return BUS_PROBE_DEFAULT; - } - return ENXIO; -} - -static void -ath_ahb_intr(void *arg) -{ - /* XXX TODO: check if its ours! */ - ar71xx_device_flush_ddr(AR71XX_CPU_DDR_FLUSH_WMAC); - ath_intr(arg); -} - -static int -ath_ahb_attach(device_t dev) -{ - struct ath_ahb_softc *psc = device_get_softc(dev); - struct ath_softc *sc = &psc->sc_sc; - int error = ENXIO; - int rid; - int device_id, vendor_id; -#ifdef ATH_EEPROM_FIRMWARE - const struct firmware *fw = NULL; - const char *buf; -#endif - - sc->sc_dev = dev; - - rid = 0; - psc->sc_sr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (psc->sc_sr == NULL) { - device_printf(dev, "cannot map register space\n"); - goto bad; - } - - sc->sc_st = (HAL_BUS_TAG) rman_get_bustag(psc->sc_sr); - sc->sc_sh = (HAL_BUS_HANDLE) rman_get_bushandle(psc->sc_sr); - /* - * Mark device invalid so any interrupts (shared or otherwise) - * that arrive before the HAL is setup are discarded. - */ - sc->sc_invalid = 1; - -#ifdef ATH_EEPROM_FIRMWARE - /* - * If there's an EEPROM firmware image, load that in. - */ - if (resource_string_value(device_get_name(dev), device_get_unit(dev), - "eeprom_firmware", &buf) == 0) { - device_printf(dev, "%s: looking up firmware @ '%s'\n", - __func__, buf); - - fw = firmware_get(buf); - if (fw == NULL) { - device_printf(dev, "%s: couldn't find firmware\n", - __func__); - goto bad1; - } - - device_printf(dev, "%s: EEPROM firmware @ %p\n", - __func__, fw->data); - sc->sc_eepromdata = - malloc(fw->datasize, M_TEMP, M_WAITOK | M_ZERO); - if (! sc->sc_eepromdata) { - device_printf(dev, "%s: can't malloc eepromdata\n", - __func__); - goto bad1; - } - memcpy(sc->sc_eepromdata, fw->data, fw->datasize); - firmware_put(fw, 0); - } -#endif /* ATH_EEPROM_FIRMWARE */ - - /* - * Arrange interrupt line. - */ - rid = 0; - psc->sc_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_SHAREABLE|RF_ACTIVE); - if (psc->sc_irq == NULL) { - device_printf(dev, "could not map interrupt\n"); - goto bad1; - } - if (bus_setup_intr(dev, psc->sc_irq, - INTR_TYPE_NET | INTR_MPSAFE, - NULL, ath_ahb_intr, sc, &psc->sc_ih)) { - device_printf(dev, "could not establish interrupt\n"); - goto bad2; - } - - /* - * Setup DMA descriptor area. - */ - if (bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - 1, 0, /* alignment, bounds */ - BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - 0x3ffff, /* maxsize XXX */ - ATH_MAX_SCATTER, /* nsegments */ - 0x3ffff, /* maxsegsize XXX */ - BUS_DMA_ALLOCNOW, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ - &sc->sc_dmat)) { - device_printf(dev, "cannot allocate DMA tag\n"); - goto bad3; - } - - /* - * Check if a device/vendor ID is provided in hints. - */ - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "vendor_id", &vendor_id) != 0) { - vendor_id = VENDOR_ATHEROS; - } - - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "device_id", &device_id) != 0) { - device_id = AR9130_DEVID; - } - - ATH_LOCK_INIT(sc); - ATH_PCU_LOCK_INIT(sc); - ATH_RX_LOCK_INIT(sc); - ATH_TX_LOCK_INIT(sc); - ATH_TXSTATUS_LOCK_INIT(sc); - - error = ath_attach(device_id, sc); - if (error == 0) /* success */ - return 0; - - ATH_TXSTATUS_LOCK_DESTROY(sc); - ATH_RX_LOCK_DESTROY(sc); - ATH_TX_LOCK_DESTROY(sc); - ATH_PCU_LOCK_DESTROY(sc); - ATH_LOCK_DESTROY(sc); - bus_dma_tag_destroy(sc->sc_dmat); -bad3: - bus_teardown_intr(dev, psc->sc_irq, psc->sc_ih); -bad2: - bus_release_resource(dev, SYS_RES_IRQ, 0, psc->sc_irq); -bad1: - bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_sr); -bad: - /* XXX?! */ - if (sc->sc_eepromdata) - free(sc->sc_eepromdata, M_TEMP); - return (error); -} - -static int -ath_ahb_detach(device_t dev) -{ - struct ath_ahb_softc *psc = device_get_softc(dev); - struct ath_softc *sc = &psc->sc_sc; - - /* check if device was removed */ - sc->sc_invalid = !bus_child_present(dev); - - ath_detach(sc); - - bus_generic_detach(dev); - bus_teardown_intr(dev, psc->sc_irq, psc->sc_ih); - bus_release_resource(dev, SYS_RES_IRQ, 0, psc->sc_irq); - - bus_dma_tag_destroy(sc->sc_dmat); - bus_release_resource(dev, SYS_RES_MEMORY, 0, psc->sc_sr); - /* XXX?! */ - if (sc->sc_eepromdata) - free(sc->sc_eepromdata, M_TEMP); - - ATH_TXSTATUS_LOCK_DESTROY(sc); - ATH_RX_LOCK_DESTROY(sc); - ATH_TX_LOCK_DESTROY(sc); - ATH_PCU_LOCK_DESTROY(sc); - ATH_LOCK_DESTROY(sc); - - return (0); -} - -static int -ath_ahb_shutdown(device_t dev) -{ - struct ath_ahb_softc *psc = device_get_softc(dev); - - ath_shutdown(&psc->sc_sc); - return (0); -} - -static int -ath_ahb_suspend(device_t dev) -{ - struct ath_ahb_softc *psc = device_get_softc(dev); - - ath_suspend(&psc->sc_sc); - - return (0); -} - -static int -ath_ahb_resume(device_t dev) -{ - struct ath_ahb_softc *psc = device_get_softc(dev); - - ath_resume(&psc->sc_sc); - - return (0); -} - -static device_method_t ath_ahb_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, ath_ahb_probe), - DEVMETHOD(device_attach, ath_ahb_attach), - DEVMETHOD(device_detach, ath_ahb_detach), - DEVMETHOD(device_shutdown, ath_ahb_shutdown), - DEVMETHOD(device_suspend, ath_ahb_suspend), - DEVMETHOD(device_resume, ath_ahb_resume), - { 0,0 } -}; - -static driver_t ath_ahb_driver = { - "ath", - ath_ahb_methods, - sizeof (struct ath_ahb_softc) -}; - -DRIVER_MODULE(if_ath_ahb, nexus, ath_ahb_driver, 0, 0); -DRIVER_MODULE(if_ath_ahb, apb, ath_ahb_driver, 0, 0); -MODULE_VERSION(if_ath_ahb, 1); -MODULE_DEPEND(if_ath_ahb, wlan, 1, 1, 1); /* 802.11 media layer */ -MODULE_DEPEND(if_ath_ahb, ath_main, 1, 1, 1); /* if_ath driver */ -MODULE_DEPEND(if_ath_ahb, ath_hal, 1, 1, 1); /* ath HAL */ diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 105bc238cb7d..d2bc5b195963 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -259,9 +259,8 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device ath # Atheros NICs -device ath_pci # Atheros pci/cardbus glue -device ath_hal # pci/cardbus chip support +device ath # Atheros CardBus/PCI NICs +device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0ef69528b45e..8b5e48a2d53f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -54,7 +54,6 @@ SUBDIR= \ ath_hal_ar9300 \ ath_main \ ath_rate \ - ath_pci \ ${_autofs} \ axgbe \ backlight \ diff --git a/sys/modules/ath_ahb/Makefile b/sys/modules/ath_ahb/Makefile deleted file mode 100644 index 02278eadea2b..000000000000 --- a/sys/modules/ath_ahb/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer, -# without modification. -# 2. Redistributions in binary form must reproduce at minimum a disclaimer -# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any -# redistribution must be conditioned upon including a substantially -# similar Disclaimer requirement for further binary redistribution. -# -# NO WARRANTY -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY -# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. -# -# $FreeBSD$ -# - -.PATH: ${SRCTOP}/sys/dev/ath -.PATH: ${SRCTOP}/sys/dev/ath/ath_hal - -KMOD= if_ath_ahb -SRCS= if_ath_ahb.c -SRCS+= device_if.h bus_if.h opt_wlan.h opt_ath.h opt_ah.h - -CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal - -.include - -CWARNFLAGS+= ${NO_WUNUSED_BUT_SET_VARIABLE} diff --git a/sys/modules/ath_main/Makefile b/sys/modules/ath_main/Makefile index 4cf55d42fc92..6a08874115ac 100644 --- a/sys/modules/ath_main/Makefile +++ b/sys/modules/ath_main/Makefile @@ -39,6 +39,7 @@ SRCS= if_ath.c if_ath_alq.c if_ath_debug.c if_ath_keycache.c if_ath_sysctl.c SRCS+= if_ath_tx.c if_ath_tx_ht.c if_ath_led.c if_ath_rx.c if_ath_tdma.c SRCS+= if_ath_beacon.c if_ath_rx_edma.c if_ath_tx_edma.c if_ath_spectral.c SRCS+= if_ath_btcoex.c if_ath_btcoex_mci.c if_ath_lna_div.c if_ath_ioctl.c if_ath_descdma.c +SRCS+= if_ath_pci.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h opt_wlan.h diff --git a/sys/modules/ath_pci/Makefile b/sys/modules/ath_pci/Makefile deleted file mode 100644 index a5a2d87925ca..000000000000 --- a/sys/modules/ath_pci/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer, -# without modification. -# 2. Redistributions in binary form must reproduce at minimum a disclaimer -# similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any -# redistribution must be conditioned upon including a substantially -# similar Disclaimer requirement for further binary redistribution. -# -# NO WARRANTY -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY -# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -# THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES. -# -# $FreeBSD$ -# - -.PATH: ${SRCTOP}/sys/dev/ath -.PATH: ${SRCTOP}/sys/dev/ath/ath_hal - -KMOD= if_ath_pci -SRCS= if_ath_pci.c -SRCS+= device_if.h bus_if.h pci_if.h opt_wlan.h opt_ath.h opt_ah.h - -CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal - -.include - -CWARNFLAGS+= ${NO_WUNUSED_BUT_SET_VARIABLE} diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index c4277983b66a..dc7edadd78d0 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -241,9 +241,8 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device ath # Atheros NICs -device ath_pci # Atheros pci/cardbus glue -device ath_hal # pci/cardbus chip support +device ath # Atheros CardBus/PCI NICs +device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index 99d1975442f7..b6e402ab77a1 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -237,9 +237,8 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_amrr # AMRR transmit rate control algorithm -device ath # Atheros NICs -device ath_pci # Atheros pci/cardbus glue -device ath_hal # pci/cardbus chip support +device ath # Atheros CardBus/PCI NICs +device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath From nobody Tue Aug 8 20:54:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL55X1bKMz4q4bn; Tue, 8 Aug 2023 20:54: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 4RL55X12Z1z4ndG; Tue, 8 Aug 2023 20:54:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691528048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJz9ThLByAXJD26s9NuiXgXxYtOw7ME9LOabbZLPIw8=; b=mMhniczK7uZoH0hUFJda4yw0EkBNtn9M+nGjoB4MdvA26pDv27g1gj5bl2Nz55GO6uoW26 he17lVL2ENW1nlBI+UfG2OFNJX2hfMf+qO/e4j/qSllgIQw78DWAEclyTZwbhnMA3PK8i7 0MUbCfEmIX8VmbVXWLxVNXfbDMHBfwexuAx7BHgjAwIyoe27IK/uSGTYaThYz9ebSQlYa4 /30WtdDAfKg5IXvr74CZEudVb0eCuqN4vU0FpCxWbLzw/e13A6qeFEcn87ULBneCtMmqJC XMZFpk/uEbBEdVxtcAtFlYGDiCoCEYILJ15PkuPPo5hd6w5rYD3scXRDqSZHSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691528048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cJz9ThLByAXJD26s9NuiXgXxYtOw7ME9LOabbZLPIw8=; b=Crc7k8WvbtwurOuTluf1JkaKt/HzDGp54ePKKVV59nUkjIdZtmB5SVBL3zH6bS7GiGHZUF EB1QiXf9PuyA6Kwhj0ZPIsh7gH1syd117H+dhlEgA4bhEtyButIJ21f9w3rInOdqJuScVK eb28T4ZxhGZkHeay0+Aj6L8a9zpwfv0Lz+jxqYb3ydd8MEbrSDgZvcNns62SQ8Rgox89ZQ 2ocam0KhkLQ1oVAsnBIvOdgakJP1dGcYCAsLO0kJFFrWDckunm/hSBvzkph5iyLE2p680G CuqlVrv50BXX7WOH/pSnneDN3ZDAA2j5s+q3XgNaeEPpth7VG5xdCDF0XEJ/tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691528048; a=rsa-sha256; cv=none; b=I7M/G/cFXfeBmiI44Aj1FYIMgbPQvArZuGtDOE7xscn71+Q8ynKK0A0+aWgZJuuge82K5T +BHqu/0VDfk1aXDtIqIl4nPGTqmjvEXX3SPQUWFV1ByRCb5qoJiYnr8PsVCcmq8KPv3vWI u/D3P2KXt6bN/NE+JGDUQsPBZtvSlVsHB4XUfv7k6avPTzxLSBCFTh0L1wx/xo9pocaCu1 2vG6WLRG7IUszrujkO3J98rLEB0CYRHXMwsXS2Q6joDRO6AHr2a2Z2Y1txLyPykvC3vxAU D62Pa8JmeYD1yf1YDYwDkPJ0jFUhchkqpC1SPKjD6FiAqmh9OF+InZsXypkzhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL55X04vQzpfX; Tue, 8 Aug 2023 20:54: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 378Ks7M9072624; Tue, 8 Aug 2023 20:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378Ks7o0072621; Tue, 8 Aug 2023 20:54:07 GMT (envelope-from git) Date: Tue, 8 Aug 2023 20:54:07 GMT Message-Id: <202308082054.378Ks7o0072621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 76fc279f1ba4 - main - ObsoleteFiles.inc: Correct typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76fc279f1ba4adc31d6147d3bfdeec147ff65cc5 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=76fc279f1ba4adc31d6147d3bfdeec147ff65cc5 commit 76fc279f1ba4adc31d6147d3bfdeec147ff65cc5 Author: Marius Strobl AuthorDate: 2023-08-08 20:52:16 +0000 Commit: Marius Strobl CommitDate: 2023-08-08 20:52:16 +0000 ObsoleteFiles.inc: Correct typo Fixes: 37c8ee8847fa ath(4): Remove MIPS AHB frontend and join PCI one w/ main support again --- ObsoleteFiles.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 8ca4c98d6a6d..4b7a4d69c6c9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,7 +52,7 @@ # xargs -n1 | sort | uniq -d; # done -# 20230807: Removal of the ath(4) AHB bus-frontend or MIPS +# 20230807: Removal of the ath(4) AHB bus-frontend for MIPS OLD_FILES+=usr/share/man/man4/ath_ahb.4 OLD_FILES+=usr/share/man/man4/ath_pci.4 From nobody Tue Aug 8 21:23:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL5lH6CzPz4q6P6; Tue, 8 Aug 2023 21:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RL5lH5Qyzz4qmv; Tue, 8 Aug 2023 21:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691529803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dou69MZKLq0wODrw4yBmOB/1GKDpv6rQjsAwT+HtSzg=; b=AsXFFMPyWEUgJbJ+bmttL/zRvGfulzSGxo2CUZu1zPV8bUjmMZwwZt20kEaOePJXdSj2li Pn+x/wxOOOctkZVNe4hNLAqd9UCw6ZMFJJR5HxzVzPTj92daxpcyEbEBZGg9fGEJwkrSm7 0mikcIpNnxD1SmxbT+MZw71g4/UOc2O2yuH7hxEBVe6GKcLQpAXJdv1U/ZkX2fnSombTGr yxqEiaolH6ZK46wRrkowlcdfz+gC5aTc5R10R6slJwffK9o+YnALHl9b8GR8hGXFpahfUW r1lan4bv8T25wALDfI2BjK/0VZmxwYvPhp4LU6AQZpZ66FCGw76BzvYW6Ws21A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691529803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dou69MZKLq0wODrw4yBmOB/1GKDpv6rQjsAwT+HtSzg=; b=kegw0zfGVtfiv9vvwMrdodyVGN0h0Yhj2uFSWrb7OEAVywNVyEOZxEByQ6yBBU3fgEjlsK V6SQ7tYJkH3rCH2unLX+5fV96S3+3DX7y4s0wwCdSbi9YU8Eizz/EXenZD/jSJtmjFja7u RoQbS63XlHNinjJwgOzGS55Vn14AtEFcDJ4SyO6fbFYf9vr9ejtt4ioNySWitl+Adgyj9V MgqTQFMcVerqkwV02A1d4XVQyEu7GnPDkkrRKdQ7LDNZp4I9tntjYSTjIOw0RZdauxLN1x jUKycf76HntIPyMDa+rjLcDPL72Ntz2i3J5GFwEKkMAVu96zFwA14TX2BYtdUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691529803; a=rsa-sha256; cv=none; b=fcrPwcJOIsuVcGLwyzMf70QpvdJOizWKcFKnle+UBYOgxurzy5c/+V7JYCiu8veMKw7o2v PoEK1jhv2UkkEP6qCdfEJTVYLjTfxyVSQNSrn2b6iOJAFyt7H94LabAX1oESGKLQPsTZS7 q4XRidvQBCUA5vyAmc8SB2uF5sWaxCM317DTzfwTfRigA5Ne7+P+rL3KtEWhT4GcK3Ee39 SGrGhqd7z5xKUl+tLYvOL6bkfdMe4O54qDaDPE3FIWkzfF1xKPjTYndQ9A7Ne/K4ejMWOD PFJppeEhIM0R474DeYt35CqR+4D/VRh6welK/kyKCa3SkVyL4Z8tQgVRklxN4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL5lH4TQJzqPC; Tue, 8 Aug 2023 21:23:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378LNNvI023176; Tue, 8 Aug 2023 21:23:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378LNNnI023173; Tue, 8 Aug 2023 21:23:23 GMT (envelope-from git) Date: Tue, 8 Aug 2023 21:23:23 GMT Message-Id: <202308082123.378LNNnI023173@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: 9f2cddd261d0 - main - ping: use the in6_addr buffer when parsing src address as AF_INET6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f2cddd261d09b736893454cb8b7aa0651ac5211 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9f2cddd261d09b736893454cb8b7aa0651ac5211 commit 9f2cddd261d09b736893454cb8b7aa0651ac5211 Author: R. Christian McDonald AuthorDate: 2023-08-08 18:40:02 +0000 Commit: Kristof Provost CommitDate: 2023-08-08 21:21:49 +0000 ping: use the in6_addr buffer when parsing src address as AF_INET6 Reviewed by: kp MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/ping/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 2f94b5d3227d..bfe19e0ff442 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -102,7 +102,7 @@ main(int argc, char *argv[]) */ if (inet_pton(AF_INET, optarg, &a) == 1) ipv4 = true; - else if (inet_pton(AF_INET6, optarg, &a) == 1) + else if (inet_pton(AF_INET6, optarg, &a6) == 1) ipv6 = true; break; #endif From nobody Tue Aug 8 21:39:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL6672c2Sz4q7Hb; Tue, 8 Aug 2023 21:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RL66723TYz4rck; Tue, 8 Aug 2023 21:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691530783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hISHTKoNJDe7QJQEtt5XjaE+G5TR10p1EcmKs9P15FM=; b=N3JrCanKHI7B6M+c+TAjAD6nyYKgq3ZfICc0smSaSBINnE0Awdo687rb++Y5p6+kVyrAbb 77YPva7eHFYYCR3ns3ouy5nst4FlWlu/+bLZ8uADVW26BS/KIdDT5Z7/AN4IiDAqEXvtZg Eu1ShtzrZOfhrZFpign+SNgB/7KN/NTnsupSGr6q6tn+DfXaeHpodOvOEfI9kr4Q8lHl+g 4nLPUhDiTJ8W0rXiz/3Wnx1DMGfxhG9fmPlzevuZSi/mYDPtDpy6KVkLWIfx61copiSq8o 7O3alWcG0VA3O5Rn9mZNGJVYcRqNC2NTmfnkT3sYmCnxRPoElDd3AYpAlQbRUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691530783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hISHTKoNJDe7QJQEtt5XjaE+G5TR10p1EcmKs9P15FM=; b=TcCj8uOJZQMX3g8XSvu1z07YVaysgG7S0JvbPF3+DYGIBuyQWCi3PAj5rNTE2shyXSaBba 4KQOX0YgtA0oSFlV32qdCmc9fwQqln3XMGa8w1K6H+lkuGHwCRm8GCEZrLxwpEcUXGTEPO v0mGBwpzaaHKEJUmEFypXreBuWl1fqe83NgpVz1UNo+PwXEJ2x4aT458uf1VpFh6ggyDMZ jiN5cVg55mXSpBKs3alW2Lopk6Y53BEnspgXbeZfApcCleabNDVoHqpHJHY5Oa/FaQ3FRi A/2qQwM/VVI/JIIoDX28ZRIbQ0+mVPPjJQ3O4kLGENthXquyfqMZ3QRDapS9tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691530783; a=rsa-sha256; cv=none; b=yK7/nCc/hg2J2E3ycwV0vTKtd0JmaSdx0AGUlfVF1O1sqot09m+K1r2E1xoR982IIkV0Sk qDcbBtEjLRv4VNSTTPEbcTUFFS6nWoLOA3SvcHvU2N8VQVCrA6/n5HZrzyz6sJ0kyaX9l0 C2o5KUS7VsOAe8XKsuL5IlctTEat98/en+jFCN5x+fd38U0jPuwsLj8hivU+dFDe6aCItt 5AkRKI1Ojtwl6VWUfTBBiGZ2EXIyLgydS88VlL1BnC9z7Z9UOBiQCwSdTKKEqThqnpriJ5 hDXPjl6r4WPntIcF9DmS63f15hjuPO2HvAlU8S4YqbLPloLWfBAEcsELorOC1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL66714HdzqM5; Tue, 8 Aug 2023 21:39:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 378LdhjH040295; Tue, 8 Aug 2023 21:39:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 378LdhO9040292; Tue, 8 Aug 2023 21:39:43 GMT (envelope-from git) Date: Tue, 8 Aug 2023 21:39:43 GMT Message-Id: <202308082139.378LdhO9040292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 76f28f656eb5 - main - tests: Fix build after 8920c5f2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76f28f656eb5db81b49d6d89e1d43815aeda3128 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=76f28f656eb5db81b49d6d89e1d43815aeda3128 commit 76f28f656eb5db81b49d6d89e1d43815aeda3128 Author: Dmitry Chagin AuthorDate: 2023-08-08 21:39:35 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-08 21:39:35 +0000 tests: Fix build after 8920c5f2 MFC after: 2 weeks --- tests/sys/vm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index 44ffb9ae7d7b..5517bbcbd108 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -20,6 +20,6 @@ PROGS+= mmap_map_32bit_helper SUBDIR= soxstack TESTS_SUBDIRS+= stack -SUBDIR_DEPENDS_stack=soxstack +SUBDIR_DEPEND_stack=soxstack .include From nobody Tue Aug 8 22:26:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL78c4jbLz4q9cN for ; Tue, 8 Aug 2023 22:26:56 +0000 (UTC) (envelope-from emma.hicks@techvisitor-list.org) Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01on2087.outbound.protection.outlook.com [40.107.222.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RL78b1pCTz3Chk for ; Tue, 8 Aug 2023 22:26:55 +0000 (UTC) (envelope-from emma.hicks@techvisitor-list.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of emma.hicks@techvisitor-list.org designates 40.107.222.87 as permitted sender) smtp.mailfrom=emma.hicks@techvisitor-list.org; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k7gupcQLU0oktGqc6eStm74rFJCY1if3qFcEPdXtu8twS563hAsLcNko1xcM9jvaPVdttYRXzgsX3woGfdlJQKkcRHRt4+J+TvjOrB8infdGP7tX9LBC7Izx/X+OLy5+Cz51o0eLvKdzd4OraJ6L8YzIKGlzho9X6k/mW0gkDWi5AbaYD3s1GUsVAn0lZVfJHpqS2WMbZAV1BaFx6hOHmk+au3s3MkAVYYDYVAF7T/UVAWOypoZS3PbECRwqqeST2FkvNm0ZPDJKVG8eeojgRvKIUstH78lrYlDnDnO5cYy8S/OsHEIqISGVlznZidg2fS8JzeDmnW3WusE49UfvOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zGKW4ct9PxJzdGM8lXOI5gnFRJdGOvJ6fgZfdDJFgBE=; b=eY/E1D79o4UJDQOXIdhcEJNCqZtH5A+P141oqkOPBoDkRP5MoFaBOd3AtEvmp0G14fPqFr/6VzfG6NWRuusnd7DUoaB/sPPUIdHLiRqf8IyplPoc2mQ3RmyuBM9P4qMXfGzyLhtt3jnmBH+T41cxGs9lqEL4Nyy7K0uDaiE8A3QHZiN+SU8dvwKbnmDiV88dOuGAgD6cWryBIJkJoX9ZqzfLds6/hFvpQXfY+zF0/44Nf4q+3bn/GI2gEzGRtLybLwjsJ/mDZ9xiUFWA6ZxzKObRRjFNvJpBiKfP+XuF+oAxmiCyYRJwSoXnTMN1w7I9C1RWZcbq2c6BaPGvDGLh6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=techvisitor-list.org; dmarc=pass action=none header.from=techvisitor-list.org; dkim=pass header.d=techvisitor-list.org; arc=none Received: from BMXPR01MB2999.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:3e::12) by MAZPR01MB9052.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:10e::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Tue, 8 Aug 2023 22:26:49 +0000 Received: from BMXPR01MB2999.INDPRD01.PROD.OUTLOOK.COM ([fe80::bcf:5c88:234a:8dff]) by BMXPR01MB2999.INDPRD01.PROD.OUTLOOK.COM ([fe80::bcf:5c88:234a:8dff%4]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 22:26:49 +0000 From: Emma Hicks To: FLASH MEMORY SUMMIT 2023 Subject: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Topic: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Index: AdnKR7DcfjyfOhRMQQm7huAy4bdk6w== Return-Receipt-To: Date: Tue, 8 Aug 2023 22:26:49 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BMXPR01MB2999:EE_|MAZPR01MB9052:EE_ x-ms-office365-filtering-correlation-id: e193216b-c3ca-4a68-8b37-08db985e8ed8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5IFP+aWM5W3e9/ARL00P8OexH45fWaDkcgUMwPYLrND1dP72aUPQp2PXr8nCJEIS3cY/Lqzf1NTelNZft9apMYkOCUAbgTyD3/U1XFOs1KB5OeAYkuLkTaycVXK1ljv+aSkwQChJWpewZYK7poL6ZdbRhhAVLAMj71g4Xyz2HjVY2lQP4I0LdV9GSnlCrkLb/hz1ZtM+AU+GOJfc9VyM+SAfH5BUvslgQnSf8qRlOS2rcTCa+/VFGGhsMVdetHnbG+xz6kujYSfRcQdkZV5u219V/J6PTSPjlGWLsf7m8Z46HxtrzEfTY0hizXvinBKJ6fEbW212w0FDmYkAfVReTAGqrR83d6Yb4rXS/P2v5h4Z9SxQgzTuaWSQaYWmzYaDJLf9G3vEdLRZgszo0C17L3KSjYDfejFwQLa/cvk0awNvLSoOt6hNMYD9zHECaDt2g3rLKoo4uaRaP+cv2QivVupoIVkGdFNlkM5WQ4UKKkafGNacuxxq+R7QT+c4fWIp7rjQvnZW5apfjcbZ7ae4vH9Lh4jTT/tpKryQSpOn2NxEeaR7S+5TOBdo6Qrvw/3sxsmcN6wgQSLKvacvcMxKxYWp8d+Z5JhZ3KDC8/EklHKbtnsgrE4pO6p3AV2u0wpq x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BMXPR01MB2999.INDPRD01.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(346002)(396003)(376002)(366004)(136003)(39850400004)(186006)(451199021)(1800799005)(26005)(6506007)(33656002)(9686003)(71200400001)(86362001)(478600001)(83380400001)(7696005)(6916009)(41300700001)(64756008)(66446008)(66476007)(66556008)(66946007)(76116006)(316002)(8676002)(38070700005)(5660300002)(8936002)(52536014)(122000001)(55016003)(38100700002)(44832011)(4744005)(2906002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?EybeWRO/7vDX239TnNQM7LIcl65Kco/Ysy9AAEaPGlgOJD7q/4ybVh+4s692?= =?us-ascii?Q?tY1xaoejaR/LW7FJvLCb1K1STCLojGq781FXQ3kQ5fw7Yh/cFMhPxKj2FemL?= =?us-ascii?Q?OO9E1E3zw37YlHDC5uePtIUmP3P9dOgbCCijmyLxVvg5VdByRzp3JGsdmzB4?= =?us-ascii?Q?PTQhQU/Q68VUb4iIlL89tjYrdKgsBAQEOukFCAM1PljXOUk1FU5IImcU9w6j?= =?us-ascii?Q?iSj9hGx34PBUfnobMcTxsiiu/ZXf73eQ075dRo9hdg2l6Xdp5xUZdWC/q7GD?= =?us-ascii?Q?hyRZrxU6kzjMPJ0tEdZUhjzWyQ37C3jRlICwLVXwhluYmCHotySPkwDEoQn+?= =?us-ascii?Q?E0GwaS/ZLH4UBog04rxHJoGTJrz+drx86nLMHsEY12o+JKZIXnKad7TMT4Wm?= =?us-ascii?Q?sujltdqWmRZWvMasggWRuW2JKGwDc8eFRGgSp2FXLhOsVt0mWX/Vxx5o7b1O?= =?us-ascii?Q?9LTc9O2oVmOubb5afCqVdQu9KnJxDw8JLaaaMj3eELOeBkUZjG3dsmxwdIV0?= =?us-ascii?Q?1t9AX+2jqn8cwj8XeUtTDZLOhRkv2bjRbcK98rzVBiTeOq0edB68nUT8Sier?= =?us-ascii?Q?ysM2s9evAAHmhHgn59A5uYOBQmCZxmkdHS7maG/N7f2AYl77RIh4+E1V1aTG?= =?us-ascii?Q?EzOtMTi/5Q6G/082M5akEKRI3K01tEcSXrvdDDmj06w+GmXIkVNr2HhUcck2?= =?us-ascii?Q?GXNqyA1g5XBGoPBpNvQ7HPodIE97WXU93K/9QjKyrNGLo1NhAIFiTM+x5/6y?= =?us-ascii?Q?MZoeSn8t7+yizpY/xYhENEQWNmu68T1Bm+ub13UedwLe4uN6p2jn56rRFa/D?= =?us-ascii?Q?Tw1/JSWr7oszNL6lgCLYookybjCSgwjVB3idfeYihXVoUXOU61qJNfvtdznh?= =?us-ascii?Q?PEm3dPpfQMjUYOjw4iNVRK0O6B8wkNtZIXiZNmui1gzLQ1G5pPRvoCmlSENk?= =?us-ascii?Q?qMEK2DXRL8V9mbxFDCjFRRups4Pj9zqX+tvJSlSh48ysg3zW6gRxTawCUS30?= =?us-ascii?Q?/A0HM9Tk2nNqhr4JLIN2yQqNj8yAFbjlLAeB5zEyMPUC9zrhyfJc/R3rh9Cw?= =?us-ascii?Q?EP1OrTytpP0ChQM3OwxPnlFEY44hqQZ0JsOFsnNhFYWriCHY3yERAZiB2hfO?= =?us-ascii?Q?QCA/C3WoXgWuuBo9UhYlF8u39zTRzwijh/cIcXWwYg1XvbmvKoGu/eA/NvaH?= =?us-ascii?Q?Puf4npftMFoJWvIDnOHIvwFMJHL7Mi3+5OIio15Pvy6OhYDbtR+TDxLbCK4T?= =?us-ascii?Q?C9UVWGFmq4FDpP7hawYtLJAyxwflnflaBn9IJTjNgG4Ww9Ydm5ahwDBKTD+H?= =?us-ascii?Q?k6Xe+JOlbNXVc+0VQ+VEYLi8cfU3JGt/WKE3L2kLhaLaJjeEiQi7RFCCuYLv?= =?us-ascii?Q?qWiC7XHfIwAtRuh68jT2zKbkVi5QjyNBpawzGkQchPPqU3ZknfLSOvy1jkT7?= =?us-ascii?Q?ovgjLSDfzeKArgRrnDCgFkzqRLLIDcGH6ephLOmYvbe+/sl6RproB9WtPT6s?= =?us-ascii?Q?wCFdq8udDR4atwWu+XsNNsX8Iye65qf0YT6OTByXYv7Aq0HoKUO/FqDr9y7R?= =?us-ascii?Q?vjEJOISlavErMt9IML6vW/8cf0BrvhLdPk5NrHn4bhLSiGx4ouQqcIk/ciie?= =?us-ascii?Q?nw=3D=3D?= Content-Type: multipart/alternative; boundary="_000_BMXPR01MB2999BDE8710073969B57E8E1A70DABMXPR01MB2999INDP_" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: techvisitor-list.org X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BMXPR01MB2999.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: e193216b-c3ca-4a68-8b37-08db985e8ed8 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2023 22:26:49.3931 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: deedb169-8cb3-4909-92f9-4f6eab4226d4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: tNdT+MGdY7C17V8lIl5sKRVenVwTvhMA1KuKEj2u43Gn42fm7IBuKOaUY8T35QeArN86ntOLWt8vjg/7n91hzGC0gw2W1aL534SpWOi/jdo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MAZPR01MB9052 X-Spamd-Result: default: False [-2.30 / 15.00]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; NEURAL_SPAM_LONG(0.98)[0.981]; NEURAL_HAM_SHORT(-0.98)[-0.980]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; RCVD_IN_DNSWL_NONE(0.00)[40.107.222.87:from]; TO_DN_ALL(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[techvisitor-list.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.222.87:from] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RL78b1pCTz3Chk --_000_BMXPR01MB2999BDE8710073969B57E8E1A70DABMXPR01MB2999INDP_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Hope this email finds you well, Utilize our high-quality Show name attendees contact database to help you r= each your target audience. Our database is segmented and ready to help you = reach your goals. We have compiled and identified 3295 contacts of visitors from FLASH MEMORY= SUMMIT 2023, if interested I can share the pricing and guarantees. Looking forward for your response. Many thanks, Emma Hicks - Senior Marketing Executive If you do not wish to receive these messages, reply back with remove and we= will make sure you don't receive any more emails from our end. --_000_BMXPR01MB2999BDE8710073969B57E8E1A70DABMXPR01MB2999INDP_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi,

Hope this email finds you well,

Utilize our high-quality Show name= attendees contact database to help you reach your target audience. Our database is segmented and ready to help you reach you= r goals.

We have compiled and identified 3295 contacts of visitors from FLASH MEMORY SUMM= IT 2023, if interested I can share the pricing and guarantees.

Looking forward for your response.=

Many thanks,

Emma Hicks - Senior Marketing Executive

If you do not wish to receive these messages, reply back= with remove and we will make sure you don’t receive any more emails = from our end.

 

--_000_BMXPR01MB2999BDE8710073969B57E8E1A70DABMXPR01MB2999INDP_-- From nobody Wed Aug 9 00:11:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RL9TK0HVWz4Tm1g; Wed, 9 Aug 2023 00:11: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 4RL9TJ6XK1z3KV7; Wed, 9 Aug 2023 00:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691539892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQsz8qdh+mGdp1Txx04kL1bfUWdF/d1Q3dd7ONpUhvo=; b=CI0sjHtEmuYXCKsecuXPW0T/MwUpEJUPqwwEU+uTdGn+XWHQ3F6mjsWIjfqVwMZ+bNFXPA fPirkEMCTUn7PXlqYEIm41DWK6SVocpWZKZuh8vnTb7jv5/TkqTlqJkDXTqvbY065h75Ia Xh96e1TWzNSEgb/nHhIPXgAphDkfMUHbLVeIJTnGlGyjrUj1ZwSMhw9HGM9XFitU52cxFn mHJwves9BNU13tBeCScYZ6e9gKWH5nu8JJta/N9FmRqRJRT7bjefBAQpHXmdi4+DB1RB9Z BfW+9/HT5P3JLPxuS5+nXSxo9IkxrJARW5vKqDRoV1K0D1T8Cmo+/FGlNKrm1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691539892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NQsz8qdh+mGdp1Txx04kL1bfUWdF/d1Q3dd7ONpUhvo=; b=kLWp8lbgKY2a+xeYGp3P7nmSBMRSq5OLdv2FYJBmjls/AzdfvcRm4lWBNClDkqCjRDAWs1 KIcl4D0Wb/ikEJqMv1YqJVOqre8Jn06knosbkfqNE1/1LUFYAzijvHLfHjUNYA5iGSq/kN L+74LU+YJP3eIve/pUWZ8gs2wixLl9tt/HZ2haPh8nGLhtTfcefeCvCpKAld8B6YX1WsTG Xd7K0zI90Y6GDY+43Wy+zZ1lRj7c46Qn0HYaTPwjl8CIh2kMu2tJy721DJf4ZEfB7MwsLF at27Gqz3djuxedmBMY74h6D2BX5JehIi1kTDSuj7pfbyC8SXMXpfneASYw0LdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691539892; a=rsa-sha256; cv=none; b=Nm7pHBdYxGtF/FZ+WcgsTnvWabFaPB7xl3pf1eWiGCRjpTVU/ULOJ8QRmqV4UQ5k46h1g2 BRB1NeNHzCpKnLeiQXDZ+YMjEMTwzYmoymxAUczd7lvMAon6pPTGFbb7XakosnjepjL1Rb Ta+1/wZNzzZEEJbcw0KPZH9lmtSnBl7uG419qNJI8I4XvSgDcZHDY/lUl4CbQf8IJnHQSK X9cc7hZMaob3hGiDzM/BoliwzhLHjBfIZGLpVsfn/5i/UXYVAvT1JUmxR4w8xKbLyEuS71 9NIKz8vInBbfJ27XsQIja6iz5MEae9am/kPEVNK6RBwNsnRbTMBcSNLJIH+KFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RL9TJ5chmzv4s; Wed, 9 Aug 2023 00:11: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 3790BW2k004219; Wed, 9 Aug 2023 00:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3790BW23004216; Wed, 9 Aug 2023 00:11:32 GMT (envelope-from git) Date: Wed, 9 Aug 2023 00:11:32 GMT Message-Id: <202308090011.3790BW23004216@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: 6dff61a1d187 - main - Rate limit kernel UFS/FFS cylinder group check-hash error messages. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6dff61a1d1878ea5e9f6e5c36521b3f39cd34b33 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6dff61a1d1878ea5e9f6e5c36521b3f39cd34b33 commit 6dff61a1d1878ea5e9f6e5c36521b3f39cd34b33 Author: Kirk McKusick AuthorDate: 2023-08-09 00:10:07 +0000 Commit: Kirk McKusick CommitDate: 2023-08-09 00:11:04 +0000 Rate limit kernel UFS/FFS cylinder group check-hash error messages. When a large file is deleted or a large number of files are deleted, even a single cylinder group with a bad check hash can generate thousands of check-hash warnings. As with other filesystem messages such as out-of-space, print a maximum of one check-hash error per second. Note the limit is per filesystem. If two filesystems have cylinder group(s) with a bad check hash, each will print a maximum of one check-hash error message per second. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 58 +++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index e173253720c6..f6bf4c1dadc0 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -2991,15 +2991,6 @@ ffs_mapsearch(struct fs *fs, return (-1); } -static const struct statfs * -ffs_getmntstat(struct vnode *devvp) -{ - - if (devvp->v_type == VCHR) - return (&devvp->v_rdev->si_mountpt->mnt_stat); - return (ffs_getmntstat(VFSTOUFS(devvp->v_mount)->um_devvp)); -} - /* * Fetch and verify a cylinder group. */ @@ -3013,6 +3004,7 @@ ffs_getcg(struct fs *fs, { struct buf *bp; struct cg *cgp; + struct mount *mp; const struct statfs *sfs; daddr_t blkno; int error; @@ -3021,10 +3013,13 @@ ffs_getcg(struct fs *fs, *cgpp = NULL; if ((fs->fs_metackhash & CK_CYLGRP) != 0) flags |= GB_CKHASH; - if (devvp->v_type == VREG) - blkno = fragstoblks(fs, cgtod(fs, cg)); - else + if (devvp->v_type == VCHR) { blkno = fsbtodb(fs, cgtod(fs, cg)); + mp = devvp->v_rdev->si_mountpt; + } else { + blkno = fragstoblks(fs, cgtod(fs, cg)); + mp = devvp->v_mount; + } error = breadn_flags(devvp, blkno, blkno, (int)fs->fs_cgsize, NULL, NULL, 0, NOCRED, flags, ffs_ckhash_cg, &bp); if (error != 0) @@ -3033,28 +3028,35 @@ ffs_getcg(struct fs *fs, if ((fs->fs_metackhash & CK_CYLGRP) != 0 && (bp->b_flags & B_CKHASH) != 0 && cgp->cg_ckhash != bp->b_ckhash) { - sfs = ffs_getmntstat(devvp); - printf("UFS %s%s (%s) cylinder checksum failed: cg %ju, cgp: " - "0x%x != bp: 0x%jx\n", - devvp->v_type == VCHR ? "" : "snapshot of ", - sfs->f_mntfromname, sfs->f_mntonname, - (intmax_t)cg, cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); + if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, + &VFSTOUFS(mp)->um_secs_integritymsg, 1)) { + sfs = &mp->mnt_stat; + printf("UFS %s%s (%s) cylinder checkhash failed: " + "cg %ju, cgp: 0x%x != bp: 0x%jx\n", + devvp->v_type == VCHR ? "" : "snapshot of ", + sfs->f_mntfromname, sfs->f_mntonname, (intmax_t)cg, + cgp->cg_ckhash, (uintmax_t)bp->b_ckhash); + } bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); return (EIO); } if (!cg_chkmagic(cgp) || cgp->cg_cgx != cg) { - sfs = ffs_getmntstat(devvp); - printf("UFS %s%s (%s)", - devvp->v_type == VCHR ? "" : "snapshot of ", - sfs->f_mntfromname, sfs->f_mntonname); - if (!cg_chkmagic(cgp)) - printf(" cg %ju: bad magic number 0x%x should be " - "0x%x\n", (intmax_t)cg, cgp->cg_magic, CG_MAGIC); - else - printf(": wrong cylinder group cg %ju != cgx %u\n", - (intmax_t)cg, cgp->cg_cgx); + if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, + &VFSTOUFS(mp)->um_secs_integritymsg, 1)) { + sfs = &mp->mnt_stat; + printf("UFS %s%s (%s)", + devvp->v_type == VCHR ? "" : "snapshot of ", + sfs->f_mntfromname, sfs->f_mntonname); + if (!cg_chkmagic(cgp)) + printf(" cg %ju: bad magic number 0x%x should " + "be 0x%x\n", (intmax_t)cg, cgp->cg_magic, + CG_MAGIC); + else + printf(": wrong cylinder group cg %ju != " + "cgx %u\n", (intmax_t)cg, cgp->cg_cgx); + } bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); From nobody Wed Aug 9 01:15:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLBvF6622z4TqBX; Wed, 9 Aug 2023 01:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLBvF5MDVz3Pcw; Wed, 9 Aug 2023 01:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691543737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6KkIwRVp1p2dbIso7dwwYj5SWLxxkU/hGJ2iIrvL9js=; b=ZvQetOUbvxumvoHWFmq9Kiku3HLQ1JQAInbRRgWyx0VB8QAaLkZd0PWuVU9jO7pHC7abNv ySU9sL6/S+R4aZ8j3ziHMinFeNovNx1c8RcQp65qqkZHPVXUjiIpTe0WBJ+37vjNaq4Jql NYDae5MLELhbPHCje+Ho20rdyOA+KP9tfBYTpe1B4mfacLVJ3V71rS63G7dDOT7uoISpAS QhuunP/7c3/8jwHN0dheoQ6wgdpkQFutmhYIKXIqz/lr6tKlDG5UbxP+k+YEThqWD0Bzu2 PwHjtvRkeuEmfT/2IUza7BRG56/gX/YlVQ6f4v+TuMziq0SUZE6APxHhLznwMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691543737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6KkIwRVp1p2dbIso7dwwYj5SWLxxkU/hGJ2iIrvL9js=; b=ChLqvTghOwU8R+6h0FtSkBmTH1W+JIu4S4B/i6B9rVoKMaexVEAIhQ3Z01rEOguCt9Xw36 FwESMCU10I6Q1EZ+mAvE1gQr58W3qV2gkMDBbp1LQ4Aoof03xwZigq5AjTm9oI+yNSIRU7 YdcaUWeyxO+/n1wbzvw2GV4ul40emV1WSC+qTAI/K6BCUq2A3Cl9QfDNEVhv/gwZ/tWhxm zQt0wx7AIpKi0RXiD5JQrxWBB8cQq9gscDiOvuMuyAwcV9Lb3aRs2r2QGcHFPZBVjWLrRp /FadPTWFE2V9q8H9CfU0wizX59HSStF2cawll1Yva5t3tuTu29ETaA07toTxZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691543737; a=rsa-sha256; cv=none; b=bJD9uTcc2d/O4+wuweOp0YQA1OrjS33//slcdU34Fc15DKQndY9ZQcmGKAAnM0HpxXgWUo Krm5KI2CON/M8Z6d7f0Q08LerESTPlKptCNmvyt5fgle8KseqHm32ztbzNggZF7jWrJ4sH Lfr9zGaTAGgS+O+YgVI0XjCRMfa3Grq2le8lXcxc80WlTtfparwXLgmvJ9Esz8v3HVfvMi /Kx921gQMN3Uhrv1XwkG2WhaOrupzPjxEOBa+PDybcdui+KCHe0ZZDz+V3URYKYCREGr2B DOiUX6/mOvybYRM1bDwB1JGHduVuOYGmPI6CdnTQisaLnXk7LO8HxgFMV2NWZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLBvF4MMqzw10; Wed, 9 Aug 2023 01:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3791FbQx006682; Wed, 9 Aug 2023 01:15:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3791FbWB006679; Wed, 9 Aug 2023 01:15:37 GMT (envelope-from git) Date: Wed, 9 Aug 2023 01:15:37 GMT Message-Id: <202308090115.3791FbWB006679@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: 07d3738b82b6 - main - soxstack: silence GCC warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07d3738b82b6e064288cb1d630a3bde611e30819 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=07d3738b82b6e064288cb1d630a3bde611e30819 commit 07d3738b82b6e064288cb1d630a3bde611e30819 Author: Ed Maste AuthorDate: 2023-08-09 01:13:20 +0000 Commit: Ed Maste CommitDate: 2023-08-09 01:15:19 +0000 soxstack: silence GCC warning Add parens around _STACK_FLAG_GROWS expression to fix GCC warning about arithmetic in operand of '|'. Sponsored by: The FreeBSD Foundation --- tests/sys/vm/soxstack/soxstack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/vm/soxstack/soxstack.c b/tests/sys/vm/soxstack/soxstack.c index fe3eb1c03a29..ac7c9cf03746 100644 --- a/tests/sys/vm/soxstack/soxstack.c +++ b/tests/sys/vm/soxstack/soxstack.c @@ -16,7 +16,7 @@ int checkstack(void); -#define _STACK_FLAG_GROWS KVME_FLAG_GROWS_UP | KVME_FLAG_GROWS_DOWN +#define _STACK_FLAG_GROWS (KVME_FLAG_GROWS_UP | KVME_FLAG_GROWS_DOWN) int checkstack(void) { From nobody Wed Aug 9 04:03:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLGcZ2vHRz4m6Dv; Wed, 9 Aug 2023 04:03: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 4RLGcY6xRtz3Zjr; Wed, 9 Aug 2023 04:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPBFGVdu1EpLpNymT3YG05wx6J9xE1XPTneCx8X0e2U=; b=oOiBEuAo00Dhdih/5qbHf/9w8yqMxXOVuQ96+qNrx7Te0BBmlWJicVDSawJt3kSMxVGMcl bhWMi95AVOHFNeNUc7PAt+FpnrjAIS+UxEQAmz+9d+VwVBJCAGdxwqphxuWO2U8uQaabve 5YYlpiRR9wXVBowk/5P83AFtkO8pD140hEWsTFq3A3w+awQv5Czx7K3vgHj+ZgH7+SyMkP omen9oBvaLQtmeUQ15rsFJZTgYENc+jRHIyMC9g/0EGQ8G+LLo5kX3E3/xmdnXVTrpQn0d idNyv/f7JHg61MOGZDIXRwy91eNOUwQCj79vHf0rUX5fw+ce7lAIyZVQh0GgWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPBFGVdu1EpLpNymT3YG05wx6J9xE1XPTneCx8X0e2U=; b=ZjCNXWfC17UJrxKaEY5sz+pirbmApvH2mDCFv9aTJ8rmGdvi7rBMAzEVn1DFHxPDN6XMsQ nlPAi/WTHgL6EKOSVPM8cfkccIf4UTZfl1+fqQdag/pttNqBbGNmbtqAd79cPDTk6S0DK4 jTFJxEsgAXcMW7vFLh2IH24alwtpR8sqptMBiZXuUexGH681zDcpT4ifipVVFsxcSp03LS t88Fbcy88M2UWhKKNvE165OqHygWwXhN48hIBWN89czv1pVNtb1He4a5LBWrQ9B7bawTT8 buZYXH6eglM5/G6GN3FOXZaGh6haCGGhf5XTATqO0Vb1kJHCoAkWIuRKFrbvzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691553790; a=rsa-sha256; cv=none; b=Z5ixktLPJd+TuYQfLaTth93A6zU5vJ+Gmj2wsCx/P3M9H7lO33VwrMQcWn1c1ATELdNay4 m2+kqxV51Y2fzPNX+3djwkOqWkYlKbwFpIf8gFipFkaSIyZC3GBFgtCe9nUHwq/9UT9ZUn PURrf7AV/fvtFZFSq56Mtpf49Nr8UBw3eAxe//a5PSQSneWBuJ8j7Vc+ghZS9DjwCy+si/ ySpeqlco5yoVVz2LlDEaUx6iMjyA0+yI0brG3qmf6Crn8WK0QFUZUU5PAaRklDtwUjjnzJ pinGt4/NuKNP9czcukqqYmW7iy+xzvp7mT73dUoyHpkP1KmaG+ztaKFj629DTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLGcY62J0z11kl; Wed, 9 Aug 2023 04:03: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 379439g0090143; Wed, 9 Aug 2023 04:03:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379439Vx090140; Wed, 9 Aug 2023 04:03:09 GMT (envelope-from git) Date: Wed, 9 Aug 2023 04:03:09 GMT Message-Id: <202308090403.379439Vx090140@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: 651fdc3d198d - main - Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 651fdc3d198d066b18823db3b74cf38a0144dfac Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=651fdc3d198d066b18823db3b74cf38a0144dfac commit 651fdc3d198d066b18823db3b74cf38a0144dfac Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 03:54:15 +0000 Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" This reverts commit 5b353925ff61b9ddb97bb453ba75278b578ed7d9. The reason is the lesser scalability of the vnode' rangelock comparing with the vnode lock. Requested by: mjg Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41334 --- sys/kern/vfs_vnops.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 306840ff0357..83e95731d7c4 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1443,7 +1443,6 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; - bool rl_locked; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1466,7 +1465,12 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, } foffset_lock_uio(fp, uio, flags); - if (vp->v_type == VREG) { + if (do_vn_io_fault(vp, uio)) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1478,22 +1482,11 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } - rl_locked = true; - } else { - rl_locked = false; - } - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); + vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } - if (rl_locked) - vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } From nobody Wed Aug 9 04:03:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLGcb2LTdz4m6TM; Wed, 9 Aug 2023 04:03: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 4RLGcb0Kvyz3b0J; Wed, 9 Aug 2023 04:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oirqSHYmMD9ek0BdVEj+wV26QZxKwXYkVUqwhhRvgsc=; b=kLfETmpi2J7wodkTi6quobsKlswhGiS4O9QzuSNentbgn+otyG6t+vF8BTYsGZXHWdZMlF 3lCJylPSlGDUQGoI/qmJEZdE2pFwjcMqaHWPqBkzXuhUMUMHCzh5Pn8cTZcGt8jsVXrmo8 1lbgzC50+KTiFmDXmMEL/FohIqKxfA//uqZSnMNf14QuRi02KUIv7EPqW+8H9+CVcYN/Ou SUQsEWvAzaUy0p0XrFAAu7lLal82d84vgGKS/4NrqYMw9UsCwPYU5u4rPSTGYGQzcjrbxk vCqX1iXoRbxfit8k2lvrPuCEpYdcNJzaFmhJY0vtdEHqmeTLxL3MTFKD8zrtEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oirqSHYmMD9ek0BdVEj+wV26QZxKwXYkVUqwhhRvgsc=; b=BWqM4lE+ovxgLzq8DNKJMSRtOOh5oKVUhBJeAWVwlBI/umgNFLRRF+5957MwY5mK6OfZZN fC3iBrJc9lkHZs1uXT0P+e5HpxzmwzIoFHCVHU3ruq3RVTPCrjqDhAT64qA8qWR1hYeidg wGlS9pZlzbUNoFbIVHwS6KKPlIpwO2RpY3Rh5gNZVq69gAAes5vrJySDE8Gc0KRPKO3gPU lnKbqicq76bINvXtE1jZWUCfV9d3wjMnOBnNIaZ3rTR/irdsmuJ0Ml6Czk5LXYYyRD1Dt3 YpxmI2ogM9uutchGGyVLhhmYXlFv4YAzqchcnUHZNv15Kq5XSreQ9dS7Qf6rxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691553791; a=rsa-sha256; cv=none; b=Fp7uYw/twk0g/ClkXWyoEbyUg4btjOkmRO/lScqYQyFaHiIcuZ7lsXD7JYtBtcW064JSWn v2FUeoRI0PSyhPWdwadUInOtGMo2kaGC6GaqKcO1fVxa6As8MPRB4tY4e8x6lKoOTWC4X1 9w0zaJlOcOJSGyYUqP+pW4ARcLP7SyHPzztvsfP/OT1FFIYU6bUdtuJir5ydt/FIJK0jma V//6AnQ1pLkmsA/Wju5V9YyKSMQeLCk9Mywbt0tFtFas5N6jPEVUJgNCkG2ME9+rLXl9pn KufBbeh33L8dFHeX0nIhe6Ae82rv+kTMvBKh9FdtdK/4mb4rtd+JUON3SHAbMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLGcZ6WPNz11Xt; Wed, 9 Aug 2023 04:03:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37943AQV090199; Wed, 9 Aug 2023 04:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37943AWh090196; Wed, 9 Aug 2023 04:03:10 GMT (envelope-from git) Date: Wed, 9 Aug 2023 04:03:10 GMT Message-Id: <202308090403.37943AWh090196@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: 821dec4d56a8 - main - vnode io: request range-locking when pgcache reads are enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 821dec4d56a876db56a82cf1dc54a84905b74f5b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=821dec4d56a876db56a82cf1dc54a84905b74f5b commit 821dec4d56a876db56a82cf1dc54a84905b74f5b Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 03:54:15 +0000 vnode io: request range-locking when pgcache reads are enabled PR: 272678 Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41334 --- sys/kern/vfs_vnops.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 83e95731d7c4..c6ca5b9b5120 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1443,6 +1443,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; + bool do_io_fault, do_rangelock; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1464,13 +1465,10 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, return (EISDIR); } + do_io_fault = do_vn_io_fault(vp, uio); + do_rangelock = do_io_fault || (vn_irflag_read(vp) & VIRF_PGREAD) != 0; foffset_lock_uio(fp, uio, flags); - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; + if (do_rangelock) { if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1482,11 +1480,19 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } + } + if (do_io_fault) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); - vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } + if (do_rangelock) + vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } From nobody Wed Aug 9 04:03:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLGcd04Hxz4m6Dy; Wed, 9 Aug 2023 04:03: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 4RLGcc1pd2z3ZZg; Wed, 9 Aug 2023 04:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6s8C7K5WCP5EFLwjO7r5l7xexjFXeZYN/4WIaqoJmWI=; b=q5DTngnL1FRr2H5lcV23oPdsmTgpIdX0LOD2vwllqmxMs45oojIjuqkl+8iLfybVX3TCIn KFLvmP6x2iZqTSy1MVlUuxU35/RpYUMmfrGYcA8+Q41vpAKCSeYiTBkC6Q0QqYR7dHm7IQ 4UZypD2HD5Tzten5bjAJXN2x+8VhQlvQGXaZWPb5R/KToFp1sPRZkjcfXq0AmlDWN6xar3 Xh5l2FdDIm9QPDLDYOwQcNqBMxW/S9HDyEwJt53TgM+25YCqksnA+ZULoL35dW23LYJ1Lm PlUX5VlWYG3btcgqNuRUGzVUnsL8PszBpcRWnSAVmeXziVHLOx/HmrOasb2GfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691553792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6s8C7K5WCP5EFLwjO7r5l7xexjFXeZYN/4WIaqoJmWI=; b=KtWyacWZvo9fgWQ5nXE0ZVdltS/HiUJkK7PgANAHmX7AfdTnoVWSJvTzdArMnjmWJjh9mv uvqI0Cs8on3LfCmCw2X6US5P8SfPnfRQksp63/UsMvwWdbB1PPY/EKaQD8+8sBRTwxfNED nFlKMV8N6W6JRfRekXOEsi2yOsPFdqp8JoRZQ/rDuJDk/fhCvnjqnFywQgTYg5CiNmmCY8 V1ER9gmXuxqSNGeZlHDblufG2F1mtckvZyUGKXY2QcRI673pTgXnA7XosEZhk32se2oVUK AhewLnP1++l4/CJSOirbZ2eJYWgMkYWbzFnJPurCTEx+oGfZSV9nf4yqQGOFNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691553792; a=rsa-sha256; cv=none; b=idW+yB/6qbbzPVexytr9a5NzOSVT7L0JIITuI3KlAzdkxnwR7oUEnwLmcsxyA6+xYUo4AS EFCZMKYVfoXjoLoYSiKMrUhEoo+4NjN7IbF6yU4CcyriVFWr5vMFUeEAZldjUmg8XkLlRz 9kitjUgCP6QZqxK2RouetEaP0rFcmuicNpBSHTm88jbfcW0O8WZ2F8u39nXTnckg9Zk37i rvAn+Ic1Se5W09y01nel4rI++ULLWeuWIThr1FLiBiVi5TzMWHRvVzn3KHUJ8P2HX3isTC EsA1CPupdjoy8OVYKuIbt3lYBufd9fj3trvQH+L66p/EOxJMBB0pWxMLxwTAfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLGcc0hYzz11n6; Wed, 9 Aug 2023 04:03:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37943CYD090256; Wed, 9 Aug 2023 04:03:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37943CO8090253; Wed, 9 Aug 2023 04:03:12 GMT (envelope-from git) Date: Wed, 9 Aug 2023 04:03:12 GMT Message-Id: <202308090403.37943CO8090253@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: 0f613ab85e5a - main - tmpfs: add a knob to enable pgcache read for mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f613ab85e5a5274704d179f39fb15163d46e7c4 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f613ab85e5a5274704d179f39fb15163d46e7c4 commit 0f613ab85e5a5274704d179f39fb15163d46e7c4 Author: Konstantin Belousov AuthorDate: 2023-08-06 01:35:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 03:54:15 +0000 tmpfs: add a knob to enable pgcache read for mount Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41334 --- sys/fs/tmpfs/tmpfs.h | 3 +++ sys/fs/tmpfs/tmpfs_subr.c | 3 ++- sys/fs/tmpfs/tmpfs_vfsops.c | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index 126b99acba6b..7e24fd5e1924 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -428,6 +428,9 @@ struct tmpfs_mount { bool tm_nonc; /* Do not update mtime on writes through mmaped areas. */ bool tm_nomtime; + + /* Read from page cache directly. */ + bool tm_pgread; }; #define TMPFS_LOCK(tm) mtx_lock(&(tm)->tm_allnode_lock) #define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->tm_allnode_lock) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 28834a96ee9a..69a9936ebcde 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -1061,7 +1061,8 @@ loop: VI_LOCK(vp); KASSERT(vp->v_object == NULL, ("Not NULL v_object in tmpfs")); vp->v_object = object; - vn_irflag_set_locked(vp, VIRF_PGREAD | VIRF_TEXT_REF); + vn_irflag_set_locked(vp, (tm->tm_pgread ? VIRF_PGREAD : 0) | + VIRF_TEXT_REF); VI_UNLOCK(vp); VM_OBJECT_WUNLOCK(object); break; diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index 7a88e7deba9d..b04b3c084b3b 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -329,7 +329,7 @@ tmpfs_mount(struct mount *mp) struct tmpfs_mount *tmp; struct tmpfs_node *root; int error; - bool nomtime, nonc; + bool nomtime, nonc, pgread; /* Size counters. */ u_quad_t pages; off_t nodes_max, size_max, maxfilesize, ea_max_size; @@ -412,6 +412,7 @@ tmpfs_mount(struct mount *mp) ea_max_size = 0; nonc = vfs_getopt(mp->mnt_optnew, "nonc", NULL, NULL) == 0; nomtime = vfs_getopt(mp->mnt_optnew, "nomtime", NULL, NULL) == 0; + pgread = vfs_getopt(mp->mnt_optnew, "pgread", NULL, NULL) == 0; /* Do not allow mounts if we do not have enough memory to preserve * the minimum reserved pages. */ @@ -462,6 +463,7 @@ tmpfs_mount(struct mount *mp) tmp->tm_ronly = (mp->mnt_flag & MNT_RDONLY) != 0; tmp->tm_nonc = nonc; tmp->tm_nomtime = nomtime; + tmp->tm_pgread = pgread; /* Allocate the root node. */ error = tmpfs_alloc_node(mp, tmp, VDIR, root_uid, root_gid, From nobody Wed Aug 9 05:28:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLJWN0K1hz4mBl9; Wed, 9 Aug 2023 05:28: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 4RLJWM6qBBz4D3x; Wed, 9 Aug 2023 05:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691558928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZ+lWiN94gkiScEtCo5n39PfwKA0U0S4pb8NpyFOq3M=; b=vsIkUFOBu+Xw1e0EqagqU6JE5UCuhXd2YEiQU6Ra7VnwjntMozMPI8fjoZqVKsSfb4wuFo DH8i55bMAaaQDYNn3JY+OPODSbPx5Cd40DLryb4YEK0rxOVzbRnXcIyYgRQzxhyF9WK31n ycYEQ8ZghFT8TXGNJcCJaMMGZk7B2l1iPSLv2y5oJc+KV45IIzMOCGpqK/FVNDIy9Ti5Ns viSmHPDRjCrure0wd/YE0Mm4gGOdOqUsUtlz3E/6riNaHKPb3FaWicS4c6IJBlDtVqydfV KGXEc1S3ApfYeJ9kX9flIJCxVyhODjQCRsAO2G/+pYp5MeV8BKYbfPcusUahEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691558928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CZ+lWiN94gkiScEtCo5n39PfwKA0U0S4pb8NpyFOq3M=; b=HWdbBTB9ROG0uSpEjRDCLkAw/xDfLjW75JnvDUDc2Yp2Jz7sTRe+4zNdtWHFldzdQusWQ5 dD3G+6b6oYxAmJdeANHaCrsHEYA15iMarVT9Nt9jI2zwoFI3G/bNx+w9rqhwBQhOLBIB+6 ujNRklYlZQl7kgsCmKsYOts90drcJx4X+r0pIVkV0jlEOUPzZuBpje13L2tgEy0caj28vN w4icDKAiiK973mEmSE6wRqodGLgeXx0DTqV9oUBvjhMJpD+vyUi8x7rN1kf35OfkFB56s+ 6bQfQSVfZFBGUrSKQUsbroTBEC85l28XIBJm39txgKf/sQArZde/6uyEm/EAXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691558928; a=rsa-sha256; cv=none; b=UV+VHg1nq3G+cBxMW+am4Oo/492jWhT3/NuYb8M6/KQBAAgNSOyluQh0yMnpiFx0q7Coqj Q+pRoK0jHBoFgKSp2J9UyyMRp8UBm6MpG/6aQt5kdHfDyoWq06Lv691fT/5V7X05yHbZzb +8+2eQxq1aMGIWhbq09+HhDFqOYHhTwg79arhC+N2S6ru0LvZ4JFJg5uOA5DRjfTp2LM5X MjRHxjSwLVqKpWedVIJOm3CyqI6NFy0JturrKHEe0jx1wFzjGoie5OunAdsaw9KLhohQdB oj+mbcbY4tiQyaZ5mQuiWiaZCG/r+HlEFt5k8cEXinDO+PrJW6X7cJq2IQqenQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLJWM5tVCz13j2; Wed, 9 Aug 2023 05:28: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 3795SlwE023334; Wed, 9 Aug 2023 05:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3795SlFA023331; Wed, 9 Aug 2023 05:28:47 GMT (envelope-from git) Date: Wed, 9 Aug 2023 05:28:47 GMT Message-Id: <202308090528.3795SlFA023331@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: 21a52f99440c - main - libc dlfcn.c: make dl_iterate_phdr() from libc more useful List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21a52f99440c9bec7679f3b0c5c9d888901c3694 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21a52f99440c9bec7679f3b0c5c9d888901c3694 commit 21a52f99440c9bec7679f3b0c5c9d888901c3694 Author: Konstantin Belousov AuthorDate: 2023-08-09 05:07:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 05:07:05 +0000 libc dlfcn.c: make dl_iterate_phdr() from libc more useful Apparently there are applications that resolve dl_iterate_phdr from libc and try to call the symbol. Our libc only provides stubs for dl* to satisfy static linker or statically linked binaries, and is not prepared to this situation. Add a code to dso libc to find real dl_iterate_phdr and redirect the call to it. Reported by: yuri PR: 272992 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/gen/dlfcn.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c index 61984e2fe86c..f1ee86ec1934 100644 --- a/lib/libc/gen/dlfcn.c +++ b/lib/libc/gen/dlfcn.c @@ -169,7 +169,9 @@ _rtld_thread_init(void *li __unused) #ifndef IN_LIBDL static pthread_once_t dl_phdr_info_once = PTHREAD_ONCE_INIT; static struct dl_phdr_info phdr_info; +#ifndef PIC static mutex_t dl_phdr_info_lock = MUTEX_INITIALIZER; +#endif static void dl_init_phdr_info(void) @@ -208,7 +210,16 @@ int dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *) __unused, void *data __unused) { -#ifndef IN_LIBDL +#if defined IN_LIBDL + return (0); +#elif defined PIC + int (*r)(int (*)(struct dl_phdr_info *, size_t, void *), void *); + + r = dlsym(RTLD_DEFAULT, "dl_iterate_phdr"); + if (r == NULL) + return (0); + return (r(callback, data)); +#else tls_index ti; int ret; @@ -223,8 +234,6 @@ dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *) __unused, ret = callback(&phdr_info, sizeof(phdr_info), data); mutex_unlock(&dl_phdr_info_lock); return (ret); -#else - return (0); #endif } From nobody Wed Aug 9 06:07:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLKNW4h8cz4mFPG; Wed, 9 Aug 2023 06:07: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 4RLKNW48nNz4HYw; Wed, 9 Aug 2023 06:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691561275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=he7XNlZ9/8URUuScPK6LSBuS8a0L3Zid7dK3w7I6Aac=; b=LgabK5nZJjsqsU9DhXzHB5RCgUjuqUI/SunIatIMQV7/iwQBspSQBCxZrp3uK+GXUGBwbs neYpZN8bjj7XdOlX/08/64BroUlW372UWlzSnDFr08Q9JAmu6J5vkPdMseIjUab5B0zVN1 FEiaWLLNOCy2VBAPNNSL5UXJYOyGfl1UGS2eNrCoXTRkSA6BFVyxRw5okmrbswez9hS2nh V5/UCGDkrgKdhnC5iZx3He2f0kcQioAc6QJQX+JF26dhw/A3AdostPVMbCgk27W2WXNiQa TjrMrNGk9TZDlzNZ8VpxFOVUflAQxReMCKtx8u5+pT70kn10H1tNxWdGADspPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691561275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=he7XNlZ9/8URUuScPK6LSBuS8a0L3Zid7dK3w7I6Aac=; b=XG2dKhldBOmnrDiEzZHPlFmwHymP2b9Sn54AeJLerOVrErKiL+AhoV9g39gZG1fpAf0ilU vdEbmTmHlhcP3XwFF1Ps/YTY3UzOdp64hsYYwMJgtpilRLbwf4ZCrJMrU+84Xe5FeTEKCH QwPauFprGHk3sUtD7L+1r//E3bB1bwfF9AYi4USitG+SKRML/3Hf1bP7ATIZIZiIqVZxPI Lyh3wpEhwqIN5ATEilNVzOhiSAypUscokUHD/hCkbLT/qfJSX7RY8eBRyLok1GSoJdpRDZ y4SoKvexL5xTvQdUz1och0NmbkmCONUOPL9hgtVlO3aYCs6kRUh3+//yebjiIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691561275; a=rsa-sha256; cv=none; b=ypYIeBuDuiKoZuTjQp7s1UcBRGStatU7fS7+5BCK6fhIi4Q0Y7rQV5NuOPRCfRufAbyjC8 D/MJ2aLrwUUKJ6zl+baFzwBCEc7HWsNLfmGTdjgweN5WNB5lKsbBU8EQjz58aUI1gsimLY aGSpgn3/+zQuZsereW4gp9q4HXDK2vVJmnHxERLSyyMO07fC03IBh/kH/MGzOczAGuua8w 6X/kBptNddA0+udzASRGF8+e6IcZQSIIt16l/3YowYTl7uK/EgpjgyEWqyCPjQHsVfxcV0 nmH21swFfIMuclAVWzbkSLr/UamkCT0DyN1o0xcDMU0zruklyW0c/NKCry8Jcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLKNW3C3Qz13xL; Wed, 9 Aug 2023 06:07: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 37967txK090818; Wed, 9 Aug 2023 06:07:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37967t9e090815; Wed, 9 Aug 2023 06:07:55 GMT (envelope-from git) Date: Wed, 9 Aug 2023 06:07:55 GMT Message-Id: <202308090607.37967t9e090815@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: 28b36ecf990f - main - Revert "exit1(): Revert sparc64 workaround" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28b36ecf990fc28a935ab2ce75f7504721c3a7ea Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=28b36ecf990fc28a935ab2ce75f7504721c3a7ea commit 28b36ecf990fc28a935ab2ce75f7504721c3a7ea Author: Konstantin Belousov AuthorDate: 2023-08-09 05:56:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-09 06:00:20 +0000 Revert "exit1(): Revert sparc64 workaround" This reverts commit 96c76d930656f13d3c041dc8d8f2fc3dd1e5e05a. There are other relatively common reasons why init might get killed during reboot, the workaround was really not sparc64-specific. Discussed with: marius Sponsored by: The FreeBSD Foundation --- sys/kern/kern_exit.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index e3345c14df26..f1ab2f68b3f2 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -238,7 +238,14 @@ exit1(struct thread *td, int rval, int signo) TSPROCEXIT(td->td_proc->p_pid); p = td->td_proc; - if (p == initproc) { + /* + * In case we're rebooting we just let init die in order to + * work around an issues where pid 1 might get a fatal signal. + * For instance, if network interface serving NFS root is + * going down due to reboot, page-in requests for text are + * failing. + */ + if (p == initproc && rebooting == 0) { printf("init died (signal %d, exit %d)\n", signo, rval); panic("Going nowhere without my init!"); } From nobody Wed Aug 9 07:28:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLM9g63cPz4mL6m; Wed, 9 Aug 2023 07:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLM9g5G83z4S6w; Wed, 9 Aug 2023 07:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691566119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i+avjXaD5lcgpdXqfiGORKu5l2xsLlOnWSQpUKOvSyo=; b=QI+YmAXj6qgmfC9nunlyfNLa087Di7j8lbr0zyH2A/hroh/3Kk3hDsFyMPUuCCDdpooPyF tzbUTeYhXkEx0llKpysaOVjmzLTW30y88RI6cd8nITCE5Ycoi8vB9Ik0hM2761e9HH8Ngk XgOJDut6vtfvQB9rCBi11HXGskYlqVugLmJcErO0Z0wrsAEL4QgZXA4Y4X3euvcNb83KpH WHMce+ETZeVcr2kVgQjdXdIv+5QqPPemGv75kF4RqaORY/cKP0Fv1fcO8X94QQveGKcypw ViTsx7SWWwYHZOFI0D9d8oN+OpFuhb+bCTqZPLUFws7wdcRfAiTG2k4QJEKYww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691566119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i+avjXaD5lcgpdXqfiGORKu5l2xsLlOnWSQpUKOvSyo=; b=DjWkch0VSCnWSF9R4QYmUWNk4aREqw8yMvQcI95WUDnuPxMbMe4ly/06fzXyfGQ24+/kwA nyFPWsaF32HCMADnj+9xYPHV7zD7Q/H5dSXmX/i55eSUDwH8rS52aX+mTly8Io54UT6hbc 07gX4dwe4Q84HXh0s0N0RPeOtRRBc2pqZVP7bI8to5b0ZpMF8z9qUUE9Nu5HjjmLSOOz6T JICc64QWbJkgf4fgq9o45pbiy40SyozmU7n9n3UMT1bWCgeYoxObyscevh4B6UI9flKE06 VhIIGUJRdcGR99p8pxjLOBFBHVLMj+f5toXdgPpQxW//x3OSS9CDx5eLH139lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691566119; a=rsa-sha256; cv=none; b=GtBw88xnw+gKTwlN/xcCLc9rXQk1UV2tiVrYlHaLJ96/MT3NpzFHsJVrgqY9WHF0qebMUh dBBmuXewzsvngzwWLMA2SZVW42XKemkoacsTpeNiiSx+zOedt2peE+PjhNT4vnaaEjDHRp RcoBJoNM3r+8D/O2Mh1IFiAmol/eGLIhiDabMMyVT1Q45+k/x7Wk4Ux9SBogB9bBSu+W6w aWhVAXogDBi7cYeVQdtLwJBFQdUZYBMvRwi+Kial35DcahWT1InrvCq8QOUE2rw4OZp8Ai EzElN+gUx3wjcuXqTShfHrYlANIIxPEYYUDcq4IxBOb8zavTAU0ZVTJJ666Ygg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLM9g4HQ4z16Rq; Wed, 9 Aug 2023 07:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3797Sd7I023956; Wed, 9 Aug 2023 07:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3797SdPd023953; Wed, 9 Aug 2023 07:28:39 GMT (envelope-from git) Date: Wed, 9 Aug 2023 07:28:39 GMT Message-Id: <202308090728.3797SdPd023953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 15047a65099f - main - rangesets: use PCTRIE_DEFINE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 15047a65099f3d26b1d3ced5037dd950e4a6fc46 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=15047a65099f3d26b1d3ced5037dd950e4a6fc46 commit 15047a65099f3d26b1d3ced5037dd950e4a6fc46 Author: Doug Moore AuthorDate: 2023-08-09 07:26:25 +0000 Commit: Doug Moore CommitDate: 2023-08-09 07:26:25 +0000 rangesets: use PCTRIE_DEFINE subr_rangeset.c is the only source file that calls functions like pctrie_insert and pctrie_remove directly; other users of pctries use the PCTRIE_DEFINE macro to define interfaces to pctrie that let them ignore issues of offsets within structs and uint64_t return values. Change subr_rangeset.c to use PCTRIE_DEFINE too. And change pctrie.h to mark the lookup function as unused, to avoid warnings when compiling files, like subr_rangeset.c, that don't invoke lookup(). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D41391 --- sys/kern/subr_rangeset.c | 72 +++++++++++++++++++----------------------------- sys/sys/pctrie.h | 2 +- 2 files changed, 29 insertions(+), 45 deletions(-) diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c index c8af58c6f84f..a27126ab127b 100644 --- a/sys/kern/subr_rangeset.c +++ b/sys/kern/subr_rangeset.c @@ -72,6 +72,8 @@ rs_node_free(struct pctrie *ptree __unused, void *node) uma_zfree(rs_node_zone, node); } +PCTRIE_DEFINE(RANGESET, rs_el, re_start, rs_node_alloc, rs_node_free); + void rangeset_init(struct rangeset *rs, rs_dup_data_t dup_data, rs_free_data_t free_data, void *data_ctx, u_int alloc_flags) @@ -96,16 +98,10 @@ bool rangeset_check_empty(struct rangeset *rs, uint64_t start, uint64_t end) { struct rs_el *r; - uint64_t *r1; rangeset_check(rs); - r1 = pctrie_lookup_le(&rs->rs_trie, end); - if (r1 != NULL) { - r = __containerof(r1, struct rs_el, re_start); - if (r->re_end > start) - return (false); - } - return (true); + r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, end); + return (r == NULL || r->re_end <= start); } int @@ -122,7 +118,7 @@ rangeset_insert(struct rangeset *rs, uint64_t start, uint64_t end, r = data; r->re_start = start; r->re_end = end; - error = pctrie_insert(&rs->rs_trie, &r->re_start, rs_node_alloc); + error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, r); rangeset_check(rs); return (error); } @@ -132,16 +128,14 @@ rangeset_remove_pred(struct rangeset *rs, uint64_t start, uint64_t end, rs_pred_t pred) { struct rs_el *r, *rn; - uint64_t *r1; int error; rangeset_check(rs); error = 0; for (; end > 0 && start < end;) { - r1 = pctrie_lookup_le(&rs->rs_trie, end - 1); - if (r1 == NULL) + r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, end - 1); + if (r == NULL) break; - r = __containerof(r1, struct rs_el, re_start); /* * ------============================--|-------|---- @@ -167,8 +161,8 @@ rangeset_remove_pred(struct rangeset *rs, uint64_t start, uint64_t end, */ end = r->re_start; if (pred(rs->rs_data_ctx, r)) { - pctrie_remove(&rs->rs_trie, r->re_start, - rs_node_free); + RANGESET_PCTRIE_REMOVE(&rs->rs_trie, + r->re_start); rs->rs_free_data(rs->rs_data_ctx, r); } continue; @@ -180,11 +174,10 @@ rangeset_remove_pred(struct rangeset *rs, uint64_t start, uint64_t end, */ if (r->re_start >= start) { if (pred(rs->rs_data_ctx, r)) { - pctrie_remove(&rs->rs_trie, r->re_start, - rs_node_free); + RANGESET_PCTRIE_REMOVE(&rs->rs_trie, + r->re_start); r->re_start = end; - error = pctrie_insert(&rs->rs_trie, - &r->re_start, rs_node_alloc); + error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, r); /* * The insert above must succeed * because rs_node zone is marked @@ -215,8 +208,7 @@ rangeset_remove_pred(struct rangeset *rs, uint64_t start, uint64_t end, } rn->re_start = end; rn->re_end = r->re_end; - error = pctrie_insert(&rs->rs_trie, &rn->re_start, - rs_node_alloc); + error = RANGESET_PCTRIE_INSERT(&rs->rs_trie, rn); if (error != 0) { rs->rs_free_data(rs->rs_data_ctx, rn); break; @@ -247,14 +239,12 @@ void rangeset_remove_all(struct rangeset *rs) { struct rs_el *r; - uint64_t *r1; for (;;) { - r1 = pctrie_lookup_ge(&rs->rs_trie, 0); - if (r1 == NULL) + r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, 0); + if (r == NULL) break; - r = __containerof(r1, struct rs_el, re_start); - pctrie_remove(&rs->rs_trie, r->re_start, rs_node_free); + RANGESET_PCTRIE_REMOVE(&rs->rs_trie, r->re_start); rs->rs_free_data(rs->rs_data_ctx, r); } } @@ -263,13 +253,11 @@ void * rangeset_lookup(struct rangeset *rs, uint64_t place) { struct rs_el *r; - uint64_t *r1; rangeset_check(rs); - r1 = pctrie_lookup_le(&rs->rs_trie, place); - if (r1 == NULL) + r = RANGESET_PCTRIE_LOOKUP_LE(&rs->rs_trie, place); + if (r == NULL) return (NULL); - r = __containerof(r1, struct rs_el, re_start); if (r->re_end <= place) return (NULL); return (r); @@ -279,7 +267,7 @@ int rangeset_copy(struct rangeset *dst_rs, struct rangeset *src_rs) { struct rs_el *src_r, *dst_r; - uint64_t cursor, *r1; + uint64_t cursor; int error; MPASS(pctrie_is_empty(&dst_rs->rs_trie)); @@ -288,17 +276,15 @@ rangeset_copy(struct rangeset *dst_rs, struct rangeset *src_rs) error = 0; for (cursor = 0;; cursor = src_r->re_start + 1) { - r1 = pctrie_lookup_ge(&src_rs->rs_trie, cursor); - if (r1 == NULL) + src_r = RANGESET_PCTRIE_LOOKUP_GE(&src_rs->rs_trie, cursor); + if (src_r == NULL) break; - src_r = __containerof(r1, struct rs_el, re_start); dst_r = dst_rs->rs_dup_data(dst_rs->rs_data_ctx, src_r); if (dst_r == NULL) { error = ENOMEM; break; } - error = pctrie_insert(&dst_rs->rs_trie, &dst_r->re_start, - rs_node_alloc); + error = RANGESET_PCTRIE_INSERT(&dst_rs->rs_trie, dst_r); if (error != 0) break; } @@ -312,13 +298,12 @@ static void rangeset_check(struct rangeset *rs) { struct rs_el *r, *rp; - uint64_t cursor, *r1; + uint64_t cursor; for (cursor = 0, rp = NULL;; cursor = r->re_start + 1, rp = r) { - r1 = pctrie_lookup_ge(&rs->rs_trie, cursor); - if (r1 == NULL) + r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, cursor); + if (r == NULL) break; - r = __containerof(r1, struct rs_el, re_start); KASSERT(r->re_start < r->re_end, ("invalid interval rs %p elem %p (%#jx, %#jx)", rs, r, (uintmax_t)r->re_start, (uintmax_t)r->re_end)); @@ -343,7 +328,7 @@ DB_SHOW_COMMAND(rangeset, rangeset_show_fn) { struct rangeset *rs; struct rs_el *r; - uint64_t cursor, *r1; + uint64_t cursor; if (!have_addr) { db_printf("show rangeset addr\n"); @@ -353,10 +338,9 @@ DB_SHOW_COMMAND(rangeset, rangeset_show_fn) rs = (struct rangeset *)addr; db_printf("rangeset %p\n", rs); for (cursor = 0;; cursor = r->re_start + 1) { - r1 = pctrie_lookup_ge(&rs->rs_trie, cursor); - if (r1 == NULL) + r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, cursor); + if (r == NULL) break; - r = __containerof(r1, struct rs_el, re_start); db_printf(" el %p start %#jx end %#jx\n", r, r->re_start, r->re_end); } diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 687236cdd872..62af29d3f754 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -83,7 +83,7 @@ name##_PCTRIE_INSERT(struct pctrie *ptree, struct type *ptr) \ allocfn); \ } \ \ -static __inline struct type * \ +static __inline __unused struct type * \ name##_PCTRIE_LOOKUP(struct pctrie *ptree, uint64_t key) \ { \ \ From nobody Wed Aug 9 08:27:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLNV40JCPz4mPHT; Wed, 9 Aug 2023 08:27:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLNV36mbyz4b9K; Wed, 9 Aug 2023 08:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691569676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1gxD4HVN8WWASa8sWBp5tIGO7F02mw6Is6csY91oMo=; b=eEArzJf3E5x/IfbX6HkFYTBM21/P40CLNJdhnL+qVsDHt/8LLxNktAdfo/6CHv4MnKea0r Gav2m5iyp5gWSyay/vqpMMZPMsMAe1lmtpNfjMPGorhxrBb8/XSszbFCGvQ4Ob7SBgigm5 9659/izBE4/bHCCyrpfEvqMhslOffArOEVK1UK6S5Rf+ogu3ovtbF3HAZye5Gs9gSCXwic XctdORtLyH8Hytg2Mf2s3+olvl9BYsVN5TpzI6yUn4sKFMBTxk5wYfBlXNyEieJsaRUcRn ERgduNg29efzlx7UshUzZAPr2k4NHn7Jg845fn8vbv1jYLqt4wxFbWZLMbDROQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691569675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y1gxD4HVN8WWASa8sWBp5tIGO7F02mw6Is6csY91oMo=; b=e3xPL6pthnxzlXUdQA8hW7UfmHS3D8j9A6uP8P1OYoVLQUm8/W+aCVESAxB8TVM48XdU2J plQcxofpySCKfl1GNTlES70GdeTThdsMUHiwQvSsrK+zNbj8qYqAvepVqfE7lw5QeputR0 RGWastFHOPhRr/iSgUFgvDtfpivqJ+UGNcIDUm1FXlGIwRyyI5yA+2U4KVhI8w8o/k5wWI xGe11rQHKn9DgGjHgh9DckhtMti9Q5Fy9BcgQ3x17nVmvVWhXR/ExhwOqMukv73uWpubi/ nomdJwEz6CYQ9c5kV2X69OPvYrzZ/1SSAVskIq0eOMBTa7oYL52/NYyNepDglQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691569675; a=rsa-sha256; cv=none; b=eq3UIEMT8667UAahTraPesGJnH57jTsTV77GGyIct6ZW3fdlrT7tMakKN2WeHeyu7sg1sZ qo0w8mE6kBX8h1EQtDFzq8wRFJTlB8NTb+P1zkyyvbf7TBcaLZY0YxYRB0H4YBpwqW1jfR MNPhlmupj0KCQ+gR9VJh3fz3uCpQjOOrs+2pOrlWWOzjWmeT6mU99CT4hb/eMxVPagI3E2 hHhH3Ne8z4se01X0MtRTHF7lcFGBUYMunRdpax7XUuf0gKBLmSFvGH+IKeA2GOdz+Ljmhb EW/EGYMhEYFS6DzqJhU31jKhN1LdMDH/KoFqppte1eIpzEMHtArl+47t9H6AJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLNV35ZSPz17WR; Wed, 9 Aug 2023 08:27: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 3798RtKu023213; Wed, 9 Aug 2023 08:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3798RtvV023210; Wed, 9 Aug 2023 08:27:55 GMT (envelope-from git) Date: Wed, 9 Aug 2023 08:27:55 GMT Message-Id: <202308090827.3798RtvV023210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 85e5480df95e - main - sctp: another cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85e5480df95e6bca38910f44f6e9b4d7773904ed Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=85e5480df95e6bca38910f44f6e9b4d7773904ed commit 85e5480df95e6bca38910f44f6e9b4d7773904ed Author: Michael Tuexen AuthorDate: 2023-08-09 02:17:52 +0000 Commit: Michael Tuexen CommitDate: 2023-08-09 02:17:52 +0000 sctp: another cleanup No functional change intended. MFC after: 1 week --- sys/netinet/sctp_usrreq.c | 226 ++++++++++++++++++++++------------------------ 1 file changed, 106 insertions(+), 120 deletions(-) diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 5bbb32534ff0..022ff0265a7e 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -653,7 +653,10 @@ connected_type: int sctp_disconnect(struct socket *so) { + struct epoch_tracker et; struct sctp_inpcb *inp; + struct sctp_association *asoc; + struct sctp_tcb *stcb; inp = (struct sctp_inpcb *)so->so_pcb; if (inp == NULL) { @@ -661,134 +664,117 @@ sctp_disconnect(struct socket *so) return (ENOTCONN); } SCTP_INP_RLOCK(inp); - if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) { - if (LIST_EMPTY(&inp->sctp_asoc_list)) { - /* No connection */ - SCTP_INP_RUNLOCK(inp); - return (0); - } else { - struct epoch_tracker et; - struct sctp_association *asoc; - struct sctp_tcb *stcb; - - stcb = LIST_FIRST(&inp->sctp_asoc_list); - if (stcb == NULL) { - SCTP_INP_RUNLOCK(inp); - SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); - return (EINVAL); - } - SCTP_TCB_LOCK(stcb); - asoc = &stcb->asoc; - if (stcb->asoc.state & SCTP_STATE_ABOUT_TO_BE_FREED) { - /* We are about to be freed, out of here */ - SCTP_TCB_UNLOCK(stcb); - SCTP_INP_RUNLOCK(inp); - return (0); - } - NET_EPOCH_ENTER(et); - if (((so->so_options & SO_LINGER) && (so->so_linger == 0)) || - (SCTP_SBAVAIL(&so->so_rcv) > 0)) { - if (SCTP_GET_STATE(stcb) != SCTP_STATE_COOKIE_WAIT) { - /* Left with Data unread */ - struct mbuf *op_err; + KASSERT(inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE || + inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL, + ("Not a one-to-one style socket")); + stcb = LIST_FIRST(&inp->sctp_asoc_list); + if (stcb == NULL) { + SCTP_INP_RUNLOCK(inp); + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOTCONN); + return (ENOTCONN); + } + SCTP_TCB_LOCK(stcb); + asoc = &stcb->asoc; + if (asoc->state & SCTP_STATE_ABOUT_TO_BE_FREED) { + /* We are about to be freed, out of here */ + SCTP_TCB_UNLOCK(stcb); + SCTP_INP_RUNLOCK(inp); + return (0); + } + NET_EPOCH_ENTER(et); + if (((so->so_options & SO_LINGER) && (so->so_linger == 0)) || + (SCTP_SBAVAIL(&so->so_rcv) > 0)) { + if (SCTP_GET_STATE(stcb) != SCTP_STATE_COOKIE_WAIT) { + /* Left with Data unread */ + struct mbuf *op_err; - op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, ""); - sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED); - SCTP_STAT_INCR_COUNTER32(sctps_aborted); - } - SCTP_INP_RUNLOCK(inp); - if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || - (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { - SCTP_STAT_DECR_GAUGE32(sctps_currestab); - } - (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, - SCTP_FROM_SCTP_USRREQ + SCTP_LOC_3); - /* No unlock tcb assoc is gone */ - NET_EPOCH_EXIT(et); - return (0); + op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, ""); + sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED); + SCTP_STAT_INCR_COUNTER32(sctps_aborted); + } + SCTP_INP_RUNLOCK(inp); + if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || + (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { + SCTP_STAT_DECR_GAUGE32(sctps_currestab); + } + (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, + SCTP_FROM_SCTP_USRREQ + SCTP_LOC_3); + /* No unlock tcb assoc is gone */ + NET_EPOCH_EXIT(et); + return (0); + } + if (TAILQ_EMPTY(&asoc->send_queue) && + TAILQ_EMPTY(&asoc->sent_queue) && + (asoc->stream_queue_cnt == 0)) { + /* there is nothing queued to send, so done */ + if ((*asoc->ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, asoc)) { + goto abort_anyway; + } + if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_SENT) && + (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT)) { + /* only send SHUTDOWN 1st time thru */ + struct sctp_nets *netp; + + if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || + (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { + SCTP_STAT_DECR_GAUGE32(sctps_currestab); } - if (TAILQ_EMPTY(&asoc->send_queue) && - TAILQ_EMPTY(&asoc->sent_queue) && - (asoc->stream_queue_cnt == 0)) { - /* there is nothing queued to send, so done */ - if ((*asoc->ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, asoc)) { - goto abort_anyway; - } - if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_SENT) && - (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT)) { - /* only send SHUTDOWN 1st time thru */ - struct sctp_nets *netp; - - if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || - (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { - SCTP_STAT_DECR_GAUGE32(sctps_currestab); - } - SCTP_SET_STATE(stcb, SCTP_STATE_SHUTDOWN_SENT); - sctp_stop_timers_for_shutdown(stcb); - if (stcb->asoc.alternate) { - netp = stcb->asoc.alternate; - } else { - netp = stcb->asoc.primary_destination; - } - sctp_send_shutdown(stcb, netp); - sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWN, - stcb->sctp_ep, stcb, netp); - sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, - stcb->sctp_ep, stcb, NULL); - sctp_chunk_output(stcb->sctp_ep, stcb, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED); - } + SCTP_SET_STATE(stcb, SCTP_STATE_SHUTDOWN_SENT); + sctp_stop_timers_for_shutdown(stcb); + if (stcb->asoc.alternate) { + netp = stcb->asoc.alternate; } else { - /* - * we still got (or just got) data to send, - * so set SHUTDOWN_PENDING - */ - /* - * XXX sockets draft says that SCTP_EOF - * should be sent with no data. currently, - * we will allow user data to be sent first - * and move to SHUTDOWN-PENDING - */ - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_SHUTDOWN_PENDING); - if ((*asoc->ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, asoc)) { - SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_PARTIAL_MSG_LEFT); - } - if (TAILQ_EMPTY(&asoc->send_queue) && - TAILQ_EMPTY(&asoc->sent_queue) && - (asoc->state & SCTP_STATE_PARTIAL_MSG_LEFT)) { - struct mbuf *op_err; - - abort_anyway: - op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, ""); - stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_4; - sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED); - SCTP_STAT_INCR_COUNTER32(sctps_aborted); - if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || - (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { - SCTP_STAT_DECR_GAUGE32(sctps_currestab); - } - SCTP_INP_RUNLOCK(inp); - (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, - SCTP_FROM_SCTP_USRREQ + SCTP_LOC_5); - NET_EPOCH_EXIT(et); - return (0); - } else { - sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED); - } + netp = stcb->asoc.primary_destination; + } + sctp_send_shutdown(stcb, netp); + sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWN, + stcb->sctp_ep, stcb, netp); + sctp_timer_start(SCTP_TIMER_TYPE_SHUTDOWNGUARD, + stcb->sctp_ep, stcb, NULL); + sctp_chunk_output(stcb->sctp_ep, stcb, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED); + } + } else { + /* + * we still got (or just got) data to send, so set + * SHUTDOWN_PENDING + */ + /* + * XXX sockets draft says that SCTP_EOF should be sent with + * no data. currently, we will allow user data to be sent + * first and move to SHUTDOWN-PENDING + */ + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_SHUTDOWN_PENDING); + if ((*asoc->ss_functions.sctp_ss_is_user_msgs_incomplete) (stcb, asoc)) { + SCTP_ADD_SUBSTATE(stcb, SCTP_STATE_PARTIAL_MSG_LEFT); + } + if (TAILQ_EMPTY(&asoc->send_queue) && + TAILQ_EMPTY(&asoc->sent_queue) && + (asoc->state & SCTP_STATE_PARTIAL_MSG_LEFT)) { + struct mbuf *op_err; + + abort_anyway: + op_err = sctp_generate_cause(SCTP_CAUSE_USER_INITIATED_ABT, ""); + stcb->sctp_ep->last_abort_code = SCTP_FROM_SCTP_USRREQ + SCTP_LOC_4; + sctp_send_abort_tcb(stcb, op_err, SCTP_SO_LOCKED); + SCTP_STAT_INCR_COUNTER32(sctps_aborted); + if ((SCTP_GET_STATE(stcb) == SCTP_STATE_OPEN) || + (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_RECEIVED)) { + SCTP_STAT_DECR_GAUGE32(sctps_currestab); } - soisdisconnecting(so); - NET_EPOCH_EXIT(et); - SCTP_TCB_UNLOCK(stcb); SCTP_INP_RUNLOCK(inp); + (void)sctp_free_assoc(inp, stcb, SCTP_NORMAL_PROC, + SCTP_FROM_SCTP_USRREQ + SCTP_LOC_5); + NET_EPOCH_EXIT(et); return (0); + } else { + sctp_chunk_output(inp, stcb, SCTP_OUTPUT_FROM_CLOSING, SCTP_SO_LOCKED); } - /* not reached */ - } else { - /* UDP model does not support this */ - SCTP_INP_RUNLOCK(inp); - SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EOPNOTSUPP); - return (EOPNOTSUPP); } + soisdisconnecting(so); + NET_EPOCH_EXIT(et); + SCTP_TCB_UNLOCK(stcb); + SCTP_INP_RUNLOCK(inp); + return (0); } int From nobody Wed Aug 9 08:50:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLNzx3MCKz4mQrJ; Wed, 9 Aug 2023 08:50: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 4RLNzx0YXhz4dqg; Wed, 9 Aug 2023 08:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691571021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/apLPGkdFGIgXOYTMNO8d83WWvFjppI36ywHJfSg9I=; b=mlwcbsn8eIrxV5qNTSAjhyQoPyhv9b6G0b+QbJe2CmVLy31XL7rqVF0c/H+eY3X0Q+/nAc TVT7TKlZwTDT4X0KKVKR0kXNgBTp1yWxg9MwlAYRItOPzn6GGDchHb2FwKfcvKns+8bbmn gwzFYwYgBeZoHtDhet9m7FF8VO8icnq3V1R+Gf7PHorOZmaLshYu5XLRVh8nC/A0dVv5w5 kgCI6yPT928mQwu9KawZI/eqMy7NFxyd3xbaAvrKYlN7kYgUR8vBhOifXFavvId/Y3BpAh pB+iGo9Qiiw16WnwkXuicIHR6OSM/jh753/lyq0dF0YStpkSpyiSDJJNmgOdBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691571021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6/apLPGkdFGIgXOYTMNO8d83WWvFjppI36ywHJfSg9I=; b=s/1WvGuOQVg3NddwUKHAob9xCAX+eg+YqLUfu8LtKe2HB4q1mIhUI4JlNuFn5zQWZ8H6qf ooFUr1DkVMFLlGVi03rpMR3hS8qnHmzKPStJ3VJ8E15qEFRVVALep2BwijSmfO6djrglsq hoVw3G6GM/RcYYj0xwu53ixK5EWXAo4HQkewvi2vDPwkhczMVT8zug/ULobwrlALzrNADO hrghxOL+QSEEzQCVIrdXgC592WuYHYxAVXL/0GJ7YGxdg+TUmhfBtSdtsQZyXFVHeSJTIn u5plGvMQwt+4F1Druczfdyblmy/iLM12QnJqKwfzADlokIRB27T6VIY8KLH4WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691571021; a=rsa-sha256; cv=none; b=IS/ZO7ue/9ogmBw5XriYaMUiGlg3xaHnEkfQVBJfD2t9rrMKPtVqrCKO/OYkmC6KXsSnlt NHPhC9occdNvz1CqVpFfA29A3EoZb/k1ZjHUKenB9oIW6n5J/9IGScxU5WysKroTovF0EB NWMqfiJl/fGQiuiDDpeTfNHExe9NvefMsMhRqAsdBokkeeZ6Tcr9TWUbkB3nfHt9J42NYa 4rlgv68agajqbenCbxU1QNRkMfpncvREACtakAb/MPiWhv68mpupmaowc3rA4uL1alWUE1 GgpW51EHuc3HYRRXFlnTOlrQ8mny9QGVDWsOzSGY/uJySLFlV/BrVu5Syj545A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLNzw6kcgz188k; Wed, 9 Aug 2023 08:50:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3798oKOc065096; Wed, 9 Aug 2023 08:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3798oKD9065093; Wed, 9 Aug 2023 08:50:20 GMT (envelope-from git) Date: Wed, 9 Aug 2023 08:50:20 GMT Message-Id: <202308090850.3798oKD9065093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 393387820bae - main - arm64: rockchip: rk_i2c: Probe again at ORDER_LATE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 393387820bae03c86420dbc33c6984cf7732c561 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=393387820bae03c86420dbc33c6984cf7732c561 commit 393387820bae03c86420dbc33c6984cf7732c561 Author: Emmanuel Vadot AuthorDate: 2023-08-09 08:45:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 08:50:04 +0000 arm64: rockchip: rk_i2c: Probe again at ORDER_LATE The gic driver is also probed at this pass and depending on the order of the nodes in the dts rk_i2c can be probed first and will fail, this is the case for the rk3328 SoC. The PMIC drivers are also probed at this pass but on the iicbus which is created in rk_i2c so there is no order conflict here. Fixes: ddefad7c4f48 ("arm64: rockchip: Tweak i2c, pmic and iodomain order") Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/arm64/rockchip/rk_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_i2c.c b/sys/arm64/rockchip/rk_i2c.c index b9f0fd592122..e3824ba843fe 100644 --- a/sys/arm64/rockchip/rk_i2c.c +++ b/sys/arm64/rockchip/rk_i2c.c @@ -727,8 +727,8 @@ static driver_t rk_i2c_driver = { }; EARLY_DRIVER_MODULE(rk_i2c, simplebus, rk_i2c_driver, 0, 0, - BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); EARLY_DRIVER_MODULE(ofw_iicbus, rk_i2c, ofw_iicbus_driver, - 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); MODULE_DEPEND(rk_i2c, iicbus, 1, 1, 1); MODULE_VERSION(rk_i2c, 1); From nobody Wed Aug 9 10:38:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLRND5X6yz4pmT1; Wed, 9 Aug 2023 10:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLRND542Rz3MQC; Wed, 9 Aug 2023 10:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691577484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3R0hsVoJqFp0GzTkJEQzg0di85AVeVdGZyOziG2hio=; b=lSYUKk5SZ8HTf+Gxl9lF7ofiFZY0fxyIxH5xPEJVdGeyE35DAG44LMH6pYFHdAVsCm72Rr apeStpJI0NBjJaypp3JIcIC07CVxE0NpC0SV926Y0Ulm4mMUp+T2lpGBjF3llZPrOIU9iH psLjmuUvLOwFZnGwxYqld+pnitXpXux4kkq3WGiwOlbqQmcOQHfFj8ICPKmTsdLI6BcIiT txwpXT2jf81/67ZMqM6efRyFnvNb2lOB4gPBK0B/quOR5DzaMQCsYhlVTzopGZDv6bgbH9 ptHrPYy2AOUTdt3iTrAJKQGCHLZ68a7idhO8XyM5lIvRiPKyzRxqHLULluLCEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691577484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3R0hsVoJqFp0GzTkJEQzg0di85AVeVdGZyOziG2hio=; b=j1GEEAvjhxnFFuCDYH1ACKzAvgHE3VLMLOidwTeB3/c1dIxuQqKczFG9UYNOgYvPv63EEt SXcWsrDNWLq9lyU7H0plNhRp8/nw73B6gQI7TDNfZU0nNwc22jdiEsMynfpcewIxeGvoiO T030hyq7Xo/7NZUSGzyoxBqiqHEAAV10bW5TBeUaH0tcHlJUvWeDysCTgLYtnWBKlIrs3I vsDeZiCDY1U46HFhhdP6RdVc8yviKZfsue89RpwZZxXiP3Xw19X52ZoQb/Jv7//bOX4pW7 ySl57asWx7Z2Z3RPDgXbBPCkjnUP7KFITmA5yHqzupaA6N0EgYmAek/og+270w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691577484; a=rsa-sha256; cv=none; b=eLcdvIFiXlp1xy/Btcmpzz5YDP+AAIys1o48DALTnXOzbD77YCMIoH1BDEO9lvBp7Xgjtd EdY2Nk68Ndn5nATwF8geZbCFRuYiZ5kguxKTd/pzEOBnpF8UJlQ5S6tSqZeYOcVFKWlxme acq3fXmk6k5QhjXk/+rr/TWupmS8trLGJqqz1HIjG0HO/wrtqphbEcG6sNi6jR7LcrFby4 SwBY+YO7ilXJfBVFtbKpvuWOvKqhngEf9ojC1/ToQ09znrYuGq9TGXXCEuwbTIwnMaHLHq fVkPjQ5na4avEqEY4jMMCVlc0xmLwnkXlANTa1xaJmh5p5zZ7u+l0Yb19YeQoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLRND468Wz1BTW; Wed, 9 Aug 2023 10:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379Ac4SO039241; Wed, 9 Aug 2023 10:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Ac4rM039238; Wed, 9 Aug 2023 10:38:04 GMT (envelope-from git) Date: Wed, 9 Aug 2023 10:38:04 GMT Message-Id: <202308091038.379Ac4rM039238@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: b8b33f3b3b71 - main - vfs: retire NAMEI_DIAGNOSTIC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce commit b8b33f3b3b71ad7b4b5714afec21d6e8ad7fd6ce Author: Mateusz Guzik AuthorDate: 2023-08-09 10:37:13 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-09 10:37:13 +0000 vfs: retire NAMEI_DIAGNOSTIC It is too spammy and information-deficient for practical use. Also see https://reviews.freebsd.org/D41207 --- sys/kern/vfs_lookup.c | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 1f62cf3e6652..9ed7990fb8fb 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -71,9 +71,6 @@ __FBSDID("$FreeBSD$"); #include -#define NAMEI_DIAGNOSTIC 1 -#undef NAMEI_DIAGNOSTIC - #ifdef INVARIANTS static void NDVALIDATE_impl(struct nameidata *, int); #define NDVALIDATE(ndp) NDVALIDATE_impl(ndp, __LINE__) @@ -1106,12 +1103,6 @@ dirloop: error = ENAMETOOLONG; goto bad; } -#ifdef NAMEI_DIAGNOSTIC - { char c = *cp; - *cp = '\0'; - printf("{%s}: ", cnp->cn_nameptr); - *cp = c; } -#endif prev_ni_pathlen = ndp->ni_pathlen; ndp->ni_pathlen -= cnp->cn_namelen; KASSERT(ndp->ni_pathlen <= PATH_MAX, @@ -1258,18 +1249,12 @@ unionlookup: */ if (needs_exclusive_leaf(dp->v_mount, cnp->cn_flags)) cnp->cn_lkflags = LK_EXCLUSIVE; -#ifdef NAMEI_DIAGNOSTIC - vn_printf(dp, "lookup in "); -#endif lkflags_save = cnp->cn_lkflags; cnp->cn_lkflags = enforce_lkflags(dp->v_mount, cnp->cn_lkflags); error = VOP_LOOKUP(dp, &ndp->ni_vp, cnp); cnp->cn_lkflags = lkflags_save; if (error != 0) { KASSERT(ndp->ni_vp == NULL, ("leaf should be empty")); -#ifdef NAMEI_DIAGNOSTIC - printf("not found\n"); -#endif if ((error == ENOENT) && (dp->v_vflag & VV_ROOT) && (dp->v_mount != NULL) && (dp->v_mount->mnt_flag & MNT_UNION)) { @@ -1321,9 +1306,6 @@ unionlookup: } good: -#ifdef NAMEI_DIAGNOSTIC - printf("found\n"); -#endif dp = ndp->ni_vp; /* @@ -1509,12 +1491,7 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, * Search a new directory. * * See a comment in vfs_lookup for cnp->cn_nameptr. - */ -#ifdef NAMEI_DIAGNOSTIC - printf("{%s}: ", cnp->cn_nameptr); -#endif - - /* + * * Check for "" which represents the root directory after slash * removal. */ @@ -1541,9 +1518,6 @@ vfs_relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, /* * We now have a segment name to search for, and a directory to search. */ -#ifdef NAMEI_DIAGNOSTIC - vn_printf(dp, "search in "); -#endif if ((error = VOP_LOOKUP(dp, vpp, cnp)) != 0) { KASSERT(*vpp == NULL, ("leaf should be empty")); if (error != EJUSTRETURN) From nobody Wed Aug 9 12:39:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLV3y0rRdz4pvh5; Wed, 9 Aug 2023 12:39: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 4RLV3y03nYz3ZxK; Wed, 9 Aug 2023 12:39:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691584750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8P7FG3a9JeZXarGp0MIB/JhJWDIL4YEd04lMuXXBk=; b=wrHi5i9l3cR8DoMaVsFU7dy4HlDEUmU5DX0Hxu96/z2LobLU2GIFNYMPcdKsMt6hG2jzwr py4YNoYc061rXa9zko7xbMiVmEXNNzKQrzYB/0NZYtBzvL6rlJ6thTQZl8M6U3F9sg4At5 G/rx+BLCFZQIKVkv+jJtka83W4BfT6jTqwi+arZBqf6PG0rDGy+X2pObKljGyJTACvXKLR 4XWZYisiqvTbyNhdIA0Z4/sX54phhnLfMit33xIf8QMSz4dt2iOodyQ61RtOqtvQwmkfvj OIyMZI3cnFxOXRta68kq9Tl/dupgYYnFpBbpOHcZPAvz1xP9FgBBZOQAy8a+xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691584750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+R8P7FG3a9JeZXarGp0MIB/JhJWDIL4YEd04lMuXXBk=; b=Dg9nsHsDXfT4/x59/IgdRCS9CPkJugqp7DB7bE9ekSArcEfMEmGf+bUOAMiy0kgkSXD9rl gs6HS01S56i2hlcT0bvI67m3dm4xSeH0gYtI+3e+ghoVJ6U/tu4y2pyhCImpD1U5gN2g37 U5lL4Vl6lTFl52VaXX+yzRZTxKx9cgZgkz1cn8+lUV8Q+ycSXBNx4SOZIGV6xoAGn6e0Kf XsDoNJ491hWFEC2q8m2kxptkWdBn4cNJp1eiQ1OwhOJjSNYsAQaZ8Kq6dj3ltefwWYlh/b JCeIG8g/t0I0XgjJV1klR4lAZOtmqoRXFyKhgSYRjnA7/LyN9ZFKhS3WKgLN9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691584750; a=rsa-sha256; cv=none; b=FymT4xA5DdBBeCKo1EA4lgKqGIrfBbfNFmOl5NQb9klg9dHVSnxI43y2ws7005a6we1HlJ IppK3YQqSHGpsyB3D6l8Mp52Lddr7/v++xZZsLuaghqiBthAu87shpB+EPHnnSJA64NAlJ TwP834vNtuwcrvzw5oxvWgxEZaFGkXMaH0tRFSJX6sxvxNILGJIKyxYe6W0DVutj30n38n wXmulixn7RZEDbET60QBtzqgEFLRVS6Zasz5vlrGl5HbhtbOiMco2zjkSemqdNTogsrMob 6HKrqfzMGS3IXoivLCTD7ELPp7FWKoIVTNSSAtqM8RujBuqMyhMaZt+iRUCoyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLV3x68nPz1QW; Wed, 9 Aug 2023 12:39: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 379Cd9Mu039320; Wed, 9 Aug 2023 12:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Cd9Ns039317; Wed, 9 Aug 2023 12:39:09 GMT (envelope-from git) Date: Wed, 9 Aug 2023 12:39:09 GMT Message-Id: <202308091239.379Cd9Ns039317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 9cb4ee9a6439 - main - man4: Remove stale MLINK to ath_pci.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cb4ee9a6439a8fd3f4e6a692b7a70a61d5ca3a6 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=9cb4ee9a6439a8fd3f4e6a692b7a70a61d5ca3a6 commit 9cb4ee9a6439a8fd3f4e6a692b7a70a61d5ca3a6 Author: Marius Strobl AuthorDate: 2023-08-09 12:35:25 +0000 Commit: Marius Strobl CommitDate: 2023-08-09 12:35:25 +0000 man4: Remove stale MLINK to ath_pci.4 Reported by: Jose Luis Duran Fixes: 37c8ee8847fa ath(4): Remove MIPS AHB frontend and join PCI one w/ main support again --- ObsoleteFiles.inc | 1 + share/man/man4/Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4b7a4d69c6c9..877315f5089f 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -55,6 +55,7 @@ # 20230807: Removal of the ath(4) AHB bus-frontend for MIPS OLD_FILES+=usr/share/man/man4/ath_ahb.4 OLD_FILES+=usr/share/man/man4/ath_pci.4 +OLD_FILES+=usr/share/man/man4/if_ath_pci.4 # 20230803: Removal of support for cloning pseudo interfaces from iflib(9) OLD_FILES+=usr/include/net/iflib_private.h diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 91df1f3b94c0..2ddb1377c3cc 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -622,7 +622,6 @@ MLINKS+=altera_atse.4 atse.4 MLINKS+=altera_sdcard.4 altera_sdcardc.4 MLINKS+=altq.4 ALTQ.4 MLINKS+=ath.4 if_ath.4 -MLINKS+=ath_pci.4 if_ath_pci.4 MLINKS+=aue.4 if_aue.4 MLINKS+=axe.4 if_axe.4 MLINKS+=bce.4 if_bce.4 From nobody Wed Aug 9 13:07:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLVhP5n1Cz4pxPT for ; Wed, 9 Aug 2023 13:07: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 4RLVhP5DGVz4Hy3; Wed, 9 Aug 2023 13:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uq7Nnx3ubYnUPM0XMImHqGCIhEw+YYGAy3dZZJcVdZk=; b=VJtpoHDQjaq1qqrKA941wCHoFITCn5HxpymtutlFa1LsNBHDxRbAl8HIE8d3YuYepdbzwD mBdQVFL9kbCctwZbYJkRoHwz9lhcEyQRBOlfRCrhMs/f1ortvmH7zyMYGXGbQqyebq8vql 0Lkqg4t/Q7tCtgH92GfMoStaC6pl/0yhB8ZiehrkERZnWtr8637pTc0viQNYwGcb0DFY3R yuU26/QECsXdksocH6pvKMRfRMayKDQTey8VfI8+FNIXuFTufu5XQMTSKR+YMFWkILlGx+ zo/nMoFFEmX0aujMwc+AL6sDMEsFNfAGupG7byEik6NIXd1fVNooLG/yctIEDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uq7Nnx3ubYnUPM0XMImHqGCIhEw+YYGAy3dZZJcVdZk=; b=x2RHDmIo9AG64rXK7ioScK0Zja4qIGx48F/pXod3Rib5KW7CZJg7lPlAj7lJOqH3yqP5nz 9VLv9JtwZvIHrzoCMRDff8wEXytjpHz/+bo6i6nTc3BZZa356v4An0YAUt7P5FiJRnRC4d mfueeC4ZMbkg7caSZVH21DI74NcccpbJri1WOhMSJG1JydnUl/UwSP7d17vBbBVEuUH6US NdMC1h2/n+bd8XRkaiPGswBcAELS2snN/jVve0yFBgVW0xePIlXOWiBxrFvuTpR+WVBshF dOrfk9J765VYVbdyexjDkEky8Oks0u4ZYIyA4ZVLRxFYzywgNGZW2MbjpH+LdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586437; a=rsa-sha256; cv=none; b=HrnZoEmlLFXS1nRPip9ztTCCjYOADYNavYXmUpFXMyrFP1MnYj98/ISR9NVvcVcYIkGYvA mKh8QQsuElVv5bbPvpvnCd8r2YMnGaQzS1LEnt7Y9AXrUPcY77sQ2tB5CbxAqhi4tcftgo ahFp8xVp9LwJUbvILUeF0SdjxJT+pBSg8AdCq1NVBAMzEbuk3HyPd+G/Y8hwtjz2Blesyn l6aMbQDraaQ1cG7DDVzysWemxLMuSeXyDPkPXtIzwtEwq4gF/gBjD1vSwBUQBJfhObfmTa IwX2EXXOONbHdqfkvIlKkEjsFvaCVgw7I7l4FwSD5wF0ecIlFmVcBDxQBkMoxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLVhP3Qtsz2HS; Wed, 9 Aug 2023 13:07: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 379D7HKP091683; Wed, 9 Aug 2023 13:07:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D7Hua091682; Wed, 9 Aug 2023 13:07:17 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:07:17 GMT Message-Id: <202308091307.379D7Hua091682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 8bf583e1ce18..582be9a44380 - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 582be9a44380445c18a54b44c2b15720ca139f20 X-Git-Oldrev: 8bf583e1ce183a262b726a119817ffe4b6462794 X-Git-Newrev: 582be9a44380445c18a54b44c2b15720ca139f20 Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=8bf583e1ce18..582be9a44380 582be9a44380 Import device-tree files from Linux 6.1 From nobody Wed Aug 9 13:08:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLVjT3YXdz4pxPY for ; Wed, 9 Aug 2023 13:08: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 4RLVjT33bLz4J4t; Wed, 9 Aug 2023 13:08:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4ECTNOx6xhcB8hreRWZjyAF4VP2/AVaFrWN92lKuaI=; b=M+ztg6i2pZfaH+gxKyR00VWJkuqhuoly1LYfv40JvcP8ufoLWJOAPdRnTTAj9LFPrk8Fpp 0p+hqJbr73cdAG93r4sEsjJYY5bPfJ+yP8+uysHJJXe/asxcB7NE9FNiUQg2vDVY/4pazQ jYyDpz8oagS3oZRnleiDAgCRsu+faoexP7yWlqlN2pTNPa4de37Zx/APzElh060l8Ak7xO fPqWxfaEnIUS5K20dJexredXWPPLWBgwZzXVG16+co0Lr2aj1uiEqbE6lYoJsdOfxZYsgG iabY27FQHnTK9srVgqOMQtlz2eC2V1wI38x1z3HRVyrjXSXsJmODkvqSg5bY2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691586493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4ECTNOx6xhcB8hreRWZjyAF4VP2/AVaFrWN92lKuaI=; b=uzF/w5L2aDJxAKNdV5IhLsutg4eNWh2dpCN6uuL1CRoSJ96aaEA8xheVN29QvBdjkSgn2L fpfbUOAWBFaMEQbGQSJbRlbZoek+TmAQjTtsBz7SlfPaTV4BomAhBvvCfL3LrvKXcV/BSr N9DnTbr9AzcPcZvuemLQHGa5m2hA6UoUurFRvRwOgKdKsDxm2JtBZj95xe+FHCMzH3BADR 1Ig5FT9CJ9eDAo8NCUVsSOoKDFT4kKFm9Gq4NYx8TFZgItLSLzBe0P+Cvdm4LwPk+23Tox LZG8LIO11XZ8X6Eb8qx3B4vTpKPCnooL4keZLlG7c//jty7Hf0E/KM5lNEETHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691586493; a=rsa-sha256; cv=none; b=jO/QLwoZU8ghLSkS5a0hAMEZoVpT6WFm1ixjoz0Y2fMgUsBNPytgUhjU29mTk4J269G1r9 IreLlimZ4lHyChh5YnbnM2AW2skO8WJe3tymtynMiqwpZMUeM+9RIC4frq/DUd9odkU35P LFCigeGP8krgYjEVX4zO9+toyuc/K9+Itszm1MjVAKXL9L4UWjmp1WrTIL0vfj1DDb/rEN SAYejlIBKCwWQcca/iY5qkvFXgXxj5ydM30yeCtQkZMgFgss8ogQ9PB2pnWQCVF/HEbu1r LHa9PRItpxRwhbKea2oHbQrMA23POBhbPMEtcQhSds12WaGRJHNwbAqlbV5m9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLVjT206yz27S; Wed, 9 Aug 2023 13:08: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 379D8DXj091902; Wed, 9 Aug 2023 13:08:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379D8DbB091901; Wed, 9 Aug 2023 13:08:13 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:08:13 GMT Message-Id: <202308091308.379D8DbB091901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: d4235bf77f76 - Create tag vendor/device-tree/6.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.1 X-Git-Reftype: annotated tag X-Git-Commit: d4235bf77f769b18bcdd354a6aea6a277f923be7 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.1 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.1 tag vendor/device-tree/6.1 Tagger: Emmanuel Vadot TaggerDate: 2023-08-09 13:07:45 +0000 Tag device tree files from Linux 6.1 commit 582be9a44380445c18a54b44c2b15720ca139f20 Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:06:51 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:06:51 +0000 Import device-tree files from Linux 6.1 From nobody Wed Aug 9 13:28:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLW8W2736z4pymq; Wed, 9 Aug 2023 13:28: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 4RLW8V6n7Mz4Lyx; Wed, 9 Aug 2023 13:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyOrnk04B5xml5VWH8+1pqtQ1L3KlcXY1HVRdeQ1FZQ=; b=tIbGc6Mwpv36t5DaUByCZxbOoGnRrz808Q3jxNVbUOLV0rzB0+FBFRsVbGmu9hupMPSkoA VYCespj239Yj/miQaGMtZEUGP+aX46X3WT9SrqudEcFLBvf699dXKtVFG0LnFFd44qYneF Vmz/dBA9bDO1WKwPxTZXp3PmGacgrDwYBud5BaE290z1lAl9SesmTfqX6AFeKJ/YucDwLG bgGeGm57KQKsDvm6uIjb7V2RsvMydZOHHyEOit56RPkpcGAl/5m/wcHDLMun5oP7VI76vg BhqaWLF3EeAJn9uie+FWfKPmsNeUHVFhG0zdirSowZXStkgnegmk+i/kkz6tyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YyOrnk04B5xml5VWH8+1pqtQ1L3KlcXY1HVRdeQ1FZQ=; b=UeS/q4I738KpQTuM9ImkD8XFgS5qCouXs6Pc4fkxd12BChObu/m3CoB8iGvHj59GUKk4kC uj+vqpeHLpwj2FCus2eoQTEYYXGxiJ3RzxGYWfabcM9jcXx7yvvrfBdrlbYl869Fiamei8 xX2nWAUM/zcbCRdPx7tY7yDGk0Ad+5jq8AtrAnvaQSNqBdFDovcBi+R0sN1M8/83IAByQw wGbgyjUPbzQbnjI+HhfLlxa4ricss/CaFkzS2nhe6xFKiGtGgIr58TTMU1wwHfsQIjn166 wAy5/2s6d9TDDzpsdPNEbhV87b40y/fBomPLEHaTa17p+/SNuSfBjInwHjWYTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587690; a=rsa-sha256; cv=none; b=Ph3c0R/U+T61SOZqi0BY4tNluJKNJ08us8gjJEON7E7ZWjnesRvQvFGq7lk2vz8Sb3DDRY T+3PuG0DKtku9MjUdc1ElFSFrBYyEC+7ILFx1+huahxzkHpeCJcwtwy4/Kirkss/AvLAxi qhegP+9TqG9XT9Qth0ZsZ1aHLOdN1ZJTj4kgF8ZzhClyVjnUVI/0Bz6Mts10EF848k5LK7 vaR9/Kp/gKQZkoLsONMBYELiOXmEwCKmevBhbODUxUGvwqC0OKGLwt2cQsdELkB75ZGXQ2 dKVVUViANknhviMZR8fabi9C+cIIo/wvdkYn8xqY/kVsVWMh+Wun+xFhJJYknw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLW8V5rzwz37r; Wed, 9 Aug 2023 13:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379DSAT2025291; Wed, 9 Aug 2023 13:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DSAiN025288; Wed, 9 Aug 2023 13:28:10 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:28:10 GMT Message-Id: <202308091328.379DSAiN025288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 7ef62cebc2f9 - main - Import device-tree files from Linux 6.1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7ef62cebc2f965b0f640263e179276928885e33d Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7ef62cebc2f965b0f640263e179276928885e33d commit 7ef62cebc2f965b0f640263e179276928885e33d Merge: 9cb4ee9a6439 582be9a44380 Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:27:37 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:27:37 +0000 Import device-tree files from Linux 6.1 Sponsored by: Beckhoff Automation GmbH & Co. KG sys/contrib/device-tree/Bindings/Makefile | 3 + sys/contrib/device-tree/Bindings/arm/actions.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/airoha.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/altera.yaml | 2 +- .../device-tree/Bindings/arm/amazon,al.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 4 +- sys/contrib/device-tree/Bindings/arm/apple.yaml | 2 +- .../device-tree/Bindings/arm/arm,cci-400.yaml | 2 +- .../Bindings/arm/arm,coresight-catu.yaml | 3 + .../Bindings/arm/arm,coresight-cti.yaml | 3 + .../Bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 + .../arm/arm,coresight-dynamic-replicator.yaml | 3 + .../Bindings/arm/arm,coresight-etb10.yaml | 3 + .../Bindings/arm/arm,coresight-etm.yaml | 3 + .../Bindings/arm/arm,coresight-static-funnel.yaml | 3 + .../arm/arm,coresight-static-replicator.yaml | 3 + .../Bindings/arm/arm,coresight-stm.yaml | 3 + .../Bindings/arm/arm,coresight-tmc.yaml | 6 + .../Bindings/arm/arm,coresight-tpiu.yaml | 3 + .../device-tree/Bindings/arm/arm,corstone1000.yaml | 2 +- .../Bindings/arm/arm,embedded-trace-extension.yaml | 3 + .../device-tree/Bindings/arm/arm,integrator.yaml | 2 +- .../device-tree/Bindings/arm/arm,realview.yaml | 2 +- .../Bindings/arm/arm,versatile-sysreg.yaml | 35 + .../device-tree/Bindings/arm/arm,versatile.yaml | 2 +- .../Bindings/arm/arm,vexpress-juno.yaml | 2 +- .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 2 + .../device-tree/Bindings/arm/atmel-at91.yaml | 9 +- sys/contrib/device-tree/Bindings/arm/axxia.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,bcmbca.yaml | 25 + .../device-tree/Bindings/arm/bcm/brcm,brcmstb.txt | 11 +- sys/contrib/device-tree/Bindings/arm/bitmain.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/calxeda.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/cpus.yaml | 1 + .../device-tree/Bindings/arm/digicolor.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 60 +- .../device-tree/Bindings/arm/intel,keembay.yaml | 2 +- .../device-tree/Bindings/arm/intel,socfpga.yaml | 2 +- .../device-tree/Bindings/arm/intel-ixp4xx.yaml | 2 +- .../Bindings/arm/marvell/armada-37xx.txt | 26 - .../Bindings/arm/marvell/armada-37xx.yaml | 47 + sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 2 +- .../Bindings/arm/mediatek/mediatek,infracfg.yaml | 2 + .../Bindings/arm/mediatek/mediatek,mmsys.yaml | 4 +- .../Bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 1 + .../arm/mediatek/mediatek,mt7986-wed-pcie.yaml | 43 + .../Bindings/arm/mediatek/mediatek,pericfg.yaml | 1 + .../device-tree/Bindings/arm/microchip,sparx5.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/moxart.yaml | 2 +- .../Bindings/arm/nvidia,tegra194-ccplex.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/psci.yaml | 11 +- sys/contrib/device-tree/Bindings/arm/qcom.yaml | 23 +- sys/contrib/device-tree/Bindings/arm/rda.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/realtek.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/renesas.yaml | 18 +- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 55 +- .../device-tree/Bindings/arm/rockchip/pmu.yaml | 4 + .../socionext/socionext,uniphier-system-cache.yaml | 1 - sys/contrib/device-tree/Bindings/arm/spear.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/sti.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/tegra.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/tesla.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 54 +- sys/contrib/device-tree/Bindings/arm/toshiba.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/ux500.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/vt8500.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/xilinx.yaml | 2 +- .../device-tree/Bindings/ata/ahci-common.yaml | 123 ++ .../device-tree/Bindings/ata/ahci-platform.yaml | 92 +- .../device-tree/Bindings/ata/baikal,bt1-ahci.yaml | 115 ++ .../device-tree/Bindings/ata/brcm,sata-brcm.yaml | 5 +- .../Bindings/ata/cortina,gemini-sata-bridge.yaml | 2 - .../device-tree/Bindings/ata/sata-common.yaml | 17 +- .../device-tree/Bindings/ata/sata_highbank.yaml | 1 - .../Bindings/ata/snps,dwc-ahci-common.yaml | 102 ++ .../device-tree/Bindings/ata/snps,dwc-ahci.yaml | 75 ++ .../Bindings/bus/allwinner,sun50i-a64-de2.yaml | 2 +- .../Bindings/bus/allwinner,sun8i-a23-rsb.yaml | 2 +- sys/contrib/device-tree/Bindings/bus/palmbus.yaml | 2 +- .../Bindings/clock/airoha,en7523-scu.yaml | 2 +- .../clock/allwinner,sun4i-a10-ahb-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-apb0-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-apb1-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-axi-clk.yaml | 2 +- .../Bindings/clock/allwinner,sun4i-a10-ccu.yaml | 2 +- .../clock/allwinner,sun4i-a10-cpu-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-display-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-gates-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-mbus-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-mmc-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-mod0-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-mod1-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-osc-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-pll1-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-pll3-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-pll5-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-pll6-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-tcon-ch0-clk.yaml | 2 +- .../clock/allwinner,sun4i-a10-usb-clk.yaml | 2 +- .../Bindings/clock/allwinner,sun4i-a10-ve-clk.yaml | 2 +- .../clock/allwinner,sun5i-a13-ahb-clk.yaml | 2 +- .../clock/allwinner,sun6i-a31-pll6-clk.yaml | 2 +- .../clock/allwinner,sun7i-a20-gmac-clk.yaml | 2 +- .../clock/allwinner,sun7i-a20-out-clk.yaml | 2 +- .../clock/allwinner,sun8i-a83t-de2-clk.yaml | 2 +- .../clock/allwinner,sun8i-h3-bus-gates-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-ahb-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-apb0-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-cpus-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-de-clks.yaml | 2 +- .../Bindings/clock/allwinner,sun9i-a80-gt-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-mmc-config-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-pll4-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-usb-clks.yaml | 2 +- .../clock/allwinner,sun9i-a80-usb-mod-clk.yaml | 2 +- .../clock/allwinner,sun9i-a80-usb-phy-clk.yaml | 2 +- .../Bindings/clock/amlogic,meson8-ddr-clkc.yaml | 2 +- .../Bindings/clock/brcm,bcm2711-dvp.yaml | 2 +- .../Bindings/clock/canaan,k210-clk.yaml | 2 +- .../Bindings/clock/cirrus,cs2000-cp.yaml | 1 - .../Bindings/clock/gpio-gate-clock.yaml | 42 + .../Bindings/clock/idt,versaclock5.yaml | 6 +- .../Bindings/clock/mediatek,apmixedsys.yaml | 1 + .../Bindings/clock/mediatek,mt6795-clock.yaml | 66 + .../Bindings/clock/mediatek,mt6795-sys-clock.yaml | 54 + .../Bindings/clock/mediatek,mt7621-sysc.yaml | 2 +- .../Bindings/clock/mediatek,mt8365-clock.yaml | 42 + .../Bindings/clock/mediatek,mt8365-sys-clock.yaml | 47 + .../Bindings/clock/mediatek,topckgen.yaml | 1 + .../Bindings/clock/microchip,mpfs-ccc.yaml | 80 ++ .../Bindings/clock/microchip,mpfs-clkcfg.yaml | 80 ++ .../device-tree/Bindings/clock/qcom,a53pll.yaml | 3 +- .../Bindings/clock/qcom,gcc-apq8064.yaml | 9 + .../Bindings/clock/qcom,gcc-msm8660.yaml | 54 + .../Bindings/clock/qcom,gcc-msm8909.yaml | 58 + .../Bindings/clock/qcom,gcc-msm8916.yaml | 66 + .../Bindings/clock/qcom,gcc-msm8976.yaml | 21 +- .../Bindings/clock/qcom,gcc-msm8994.yaml | 21 +- .../Bindings/clock/qcom,gcc-msm8996.yaml | 25 +- .../Bindings/clock/qcom,gcc-msm8998.yaml | 25 +- .../device-tree/Bindings/clock/qcom,gcc-other.yaml | 7 - .../Bindings/clock/qcom,gcc-qcm2290.yaml | 25 +- .../Bindings/clock/qcom,gcc-sc7180.yaml | 25 +- .../Bindings/clock/qcom,gcc-sc7280.yaml | 21 +- .../Bindings/clock/qcom,gcc-sc8180x.yaml | 25 +- .../Bindings/clock/qcom,gcc-sc8280xp.yaml | 25 +- .../Bindings/clock/qcom,gcc-sdm845.yaml | 84 +- .../device-tree/Bindings/clock/qcom,gcc-sdx55.yaml | 21 +- .../device-tree/Bindings/clock/qcom,gcc-sdx65.yaml | 21 +- .../Bindings/clock/qcom,gcc-sm6115.yaml | 25 +- .../Bindings/clock/qcom,gcc-sm6125.yaml | 25 +- .../Bindings/clock/qcom,gcc-sm6350.yaml | 25 +- .../Bindings/clock/qcom,gcc-sm8150.yaml | 25 +- .../Bindings/clock/qcom,gcc-sm8250.yaml | 25 +- .../Bindings/clock/qcom,gcc-sm8350.yaml | 21 +- .../Bindings/clock/qcom,gcc-sm8450.yaml | 21 +- .../device-tree/Bindings/clock/qcom,gpucc.yaml | 2 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 209 +++- .../Bindings/clock/qcom,msm8996-apcc.yaml | 15 +- .../device-tree/Bindings/clock/qcom,rpmcc.yaml | 2 + .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 1 + .../Bindings/clock/qcom,sc7280-lpasscc.yaml | 6 +- .../Bindings/clock/qcom,sc7280-lpasscorecc.yaml | 26 +- .../Bindings/clock/qcom,sm6115-dispcc.yaml | 70 ++ .../Bindings/clock/qcom,sm6375-gcc.yaml | 52 + .../Bindings/clock/qcom,sm8450-dispcc.yaml | 98 ++ .../clock/renesas,rcar-usb2-clock-sel.yaml | 2 - .../Bindings/clock/renesas,rzg2l-cpg.yaml | 2 +- .../Bindings/clock/renesas,versaclock7.yaml | 64 + .../Bindings/clock/rockchip,px30-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3036-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3128-cru.yaml | 76 ++ .../Bindings/clock/rockchip,rk3228-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3288-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3308-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3368-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3399-cru.yaml | 2 +- .../Bindings/clock/rockchip,rv1108-cru.yaml | 2 +- .../Bindings/clock/rockchip,rv1126-cru.yaml | 62 + .../Bindings/clock/samsung,exynos850-clock.yaml | 69 ++ .../Bindings/clock/samsung,exynosautov9-clock.yaml | 44 + .../Bindings/clock/samsung,s2mps11.yaml | 1 - .../Bindings/clock/sprd,sc9863a-clk.yaml | 2 +- sys/contrib/device-tree/Bindings/clock/ti/gate.txt | 2 +- .../device-tree/Bindings/clock/ti/interface.txt | 2 +- .../Bindings/clock/toshiba,tmpv770x-pipllct.yaml | 2 +- .../Bindings/clock/toshiba,tmpv770x-pismu.yaml | 2 +- .../Bindings/clock/xlnx,clocking-wizard.yaml | 77 ++ .../Bindings/counter/ti,am62-ecap-capture.yaml | 61 + .../crypto/allwinner,sun4i-a10-crypto.yaml | 2 +- .../Bindings/crypto/aspeed,ast2500-hace.yaml | 53 + .../Bindings/crypto/intel,keembay-ocs-aes.yaml | 2 +- .../Bindings/crypto/intel,keembay-ocs-ecc.yaml | 2 +- .../Bindings/crypto/intel,keembay-ocs-hcu.yaml | 2 +- .../Bindings/crypto/samsung-slimsss.yaml | 1 - .../device-tree/Bindings/crypto/ti,sa2ul.yaml | 13 - .../Bindings/crypto/xlnx,zynqmp-aes.yaml | 2 +- .../allwinner,sun4i-a10-display-backend.yaml | 2 +- .../allwinner,sun4i-a10-display-engine.yaml | 2 +- .../allwinner,sun4i-a10-display-frontend.yaml | 2 +- .../Bindings/display/allwinner,sun4i-a10-hdmi.yaml | 2 +- .../Bindings/display/allwinner,sun4i-a10-tcon.yaml | 2 +- .../display/allwinner,sun4i-a10-tv-encoder.yaml | 2 +- .../Bindings/display/allwinner,sun6i-a31-drc.yaml | 2 +- .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 2 +- .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 2 +- .../display/allwinner,sun8i-a83t-dw-hdmi.yaml | 2 +- .../display/allwinner,sun8i-a83t-hdmi-phy.yaml | 2 +- .../display/allwinner,sun8i-r40-tcon-top.yaml | 2 +- .../Bindings/display/allwinner,sun9i-a80-deu.yaml | 2 +- .../device-tree/Bindings/display/arm,komeda.yaml | 1 + .../Bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- .../Bindings/display/bridge/adi,adv7511.yaml | 14 +- .../Bindings/display/bridge/adi,adv7533.yaml | 14 +- .../Bindings/display/bridge/chipone,icn6211.yaml | 9 + .../Bindings/display/bridge/fsl,ldb.yaml | 1 - .../Bindings/display/bridge/lvds-codec.yaml | 1 + .../Bindings/display/bridge/nxp,tda998x.yaml | 109 ++ .../Bindings/display/bridge/renesas,dw-hdmi.yaml | 5 + .../Bindings/display/bridge/synopsys,dw-hdmi.yaml | 1 - .../Bindings/display/ilitek,ili9486.yaml | 2 +- .../device-tree/Bindings/display/ingenic,lcd.yaml | 2 + .../Bindings/display/mediatek/mediatek,dp.yaml | 116 ++ .../Bindings/display/msm/dp-controller.yaml | 47 +- .../Bindings/display/msm/dpu-msm8998.yaml | 4 + .../Bindings/display/msm/dpu-qcm2290.yaml | 3 + .../Bindings/display/msm/dpu-sc7180.yaml | 3 + .../Bindings/display/msm/dpu-sc7280.yaml | 3 + .../Bindings/display/msm/dpu-sdm845.yaml | 4 + .../Bindings/display/msm/dsi-controller-main.yaml | 2 - .../Bindings/display/msm/dsi-phy-10nm.yaml | 2 - .../device-tree/Bindings/display/msm/gmu.yaml | 166 ++- .../device-tree/Bindings/display/msm/gpu.yaml | 4 +- .../device-tree/Bindings/display/msm/mdp4.yaml | 2 +- .../display/panel/arm,versatile-tft-panel.yaml | 3 - .../display/panel/kingdisplay,kd035g6-54nt.yaml | 2 + .../display/panel/leadtek,ltk035c5444t.yaml | 2 + .../Bindings/display/panel/panel-simple.yaml | 4 + .../Bindings/display/panel/samsung,s6e63m0.yaml | 4 + .../Bindings/display/panel/sitronix,st7701.yaml | 4 + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 1 + .../display/samsung/samsung,exynos5433-decon.yaml | 2 - .../display/samsung/samsung,exynos5433-mic.yaml | 1 - .../display/samsung/samsung,exynos7-decon.yaml | 2 +- .../Bindings/display/samsung/samsung,fimd.yaml | 2 +- .../Bindings/display/simple-framebuffer.yaml | 2 +- .../Bindings/display/sitronix,st7735r.yaml | 2 +- .../device-tree/Bindings/display/st,stm32-dsi.yaml | 17 +- .../display/tegra/nvidia,tegra20-gr3d.yaml | 1 - .../Bindings/display/tegra/nvidia,tegra20-mpe.yaml | 2 - .../Bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- .../Bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- .../Bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- .../device-tree/Bindings/dma/apple,admac.yaml | 7 + .../device-tree/Bindings/dma/arm,pl330.yaml | 6 + .../Bindings/dma/mediatek,uart-dma.yaml | 1 + .../Bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- sys/contrib/device-tree/Bindings/dma/qcom,adm.yaml | 99 ++ .../device-tree/Bindings/dma/qcom,bam-dma.yaml | 8 +- sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 1 + .../Bindings/dma/renesas,rcar-dmac.yaml | 1 + .../device-tree/Bindings/dma/ti-dma-crossbar.txt | 2 +- sys/contrib/device-tree/Bindings/dsp/fsl,dsp.yaml | 1 + .../device-tree/Bindings/firmware/fsl,scu.yaml | 5 + .../device-tree/Bindings/firmware/qcom,scm.yaml | 148 +++ .../Bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 7 +- .../Bindings/fpga/xilinx-zynq-fpga-mgr.yaml | 2 +- .../Bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml | 2 +- .../device-tree/Bindings/gnss/brcm,bcm4751.yaml | 2 +- .../device-tree/Bindings/gnss/mediatek.yaml | 2 +- .../device-tree/Bindings/gnss/sirfstar.yaml | 2 +- .../device-tree/Bindings/gnss/u-blox,neo-6m.yaml | 2 +- .../Bindings/gpio/fairchild,74hc595.yaml | 7 +- .../Bindings/gpio/fsl,imx8qxp-sc-gpio.yaml | 39 + .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 99 +- .../device-tree/Bindings/gpio/gpio-stmpe.txt | 3 +- .../device-tree/Bindings/gpio/gpio-zynq.yaml | 2 +- .../Bindings/gpio/microchip,mpfs-gpio.yaml | 20 +- .../Bindings/gpio/renesas,rcar-gpio.yaml | 1 + .../Bindings/gpio/x-powers,axp209-gpio.yaml | 2 +- .../Bindings/gpio/xlnx,gpio-xilinx.yaml | 154 +++ .../device-tree/Bindings/gpu/arm,mali-midgard.yaml | 3 +- .../device-tree/Bindings/gpu/arm,mali-utgard.yaml | 3 +- .../Bindings/hwlock/qcom-hwspinlock.yaml | 29 +- .../Bindings/hwmon/adi,axi-fan-control.yaml | 2 +- .../device-tree/Bindings/hwmon/adi,max31760.yaml | 42 + .../device-tree/Bindings/hwmon/ibm,occ-hwmon.yaml | 39 + .../device-tree/Bindings/hwmon/iio-hwmon.yaml | 2 +- .../Bindings/hwmon/microchip,sparx5-temp.yaml | 4 +- .../Bindings/hwmon/moortec,mr75203.yaml | 96 +- .../Bindings/hwmon/sensirion,shtc1.yaml | 8 +- .../Bindings/i2c/allwinner,sun6i-a31-p2wi.yaml | 2 +- .../device-tree/Bindings/i2c/aspeed,i2c.yaml | 2 +- .../device-tree/Bindings/i2c/cdns,i2c-r1p10.yaml | 2 +- .../device-tree/Bindings/i2c/i2c-imx-lpi2c.yaml | 20 +- sys/contrib/device-tree/Bindings/i2c/i2c-imx.yaml | 11 + sys/contrib/device-tree/Bindings/i2c/i2c-rk3x.yaml | 1 + .../Bindings/i2c/marvell,mv64xxx-i2c.yaml | 15 +- .../Bindings/i2c/mediatek,mt7621-i2c.yaml | 61 + .../Bindings/i2c/microchip,corei2c.yaml | 2 +- .../Bindings/i2c/nuvoton,npcm7xx-i2c.yaml | 2 +- .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 24 +- .../device-tree/Bindings/i2c/renesas,rcar-i2c.yaml | 1 + .../Bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- .../device-tree/Bindings/i3c/mipi-i3c-hci.yaml | 2 +- .../Bindings/iio/accel/adi,adis16201.yaml | 7 +- .../Bindings/iio/accel/adi,adis16240.yaml | 7 +- .../Bindings/iio/accel/adi,adxl313.yaml | 17 +- .../Bindings/iio/accel/adi,adxl345.yaml | 7 +- .../Bindings/iio/accel/adi,adxl355.yaml | 7 +- .../Bindings/iio/accel/adi,adxl367.yaml | 7 +- .../Bindings/iio/accel/adi,adxl372.yaml | 7 +- .../Bindings/iio/accel/bosch,bma220.yaml | 7 +- .../Bindings/iio/accel/bosch,bma255.yaml | 5 +- .../Bindings/iio/accel/bosch,bmi088.yaml | 7 +- .../Bindings/iio/accel/fsl,mma7455.yaml | 7 +- .../Bindings/iio/accel/kionix,kxsd9.yaml | 7 +- .../Bindings/iio/accel/memsensing,msa311.yaml | 53 + .../Bindings/iio/accel/murata,sca3300.yaml | 5 +- .../Bindings/iio/accel/nxp,fxls8962af.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7124.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7280a.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7292.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7298.yaml | 6 +- .../device-tree/Bindings/iio/adc/adi,ad7476.yaml | 8 +- .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7768-1.yaml | 7 +- .../device-tree/Bindings/iio/adc/adi,ad7923.yaml | 12 +- .../device-tree/Bindings/iio/adc/adi,ad7949.yaml | 7 +- .../Bindings/iio/adc/aspeed,ast2600-adc.yaml | 7 - .../device-tree/Bindings/iio/adc/holt,hi8435.yaml | 7 +- .../device-tree/Bindings/iio/adc/lltc,ltc2496.yaml | 8 +- .../device-tree/Bindings/iio/adc/lltc,ltc2497.yaml | 8 +- .../Bindings/iio/adc/maxim,max1027.yaml | 5 +- .../Bindings/iio/adc/maxim,max11100.yaml | 7 +- .../Bindings/iio/adc/maxim,max1118.yaml | 26 +- .../Bindings/iio/adc/maxim,max11205.yaml | 69 ++ .../Bindings/iio/adc/maxim,max1241.yaml | 7 +- .../Bindings/iio/adc/microchip,mcp3201.yaml | 6 +- .../Bindings/iio/adc/microchip,mcp3911.yaml | 12 +- .../Bindings/iio/adc/qcom,spmi-vadc.yaml | 1 + .../Bindings/iio/adc/richtek,rtq6056.yaml | 56 + .../Bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 2 + .../device-tree/Bindings/iio/adc/st,stmpe-adc.yaml | 3 +- .../device-tree/Bindings/iio/adc/ti,adc0832.yaml | 7 +- .../Bindings/iio/adc/ti,adc084s021.yaml | 7 +- .../Bindings/iio/adc/ti,adc108s102.yaml | 6 +- .../device-tree/Bindings/iio/adc/ti,adc12138.yaml | 7 +- .../Bindings/iio/adc/ti,adc128s052.yaml | 7 +- .../Bindings/iio/adc/ti,adc161s626.yaml | 7 +- .../device-tree/Bindings/iio/adc/ti,ads1015.yaml | 1 + .../device-tree/Bindings/iio/adc/ti,ads124s08.yaml | 7 +- .../device-tree/Bindings/iio/adc/ti,ads131e08.yaml | 9 +- .../device-tree/Bindings/iio/adc/ti,ads8344.yaml | 7 +- .../device-tree/Bindings/iio/adc/ti,ads8688.yaml | 7 +- .../Bindings/iio/adc/ti,am3359-adc.yaml | 11 +- .../device-tree/Bindings/iio/adc/ti,tlc4541.yaml | 7 +- .../device-tree/Bindings/iio/adc/ti,tsc2046.yaml | 8 +- .../Bindings/iio/adc/xlnx,zynqmp-ams.yaml | 1 + .../Bindings/iio/addac/adi,ad74413r.yaml | 1 + .../Bindings/iio/amplifiers/adi,ada4250.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 1 + .../device-tree/Bindings/iio/dac/adi,ad5064.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5360.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5380.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad5421.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5449.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5624r.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad5686.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad5755.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad5758.yaml | 4 +- .../device-tree/Bindings/iio/dac/adi,ad5761.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5764.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ad5770r.yaml | 11 +- .../device-tree/Bindings/iio/dac/adi,ad5791.yaml | 9 +- .../device-tree/Bindings/iio/dac/adi,ad8801.yaml | 7 +- .../device-tree/Bindings/iio/dac/adi,ltc2688.yaml | 1 + .../Bindings/iio/dac/microchip,mcp4922.yaml | 9 +- .../Bindings/iio/dac/ti,dac082s085.yaml | 9 +- .../device-tree/Bindings/iio/dac/ti,dac7311.yaml | 7 +- .../device-tree/Bindings/iio/dac/ti,dac7612.yaml | 7 +- .../Bindings/iio/frequency/adf4371.yaml | 7 +- .../Bindings/iio/health/ti,afe4403.yaml | 9 +- .../Bindings/iio/imu/adi,adis16460.yaml | 7 +- .../Bindings/iio/imu/adi,adis16480.yaml | 9 +- .../device-tree/Bindings/iio/imu/bosch,bmi160.yaml | 7 +- .../device-tree/Bindings/iio/imu/bosch,bno055.yaml | 59 + .../Bindings/iio/imu/invensense,icm42600.yaml | 6 +- .../Bindings/iio/imu/invensense,mpu6050.yaml | 5 +- .../device-tree/Bindings/iio/imu/nxp,fxos8700.yaml | 7 +- .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 12 +- .../Bindings/iio/light/liteon,ltrf216a.yaml | 49 + .../iio/potentiometer/microchip,mcp41010.yaml | 9 +- .../iio/potentiometer/microchip,mcp4131.yaml | 9 +- .../Bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- .../device-tree/Bindings/iio/pressure/bmp085.yaml | 4 +- .../Bindings/iio/samsung,sensorhub-rinato.yaml | 9 +- .../device-tree/Bindings/iio/st,st-sensors.yaml | 2 + .../Bindings/iio/temperature/maxim,max31855k.yaml | 4 +- .../Bindings/iio/temperature/maxim,max31856.yaml | 6 +- .../Bindings/iio/temperature/maxim,max31865.yaml | 6 +- .../Bindings/iio/temperature/melexis,mlx90632.yaml | 4 + .../device-tree/Bindings/input/adc-joystick.yaml | 5 + .../device-tree/Bindings/input/adi,adp5588.yaml | 111 ++ .../input/allwinner,sun4i-a10-lradc-keys.yaml | 2 +- .../device-tree/Bindings/input/goodix,gt7375p.yaml | 5 +- .../device-tree/Bindings/input/hid-over-i2c.yaml | 83 ++ .../device-tree/Bindings/input/ibm,op-panel.yaml | 50 + .../device-tree/Bindings/input/imx-keypad.yaml | 2 +- .../Bindings/input/mediatek,mt6779-keypad.yaml | 10 +- .../Bindings/input/mediatek,pmic-keys.yaml | 114 ++ .../Bindings/input/pine64,pinephone-keyboard.yaml | 66 + .../Bindings/input/qcom,pm8xxx-vib.yaml | 38 + .../Bindings/input/regulator-haptic.yaml | 2 +- .../Bindings/input/sprd,sc27xx-vibrator.yaml | 2 +- .../Bindings/input/touchscreen/auo_pixcir_ts.txt | 6 +- .../Bindings/input/touchscreen/colibri-vf50-ts.txt | 16 +- .../input/touchscreen/elan,elants_i2c.yaml | 10 +- .../Bindings/input/touchscreen/stmpe.txt | 3 +- .../Bindings/interconnect/fsl,imx8m-noc.yaml | 3 +- .../Bindings/interconnect/mediatek,cci.yaml | 3 +- .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 6 +- .../allwinner,sun4i-a10-ic.yaml | 2 +- .../allwinner,sun6i-a31-r-intc.yaml | 2 +- .../allwinner,sun7i-a20-sc-nmi.yaml | 2 +- .../Bindings/interrupt-controller/arm,gic-v3.yaml | 1 - .../Bindings/interrupt-controller/arm,gic.yaml | 4 +- .../Bindings/interrupt-controller/fsl,mu-msi.yaml | 99 ++ .../interrupt-controller/idt,32434-pic.yaml | 2 +- .../mti,cpu-interrupt-controller.yaml | 46 + .../Bindings/interrupt-controller/qcom,pdc.yaml | 87 ++ .../interrupt-controller/realtek,rtl-intc.yaml | 60 +- .../interrupt-controller/renesas,irqc.yaml | 1 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 5 + .../interrupt-controller/st,stm32-exti.yaml | 2 +- .../Bindings/interrupt-controller/ti,sci-inta.yaml | 3 + .../Bindings/interrupt-controller/ti,sci-intr.yaml | 3 + .../Bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 2 +- .../device-tree/Bindings/iommu/arm,smmu-v3.yaml | 15 +- .../device-tree/Bindings/iommu/mediatek,iommu.yaml | 4 + .../device-tree/Bindings/ipmi/npcm7xx-kcs-bmc.txt | 5 +- .../leds/backlight/mediatek,mt6370-backlight.yaml | 121 ++ .../Bindings/leds/backlight/qcom-wled.yaml | 9 +- sys/contrib/device-tree/Bindings/leds/common.yaml | 39 +- .../Bindings/leds/mediatek,mt6370-flashlight.yaml | 41 + .../Bindings/leds/mediatek,mt6370-indicator.yaml | 80 ++ .../Bindings/mailbox/mediatek,gce-mailbox.yaml | 85 ++ .../Bindings/mailbox/microchip,mpfs-mailbox.yaml | 15 +- .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 63 +- .../device-tree/Bindings/media/allegro,al5e.yaml | 2 +- .../Bindings/media/allwinner,sun4i-a10-csi.yaml | 2 +- .../Bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +- .../media/allwinner,sun4i-a10-video-engine.yaml | 2 +- .../Bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 5 + .../Bindings/media/allwinner,sun6i-a31-csi.yaml | 2 +- .../media/allwinner,sun6i-a31-mipi-csi2.yaml | 2 +- .../media/allwinner,sun8i-a83t-de2-rotate.yaml | 2 +- .../media/allwinner,sun8i-a83t-mipi-csi2.yaml | 2 +- .../media/allwinner,sun8i-h3-deinterlace.yaml | 2 +- .../Bindings/media/i2c/dongwoon,dw9714.yaml | 47 + .../Bindings/media/mediatek,mdp3-rdma.yaml | 95 ++ .../Bindings/media/mediatek,mdp3-rsz.yaml | 77 ++ .../Bindings/media/mediatek,mdp3-wrot.yaml | 80 ++ .../Bindings/media/mediatek,vcodec-encoder.yaml | 1 + .../media/mediatek,vcodec-subdev-decoder.yaml | 1 + .../Bindings/media/mediatek-jpeg-decoder.yaml | 2 +- .../Bindings/media/mediatek-jpeg-encoder.yaml | 2 +- .../Bindings/media/microchip,csi2dc.yaml | 2 + .../device-tree/Bindings/media/nxp,dw100.yaml | 69 ++ .../device-tree/Bindings/media/nxp,imx8-jpeg.yaml | 2 +- .../Bindings/media/qcom,msm8916-venus.yaml | 1 + .../Bindings/media/qcom,msm8996-venus.yaml | 1 + .../Bindings/media/qcom,sc7180-venus.yaml | 1 + .../Bindings/media/qcom,sc7280-venus.yaml | 1 + .../Bindings/media/qcom,sdm660-venus.yaml | 1 + .../Bindings/media/qcom,sdm845-venus-v2.yaml | 1 + .../Bindings/media/qcom,sdm845-venus.yaml | 1 + .../Bindings/media/qcom,sm8250-venus.yaml | 1 + sys/contrib/device-tree/Bindings/media/rc.yaml | 2 +- .../device-tree/Bindings/media/renesas,vsp1.yaml | 53 +- .../device-tree/Bindings/media/rockchip,vdec.yaml | 2 +- .../Bindings/media/samsung,exynos5250-gsc.yaml | 109 ++ sys/contrib/device-tree/Bindings/media/ti,cal.yaml | 2 +- sys/contrib/device-tree/Bindings/media/ti,vpe.yaml | 2 +- .../memory-controllers/brcm,brcmstb-memc-ddr.yaml | 52 + .../memory-controllers/fsl/imx8m-ddrc.yaml | 3 +- .../memory-controllers/mediatek,mt7621-memc.yaml | 6 +- .../memory-controllers/mediatek,smi-common.yaml | 15 +- .../memory-controllers/mediatek,smi-larb.yaml | 3 + .../memory-controllers/snps,dw-umctl2-ddrc.yaml | 118 ++ .../memory-controllers/xlnx,zynq-ddrc-a05.yaml | 38 + .../Bindings/mfd/allwinner,sun4i-a10-ts.yaml | 2 +- .../Bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 42 +- .../Bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 12 +- .../Bindings/mfd/aspeed,ast2x00-scu.yaml | 110 ++ .../Bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 2 +- .../Bindings/mfd/canaan,k210-sysctl.yaml | 2 +- .../device-tree/Bindings/mfd/cirrus,lochnagar.yaml | 7 +- .../device-tree/Bindings/mfd/dlg,da9063.yaml | 7 +- .../device-tree/Bindings/mfd/gateworks-gsc.yaml | 5 +- .../device-tree/Bindings/mfd/khadas,mcu.yaml | 2 +- .../device-tree/Bindings/mfd/maxim,max14577.yaml | 1 + .../device-tree/Bindings/mfd/maxim,max77843.yaml | 1 + .../device-tree/Bindings/mfd/mediatek,mt6370.yaml | 280 +++++ .../Bindings/mfd/mediatek,mt8195-scpsys.yaml | 68 ++ .../device-tree/Bindings/mfd/mscc,ocelot.yaml | 160 +++ .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 114 +- .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 38 +- .../device-tree/Bindings/mfd/richtek,rt5120.yaml | 178 +++ .../device-tree/Bindings/mfd/rockchip,rk817.yaml | 52 + .../device-tree/Bindings/mfd/silergy,sy7636a.yaml | 1 + .../Bindings/mfd/sprd,ums512-glbreg.yaml | 71 ++ .../device-tree/Bindings/mfd/st,stm32-lptimer.yaml | 4 + .../device-tree/Bindings/mfd/st,stm32-timers.yaml | 3 + sys/contrib/device-tree/Bindings/mfd/st,stmfx.yaml | 1 + .../Bindings/mfd/stericsson,ab8500.yaml | 22 + sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 21 +- .../Bindings/mfd/ti,j721e-system-controller.yaml | 8 +- .../device-tree/Bindings/mfd/ti,tps65086.yaml | 1 + .../device-tree/Bindings/mfd/x-powers,ac100.yaml | 2 +- .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 6 +- sys/contrib/device-tree/Bindings/mips/ralink.yaml | 2 +- .../device-tree/Bindings/mips/realtek-rtl.yaml | 2 +- .../device-tree/Bindings/misc/qcom,fastrpc.yaml | 144 +++ .../Bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- .../Bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- .../device-tree/Bindings/mmc/cdns,sdhci.yaml | 1 - sys/contrib/device-tree/Bindings/mmc/mmc-card.yaml | 2 +- .../device-tree/Bindings/mmc/mmc-controller.yaml | 13 +- .../device-tree/Bindings/mmc/mmc-spi-slot.yaml | 2 - sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 1 + .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 3 + .../device-tree/Bindings/mmc/rockchip-dw-mshc.yaml | 3 +- .../device-tree/Bindings/mmc/sdhci-am654.yaml | 3 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 6 + .../Bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- .../Bindings/mtd/amlogic,meson-nand.yaml | 93 ++ .../Bindings/mtd/arasan,nand-controller.yaml | 2 +- .../Bindings/mtd/arm,pl353-nand-r2p1.yaml | 2 +- .../Bindings/mtd/intel,lgm-ebunand.yaml | 99 ++ sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 2 +- .../Bindings/mtd/mxicy,nand-ecc-engine.yaml | 2 +- .../Bindings/mtd/partitions/u-boot.yaml | 49 + .../device-tree/Bindings/mtd/renesas-nandc.yaml | 2 +- sys/contrib/device-tree/Bindings/mtd/spi-nand.yaml | 2 +- .../device-tree/Bindings/net/adi,adin1110.yaml | 77 ++ .../Bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- .../Bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- .../Bindings/net/allwinner,sun7i-a20-gmac.yaml | 2 +- .../Bindings/net/allwinner,sun8i-a83t-emac.yaml | 2 +- sys/contrib/device-tree/Bindings/net/altr,tse.yaml | 168 +++ .../device-tree/Bindings/net/brcm,amac.yaml | 2 +- .../device-tree/Bindings/net/can/nxp,sja1000.yaml | 6 +- .../Bindings/net/cortina,gemini-ethernet.yaml | 1 + .../device-tree/Bindings/net/dsa/ar9331.txt | 1 - .../Bindings/net/dsa/arrow,xrs700x.yaml | 3 +- .../device-tree/Bindings/net/dsa/brcm,b53.yaml | 4 +- .../device-tree/Bindings/net/dsa/dsa-port.yaml | 17 + .../Bindings/net/dsa/hirschmann,hellcreek.yaml | 7 +- .../device-tree/Bindings/net/dsa/lan9303.txt | 2 - .../device-tree/Bindings/net/dsa/lantiq-gswip.txt | 1 - .../Bindings/net/dsa/mediatek,mt7530.yaml | 653 ++++++++-- .../Bindings/net/dsa/microchip,ksz.yaml | 6 +- .../device-tree/Bindings/net/dsa/mscc,ocelot.yaml | 260 ++++ .../device-tree/Bindings/net/dsa/qca8k.yaml | 3 - .../device-tree/Bindings/net/dsa/realtek.yaml | 2 - .../Bindings/net/dsa/renesas,rzn1-a5psw.yaml | 3 +- .../Bindings/net/dsa/vitesse,vsc73xx.txt | 2 - .../device-tree/Bindings/net/engleder,tsnep.yaml | 45 +- .../Bindings/net/ethernet-controller.yaml | 1 + .../device-tree/Bindings/net/ethernet-phy.yaml | 6 + sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 1 + .../device-tree/Bindings/net/fsl,fman-dtsec.yaml | 145 +++ sys/contrib/device-tree/Bindings/net/fsl-fman.txt | 128 +- .../device-tree/Bindings/net/intel,dwmac-plat.yaml | 2 +- .../device-tree/Bindings/net/mediatek,net.yaml | 27 +- .../device-tree/Bindings/net/mediatek-dwmac.yaml | 10 +- .../Bindings/net/microchip,sparx5-switch.yaml | 36 +- .../device-tree/Bindings/net/nfc/marvell,nci.yaml | 6 +- .../Bindings/net/nfc/samsung,s3fwrn5.yaml | 1 - .../Bindings/net/nvidia,tegra234-mgbe.yaml | 162 +++ .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 2 +- .../device-tree/Bindings/net/nxp,tja11xx.yaml | 17 + .../Bindings/net/pse-pd/podl-pse-regulator.yaml | 40 + .../Bindings/net/pse-pd/pse-controller.yaml | 33 + .../device-tree/Bindings/net/qca,ar803x.yaml | 8 + .../Bindings/net/qcom,ipq4019-mdio.yaml | 2 +- .../Bindings/net/realtek-bluetooth.yaml | 2 +- .../device-tree/Bindings/net/renesas,etheravb.yaml | 9 +- .../device-tree/Bindings/net/rockchip-dwmac.yaml | 9 + .../device-tree/Bindings/net/snps,dwmac.yaml | 62 +- .../Bindings/net/sunplus,sp7021-emac.yaml | 4 +- .../device-tree/Bindings/net/ti,cpsw-switch.yaml | 6 +- .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 21 +- .../device-tree/Bindings/net/ti,k3-am654-cpts.yaml | 3 +- .../Bindings/net/vertexcom-mse102x.yaml | 4 +- .../Bindings/net/wireless/brcm,bcm4329-fmac.yaml | 39 +- .../Bindings/net/wireless/microchip,wilc1000.yaml | 7 +- .../Bindings/net/wireless/qcom,ath11k.yaml | 14 + .../Bindings/net/wireless/silabs,wfx.yaml | 15 +- .../Bindings/net/wireless/ti,wlcore.yaml | 32 +- .../Bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- .../device-tree/Bindings/nvmem/imx-iim.yaml | 2 +- .../device-tree/Bindings/nvmem/imx-ocotp.yaml | 2 +- .../device-tree/Bindings/nvmem/mediatek,efuse.yaml | 1 + .../Bindings/nvmem/microchip,lan9662-otpc.yaml | 45 + .../device-tree/Bindings/nvmem/nintendo-otp.yaml | 2 +- .../device-tree/Bindings/nvmem/nvmem-consumer.yaml | 2 +- sys/contrib/device-tree/Bindings/nvmem/nvmem.yaml | 2 +- .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 3 + .../device-tree/Bindings/nvmem/rockchip-efuse.yaml | 2 +- .../device-tree/Bindings/nvmem/u-boot,env.yaml | 13 + .../opp/allwinner,sun50i-h6-operating-points.yaml | 2 +- .../device-tree/Bindings/pci/brcm,stb-pcie.yaml | 2 +- .../Bindings/pci/mediatek-pcie-gen3.yaml | 13 +- .../Bindings/pci/microchip,pcie-host.yaml | 33 +- .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 86 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 80 +- .../Bindings/pci/samsung,exynos-pcie.yaml | 2 +- .../Bindings/pci/sifive,fu740-pcie.yaml | 8 + .../Bindings/pci/toshiba,visconti-pcie.yaml | 2 +- .../device-tree/Bindings/peci/peci-aspeed.yaml | 2 +- .../device-tree/Bindings/peci/peci-controller.yaml | 2 +- .../Bindings/phy/allwinner,sun4i-a10-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun50i-a64-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun50i-h6-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun5i-a13-usb-phy.yaml | 2 +- .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- .../Bindings/phy/allwinner,sun6i-a31-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun8i-a23-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun8i-a83t-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun8i-r40-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun8i-v3s-usb-phy.yaml | 2 +- .../Bindings/phy/allwinner,sun9i-a80-usb-phy.yaml | 2 +- .../Bindings/phy/brcm,cygnus-pcie-phy.yaml | 1 + .../device-tree/Bindings/phy/cdns,dphy-rx.yaml | 4 +- .../device-tree/Bindings/phy/cdns,dphy.yaml | 4 +- .../Bindings/phy/fsl,imx8-pcie-phy.yaml | 2 +- .../Bindings/phy/hisilicon,hi3660-usb3.yaml | 22 +- .../Bindings/phy/hisilicon,hi3670-usb3.yaml | 26 +- .../Bindings/phy/intel,lgm-emmc-phy.yaml | 2 +- .../Bindings/phy/intel,lgm-usb-phy.yaml | 2 +- .../Bindings/phy/lantiq,vrx200-pcie-phy.yaml | 2 +- .../Bindings/phy/mediatek,mt7621-pci-phy.yaml | 2 +- .../device-tree/Bindings/phy/mediatek,tphy.yaml | 13 +- .../device-tree/Bindings/phy/mediatek,xsphy.yaml | 2 +- .../Bindings/phy/mscc,vsc7514-serdes.yaml | 56 + .../device-tree/Bindings/phy/mxs-usb-phy.txt | 4 +- .../Bindings/phy/phy-rockchip-inno-usb2.yaml | 1 + .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 2 +- .../Bindings/phy/phy-stm32-usbphyc.yaml | 2 + .../device-tree/Bindings/phy/qcom,edp-phy.yaml | 2 + .../Bindings/phy/qcom,hdmi-phy-qmp.yaml | 15 +- .../Bindings/phy/qcom,msm8996-qmp-pcie-phy.yaml | 189 +++ .../Bindings/phy/qcom,qmp-pcie-phy.yaml | 296 +++++ .../device-tree/Bindings/phy/qcom,qmp-ufs-phy.yaml | 240 ++++ .../device-tree/Bindings/phy/qcom,qmp-usb-phy.yaml | 401 ++++++ .../Bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 25 +- .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 1 + .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 89 ++ .../Bindings/phy/renesas,rcar-gen2-usb-phy.yaml | 123 ++ .../Bindings/phy/rockchip,pcie3-phy.yaml | 80 ++ .../Bindings/phy/rockchip,px30-dsi-dphy.yaml | 1 + .../Bindings/phy/rockchip-inno-csi-dphy.yaml | 3 +- .../Bindings/phy/rockchip-mipi-dphy-rx0.yaml | 2 +- .../Bindings/phy/samsung,exynos-pcie-phy.yaml | 2 +- .../device-tree/Bindings/phy/samsung,ufs-phy.yaml | 49 +- .../Bindings/phy/sunplus,sp7021-usb2-phy.yaml | 73 ++ .../device-tree/Bindings/phy/ti,phy-gmii-sel.yaml | 27 +- .../device-tree/Bindings/phy/ti,phy-j721e-wiz.yaml | 27 +- .../Bindings/phy/xlnx,zynqmp-psgtr.yaml | 2 +- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- .../Bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 6 + .../Bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 + .../Bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 + .../Bindings/pinctrl/brcm,bcm4908-pinctrl.yaml | 1 + .../Bindings/pinctrl/canaan,k210-fpioa.yaml | 2 +- .../Bindings/pinctrl/cypress,cy8c95x0.yaml | 134 ++ .../Bindings/pinctrl/intel,pinctrl-keembay.yaml | 3 +- .../Bindings/pinctrl/intel,pinctrl-thunderbay.yaml | 3 +- .../Bindings/pinctrl/marvell,ac5-pinctrl.yaml | 1 + .../Bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 2 +- .../Bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 4 +- .../Bindings/pinctrl/mediatek,mt6797-pinctrl.yaml | 2 +- .../Bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 2 +- .../Bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 50 +- .../Bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 2 +- .../Bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 226 ++++ .../Bindings/pinctrl/nuvoton,wpcm450-pinctrl.yaml | 1 + .../Bindings/pinctrl/pinctrl-mt8186.yaml | 14 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + .../Bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 55 +- .../Bindings/pinctrl/qcom,sc8180x-pinctrl.yaml | 79 +- .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 133 ++ .../Bindings/pinctrl/qcom,sc8280xp-pinctrl.yaml | 73 +- .../Bindings/pinctrl/qcom,sm6115-pinctrl.yaml | 96 +- .../Bindings/pinctrl/qcom,sm6125-pinctrl.yaml | 61 +- .../Bindings/pinctrl/qcom,sm6350-pinctrl.yaml | 73 +- .../Bindings/pinctrl/qcom,sm6375-tlmm.yaml | 73 +- .../Bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 41 +- .../Bindings/pinctrl/qcom,sm8350-pinctrl.yaml | 73 +- .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 135 +++ .../Bindings/pinctrl/qcom,sm8450-pinctrl.yaml | 82 +- .../Bindings/pinctrl/renesas,rza1-ports.yaml | 1 + .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- .../Bindings/pinctrl/rockchip,pinctrl.yaml | 1 + .../Bindings/pinctrl/samsung,pinctrl-pins-cfg.yaml | 1 - .../Bindings/pinctrl/samsung,pinctrl.yaml | 66 +- .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 13 + .../Bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 4 +- .../Bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +- .../Bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 1 + .../Bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 - .../Bindings/power/domain-idle-state.yaml | 10 + .../device-tree/Bindings/power/fsl,imx-gpc.yaml | 14 + .../device-tree/Bindings/power/fsl,imx-gpcv2.yaml | 19 +- .../Bindings/power/mediatek,power-controller.yaml | 137 +-- .../device-tree/Bindings/power/qcom,rpmpd.yaml | 1 + .../device-tree/Bindings/power/reset/qcom,pon.yaml | 50 +- .../Bindings/power/rockchip,power-controller.yaml | 4 + .../Bindings/power/rockchip-io-domain.yaml | 30 + .../power/supply/mediatek,mt6370-charger.yaml | 96 ++ .../device-tree/Bindings/ptp/ptp-idt82p33.yaml | 2 +- .../device-tree/Bindings/ptp/ptp-idtcm.yaml | 2 +- .../Bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 2 +- .../Bindings/pwm/intel,keembay-pwm.yaml | 2 +- .../Bindings/pwm/mediatek,pwm-disp.yaml | 3 +- .../device-tree/Bindings/pwm/pwm-rockchip.yaml | 2 + .../device-tree/Bindings/regulator/dlg,da9121.yaml | 1 + .../Bindings/regulator/gpio-regulator.yaml | 3 + .../Bindings/regulator/maxim,max77802.yaml | 1 + .../Bindings/regulator/maxim,max8997.yaml | 1 + .../regulator/mediatek,mt6331-regulator.yaml | 273 +++++ .../regulator/mediatek,mt6332-regulator.yaml | 112 ++ .../Bindings/regulator/mt6315-regulator.yaml | 1 + .../Bindings/regulator/qcom,rpmh-regulator.yaml | 40 + .../Bindings/regulator/qcom,smd-rpm-regulator.yaml | 26 +- .../Bindings/regulator/qcom,spmi-regulator.yaml | 32 + .../Bindings/regulator/qcom-labibb-regulator.yaml | 16 + .../regulator/richtek,rt4801-regulator.yaml | 1 + .../Bindings/regulator/rohm,bd71815-regulator.yaml | 1 + .../Bindings/regulator/silergy,sy8106a.yaml | 2 +- .../Bindings/regulator/ti,tps65219.yaml | 173 +++ .../device-tree/Bindings/remoteproc/qcom,adsp.yaml | 1 + .../Bindings/remoteproc/qcom,glink-edge.yaml | 8 +- .../Bindings/remoteproc/qcom,pil-info.yaml | 2 +- .../Bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 1 + .../Bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 1 + .../Bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 1 + .../Bindings/remoteproc/qcom,smd-edge.yaml | 34 +- .../Bindings/reserved-memory/google,open-dice.yaml | 2 +- .../Bindings/reserved-memory/memory-region.yaml | 2 +- .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- .../Bindings/reserved-memory/reserved-memory.yaml | 2 +- .../reset/allwinner,sun6i-a31-clock-reset.yaml | 2 +- .../Bindings/reset/canaan,k210-rst.yaml | 2 +- .../Bindings/reset/starfive,jh7100-reset.yaml | 2 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 5 +- .../device-tree/Bindings/riscv/microchip.yaml | 26 +- .../device-tree/Bindings/riscv/sifive,ccache0.yaml | 164 +++ sys/contrib/device-tree/Bindings/rng/omap_rng.yaml | 11 - .../Bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- .../Bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- .../Bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- .../Bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- .../Bindings/rtc/microchip,mfps-rtc.yaml | 2 +- .../Bindings/rtc/microcrystal,rv3032.yaml | 2 +- .../device-tree/Bindings/rtc/mstar,msc313-rtc.yaml | 2 +- .../Bindings/serial/atmel,at91-usart.yaml | 190 +++ .../device-tree/Bindings/serial/cdns,uart.yaml | 2 +- .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + sys/contrib/device-tree/Bindings/serial/pl011.yaml | 6 + .../device-tree/Bindings/serial/renesas,scif.yaml | 2 +- .../device-tree/Bindings/serial/samsung_uart.yaml | 9 +- .../Bindings/serial/snps-dw-apb-uart.yaml | 1 + .../Bindings/serial/sunplus,sp7021-uart.yaml | 2 +- .../Bindings/serio/allwinner,sun4i-a10-ps2.yaml | 2 +- .../Bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 110 +- .../Bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml | 9 + .../Bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 10 + .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 14 + .../Bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 80 ++ .../Bindings/soc/imx/fsl,imx93-src.yaml | 96 ++ .../Bindings/soc/mediatek/mediatek,ccorr.yaml | 68 ++ .../Bindings/soc/mediatek/mediatek,mutex.yaml | 2 + .../Bindings/soc/mediatek/mediatek,wdma.yaml | 81 ++ .../device-tree/Bindings/soc/mediatek/pwrap.txt | 1 + .../device-tree/Bindings/soc/qcom/qcom,apr.yaml | 112 +- .../device-tree/Bindings/soc/qcom/qcom,smd.yaml | 29 +- .../device-tree/Bindings/soc/qcom/qcom-stats.yaml | 1 + .../Bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 4 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 7 + .../device-tree/Bindings/sound/adi,max98396.yaml | 36 +- sys/contrib/device-tree/Bindings/sound/ak4375.yaml | 2 +- sys/contrib/device-tree/Bindings/sound/ak4613.yaml | 2 +- sys/contrib/device-tree/Bindings/sound/ak4642.yaml | 2 +- .../Bindings/sound/allwinner,sun4i-a10-codec.yaml | 2 +- .../Bindings/sound/allwinner,sun4i-a10-i2s.yaml | 2 +- .../Bindings/sound/allwinner,sun4i-a10-spdif.yaml | 2 +- .../sound/allwinner,sun50i-a64-codec-analog.yaml | 2 +- .../Bindings/sound/allwinner,sun50i-h6-dmic.yaml | 79 ++ .../sound/allwinner,sun8i-a23-codec-analog.yaml | 2 +- .../Bindings/sound/allwinner,sun8i-a33-codec.yaml | 2 +- .../Bindings/sound/amlogic,gx-sound-card.yaml | 2 + .../device-tree/Bindings/sound/apple,mca.yaml | 131 ++ .../Bindings/sound/audio-graph-card.yaml | 2 +- .../Bindings/sound/audio-graph-card2.yaml | 2 +- .../Bindings/sound/audio-graph-port.yaml | 25 +- .../device-tree/Bindings/sound/audio-graph.yaml | 11 +- .../device-tree/Bindings/sound/cirrus,cs42l42.yaml | 1 + .../device-tree/Bindings/sound/dai-params.yaml | 40 + .../device-tree/Bindings/sound/everest,es8326.yaml | 116 ++ .../device-tree/Bindings/sound/fsl,sai.yaml | 216 ++++ .../Bindings/sound/google,cros-ec-codec.yaml | 2 +- .../Bindings/sound/google,sc7180-trogdor.yaml | 4 + .../device-tree/Bindings/sound/imx-audio-card.yaml | 2 + .../Bindings/sound/intel,keembay-i2s.yaml | 2 +- .../device-tree/Bindings/sound/linux,bt-sco.yaml | 2 +- .../Bindings/sound/linux,spdif-dit.yaml | 2 +- .../device-tree/Bindings/sound/mchp,spdifrx.yaml | 2 +- .../device-tree/Bindings/sound/mchp,spdiftx.yaml | 2 +- sys/contrib/device-tree/Bindings/sound/mt6359.yaml | 2 +- .../sound/mt8186-mt6366-da7219-max98357.yaml | 10 + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 10 + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 + sys/contrib/device-tree/Bindings/sound/nau8825.txt | 3 + .../Bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- .../Bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-admaif.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-adx.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-ahub.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-amx.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- .../Bindings/sound/qcom,lpass-rx-macro.yaml | 2 + .../Bindings/sound/qcom,lpass-tx-macro.yaml | 2 + .../Bindings/sound/qcom,lpass-va-macro.yaml | 2 + .../Bindings/sound/qcom,lpass-wsa-macro.yaml | 2 + .../Bindings/sound/qcom,q6adm-routing.yaml | 52 + .../device-tree/Bindings/sound/qcom,q6apm-dai.yaml | 21 +- .../Bindings/sound/qcom,q6asm-dais.yaml | 112 ++ .../Bindings/sound/qcom,q6dsp-lpass-clocks.yaml | 36 +- .../Bindings/sound/qcom,q6dsp-lpass-ports.yaml | 64 +- .../device-tree/Bindings/sound/qcom,sm8250.yaml | 10 +- .../Bindings/sound/realtek,rt1015p.yaml | 2 +- .../device-tree/Bindings/sound/renesas,rsnd.yaml | 16 +- .../Bindings/sound/samsung,aries-wm8994.yaml | 2 + .../Bindings/sound/samsung,midas-audio.yaml | 2 + .../device-tree/Bindings/sound/samsung,snow.yaml | 2 + .../Bindings/sound/simple-audio-amplifier.yaml | 2 +- .../device-tree/Bindings/sound/simple-card.yaml | 2 +- .../device-tree/Bindings/sound/sound-dai.yaml | 2 +- .../device-tree/Bindings/sound/st,stm32-sai.yaml | 5 + .../device-tree/Bindings/sound/test-component.yaml | 2 +- .../device-tree/Bindings/sound/ti,src4xxx.yaml | 48 + .../device-tree/Bindings/sound/ti,ts3a227e.yaml | 94 ++ .../device-tree/Bindings/sound/wlf,wm8940.yaml | 2 +- .../device-tree/Bindings/sound/wlf,wm8978.yaml | 2 +- .../Bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- .../Bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- .../Bindings/spi/atmel,at91rm9200-spi.yaml | 10 + .../Bindings/spi/mediatek,spi-mtk-nor.yaml | 5 +- .../Bindings/spi/microchip,mpfs-spi.yaml | 15 +- .../Bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- .../device-tree/Bindings/spi/nuvoton,npcm-pspi.txt | 3 +- .../spi/nvidia,tegra210-quad-peripheral-props.yaml | 3 +- .../Bindings/spi/ralink,mt7621-spi.yaml | 61 + .../device-tree/Bindings/spi/renesas,sh-msiof.yaml | 14 +- .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 1 - .../device-tree/Bindings/spi/spi-cadence.yaml | 2 +- .../device-tree/Bindings/spi/spi-controller.yaml | 5 + .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 14 +- .../Bindings/spi/spi-peripheral-props.yaml | 5 - .../device-tree/Bindings/spi/spi-rockchip.yaml | 5 + .../device-tree/Bindings/spi/spi-xilinx.yaml | 2 +- .../device-tree/Bindings/spi/spi-zynqmp-qspi.yaml | 2 +- .../Bindings/spmi/mtk,spmi-mtk-pmif.yaml | 2 +- .../sram/allwinner,sun4i-a10-system-control.yaml | 84 +- .../Bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 2 +- .../Bindings/timer/allwinner,sun4i-a10-timer.yaml | 2 +- .../timer/allwinner,sun5i-a13-hstimer.yaml | 2 +- .../device-tree/Bindings/timer/arm,arch_timer.yaml | 11 +- .../Bindings/timer/arm,arch_timer_mmio.yaml | 1 + .../device-tree/Bindings/timer/ingenic,tcu.yaml | 4 + .../Bindings/timer/mediatek,mtk-timer.txt | 1 + .../Bindings/timer/mstar,msc313e-timer.yaml | 2 +- .../Bindings/timer/nxp,sysctr-timer.yaml | 4 + .../device-tree/Bindings/timer/renesas,tmu.yaml | 1 + .../Bindings/timer/rockchip,rk-timer.yaml | 2 +- .../Bindings/timer/samsung,exynos4210-mct.yaml | 26 + .../device-tree/Bindings/timer/sifive,clint.yaml | 18 +- .../device-tree/Bindings/timer/ti,timer-dm.yaml | 17 +- .../device-tree/Bindings/timer/xlnx,xps-timer.yaml | 2 +- .../Bindings/timestamp/hte-consumer.yaml | 2 +- .../Bindings/ufs/samsung,exynos-ufs.yaml | 2 +- .../Bindings/usb/allwinner,sun4i-a10-musb.yaml | 2 +- .../device-tree/Bindings/usb/analogix,anx7411.yaml | 2 + .../device-tree/Bindings/usb/aspeed,usb-vhub.yaml | 2 + .../Bindings/usb/brcm,bcm7445-ehci.yaml | 2 +- .../device-tree/Bindings/usb/brcm,usb-pinmap.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/dwc2.yaml | 1 + .../device-tree/Bindings/usb/faraday,fotg210.yaml | 77 ++ .../device-tree/Bindings/usb/generic-ehci.yaml | 2 +- .../device-tree/Bindings/usb/generic-ohci.yaml | 2 +- .../device-tree/Bindings/usb/generic-xhci.yaml | 2 +- .../Bindings/usb/mediatek,mt6370-tcpc.yaml | 36 + .../Bindings/usb/mediatek,mtk-xhci.yaml | 2 +- .../device-tree/Bindings/usb/mediatek,mtu3.yaml | 2 +- .../device-tree/Bindings/usb/mediatek,musb.yaml | 2 +- .../Bindings/usb/microchip,mpfs-musb.yaml | 2 +- .../device-tree/Bindings/usb/npcm7xx-usb.txt | 4 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 6 +- .../Bindings/usb/renesas,usb3-peri.yaml | 99 +- .../device-tree/Bindings/usb/richtek,rt1711h.yaml | 100 ++ .../device-tree/Bindings/usb/smsc,usb3503.yaml | 2 +- .../device-tree/Bindings/usb/snps,dwc3.yaml | 12 + .../device-tree/Bindings/usb/st,stusb160x.yaml | 12 +- sys/contrib/device-tree/Bindings/usb/usb-drd.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/usb-hcd.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/usb-xhci.yaml | 2 +- sys/contrib/device-tree/Bindings/usb/usb.yaml | 2 +- .../Bindings/usb/willsemi,wusb3801.yaml | 1 + .../device-tree/Bindings/vendor-prefixes.yaml | 12 + .../device-tree/Bindings/virtio/pci-iommu.yaml | 101 ++ sys/contrib/device-tree/Bindings/w1/w1-gpio.yaml | 2 +- .../Bindings/watchdog/allwinner,sun4i-a10-wdt.yaml | 2 +- .../Bindings/watchdog/atmel,at91sam9-wdt.yaml | 127 ++ .../Bindings/watchdog/mediatek,mt7621-wdt.yaml | 33 + .../Bindings/watchdog/mstar,msc313e-wdt.yaml | 2 +- .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 74 +- .../device-tree/Bindings/watchdog/samsung-wdt.yaml | 3 + .../device-tree/Bindings/watchdog/snps,dw-wdt.yaml | 1 + .../Bindings/watchdog/toshiba,visconti-wdt.yaml | 12 +- .../Bindings/watchdog/xlnx,xps-timebase-wdt.yaml | 68 ++ .../device-tree/include/dt-bindings/ata/ahci.h | 20 + .../include/dt-bindings/clock/aspeed-clock.h | 1 + .../include/dt-bindings/clock/ast2600-clock.h | 1 + .../include/dt-bindings/clock/exynos850.h | 136 ++- .../include/dt-bindings/clock/imx8mm-clock.h | 1 - .../include/dt-bindings/clock/imx93-clock.h | 9 +- .../include/dt-bindings/clock/lochnagar.h | 26 + .../include/dt-bindings/clock/marvell,pxa168.h | 6 + .../dt-bindings/clock/mediatek,mt6795-clk.h | 275 +++++ .../dt-bindings/clock/mediatek,mt8365-clk.h | 373 ++++++ .../dt-bindings/clock/microchip,mpfs-clock.h | 23 + .../include/dt-bindings/clock/mt8195-clk.h | 4 +- .../include/dt-bindings/clock/qcom,gcc-msm8909.h | 218 ++++ .../include/dt-bindings/clock/qcom,gcc-sdm845.h | 1 + .../dt-bindings/clock/qcom,gpucc-sc8280xp.h | 35 + .../include/dt-bindings/clock/qcom,lcc-ipq806x.h | 2 + .../dt-bindings/clock/qcom,lpassaudiocc-sc7280.h | 5 + .../dt-bindings/clock/qcom,lpasscorecc-sc7280.h | 2 + .../include/dt-bindings/clock/qcom,rpmcc.h | 1 + .../include/dt-bindings/clock/qcom,sm6115-dispcc.h | 36 + .../include/dt-bindings/clock/qcom,sm6375-gcc.h | 234 ++++ .../include/dt-bindings/clock/qcom,sm8450-dispcc.h | 103 ++ .../dt-bindings/clock/rockchip,rv1126-cru.h | 632 ++++++++++ .../dt-bindings/clock/samsung,exynosautov9.h | 128 +- .../include/dt-bindings/clock/versaclock.h | 13 + .../include/dt-bindings/firmware/imx/rsrc.h | 7 + *** 1785 LINES SKIPPED *** From nobody Wed Aug 9 13:29:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLW9Z1TSjz4pypj for ; Wed, 9 Aug 2023 13:29: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 4RLW9Z0zkyz4MHF; Wed, 9 Aug 2023 13:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpglyBQpM7QJW5+PCVo52pg4VUZJeZdcsZwL9oUrTmc=; b=lCPZcIzvvmm5ZEojNw2naotaZvmjpyMI74ka6N6pk4D+hlkt34wew/syfAOg/x7CJdhw1M UPXZ62G1dI7O3hEHVIOoEzQO5NIz5JfRIX3UopSw3zHucaDFzjcD4R4th6fZJiGPbGsi5a s5pagmOtNimX1oRmthz9B/Z3KPGdbBWohCBdeBGSYR4UUDW6RqflOCJpq7Wea95Qpvxxf9 8hBA7t8J2pgVX8Dy4POlOTs/L1qwvLJ0S6Rhcw0xvLqq0ZLaAKLYm10WLRqd198lFUmwKy REC1XNwiMEmXkXl6X8sJFaccA0z5SxqXP+1RYkqrvI2xcmHphvUu3zOcULCGZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpglyBQpM7QJW5+PCVo52pg4VUZJeZdcsZwL9oUrTmc=; b=T60AqM6+RCS1XvxaQLIXDhrxstkTPT+nc0lJtz0zYFcYNJ+mr0bhy2n9WJQUxxfqcpUjDJ PfKFd7UJwA4/CSwby9tBr1FyC6zJQP1t5xjTkWU9Vw4eEb9W5EfHNKL7tE0kf7BpFP35gO pw5rtHXjtceEKPUHT1VjepRd+yxCXJnvqy6Ip6UpuCcp/0b+RbhEK6RPD9MxhFpsmD/6K+ VP0NUslp0B8rjonDQa0h+v85dqUz2KYOOji+10prHSgSaKnXTR2WDdPsZC+PdYrQofNwNN HSJuEHZxuqNuAqAwOlncEugrGAUWt3nTKqEqU3negDqyUHka7HQInG75iV5VIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587746; a=rsa-sha256; cv=none; b=pqwIiLyU+dZSr3fzJu9FPujgN1I+UWTGYH5n7z1NfSq8JQYtqdNnawCURyb2fyJ8G0+3gn g8EUwsEdGNTIPz9uMavEcPCt8wCwOfp3SCgVwr1q9qCPGWvfg284TAA2vjCNqHQa+7dlfa Nxm8WUZg54JC8rHMt707e0ByVU0kfZqYqmi8Ok1LnzaBetBxAEB7Y/dy5p5Ij3aUSIRqg6 3XaBkvawj9HsotttZBrQdSL5kk25Qm3i7Vr0b8POjYVv3jvjksBvdeBrEFrYryQn1h09C3 k0JrM/IYTbZAFPycAuvubUQbCJxWyNwvFLhBA2QaeaNkAOe4lYkN3fm+iqrScA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLW9Y6ry8z35M; Wed, 9 Aug 2023 13:29: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 379DT5po025534; Wed, 9 Aug 2023 13:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DT5AS025533; Wed, 9 Aug 2023 13:29:05 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:29:05 GMT Message-Id: <202308091329.379DT5AS025533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 582be9a44380..c227958a722d - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: c227958a722d6ad4841da8c2545527257ef219e8 X-Git-Oldrev: 582be9a44380445c18a54b44c2b15720ca139f20 X-Git-Newrev: c227958a722d6ad4841da8c2545527257ef219e8 Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=582be9a44380..c227958a722d c227958a722d Import device-tree files from Linux 6.2 From nobody Wed Aug 9 13:29:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLW9Z3fn0z4pyZv for ; Wed, 9 Aug 2023 13:29: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 4RLW9Z1Tl2z4MDs; Wed, 9 Aug 2023 13:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTg8OnV1hRT+AOPDBrpMdzVkF/XwUR2bD95nR/aL4No=; b=UrW3Ci2g56i4nNxyqTCx0czID2+UhMQukAOfkuZf/niuw/WDqhwFB/LnIhiagtDbzOkgzH LkmuSh2P6Q1kCh1bN4HZrkmoV+EUjcdRmAwQJnt3kBYNA6B19r1kkBUYqj1K3B06GgD6r9 pD8ABnisdM/1QgY3iUkKrctJjZukF/dpJO+yGy7cRA85lCbZPKqbO0H0qbP7W/hJOcX+Tb Sj9ZgTT5qHw/vREYTjehsFECHCy8sDxsKePCQq8wmoyE+RZjWNAa8Ph/FlxRtlWgkV66KT EkLXv/WR4Rf73EcLawRvzAMfHJTT0fLOUAc9S+Es6MQMvYrw5XXHSRHEIUOQTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pTg8OnV1hRT+AOPDBrpMdzVkF/XwUR2bD95nR/aL4No=; b=VqzbpATbjR+eeoJHl+BFZYqCERBypCLXCvLQEJu5w/6FHb1Wi7iafoxqS7/n8BfVz7vyC+ emdCiQC8Ff9Gfhye12PdvExcH0H1OhkwZYDzpdyJpzU/CVbJPg0D2ZBQUkaXp8O4Wf9n49 v7Ebpm73nIo55llVeyyzKAiq5PdcxBaTYotj7bTOhvhH+9mCji1ts9rjzCX8A/8toCKOsn Q5Gc4E7Pd0TO4VmnbaTfNtomSERabeLwZlbOPuOz7WgiifQM/xQPX14GQxBRtzLFPk21MC UQER1wtE4oR2vBJnjwpuF+NuEp47XWAY5rfEJ7Qhjb/cyPgixLvxdnjx2duScA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587746; a=rsa-sha256; cv=none; b=h9/M6dBIUnpKLgp5T4NOqFCcJrfgfb4IUoWWl0q3Q+Hq7WktPcLWbbeZou+m2DjrjuAWje awk//Bbm4chRELDoZGTkI3WfAH5W6CCf7SSnKBXOGw+B8HkpH6PQyDom3Ksat/Zg/NUF2w 81+0PbQDDINXZXaUBhGytIouR1+qWccJYjuIxz+K8sXacrJVQ+4wlhJTO1UxlP7EPh3A/t uoE5fx84OzIz3vIbk2MBVPgeypnJffSkX1c3G3OjZXMkXABHFJmwRLiQLeG/D5vIKToHwG 8lmWMjR+cD7TYHGe7BChpmf7dNDt5vYQyeNksfZlEUAJnQnkhzZ9K9NxPlV64Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLW9Z0NyQz37s; Wed, 9 Aug 2023 13:29: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 379DT5Yj025553; Wed, 9 Aug 2023 13:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DT511025552; Wed, 9 Aug 2023 13:29:05 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:29:05 GMT Message-Id: <202308091329.379DT511025552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 7dca6166170e - Create tag vendor/device-tree/6.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.2 X-Git-Reftype: annotated tag X-Git-Commit: 7dca6166170e760b46d6e1af2bd71cc77d278fef Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.2 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.2 tag vendor/device-tree/6.2 Tagger: Emmanuel Vadot TaggerDate: 2023-08-09 13:28:35 +0000 Tag device tree files from Linux 6.2 commit c227958a722d6ad4841da8c2545527257ef219e8 Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:28:30 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:28:30 +0000 Import device-tree files from Linux 6.2 From nobody Wed Aug 9 13:30:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWBq0k2jz4pypq; Wed, 9 Aug 2023 13:30: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 4RLWBq0W2Vz4MmB; Wed, 9 Aug 2023 13:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2svlQw2ZGXwAJHrs68SV5vDY5EEqLx5iS+xUJ8GPv64=; b=aLWEPjYDlezW0uLnUMnLtRBgrQh28kBU4izxZTQJCZxg9RBVuY0EwSAPEfQYhUtdKhgrdY xW0KEJ2oq9ZvXE9+aM4H3Jlx56Hc/uKu8XVxZTuyWSmrdhwvO7zkvJ8pCqUNQkpE5Ohsuo B5fIym5BVNs7z1nT6NGkEqjOpdyim1ja3hkPbUorPLMDbY0WRsFbOaGPm4xrt5voJ9xsV+ ZfAugF1KArnp/K18hkWowCq/e2oosMgYZtrZQt3A9sFwi2bVyhKTlNH5Rx4wd4TVQhLcdx vTWYgkBRqmdpw0R+25qaXPJ106sme67JlPCW4PBPiqEBQumeR/mEIItCcr158A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2svlQw2ZGXwAJHrs68SV5vDY5EEqLx5iS+xUJ8GPv64=; b=iF2TfLVs2yElz9UlmF/5wAA8bCVS1o5UN5FIr8wafixhjg+7ytzD3C/wVNFWkP/NwInXp+ guUcZOirx6qIC9AUbg+ClhAnXbIFXUwSD1i0Fqo53CqqGNsxOpXKBZsQjOpyIy981tMWa9 kxPMmIfv7NAVIRnKoySOzhVTGshRKEexgIYxQ65ORmCrMSIKR8qsW40ReMcdoC+qGDU0PD DP3HbUfx/4CHuGDjKMuVKK3hMcClEpOrUWksCED3qthQtud9nGSeuBRbe0bjANf97YZoID p4E7QQPhOGYc4GX16MDsDqZnhBP52A3CdhX5lhbYZy+Nk7CVlljsjOnpig4l7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587811; a=rsa-sha256; cv=none; b=FeruuDbmDdKc9syZb5wNVYW8mKJHKE7sjE5uc1Is34E8IStJbWvvRRrg6Rb7nO7X32TKML KW9xbHoZEJ2tzICb8pfoiT3ua9/eLMAu7ccSJe3zVn1BIe1anMyNW5/78tfGa8+Db9WJEc BbPrYqHXbTGFfLluVckhiOFYiNCwHc6PjEQZDyifeih1N+9wxMoIjuC/7U7JAzM/zUXi9X PI9ua/msQgjmU4GCFqxQQq/E0UCCwV8UVWrDjFuhwvO0+RrEkHFLRCtadJEszm5LVZa6NJ J7H6q4ddoCq5DBqVYig4cKmqPGtE7bpLJCKss92UOsEfWSTNA6ZpevwCX9HfkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWBp6fhMz2rK; Wed, 9 Aug 2023 13:30:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379DUA2w030475; Wed, 9 Aug 2023 13:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DUACo030147; Wed, 9 Aug 2023 13:30:10 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:30:10 GMT Message-Id: <202308091330.379DUACo030147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8bab661a3316 - main - Import device-tree files from Linux 6.2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bab661a3316d8bd9b9fbd11a3b4371b91507bd2 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=8bab661a3316d8bd9b9fbd11a3b4371b91507bd2 commit 8bab661a3316d8bd9b9fbd11a3b4371b91507bd2 Merge: 7ef62cebc2f9 c227958a722d Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:29:14 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:29:14 +0000 Import device-tree files from Linux 6.2 Sponsored by: Beckhoff Automation GmbH & Co. KG sys/contrib/device-tree/Bindings/.gitignore | 5 + sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 1 + sys/contrib/device-tree/Bindings/arm/apple.yaml | 14 +- .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 3 +- .../device-tree/Bindings/arm/bcm/bcm2835.yaml | 2 +- .../Bindings/arm/bcm/brcm,bcm11351.yaml | 2 +- .../Bindings/arm/bcm/brcm,bcm21664.yaml | 2 +- .../Bindings/arm/bcm/brcm,bcm23550.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,bcm4708.yaml | 4 +- .../device-tree/Bindings/arm/bcm/brcm,bcmbca.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,cygnus.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,hr2.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,ns2.yaml | 2 +- .../device-tree/Bindings/arm/bcm/brcm,nsp.yaml | 2 +- .../Bindings/arm/bcm/brcm,stingray.yaml | 2 +- .../Bindings/arm/bcm/brcm,vulcan-soc.yaml | 2 +- .../device-tree/Bindings/arm/cci-control-port.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/cpus.yaml | 4 +- .../Bindings/arm/firmware/linaro,optee-tz.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 15 + .../Bindings/arm/hisilicon/hisilicon.yaml | 2 +- .../Bindings/arm/keystone/ti,k3-sci-common.yaml | 2 +- .../device-tree/Bindings/arm/keystone/ti,sci.yaml | 2 +- .../Bindings/arm/marvell/armada-7k-8k.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 2 + .../Bindings/arm/mediatek/mediatek,mmsys.yaml | 14 +- .../Bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 52 + .../device-tree/Bindings/arm/mrvl/mrvl.yaml | 2 +- .../device-tree/Bindings/arm/msm/qcom,llcc.yaml | 1 + .../device-tree/Bindings/arm/mstar/mstar.yaml | 2 +- .../device-tree/Bindings/arm/npcm/npcm.yaml | 2 +- .../device-tree/Bindings/arm/nxp/lpc32xx.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/qcom-soc.yaml | 66 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 232 ++- sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 42 + .../Bindings/arm/socionext/milbeaut.yaml | 2 +- .../Bindings/arm/socionext/uniphier.yaml | 8 +- sys/contrib/device-tree/Bindings/arm/sp810.yaml | 2 +- .../device-tree/Bindings/arm/sprd/sprd.yaml | 2 +- .../device-tree/Bindings/arm/stm32/st,mlahb.yaml | 2 +- .../Bindings/arm/stm32/st,stm32-syscon.yaml | 2 +- .../device-tree/Bindings/arm/stm32/stm32.yaml | 8 +- .../arm/sunxi/allwinner,sun6i-a31-cpuconfig.yaml | 2 +- .../arm/sunxi/allwinner,sun9i-a80-prcm.yaml | 2 +- .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 3 +- .../Bindings/arm/tegra/nvidia,tegra194-cbb.yaml | 2 +- .../Bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 54 +- .../Bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 2 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 3 +- .../device-tree/Bindings/arm/ti/ti,davinci.yaml | 2 +- .../device-tree/Bindings/arm/vexpress-config.yaml | 2 +- .../device-tree/Bindings/arm/vexpress-sysreg.yaml | 2 +- .../Bindings/ata/allwinner,sun4i-a10-ahci.yaml | 2 +- .../Bindings/ata/allwinner,sun8i-r40-ahci.yaml | 2 +- .../device-tree/Bindings/ata/ata-generic.yaml | 58 + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 232 +++ sys/contrib/device-tree/Bindings/bus/ti-sysc.yaml | 2 +- .../Bindings/chrome/google,cros-ec-typec.yaml | 1 + .../chrome/google,cros-kbd-led-backlight.yaml | 1 + .../device-tree/Bindings/clock/adi,axi-clkgen.yaml | 2 +- .../device-tree/Bindings/clock/calxeda.yaml | 2 +- .../Bindings/clock/cirrus,cs2000-cp.yaml | 2 +- .../device-tree/Bindings/clock/fixed-clock.yaml | 2 +- .../Bindings/clock/fixed-factor-clock.yaml | 2 +- .../Bindings/clock/fixed-mmio-clock.yaml | 2 +- .../Bindings/clock/fsl,imx8m-anatop.yaml | 51 + .../device-tree/Bindings/clock/fsl,plldig.yaml | 2 +- .../device-tree/Bindings/clock/fsl,sai-clock.yaml | 2 +- .../device-tree/Bindings/clock/fsl,scu-clk.yaml | 2 +- .../Bindings/clock/idt,versaclock5.yaml | 2 +- .../device-tree/Bindings/clock/imx1-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx21-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx23-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx25-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx27-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx28-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx31-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx35-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx5-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx6q-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx6sl-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx6sll-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx6sx-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx6ul-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx7d-clock.yaml | 2 +- .../Bindings/clock/imx7ulp-pcc-clock.yaml | 2 +- .../Bindings/clock/imx7ulp-scg-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx8m-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx8qxp-lpcg.yaml | 2 +- .../Bindings/clock/imx8ulp-cgc-clock.yaml | 2 +- .../Bindings/clock/imx8ulp-pcc-clock.yaml | 2 +- .../device-tree/Bindings/clock/imx93-clock.yaml | 2 +- .../Bindings/clock/imxrt1050-clock.yaml | 2 +- .../device-tree/Bindings/clock/ingenic,cgu.yaml | 4 +- .../device-tree/Bindings/clock/intel,agilex.yaml | 2 +- .../device-tree/Bindings/clock/intel,cgu-lgm.yaml | 2 +- .../Bindings/clock/intel,easic-n5x.yaml | 2 +- .../Bindings/clock/intel,stratix10.yaml | 2 +- .../Bindings/clock/mediatek,mt8186-fhctl.yaml | 53 + .../Bindings/clock/microchip,mpfs-clkcfg.yaml | 2 +- .../device-tree/Bindings/clock/milbeaut-clock.yaml | 2 +- .../Bindings/clock/nuvoton,npcm845-clk.yaml | 2 +- .../Bindings/clock/nvidia,tegra124-dfll.txt | 2 +- .../device-tree/Bindings/clock/pwm-clock.yaml | 45 + .../device-tree/Bindings/clock/qcom,a53pll.yaml | 2 +- .../device-tree/Bindings/clock/qcom,a7pll.yaml | 2 +- .../Bindings/clock/qcom,aoncc-sm8250.yaml | 11 +- .../Bindings/clock/qcom,audiocc-sm8250.yaml | 7 +- .../Bindings/clock/qcom,camcc-sm8250.yaml | 6 +- .../Bindings/clock/qcom,dispcc-sc8280xp.yaml | 97 + .../Bindings/clock/qcom,dispcc-sm6125.yaml | 9 +- .../Bindings/clock/qcom,dispcc-sm6350.yaml | 8 +- .../Bindings/clock/qcom,dispcc-sm8x50.yaml | 14 +- .../Bindings/clock/qcom,gcc-apq8064.yaml | 18 +- .../Bindings/clock/qcom,gcc-apq8084.yaml | 10 +- .../Bindings/clock/qcom,gcc-ipq8064.yaml | 27 +- .../Bindings/clock/qcom,gcc-ipq8074.yaml | 40 +- .../Bindings/clock/qcom,gcc-msm8660.yaml | 12 +- .../Bindings/clock/qcom,gcc-msm8909.yaml | 9 +- .../Bindings/clock/qcom,gcc-msm8916.yaml | 16 +- .../Bindings/clock/qcom,gcc-msm8974.yaml | 61 + .../Bindings/clock/qcom,gcc-msm8976.yaml | 9 +- .../Bindings/clock/qcom,gcc-msm8994.yaml | 9 +- .../Bindings/clock/qcom,gcc-msm8996.yaml | 7 +- .../Bindings/clock/qcom,gcc-msm8998.yaml | 9 +- .../device-tree/Bindings/clock/qcom,gcc-other.yaml | 38 +- .../Bindings/clock/qcom,gcc-qcm2290.yaml | 9 +- .../Bindings/clock/qcom,gcc-qcs404.yaml | 9 +- .../Bindings/clock/qcom,gcc-sc7180.yaml | 9 +- .../Bindings/clock/qcom,gcc-sc7280.yaml | 9 +- .../Bindings/clock/qcom,gcc-sc8180x.yaml | 9 +- .../Bindings/clock/qcom,gcc-sc8280xp.yaml | 7 +- .../Bindings/clock/qcom,gcc-sdm660.yaml | 61 + .../Bindings/clock/qcom,gcc-sdm845.yaml | 9 +- .../device-tree/Bindings/clock/qcom,gcc-sdx55.yaml | 7 +- .../device-tree/Bindings/clock/qcom,gcc-sdx65.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm6115.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm6125.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm6350.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm8150.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm8250.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm8350.yaml | 9 +- .../Bindings/clock/qcom,gcc-sm8450.yaml | 9 +- .../device-tree/Bindings/clock/qcom,gcc.yaml | 6 +- .../Bindings/clock/qcom,gpucc-sdm660.yaml | 4 +- .../Bindings/clock/qcom,gpucc-sm8350.yaml | 9 +- .../device-tree/Bindings/clock/qcom,gpucc.yaml | 22 +- .../device-tree/Bindings/clock/qcom,lcc.yaml | 86 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 42 +- .../Bindings/clock/qcom,msm8998-gpucc.yaml | 8 +- .../device-tree/Bindings/clock/qcom,q6sstopcc.yaml | 2 +- .../Bindings/clock/qcom,qcm2290-dispcc.yaml | 8 +- .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 3 +- .../Bindings/clock/qcom,sc7180-camcc.yaml | 9 +- .../Bindings/clock/qcom,sc7180-dispcc.yaml | 8 +- .../Bindings/clock/qcom,sc7180-lpasscorecc.yaml | 9 +- .../Bindings/clock/qcom,sc7180-mss.yaml | 7 +- .../Bindings/clock/qcom,sc7280-camcc.yaml | 6 +- .../Bindings/clock/qcom,sc7280-dispcc.yaml | 8 +- .../Bindings/clock/qcom,sc7280-lpasscc.yaml | 9 +- .../Bindings/clock/qcom,sc7280-lpasscorecc.yaml | 12 +- .../Bindings/clock/qcom,sdm845-camcc.yaml | 8 +- .../Bindings/clock/qcom,sdm845-dispcc.yaml | 8 +- .../Bindings/clock/qcom,sdm845-lpasscc.yaml | 47 + .../Bindings/clock/qcom,sm6115-dispcc.yaml | 7 +- .../Bindings/clock/qcom,sm6375-dispcc.yaml | 54 + .../Bindings/clock/qcom,sm6375-gcc.yaml | 9 +- .../Bindings/clock/qcom,sm8450-camcc.yaml | 8 +- .../Bindings/clock/qcom,sm8450-dispcc.yaml | 7 +- .../Bindings/clock/qcom,sm8550-gcc.yaml | 62 + .../device-tree/Bindings/clock/qcom,videocc.yaml | 20 +- .../Bindings/clock/renesas,9series.yaml | 2 +- .../Bindings/clock/renesas,versaclock7.yaml | 2 +- .../Bindings/clock/rockchip,rk3568-cru.yaml | 2 +- .../Bindings/clock/rockchip,rk3588-cru.yaml | 71 + .../Bindings/clock/st,stm32mp1-rcc.yaml | 2 +- .../device-tree/Bindings/clock/ti,cdce925.yaml | 103 + .../device-tree/Bindings/clock/ti,lmk04832.yaml | 2 +- .../device-tree/Bindings/clock/ti,sci-clk.yaml | 2 +- .../device-tree/Bindings/clock/ti/ti,clksel.yaml | 2 +- .../device-tree/Bindings/cpu/idle-states.yaml | 2 +- .../Bindings/cpufreq/apple,cluster-cpufreq.yaml | 117 ++ .../Bindings/cpufreq/cpufreq-mediatek-hw.yaml | 2 +- .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 42 + .../Bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 4 +- .../Bindings/crypto/atmel,at91sam9g46-aes.yaml | 2 +- .../Bindings/crypto/atmel,at91sam9g46-sha.yaml | 2 +- .../Bindings/crypto/atmel,at91sam9g46-tdes.yaml | 2 +- .../Bindings/crypto/rockchip,rk3288-crypto.yaml | 127 ++ .../device-tree/Bindings/crypto/st,stm32-crc.yaml | 2 +- .../device-tree/Bindings/crypto/st,stm32-cryp.yaml | 21 +- .../device-tree/Bindings/crypto/st,stm32-hash.yaml | 2 +- .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 30 +- .../Bindings/display/amlogic,meson-dw-hdmi.yaml | 2 +- .../device-tree/Bindings/display/arm,hdlcd.yaml | 2 +- .../device-tree/Bindings/display/arm,malidp.yaml | 2 +- .../Bindings/display/bridge/anx6345.yaml | 2 +- .../Bindings/display/bridge/chrontel,ch7033.yaml | 2 +- .../display/bridge/ingenic,jz4780-hdmi.yaml | 2 +- .../Bindings/display/bridge/intel,keembay-dsi.yaml | 2 +- .../Bindings/display/bridge/ite,it6505.yaml | 2 +- .../Bindings/display/bridge/ite,it66121.yaml | 2 +- .../Bindings/display/bridge/ps8640.yaml | 2 +- .../Bindings/display/bridge/renesas,dsi.yaml | 182 ++ .../Bindings/display/bridge/toshiba,tc358767.yaml | 2 +- .../Bindings/display/bridge/toshiba,tc358775.yaml | 2 +- .../device-tree/Bindings/display/fsl,lcdif.yaml | 42 +- .../Bindings/display/imx/fsl,imx-lcdc.yaml | 102 + .../device-tree/Bindings/display/ingenic,ipu.yaml | 2 +- .../device-tree/Bindings/display/ingenic,lcd.yaml | 2 +- .../Bindings/display/intel,keembay-display.yaml | 2 +- .../Bindings/display/intel,keembay-msscam.yaml | 2 +- .../Bindings/display/mediatek/mediatek,cec.yaml | 2 +- .../Bindings/display/mediatek/mediatek,dpi.yaml | 1 + .../Bindings/display/mediatek/mediatek,dsi.yaml | 2 +- .../display/mediatek/mediatek,hdmi-ddc.yaml | 2 +- .../Bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- .../Bindings/display/msm/dpu-common.yaml | 52 + .../Bindings/display/msm/dsi-controller-main.yaml | 9 +- .../Bindings/display/msm/dsi-phy-10nm.yaml | 1 - .../Bindings/display/msm/dsi-phy-14nm.yaml | 2 +- .../Bindings/display/msm/dsi-phy-28nm.yaml | 4 + .../device-tree/Bindings/display/msm/gmu.yaml | 2 +- .../device-tree/Bindings/display/msm/gpu.yaml | 2 +- .../device-tree/Bindings/display/msm/mdp5.txt | 30 +- .../Bindings/display/msm/mdss-common.yaml | 83 + .../Bindings/display/msm/qcom,mdss.yaml | 196 ++ .../Bindings/display/msm/qcom,msm8998-dpu.yaml | 95 + .../Bindings/display/msm/qcom,msm8998-mdss.yaml | 268 +++ .../Bindings/display/msm/qcom,qcm2290-dpu.yaml | 84 + .../Bindings/display/msm/qcom,qcm2290-mdss.yaml | 198 ++ .../Bindings/display/msm/qcom,sc7180-dpu.yaml | 95 + .../Bindings/display/msm/qcom,sc7180-mdss.yaml | 304 +++ .../Bindings/display/msm/qcom,sc7280-dpu.yaml | 98 + .../Bindings/display/msm/qcom,sc7280-mdss.yaml | 422 ++++ .../Bindings/display/msm/qcom,sdm845-dpu.yaml | 90 + .../Bindings/display/msm/qcom,sdm845-mdss.yaml | 270 +++ .../Bindings/display/msm/qcom,sm6115-dpu.yaml | 94 + .../Bindings/display/msm/qcom,sm6115-mdss.yaml | 182 ++ .../Bindings/display/msm/qcom,sm8250-dpu.yaml | 92 + .../Bindings/display/msm/qcom,sm8250-mdss.yaml | 330 ++++ .../Bindings/display/panel/display-timings.yaml | 2 +- .../Bindings/display/panel/ilitek,ili9163.yaml | 5 +- .../Bindings/display/panel/ilitek,ili9341.yaml | 1 + .../Bindings/display/panel/jadard,jd9365da-h3.yaml | 70 + .../Bindings/display/panel/nec,nl8048hl11.yaml | 3 +- .../Bindings/display/panel/newvision,nv3051d.yaml | 63 + .../display/panel/olimex,lcd-olinuxino.yaml | 2 +- .../Bindings/display/panel/panel-lvds.yaml | 2 +- .../Bindings/display/panel/panel-timing.yaml | 2 +- .../Bindings/display/panel/samsung,lms380kf01.yaml | 5 +- .../Bindings/display/panel/samsung,lms397kf04.yaml | 3 +- .../Bindings/display/panel/samsung,s6d27a1.yaml | 4 +- .../Bindings/display/panel/tpo,tpg110.yaml | 1 + .../Bindings/display/panel/visionox,rm69299.yaml | 2 +- .../display/tegra/nvidia,tegra124-dpaux.yaml | 1 - .../display/tegra/nvidia,tegra186-display.yaml | 2 - .../Bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 67 + .../device-tree/Bindings/dma/apple,admac.yaml | 3 + .../device-tree/Bindings/dma/dma-common.yaml | 2 +- .../device-tree/Bindings/dma/dma-controller.yaml | 2 +- .../device-tree/Bindings/dma/dma-router.yaml | 2 +- .../device-tree/Bindings/dma/ingenic,dma.yaml | 3 +- .../Bindings/dma/nvidia,tegra186-gpc-dma.yaml | 7 +- sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 26 +- .../device-tree/Bindings/dma/snps,dw-axi-dmac.yaml | 1 - .../device-tree/Bindings/dma/st,stm32-dma.yaml | 2 +- .../device-tree/Bindings/dma/st,stm32-dmamux.yaml | 2 +- .../device-tree/Bindings/dma/st,stm32-mdma.yaml | 2 +- .../device-tree/Bindings/dma/ti/k3-bcdma.yaml | 2 +- .../device-tree/Bindings/dma/ti/k3-pktdma.yaml | 2 +- .../device-tree/Bindings/dma/ti/k3-udma.yaml | 2 +- .../Bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- sys/contrib/device-tree/Bindings/edac/dmc-520.yaml | 2 +- sys/contrib/device-tree/Bindings/eeprom/at24.yaml | 5 +- sys/contrib/device-tree/Bindings/eeprom/at25.yaml | 1 + .../Bindings/eeprom/microchip,93lc46b.yaml | 3 +- .../device-tree/Bindings/example-schema.yaml | 2 +- .../Bindings/extcon/extcon-usbc-cros-ec.yaml | 1 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 2 +- .../device-tree/Bindings/firmware/arm,scpi.yaml | 2 +- .../device-tree/Bindings/firmware/qcom,scm.yaml | 3 + .../Bindings/firmware/qemu,fw-cfg-mmio.yaml | 2 +- .../Bindings/fpga/lattice,sysconfig.yaml | 81 + .../device-tree/Bindings/gpio/gpio-davinci.yaml | 2 +- .../device-tree/Bindings/gpio/gpio-latch.yaml | 94 + .../device-tree/Bindings/gpio/gpio-pca9570.yaml | 1 + .../device-tree/Bindings/gpio/gpio-tpic2810.yaml | 2 +- .../Bindings/gpio/hisilicon,ascend910-gpio.yaml | 56 + .../device-tree/Bindings/gpio/ti,omap-gpio.yaml | 2 +- .../device-tree/Bindings/gpu/brcm,bcm-v3d.yaml | 2 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 2 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 2 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 2 +- .../Bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 156 ++ .../device-tree/Bindings/gpu/vivante,gc.yaml | 2 +- .../Bindings/hwinfo/loongson,ls2k-chipid.yaml | 38 + .../Bindings/hwlock/st,stm32-hwspinlock.yaml | 2 +- .../device-tree/Bindings/hwmon/adt7475.yaml | 4 +- .../Bindings/hwmon/moortec,mr75203.yaml | 2 +- .../device-tree/Bindings/hwmon/ntc-thermistor.yaml | 1 - .../Bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 1 + .../Bindings/i2c/hisilicon,ascend910-i2c.yaml | 73 + sys/contrib/device-tree/Bindings/i2c/i2c-gpio.yaml | 2 +- .../device-tree/Bindings/i2c/i2c-mt65xx.yaml | 1 + sys/contrib/device-tree/Bindings/i2c/i2c-pxa.yaml | 2 +- .../device-tree/Bindings/i2c/ingenic,i2c.yaml | 2 +- .../Bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + .../Bindings/i2c/qcom,i2c-geni-qcom.yaml | 64 +- .../device-tree/Bindings/i2c/renesas,riic.yaml | 2 +- .../device-tree/Bindings/i2c/renesas,rzv2m.yaml | 4 +- .../device-tree/Bindings/i2c/st,nomadik-i2c.yaml | 2 +- .../device-tree/Bindings/i2c/ti,omap4-i2c.yaml | 2 +- sys/contrib/device-tree/Bindings/i3c/i3c.yaml | 2 +- .../Bindings/iio/accel/adi,adxl355.yaml | 8 +- .../Bindings/iio/accel/kionix,kx022a.yaml | 65 + sys/contrib/device-tree/Bindings/iio/adc/adc.yaml | 2 +- .../device-tree/Bindings/iio/adc/adi,ad4130.yaml | 262 +++ .../device-tree/Bindings/iio/adc/adi,ad7923.yaml | 26 +- .../device-tree/Bindings/iio/adc/adi,max11410.yaml | 177 ++ .../Bindings/iio/adc/allwinner,sun8i-a33-ths.yaml | 2 +- .../device-tree/Bindings/iio/adc/ingenic,adc.yaml | 2 +- .../Bindings/iio/adc/motorola,cpcap-adc.yaml | 2 +- .../Bindings/iio/adc/nxp,imx8qxp-adc.yaml | 2 +- .../Bindings/iio/adc/nxp,lpc1850-adc.yaml | 2 +- .../Bindings/iio/adc/qcom,spmi-iadc.yaml | 7 +- .../Bindings/iio/adc/qcom,spmi-vadc.yaml | 106 +- .../Bindings/iio/adc/renesas,rzg2l-adc.yaml | 2 +- .../Bindings/iio/adc/rockchip-saradc.yaml | 1 + .../Bindings/iio/adc/sigma-delta-modulator.yaml | 2 +- .../Bindings/iio/adc/sprd,sc2720-adc.yaml | 2 +- .../device-tree/Bindings/iio/adc/st,stm32-adc.yaml | 70 +- .../Bindings/iio/adc/ti,palmas-gpadc.yaml | 2 +- .../Bindings/iio/adc/x-powers,axp209-adc.yaml | 2 +- .../Bindings/iio/addac/adi,ad74115.yaml | 373 ++++ .../Bindings/iio/addac/adi,ad74413r.yaml | 16 +- .../device-tree/Bindings/iio/dac/adi,ad5758.yaml | 3 +- .../device-tree/Bindings/iio/dac/adi,ad5766.yaml | 2 +- .../Bindings/iio/dac/nxp,lpc1850-dac.yaml | 2 +- .../device-tree/Bindings/iio/dac/st,stm32-dac.yaml | 2 +- .../Bindings/iio/frequency/adi,adf4350.yaml | 7 +- .../Bindings/iio/frequency/adi,adf4377.yaml | 92 + .../Bindings/iio/frequency/adi,admv1013.yaml | 5 +- .../Bindings/iio/frequency/adi,admv1014.yaml | 5 +- .../Bindings/iio/frequency/adi,admv4420.yaml | 8 +- .../Bindings/iio/frequency/adi,adrf6780.yaml | 5 +- .../Bindings/iio/gyroscope/adi,adxrs290.yaml | 5 +- .../Bindings/iio/gyroscope/nxp,fxas21002c.yaml | 5 +- .../Bindings/iio/imu/adi,adis16475.yaml | 3 +- .../Bindings/iio/imu/invensense,icm42600.yaml | 1 + .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 8 + .../Bindings/iio/multiplexer/io-channel-mux.yaml | 2 +- .../Bindings/iio/pressure/meas,ms5611.yaml | 6 +- .../Bindings/iio/pressure/murata,zpa2326.yaml | 5 +- .../Bindings/iio/proximity/ams,as3935.yaml | 5 +- .../Bindings/iio/resolver/adi,ad2s90.yaml | 7 +- .../Bindings/iio/temperature/adi,ltc2983.yaml | 336 ++-- .../input/allwinner,sun4i-a10-lradc-keys.yaml | 4 +- .../device-tree/Bindings/input/azoteq,iqs7222.yaml | 25 +- .../device-tree/Bindings/input/fsl,scu-key.yaml | 2 +- .../device-tree/Bindings/input/gpio-beeper.yaml | 33 + .../device-tree/Bindings/input/gpio-keys.yaml | 2 +- sys/contrib/device-tree/Bindings/input/input.yaml | 2 +- .../device-tree/Bindings/input/matrix-keymap.yaml | 2 +- .../Bindings/input/microchip,cap11xx.yaml | 2 +- .../Bindings/input/pine64,pinephone-keyboard.yaml | 2 +- .../Bindings/input/qcom,pm8921-pwrkey.yaml | 75 + .../device-tree/Bindings/input/ti,drv260x.yaml | 109 ++ .../input/touchscreen/chipone,icn8318.yaml | 2 +- .../input/touchscreen/cypress,cy8ctma140.yaml | 2 +- .../input/touchscreen/cypress,cy8ctma340.yaml | 2 +- .../input/touchscreen/cypress,tt21000.yaml | 106 ++ .../Bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- .../Bindings/input/touchscreen/egalax-ts.txt | 4 +- .../Bindings/input/touchscreen/goodix.yaml | 2 +- .../Bindings/input/touchscreen/himax,hx83112b.yaml | 63 + .../Bindings/input/touchscreen/hycon,hy46xx.yaml | 2 +- .../input/touchscreen/hynitron,cstxxx.yaml | 65 + .../input/touchscreen/imagis,ist3038c.yaml | 2 +- .../Bindings/input/touchscreen/melfas,mms114.yaml | 2 +- .../Bindings/input/touchscreen/mstar,msg2638.yaml | 10 +- .../input/touchscreen/pixcir,pixcir_ts.yaml | 2 +- .../Bindings/input/touchscreen/silead,gsl1680.yaml | 2 +- .../Bindings/input/touchscreen/ti,tsc2005.yaml | 2 +- .../Bindings/input/touchscreen/touchscreen.yaml | 2 +- .../Bindings/input/touchscreen/zinitix,bt400.yaml | 2 +- .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 5 + .../Bindings/interconnect/qcom,osm-l3.yaml | 24 +- .../Bindings/interconnect/qcom,rpm.yaml | 24 +- .../Bindings/interrupt-controller/apple,aic.yaml | 1 - .../Bindings/interrupt-controller/apple,aic2.yaml | 29 + .../Bindings/interrupt-controller/arm,gic-v3.yaml | 2 +- .../Bindings/interrupt-controller/fsl,intmux.yaml | 3 +- .../interrupt-controller/ingenic,intc.yaml | 2 +- .../interrupt-controller/intel,ce4100-ioapic.yaml | 60 + .../interrupt-controller/intel,ce4100-lapic.yaml | 71 + .../loongarch,cpu-interrupt-controller.yaml | 34 + .../interrupt-controller/mediatek,mtk-cirq.yaml | 68 + .../Bindings/interrupt-controller/mrvl,intc.yaml | 2 +- .../interrupt-controller/nuvoton,wpcm450-aic.yaml | 2 +- .../Bindings/interrupt-controller/qcom,pdc.yaml | 4 + .../interrupt-controller/realtek,rtl-intc.yaml | 2 +- .../interrupt-controller/renesas,irqc.yaml | 2 +- .../device-tree/Bindings/iommu/apple,dart.yaml | 4 +- .../device-tree/Bindings/iommu/arm,smmu.yaml | 178 +- .../device-tree/Bindings/iommu/mediatek,iommu.yaml | 2 + .../Bindings/iommu/renesas,ipmmu-vmsa.yaml | 6 +- .../device-tree/Bindings/ipmi/ipmi-ipmb.yaml | 2 +- .../device-tree/Bindings/ipmi/ipmi-smic.yaml | 2 +- .../device-tree/Bindings/ipmi/ssif-bmc.yaml | 38 + .../Bindings/leds/backlight/gpio-backlight.yaml | 2 +- .../Bindings/leds/backlight/led-backlight.yaml | 2 +- .../Bindings/leds/backlight/pwm-backlight.yaml | 2 +- .../Bindings/leds/backlight/qcom-wled.yaml | 2 +- sys/contrib/device-tree/Bindings/leds/common.yaml | 1 + .../Bindings/leds/irled/gpio-ir-tx.yaml | 36 + .../Bindings/leds/irled/ir-spi-led.yaml | 61 + .../device-tree/Bindings/leds/irled/pwm-ir-tx.yaml | 34 + .../device-tree/Bindings/leds/issi,is31fl319x.yaml | 3 +- .../device-tree/Bindings/leds/leds-aw2013.yaml | 1 + .../device-tree/Bindings/leds/leds-gpio.yaml | 2 +- .../device-tree/Bindings/leds/leds-lgm.yaml | 10 +- .../device-tree/Bindings/leds/leds-lp50xx.yaml | 8 + .../device-tree/Bindings/leds/leds-lp55xx.yaml | 47 +- .../device-tree/Bindings/leds/leds-max77650.yaml | 9 +- .../device-tree/Bindings/leds/leds-mt6360.yaml | 43 +- .../device-tree/Bindings/leds/leds-pwm.yaml | 2 +- .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 12 +- .../device-tree/Bindings/leds/leds-rt4505.yaml | 1 + .../device-tree/Bindings/leds/leds-sgm3140.yaml | 5 +- .../device-tree/Bindings/leds/qcom,pm8058-led.yaml | 57 + .../Bindings/leds/register-bit-led.yaml | 2 +- .../device-tree/Bindings/leds/regulator-led.yaml | 2 +- .../Bindings/leds/rohm,bd71828-leds.yaml | 18 +- .../device-tree/Bindings/leds/ti,tca6507.yaml | 2 +- .../Bindings/mailbox/mediatek,gce-mailbox.yaml | 1 + .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 3 +- .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 4 +- .../device-tree/Bindings/mailbox/sprd-mailbox.yaml | 2 +- .../Bindings/mailbox/st,stm32-ipcc.yaml | 2 +- .../Bindings/media/allwinner,sun4i-a10-ir.yaml | 1 + .../Bindings/media/allwinner,sun6i-a31-csi.yaml | 4 + .../Bindings/media/allwinner,sun6i-a31-isp.yaml | 101 + .../device-tree/Bindings/media/atmel,isc.yaml | 4 +- .../Bindings/media/i2c/dongwoon,dw9768.yaml | 2 +- .../device-tree/Bindings/media/i2c/mipi-ccs.yaml | 3 +- .../device-tree/Bindings/media/i2c/ov8856.yaml | 2 +- .../Bindings/media/i2c/ovti,ov02a10.yaml | 2 +- .../Bindings/media/i2c/ovti,ov4689.yaml | 134 ++ .../Bindings/media/i2c/ovti,ov5640.yaml | 2 +- .../Bindings/media/i2c/ovti,ov5645.yaml | 104 + .../Bindings/media/i2c/ovti,ov5648.yaml | 2 +- .../Bindings/media/i2c/ovti,ov772x.yaml | 3 +- .../Bindings/media/i2c/ovti,ov8865.yaml | 2 +- .../Bindings/media/i2c/ovti,ov9282.yaml | 14 +- .../Bindings/media/i2c/sony,imx290.yaml | 129 ++ .../Bindings/media/i2c/sony,imx412.yaml | 4 +- .../Bindings/media/i2c/st,st-mipid02.yaml | 176 ++ .../Bindings/media/i2c/st,st-vgxy61.yaml | 113 ++ .../Bindings/media/i2c/toshiba,tc358746.yaml | 178 ++ .../Bindings/media/marvell,mmp2-ccic.yaml | 5 +- .../Bindings/media/mediatek,mt8195-jpegdec.yaml | 168 ++ .../Bindings/media/mediatek,mt8195-jpegenc.yaml | 147 ++ .../Bindings/media/mediatek,vcodec-encoder.yaml | 12 +- .../Bindings/media/mediatek-jpeg-decoder.yaml | 1 + .../Bindings/media/mediatek-jpeg-encoder.yaml | 1 + .../device-tree/Bindings/media/microchip,xisc.yaml | 3 +- .../device-tree/Bindings/media/renesas,ceu.yaml | 2 +- .../Bindings/media/renesas,rzg2l-cru.yaml | 157 ++ .../Bindings/media/renesas,rzg2l-csi2.yaml | 149 ++ sys/contrib/device-tree/Bindings/media/s5p-mfc.txt | 10 +- .../device-tree/Bindings/media/samsung-s5c73m3.txt | 2 +- .../device-tree/Bindings/media/st,stm32-cec.yaml | 2 +- .../device-tree/Bindings/media/st,stm32-dcmi.yaml | 6 +- .../device-tree/Bindings/media/st,stm32-dma2d.yaml | 2 +- .../Bindings/media/video-interface-devices.yaml | 2 +- .../Bindings/media/video-interfaces.yaml | 7 +- .../Bindings/memory-controllers/arm,pl35x-smc.yaml | 156 ++ .../memory-controllers/calxeda-ddr-ctrlr.yaml | 2 +- .../ddr/jedec,lpddr-channel.yaml | 146 ++ .../memory-controllers/ddr/jedec,lpddr-props.yaml | 74 + .../memory-controllers/ddr/jedec,lpddr2.yaml | 48 +- .../memory-controllers/ddr/jedec,lpddr3.yaml | 44 +- .../memory-controllers/ddr/jedec,lpddr4.yaml | 35 + .../memory-controllers/ddr/jedec,lpddr5.yaml | 46 + .../ingenic,nemc-peripherals.yaml | 2 +- .../Bindings/memory-controllers/ingenic,nemc.yaml | 2 +- .../memory-controllers/mc-peripheral-props.yaml | 38 + .../memory-controllers/renesas,rpc-if.yaml | 5 + .../st,stm32-fmc2-ebi-props.yaml | 144 ++ .../memory-controllers/st,stm32-fmc2-ebi.yaml | 140 +- .../Bindings/memory-controllers/ti,gpmc-child.yaml | 9 +- .../Bindings/memory-controllers/ti,gpmc.yaml | 2 +- .../device-tree/Bindings/mfd/actions,atc260x.yaml | 2 +- .../device-tree/Bindings/mfd/ampere,smpro.yaml | 42 + sys/contrib/device-tree/Bindings/mfd/brcm,twd.yaml | 8 + sys/contrib/device-tree/Bindings/mfd/da9062.txt | 13 +- .../device-tree/Bindings/mfd/ene-kb3930.yaml | 2 +- .../device-tree/Bindings/mfd/ene-kb930.yaml | 8 +- .../device-tree/Bindings/mfd/fsl,imx8qxp-csr.yaml | 2 +- .../device-tree/Bindings/mfd/google,cros-ec.yaml | 103 +- sys/contrib/device-tree/Bindings/mfd/max77650.yaml | 2 - .../device-tree/Bindings/mfd/mediatek,mt6360.yaml | 9 - .../device-tree/Bindings/mfd/mscc,ocelot.yaml | 4 +- sys/contrib/device-tree/Bindings/mfd/mt6397.txt | 1 + .../device-tree/Bindings/mfd/qcom,pm8008.yaml | 2 +- .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 35 +- .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 2 + .../device-tree/Bindings/mfd/qcom-pm8xxx.yaml | 37 +- .../device-tree/Bindings/mfd/rockchip,rk817.yaml | 2 + .../Bindings/mfd/rohm,bd71815-pmic.yaml | 4 +- .../Bindings/mfd/rohm,bd71828-pmic.yaml | 4 +- .../Bindings/mfd/rohm,bd71837-pmic.yaml | 4 +- .../Bindings/mfd/rohm,bd71847-pmic.yaml | 4 +- .../device-tree/Bindings/mfd/rohm,bd9576-pmic.yaml | 4 +- .../device-tree/Bindings/mfd/st,stm32-lptimer.yaml | 2 +- .../device-tree/Bindings/mfd/st,stm32-timers.yaml | 2 +- sys/contrib/device-tree/Bindings/mfd/st,stmfx.yaml | 2 +- .../device-tree/Bindings/mfd/st,stpmic1.yaml | 2 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 1 + .../device-tree/Bindings/mfd/ti,am3359-tscadc.yaml | 3 + .../Bindings/mfd/ti,j721e-system-controller.yaml | 2 + .../device-tree/Bindings/mips/brcm/soc.yaml | 96 + sys/contrib/device-tree/Bindings/mips/cpus.yaml | 115 ++ .../device-tree/Bindings/mips/ingenic/devices.yaml | 2 +- .../Bindings/mips/lantiq/lantiq,dma-xway.yaml | 2 +- .../Bindings/mips/loongson/devices.yaml | 2 +- .../device-tree/Bindings/misc/idt,89hpesx.yaml | 72 + .../device-tree/Bindings/misc/olpc,xo1.75-ec.yaml | 2 +- .../device-tree/Bindings/misc/qcom,fastrpc.yaml | 2 +- .../device-tree/Bindings/mmc/arasan,sdhci.yaml | 2 +- .../device-tree/Bindings/mmc/arm,pl18x.yaml | 4 +- .../Bindings/mmc/brcm,sdhci-brcmstb.yaml | 2 +- .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 7 +- .../Bindings/mmc/fujitsu,sdhci-fujitsu.yaml | 57 + .../device-tree/Bindings/mmc/ingenic,mmc.yaml | 2 +- .../Bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 2 +- .../device-tree/Bindings/mmc/mmc-controller.yaml | 3 +- .../device-tree/Bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- .../Bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- .../Bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 173 +- .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 1 + .../device-tree/Bindings/mmc/rockchip-dw-mshc.yaml | 3 + .../device-tree/Bindings/mmc/sdhci-am654.yaml | 69 +- .../device-tree/Bindings/mmc/sdhci-common.yaml | 32 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 23 +- .../device-tree/Bindings/mmc/sdhci-pxa.yaml | 2 +- .../Bindings/mmc/snps,dwcmshc-sdhci.yaml | 13 +- .../device-tree/Bindings/mmc/sunplus,mmc.yaml | 61 + .../device-tree/Bindings/mmc/synopsys-dw-mshc.yaml | 34 +- .../Bindings/mtd/allwinner,sun4i-a10-nand.yaml | 34 +- .../Bindings/mtd/arasan,nand-controller.yaml | 5 +- .../Bindings/mtd/arm,pl353-nand-r2p1.yaml | 32 +- .../device-tree/Bindings/mtd/atmel-nand.txt | 6 +- .../device-tree/Bindings/mtd/brcm,brcmnand.yaml | 96 +- .../device-tree/Bindings/mtd/denali,nand.yaml | 2 +- .../device-tree/Bindings/mtd/gpmi-nand.yaml | 2 +- .../device-tree/Bindings/mtd/ingenic,nand.yaml | 148 +- .../Bindings/mtd/intel,lgm-ebunand.yaml | 50 +- .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 20 +- .../device-tree/Bindings/mtd/lpc32xx-mlc.txt | 2 +- .../device-tree/Bindings/mtd/lpc32xx-slc.txt | 2 +- .../Bindings/mtd/microchip,mchp48l640.yaml | 18 +- .../device-tree/Bindings/mtd/mtd-physmap.yaml | 7 +- sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 24 +- sys/contrib/device-tree/Bindings/mtd/mtk-nand.txt | 2 +- sys/contrib/device-tree/Bindings/mtd/mxc-nand.yaml | 2 +- .../device-tree/Bindings/mtd/nand-chip.yaml | 6 +- .../device-tree/Bindings/mtd/nand-controller.yaml | 4 +- .../mtd/partitions/arm,arm-firmware-suite.yaml | 2 + .../mtd/partitions/brcm,bcm4908-partitions.yaml | 2 + .../partitions/brcm,bcm947xx-cfe-partitions.yaml | 2 + .../Bindings/mtd/partitions/fixed-partitions.yaml | 30 +- .../mtd/partitions/linksys,ns-partitions.yaml | 2 + .../Bindings/mtd/partitions/nvmem-cells.yaml | 4 +- .../Bindings/mtd/partitions/partition.yaml | 5 + .../Bindings/mtd/partitions/partitions.yaml | 41 + .../Bindings/mtd/partitions/qcom,smem-part.yaml | 40 +- .../Bindings/mtd/partitions/redboot-fis.yaml | 6 + .../partitions/tplink,safeloader-partitions.yaml | 57 + .../Bindings/mtd/partitions/u-boot.yaml | 7 + .../device-tree/Bindings/mtd/qcom,nandc.yaml | 131 +- .../Bindings/mtd/rockchip,nand-controller.yaml | 4 +- .../Bindings/mtd/st,stm32-fmc2-nand.yaml | 49 +- .../device-tree/Bindings/mtd/ti,am654-hbmc.yaml | 36 +- .../device-tree/Bindings/mtd/ti,gpmc-onenand.yaml | 3 + sys/contrib/device-tree/Bindings/mux/gpio-mux.yaml | 2 +- .../device-tree/Bindings/mux/mux-consumer.yaml | 2 +- .../device-tree/Bindings/mux/mux-controller.yaml | 2 +- sys/contrib/device-tree/Bindings/mux/reg-mux.yaml | 2 +- .../device-tree/Bindings/net/adi,adin1110.yaml | 4 + .../Bindings/net/allwinner,sun8i-a83t-emac.yaml | 3 + .../device-tree/Bindings/net/asix,ax88178.yaml | 6 +- .../net/bluetooth/bluetooth-controller.yaml | 29 + .../net/bluetooth/brcm,bcm4377-bluetooth.yaml | 81 + .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 183 ++ .../device-tree/Bindings/net/brcm,bcmgenet.yaml | 2 +- .../Bindings/net/broadcom-bluetooth.yaml | 3 + .../Bindings/net/can/allwinner,sun4i-a10-can.yaml | 2 +- .../device-tree/Bindings/net/can/bosch,c_can.yaml | 2 +- .../device-tree/Bindings/net/can/bosch,m_can.yaml | 2 +- .../Bindings/net/can/can-controller.yaml | 2 +- .../Bindings/net/can/can-transceiver.yaml | 2 +- .../device-tree/Bindings/net/can/ctu,ctucanfd.yaml | 2 +- .../device-tree/Bindings/net/can/fsl,flexcan.yaml | 1 + .../Bindings/net/can/microchip,mcp251xfd.yaml | 4 +- .../Bindings/net/can/renesas,rcar-canfd.yaml | 135 +- .../device-tree/Bindings/net/cdns,macb.yaml | 1 - .../Bindings/net/dsa/arrow,xrs700x.yaml | 2 +- .../device-tree/Bindings/net/dsa/dsa-port.yaml | 5 +- sys/contrib/device-tree/Bindings/net/dsa/dsa.yaml | 2 +- .../Bindings/net/dsa/hirschmann,hellcreek.yaml | 4 +- .../Bindings/net/dsa/microchip,lan937x.yaml | 2 +- .../device-tree/Bindings/net/dsa/mscc,ocelot.yaml | 2 +- .../device-tree/Bindings/net/dsa/nxp,sja1105.yaml | 2 +- .../Bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- .../device-tree/Bindings/net/engleder,tsnep.yaml | 2 +- .../Bindings/net/ethernet-controller.yaml | 13 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 2 +- sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 4 +- .../device-tree/Bindings/net/fsl,fman-dtsec.yaml | 53 +- .../Bindings/net/fsl,qoriq-mc-dpmac.yaml | 4 +- sys/contrib/device-tree/Bindings/net/fsl-fman.txt | 5 +- .../device-tree/Bindings/net/ingenic,mac.yaml | 2 +- .../Bindings/net/marvell,dfx-server.yaml | 62 + .../Bindings/net/marvell,orion-mdio.yaml | 30 +- .../device-tree/Bindings/net/marvell,pp2.yaml | 305 +++ .../device-tree/Bindings/net/marvell,prestera.yaml | 91 + .../Bindings/net/mctp-i2c-controller.yaml | 2 +- sys/contrib/device-tree/Bindings/net/mdio.yaml | 2 +- .../device-tree/Bindings/net/micrel,ks8851.yaml | 1 + .../Bindings/net/microchip,lan95xx.yaml | 6 +- .../device-tree/Bindings/net/nfc/nxp,nci.yaml | 4 +- .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 5 +- .../device-tree/Bindings/net/pcs/fsl,lynx-pcs.yaml | 40 + .../device-tree/Bindings/net/qca,ar71xx.yaml | 1 - sys/contrib/device-tree/Bindings/net/qcom,ipa.yaml | 86 +- .../Bindings/net/qcom,ipq4019-mdio.yaml | 46 +- .../Bindings/net/realtek-bluetooth.yaml | 1 + .../net/renesas,r8a779f0-ether-switch.yaml | 262 +++ sys/contrib/device-tree/Bindings/net/sff,sfp.yaml | 3 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 345 +++- .../Bindings/net/socionext,synquacer-netsec.yaml | 73 + .../Bindings/net/wireless/esp,esp8089.yaml | 2 +- .../Bindings/net/wireless/ieee80211.yaml | 2 +- .../Bindings/net/wireless/mediatek,mt76.yaml | 2 +- .../Bindings/net/wireless/microchip,wilc1000.yaml | 2 +- .../Bindings/net/wireless/qca,ath9k.yaml | 2 +- .../Bindings/net/wireless/qcom,ath11k.yaml | 2 +- .../Bindings/net/wireless/silabs,wfx.yaml | 2 +- .../device-tree/Bindings/net/xilinx_axienet.txt | 2 + .../device-tree/Bindings/nvmem/fsl,scu-ocotp.yaml | 2 +- .../Bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- .../Bindings/nvmem/layouts/kontron,sl28-vpd.yaml | 64 + .../Bindings/nvmem/layouts/nvmem-layout.yaml | 34 + .../Bindings/nvmem/layouts/onie,tlv-layout.yaml | 147 ++ sys/contrib/device-tree/Bindings/nvmem/nvmem.yaml | 8 + .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 2 +- .../device-tree/Bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- .../device-tree/Bindings/nvmem/snvs-lpgpr.yaml | 20 +- .../Bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- .../device-tree/Bindings/nvmem/st,stm32-romem.yaml | 3 +- .../device-tree/Bindings/nvmem/u-boot,env.yaml | 21 + .../opp/allwinner,sun50i-h6-operating-points.yaml | 4 +- sys/contrib/device-tree/Bindings/opp/opp-v1.yaml | 2 +- .../device-tree/Bindings/opp/opp-v2-base.yaml | 8 +- .../device-tree/Bindings/opp/opp-v2-kryo-cpu.yaml | 2 +- .../Bindings/opp/opp-v2-qcom-level.yaml | 2 +- sys/contrib/device-tree/Bindings/opp/opp-v2.yaml | 4 +- .../device-tree/Bindings/pci/baikal,bt1-pcie.yaml | 168 ++ .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 146 +- .../Bindings/pci/mediatek,mt7621-pcie.yaml | 2 +- .../Bindings/pci/mediatek-pcie-gen3.yaml | 77 +- .../Bindings/pci/nvidia,tegra194-pcie.yaml | 34 +- sys/contrib/device-tree/Bindings/pci/pci-ep.yaml | 2 +- .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 2 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 22 + .../Bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- .../device-tree/Bindings/pci/rockchip-dw-pcie.yaml | 4 +- .../Bindings/pci/snps,dw-pcie-common.yaml | 266 +++ .../device-tree/Bindings/pci/snps,dw-pcie-ep.yaml | 212 ++- .../device-tree/Bindings/pci/snps,dw-pcie.yaml | 262 ++- .../device-tree/Bindings/pci/ti,j721e-pci-ep.yaml | 7 + .../Bindings/pci/ti,j721e-pci-host.yaml | 22 + .../Bindings/pci/toshiba,visconti-pcie.yaml | 7 +- .../Bindings/pci/xlnx,axi-pcie-host.yaml | 88 + .../device-tree/Bindings/pci/xlnx,nwl-pcie.yaml | 149 ++ .../Bindings/perf/amlogic,g12-ddr-pmu.yaml | 54 + .../device-tree/Bindings/perf/arm,dsu-pmu.yaml | 3 - .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 11 + .../Bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 26 + .../Bindings/phy/amlogic,g12a-usb2-phy.yaml | 78 + .../Bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 59 + .../Bindings/phy/brcm,ns2-pcie-phy.yaml | 2 +- .../device-tree/Bindings/phy/calxeda-combophy.yaml | 2 +- .../Bindings/phy/fsl,imx8-pcie-phy.yaml | 16 +- .../Bindings/phy/fsl,imx8mq-usb-phy.yaml | 5 +- .../device-tree/Bindings/phy/fsl,lynx-28g.yaml | 2 +- .../device-tree/Bindings/phy/ingenic,phy-usb.yaml | 2 +- .../Bindings/phy/intel,keembay-phy-usb.yaml | 2 +- .../Bindings/phy/intel,phy-thunderbay-emmc.yaml | 17 +- .../Bindings/phy/marvell,mmp3-usb-phy.yaml | 2 +- .../device-tree/Bindings/phy/mediatek,dsi-phy.yaml | 2 +- .../Bindings/phy/mediatek,hdmi-phy.yaml | 2 +- .../device-tree/Bindings/phy/mediatek,ufs-phy.yaml | 2 +- .../Bindings/phy/phy-cadence-sierra.yaml | 2 +- .../Bindings/phy/phy-cadence-torrent.yaml | 2 +- .../Bindings/phy/phy-stm32-usbphyc.yaml | 2 +- .../device-tree/Bindings/phy/phy-tegra194-p2u.yaml | 2 +- .../Bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 299 +++ .../Bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 241 +++ .../Bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 391 ++++ .../Bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 219 +++ .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 165 ++ .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 83 + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 102 + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 99 + .../device-tree/Bindings/phy/qcom,usb-hs-28nm.yaml | 1 - .../device-tree/Bindings/phy/qcom,usb-hs-phy.yaml | 2 +- .../phy/renesas,r8a779f0-ether-serdes.yaml | 54 + .../Bindings/phy/ti,phy-am654-serdes.yaml | 2 +- .../device-tree/Bindings/phy/ti,phy-gmii-sel.yaml | 50 +- .../device-tree/Bindings/phy/ti,phy-j721e-wiz.yaml | 2 + .../Bindings/phy/transmit-amplitude.yaml | 2 +- .../Bindings/pinctrl/fsl,imxrt1050.yaml | 2 +- .../Bindings/pinctrl/fsl,scu-pinctrl.yaml | 2 +- .../Bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- .../device-tree/Bindings/pinctrl/intel,lgm-io.yaml | 2 +- .../Bindings/pinctrl/loongson,ls2k-pinctrl.yaml | 123 ++ .../Bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 5 +- .../Bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 95 +- .../Bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 108 +- .../Bindings/pinctrl/mediatek,pinctrl-mt6795.yaml | 7 +- .../pinctrl/nvidia,tegra-pinmux-common.yaml | 178 ++ .../Bindings/pinctrl/nvidia,tegra114-pinmux.yaml | 155 ++ .../Bindings/pinctrl/nvidia,tegra124-pinmux.yaml | 176 ++ .../Bindings/pinctrl/nvidia,tegra194-pinmux.yaml | 284 +++ .../Bindings/pinctrl/nvidia,tegra20-pinmux.yaml | 112 ++ .../Bindings/pinctrl/nvidia,tegra210-pinmux.yaml | 142 ++ .../Bindings/pinctrl/nvidia,tegra30-pinmux.yaml | 176 ++ .../device-tree/Bindings/pinctrl/pincfg-node.yaml | 2 +- .../device-tree/Bindings/pinctrl/pinmux-node.yaml | 2 +- .../Bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 113 +- .../Bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 135 ++ .../Bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 131 ++ .../Bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 119 ++ .../Bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 103 +- .../Bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 125 ++ .../Bindings/pinctrl/qcom,msm8909-tlmm.yaml | 75 +- .../Bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 166 ++ .../Bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 97 +- .../Bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 164 ++ .../Bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 179 ++ .../Bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 136 ++ .../Bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 162 ++ .../Bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 182 ++ .../Bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 171 ++ .../Bindings/pinctrl/qcom,pmic-mpp.yaml | 45 +- .../Bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 135 ++ .../Bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 176 ++ .../Bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 158 ++ .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 48 +- .../Bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 47 +- .../Bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 151 ++ .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 44 +- .../Bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 150 ++ .../Bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 188 ++ .../Bindings/pinctrl/qcom,sdm670-tlmm.yaml | 127 ++ .../Bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 158 ++ .../Bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 95 +- .../Bindings/pinctrl/qcom,sdx65-tlmm.yaml | 165 ++ .../Bindings/pinctrl/qcom,sm6115-tlmm.yaml | 150 ++ .../Bindings/pinctrl/qcom,sm6125-tlmm.yaml | 150 ++ .../Bindings/pinctrl/qcom,sm6350-tlmm.yaml | 147 ++ .../Bindings/pinctrl/qcom,sm6375-tlmm.yaml | 23 +- .../Bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 173 ++ .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 58 +- .../Bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 206 +- .../Bindings/pinctrl/qcom,sm8350-tlmm.yaml | 144 ++ .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 51 +- .../Bindings/pinctrl/qcom,sm8450-tlmm.yaml | 149 ++ .../Bindings/pinctrl/qcom,tlmm-common.yaml | 20 +- .../Bindings/pinctrl/rockchip,pinctrl.yaml | 2 +- .../Bindings/pinctrl/semtech,sx1501q.yaml | 208 ++ .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 7 +- .../device-tree/Bindings/power/avs/qcom,cpr.yaml | 2 +- .../Bindings/power/domain-idle-state.yaml | 2 +- .../device-tree/Bindings/power/fsl,scu-pd.yaml | 2 +- .../device-tree/Bindings/power/qcom,rpmpd.yaml | 4 + .../device-tree/Bindings/power/renesas,apmu.yaml | 6 +- .../Bindings/power/reset/gpio-restart.yaml | 13 +- .../Bindings/power/reset/restart-handler.yaml | 30 + .../Bindings/power/reset/xlnx,zynqmp-power.yaml | 2 +- .../device-tree/Bindings/power/supply/bq2415x.yaml | 2 +- .../device-tree/Bindings/power/supply/bq24190.yaml | 2 +- .../device-tree/Bindings/power/supply/bq24257.yaml | 2 +- .../device-tree/Bindings/power/supply/bq24735.yaml | 2 +- .../device-tree/Bindings/power/supply/bq25890.yaml | 18 +- .../device-tree/Bindings/power/supply/bq27xxx.yaml | 2 - .../Bindings/power/supply/dlg,da9150-charger.yaml | 2 +- .../power/supply/dlg,da9150-fuel-gauge.yaml | 2 +- .../Bindings/power/supply/ingenic,battery.yaml | 6 +- .../device-tree/Bindings/power/supply/isp1704.yaml | 2 +- .../Bindings/power/supply/lltc,lt3651-charger.yaml | 2 +- .../Bindings/power/supply/lltc,ltc294x.yaml | 2 +- .../Bindings/power/supply/maxim,ds2760.yaml | 2 +- .../Bindings/power/supply/maxim,max14656.yaml | 2 +- .../Bindings/power/supply/maxim,max17042.yaml | 2 + .../Bindings/power/supply/mt6360_charger.yaml | 2 +- .../Bindings/power/supply/power-supply.yaml | 6 + .../Bindings/power/supply/richtek,rt9455.yaml | 2 +- .../Bindings/power/supply/rohm,bd99954.yaml | 3 +- .../Bindings/power/supply/sc2731-charger.yaml | 3 +- .../Bindings/power/supply/sc27xx-fg.yaml | 2 +- .../Bindings/power/supply/ti,lp8727.yaml | 2 +- .../device-tree/Bindings/power/wakeup-source.txt | 13 +- .../Bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 4 +- .../Bindings/pwm/google,cros-ec-pwm.yaml | 1 + .../Bindings/pwm/microchip,corepwm.yaml | 6 +- .../Bindings/pwm/nvidia,tegra20-pwm.yaml | 96 + .../device-tree/Bindings/pwm/renesas,pwm-rcar.yaml | 1 + .../device-tree/Bindings/pwm/renesas,tpu-pwm.yaml | 1 + .../regulator/google,cros-ec-regulator.yaml | 1 + .../Bindings/regulator/max77650-regulator.yaml | 1 + .../device-tree/Bindings/regulator/max8660.yaml | 8 +- .../Bindings/regulator/maxim,max77802.yaml | 2 +- .../regulator/mediatek,mt6357-regulator.yaml | 294 +++ .../Bindings/regulator/mt6360-regulator.yaml | 12 +- .../Bindings/regulator/pwm-regulator.yaml | 2 +- .../Bindings/regulator/qcom,rpmh-regulator.yaml | 36 +- .../Bindings/regulator/qcom,smd-rpm-regulator.yaml | 3 + .../Bindings/regulator/regulator-output.yaml | 39 + .../device-tree/Bindings/regulator/regulator.yaml | 2 +- .../Bindings/regulator/richtek,rt6190.yaml | 79 + .../Bindings/regulator/rohm,bd71815-regulator.yaml | 2 +- .../Bindings/regulator/rohm,bd71828-regulator.yaml | 2 +- .../Bindings/regulator/rohm,bd71837-regulator.yaml | 2 +- .../Bindings/regulator/rohm,bd71847-regulator.yaml | 2 +- .../Bindings/regulator/rohm,bd9576-regulator.yaml | 4 +- .../Bindings/regulator/samsung,s2mps14.yaml | 21 +- .../Bindings/regulator/st,stm32-booster.yaml | 2 +- .../Bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- .../Bindings/regulator/ti,tps65219.yaml | 14 +- .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- .../Bindings/remoteproc/fsl,imx-rproc.yaml | 18 +- .../Bindings/remoteproc/ingenic,vpu.yaml | 2 +- .../device-tree/Bindings/remoteproc/mtk,scp.yaml | 2 +- .../device-tree/Bindings/remoteproc/qcom,adsp.yaml | 2 +- .../Bindings/remoteproc/qcom,pil-info.yaml | 2 +- .../Bindings/remoteproc/renesas,rcar-rproc.yaml | 2 +- .../Bindings/remoteproc/st,stm32-rproc.yaml | 2 +- .../Bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 135 ++ .../Bindings/reserved-memory/shared-dma-pool.yaml | 2 +- .../device-tree/Bindings/reset/ti,sci-reset.yaml | 2 +- .../Bindings/reset/ti,tps380x-reset.yaml | 2 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 17 +- .../device-tree/Bindings/riscv/starfive.yaml | 4 +- .../device-tree/Bindings/rng/ingenic,rng.yaml | 2 +- .../device-tree/Bindings/rng/ingenic,trng.yaml | 2 +- .../device-tree/Bindings/rng/intel,ixp46x-rng.yaml | 2 +- .../device-tree/Bindings/rng/nuvoton,npcm-rng.yaml | 4 +- .../Bindings/rng/silex-insight,ba431-rng.yaml | 2 +- .../device-tree/Bindings/rng/st,stm32-rng.yaml | 2 +- .../Bindings/rng/xiphera,xip8001b-trng.yaml | 2 +- .../Bindings/rtc/amlogic,meson6-rtc.yaml | 62 + .../device-tree/Bindings/rtc/epson,rx8900.yaml | 2 +- .../device-tree/Bindings/rtc/fsl,scu-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/haoyu,hym8563.yaml | 56 + .../device-tree/Bindings/rtc/ingenic,rtc.yaml | 2 +- .../device-tree/Bindings/rtc/qcom-pm8xxx-rtc.yaml | 18 +- .../device-tree/Bindings/rtc/renesas,rzn1-rtc.yaml | 2 +- sys/contrib/device-tree/Bindings/rtc/rtc.yaml | 2 +- .../device-tree/Bindings/rtc/sa1100-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/st,m41t80.yaml | 73 + .../device-tree/Bindings/rtc/st,stm32-rtc.yaml | 2 +- sys/contrib/device-tree/Bindings/serial/8250.yaml | 2 +- .../device-tree/Bindings/serial/8250_omap.yaml | 2 +- .../Bindings/serial/brcm,bcm7271-uart.yaml | 2 +- .../device-tree/Bindings/serial/fsl-lpuart.yaml | 3 + .../device-tree/Bindings/serial/ingenic,uart.yaml | 6 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 1 + sys/contrib/device-tree/Bindings/serial/rs485.yaml | 2 +- .../device-tree/Bindings/serial/serial.yaml | 2 +- .../device-tree/Bindings/serial/st,stm32-uart.yaml | 2 +- .../Bindings/serial/xlnx,opb-uartlite.yaml | 3 +- .../device-tree/Bindings/serio/ps2-gpio.yaml | 2 +- .../Bindings/slimbus/qcom,slim-ngd.yaml | 120 ++ .../device-tree/Bindings/slimbus/qcom,slim.yaml | 86 + .../device-tree/Bindings/slimbus/slimbus.yaml | 95 + .../soc/mediatek/mediatek,mt7986-wo-ccif.yaml | 51 + .../device-tree/Bindings/soc/mediatek/mtk-svs.yaml | 2 +- .../device-tree/Bindings/soc/mediatek/pwrap.txt | 3 + .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 4 +- .../Bindings/soc/qcom/qcom,apr-services.yaml | 53 + .../device-tree/Bindings/soc/qcom/qcom,apr.yaml | 173 +- .../Bindings/soc/qcom/qcom,geni-se.yaml | 44 +- .../Bindings/soc/qcom/qcom,rpmh-rsc.yaml | 5 + .../Bindings/soc/qcom/qcom,smd-rpm.yaml | 28 +- .../device-tree/Bindings/soc/qcom/qcom,smem.yaml | 2 +- .../device-tree/Bindings/soc/qcom/qcom,smp2p.yaml | 2 +- .../device-tree/Bindings/soc/qcom/qcom,spm.yaml | 5 +- .../device-tree/Bindings/soc/qcom/qcom,wcnss.yaml | 8 +- .../device-tree/Bindings/soc/qcom/qcom-stats.yaml | 2 +- .../soc/renesas/renesas,r9a09g011-sys.yaml | 43 + .../device-tree/Bindings/soc/renesas/renesas.yaml | 472 +++++ .../Bindings/soc/samsung/exynos-usi.yaml | 2 +- .../device-tree/Bindings/soc/ti/sci-pm-domain.yaml | 2 +- .../device-tree/Bindings/sound/adi,adau1372.yaml | 7 +- .../device-tree/Bindings/sound/adi,adau1977.yaml | 1 + .../device-tree/Bindings/sound/adi,adau7118.yaml | 5 +- sys/contrib/device-tree/Bindings/sound/ak4375.yaml | 5 +- sys/contrib/device-tree/Bindings/sound/ak4613.yaml | 5 +- sys/contrib/device-tree/Bindings/sound/ak4642.yaml | 5 +- .../Bindings/sound/allwinner,sun4i-a10-codec.yaml | 3 +- .../Bindings/sound/allwinner,sun4i-a10-i2s.yaml | 3 +- .../Bindings/sound/allwinner,sun4i-a10-spdif.yaml | 3 +- .../Bindings/sound/allwinner,sun50i-h6-dmic.yaml | 12 +- .../Bindings/sound/allwinner,sun8i-a33-codec.yaml | 5 +- .../device-tree/Bindings/sound/amlogic,aiu.yaml | 2 +- .../Bindings/sound/amlogic,g12a-toacodec.yaml | 2 +- .../device-tree/Bindings/sound/amlogic,t9015.yaml | 2 +- .../device-tree/Bindings/sound/apple,mca.yaml | 5 +- .../Bindings/sound/audio-graph-port.yaml | 2 +- .../device-tree/Bindings/sound/awinic,aw8738.yaml | 2 +- .../device-tree/Bindings/sound/cirrus,cs35l41.yaml | 3 +- .../device-tree/Bindings/sound/cirrus,cs35l45.yaml | 5 +- .../device-tree/Bindings/sound/cirrus,cs42l51.yaml | 7 +- .../Bindings/sound/cirrus,lochnagar.yaml | 5 +- .../device-tree/Bindings/sound/cirrus,madera.yaml | 3 + .../device-tree/Bindings/sound/dai-common.yaml | 23 + .../Bindings/sound/davinci-mcasp-audio.yaml | 3 +- .../device-tree/Bindings/sound/dmic-codec.yaml | 55 + .../device-tree/Bindings/sound/everest,es8316.yaml | 5 +- .../device-tree/Bindings/sound/everest,es8326.yaml | 0 .../device-tree/Bindings/sound/fsl,micfil.yaml | 1 + .../device-tree/Bindings/sound/fsl,rpmsg.yaml | 36 +- .../device-tree/Bindings/sound/fsl,sai.yaml | 101 +- .../Bindings/sound/google,cros-ec-codec.yaml | 6 +- .../device-tree/Bindings/sound/ingenic,aic.yaml | 17 +- .../device-tree/Bindings/sound/ingenic,codec.yaml | 7 +- .../Bindings/sound/intel,keembay-i2s.yaml | 8 +- .../device-tree/Bindings/sound/linux,bt-sco.yaml | 5 +- .../Bindings/sound/linux,spdif-dit.yaml | 2 +- .../Bindings/sound/marvell,mmp-sspa.yaml | 7 +- .../Bindings/sound/maxim,max98357a.yaml | 52 + .../device-tree/Bindings/sound/maxim,max98504.yaml | 86 + .../device-tree/Bindings/sound/mchp,i2s-mcc.yaml | 18 +- .../device-tree/Bindings/sound/mchp,spdiftx.yaml | 5 +- .../device-tree/Bindings/sound/microchip,pdmc.yaml | 5 +- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 15 +- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 3 +- .../device-tree/Bindings/sound/mvebu-audio.txt | 14 +- sys/contrib/device-tree/Bindings/sound/nau8315.txt | 6 + .../Bindings/sound/nvidia,tegra186-asrc.yaml | 2 +- .../Bindings/sound/nvidia,tegra186-dspk.yaml | 2 +- .../Bindings/sound/nvidia,tegra20-spdif.yaml | 5 +- .../Bindings/sound/nvidia,tegra210-adx.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-amx.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-dmic.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-i2s.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-mixer.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-mvc.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-ope.yaml | 2 +- .../Bindings/sound/nvidia,tegra210-sfc.yaml | 2 +- .../device-tree/Bindings/sound/nxp,tfa989x.yaml | 2 +- .../device-tree/Bindings/sound/qcom,lpass-cpu.yaml | 5 +- .../Bindings/sound/qcom,lpass-rx-macro.yaml | 10 +- .../Bindings/sound/qcom,lpass-tx-macro.yaml | 14 +- .../Bindings/sound/qcom,lpass-va-macro.yaml | 10 +- .../Bindings/sound/qcom,lpass-wsa-macro.yaml | 62 +- *** 2740 LINES SKIPPED *** From nobody Wed Aug 9 13:30:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWCc0c2Lz4pyvR for ; Wed, 9 Aug 2023 13:30: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 4RLWCc075zz4N6Q; Wed, 9 Aug 2023 13:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPTxBnh4aVV5iLWYFiuJ1ZZSe1pkHCTwTHewKVDP6wg=; b=wcwwOjOVn/LpzUcT1883G5KPBbPGFcSzCBFxKARzF+wanwdkCJQgzsEZe9MRc/MMQSGWNb EI0iL0UFXmcDQZ+0MAPYW+Gdc+BPGdQq9GJQzPzAUjP78MRhh0bWVxkTBNqH0o+NFDXY9G YdGBjbtXYzYe0I1S4At/stYho1jOaQ4N4UgFrnMojzs87ejsO2+3G5qcvxHLUK890g4atF sPf0s4huimA3Xdbx9gsaMJXwlQjNdh3M1A+81x83VdHNlmIMlRRx9yG50BOxdIRfqII6Y8 9U0Sy8x1LCM7IG3bq+BuUgAl1Xm6V+hDBDKpiq2hA6lIMkib0AseC0TBGswF7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPTxBnh4aVV5iLWYFiuJ1ZZSe1pkHCTwTHewKVDP6wg=; b=POp8OBRxB3etOFBDDVzDvL2uLrp2NpC5Vf5KrctT4TkVDwJlq3oUteuT3+B2oiHEl1T55p 8Vm4QSEw8baxyRoIwICnYo1jloyQiLnrCl7GwFjRifWgFR8yNLbEsrf2W6b1KizG67kR/7 8+KYR9JuNY1e+NNUXQFYJiw81o0Skuyd5WmeePoa6q/TSY/XXuXV+A0xuXRFywDDt+I+Ly 8fNSzWUfjzUkbfFphSo2gOyV102uem4FYXp1sKmJ3x+MCOgvHSdIelQjTpfQ0mr8tg8ntr kQLSouAmZQQ5QxPsypdMUw2t8D6OCsyJnL4OcwTyxlX3lc2BPtHikg0qe+rong== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587852; a=rsa-sha256; cv=none; b=xcolfdpTMVgaSfPRSqW1h56EsESjTv2hGcpG77zuUjkmGyLdf1QOVGzPs8aw/2edMDa88n 8UDQ4RDmpHPnoHPFpws44b+BaD4KbeIMplaxvsMP0nFPIXS7R8TIgrDWu/dx+kEqIrX8e/ l3ueaZGVDwfWiN54GDAlZVyT+ntDSaIpyN749xxPBLE1POmN1GeaaP/tAriLMt1t/YVdqx ZZdbr0GvO4F8Fe3yk06Mp6ZJ+coeiXeBDF+voNAlNkTA2stGulBOCpox+mCFylNcf4zfu7 qo6QVkIl913PAHG5HXt840nL88i47b739WioNeVs4GvfMkwAs6KeeNjeATPbDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWCb60Y2z2rZ; Wed, 9 Aug 2023 13:30: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 379DUpIW037820; Wed, 9 Aug 2023 13:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DUpd1037819; Wed, 9 Aug 2023 13:30:51 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:30:51 GMT Message-Id: <202308091330.379DUpd1037819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: c227958a722d..4a8223f297bb - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: 4a8223f297bb7dff7a684da702777d7e94d054fe X-Git-Oldrev: c227958a722d6ad4841da8c2545527257ef219e8 X-Git-Newrev: 4a8223f297bb7dff7a684da702777d7e94d054fe Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=c227958a722d..4a8223f297bb 4a8223f297bb Import device-tree files from Linux 6.3 From nobody Wed Aug 9 13:30:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWCc0pkfz4pyvS for ; Wed, 9 Aug 2023 13:30: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 4RLWCc0PZ8z4NBk; Wed, 9 Aug 2023 13:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MmWrWScDZj+WLPWMCr5sO85AAElLzstdRcJwm7jvY4=; b=PjwEhSCB9U9EZgPe2xRZ+b4d6NHAaxIaxIp6w6+8fHpLaTt3yAkzOlPahJxn777DxbId4E JAtQU68C9w3O2nGyavG3Mj3ISQUB7PA2vTThRoRlvZ3gCprc18ieN2SxQ/JDbFrljAxAuZ gQ2VQuodyeJrSdpWqLudqnxcQ+vErFtwd7Fa4N2pibGPcxNA70MqKvH92iJ7v6d1sqIqPs utDolsKA9LjGDHdfLagGzN4p7NS85Z/ti4ymclH0sprzlhrNat/U+Qw40jVbf71WKbq8zK VtGKPrxbdG76R5rdb3n2ZC8OulJHTee+oynCqEyNvhDXmQJ7w8ko4q0g1xp3JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9MmWrWScDZj+WLPWMCr5sO85AAElLzstdRcJwm7jvY4=; b=mFiHyNdTtpq2jHNBggYc9AgAh1seBt/vFfoYRQP3mUj2bhlAuMiZELn0EPvzpKHbs6psyj Wn2YlqEmHP7Yy5s1pWsCx9LSiDXUVg0mOxFdrKp2+ob0d35vXKFOGcDcGBZEAvG/GPK08R vmG7borF2uMdT4PzmwO5amLePfliohtbuXEml/PSNuRvOx0CCJVyRDLeH6/E81FJOeDSWN 0Kge3AWsbhsAFsoLm7BsK7vdVD2icpX/Wx6jSvQH5a9xtjhOwnY2jQeihnaM9F3oax9dvf QKUgE5WCWFzY85Pzfz2vSoX9CgADDt/ly8WJys9dz1Tirom+q3yajFlRWx2GLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587852; a=rsa-sha256; cv=none; b=a2w6uH6goYLvpmsAmpNY4IMLveD1yDqPOs0rDm26hGSWIH/yIBEJ7M3egsyaVNkKs+e8Uv 6ohL5pnwGZjlDuViqbzbWCSR/NeeIdtqwrtpn40E03E/GqYrV2Ks7YlcdncYJjc52t6iEX dqpePaWsXMT8kRP02wMIw1GcY/xFZCxitcFE2LdA//Wz5GrXL2uwkw0XPU1lnPF0DVlj/O T5NMG3E2LLBxNpXgx35bDtQGbHKRraOgfj8jqnf7Pirm3ukWITCAotRQkNsidu7wJkedDs 1WzCh1PA4MalHqrBjkuXKx1S1ZjLDCYh0kdqtDHWELG/cxfcBhiyEyOq/FV4ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWCb6TRSz35f; Wed, 9 Aug 2023 13:30: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 379DUpTu037839; Wed, 9 Aug 2023 13:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DUpbw037838; Wed, 9 Aug 2023 13:30:51 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:30:51 GMT Message-Id: <202308091330.379DUpbw037838@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: bcc33d14333d - Create tag vendor/device-tree/6.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.3 X-Git-Reftype: annotated tag X-Git-Commit: bcc33d14333d4072547ec6e953826b376f4b94f7 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.3 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.3 tag vendor/device-tree/6.3 Tagger: Emmanuel Vadot TaggerDate: 2023-08-09 13:30:22 +0000 Tag device tree files from Linux 6.3 commit 4a8223f297bb7dff7a684da702777d7e94d054fe Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:30:20 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:30:20 +0000 Import device-tree files from Linux 6.3 From nobody Wed Aug 9 13:31:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWDh0Z9jz4q02W; Wed, 9 Aug 2023 13:31: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 4RLWDg673zz4Ngr; Wed, 9 Aug 2023 13:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+Ox9jvSHjUC6CrdllxcLWPL9J4L+HTinmabaDiKzXs=; b=dsVf3nvQe869hLFn9bDCpf3TQ7GXOqpe+4k1SbjN1OTpBjC3SYNYHK90pdpx533IFo0ga6 /Yndotn7x8tVe/hdHcyD1HD3K32XOlugbiClYs+7Rwr1kxPOuY0ZE1p0wUGQSnbfQMfirV +oJOrdsIFU+XU4yfgSVo0PThCDtikJiDJGx3YeAFUhR2iKbrQjdV+IqmQbwDS6XbkU/wBP rQeLaS6VyFiNDDeFvJ+YcrzNsmMe1tcrpqbzBCGpC6PNjGU8oQqmjKH1M35C49tK3oGhJ1 nJn2daEIr6SQghC066CdoIvRlgTlDKEd31nu8LPx/tjR7OpvjFuxTTDEV7io3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w+Ox9jvSHjUC6CrdllxcLWPL9J4L+HTinmabaDiKzXs=; b=UhgTBjmAJkhfGVgMQbj6ACS9fZq4qI3nDUQr+hW41x1Q/Zwx7UZ0pG7vDXV2akG4ajz00t XlmkW7ylJoqALxBrT5PVHd5KnaVGU7iZQUDmOSKKUHcjMNor/MxAP1gpu5pTfWH5rpxuFb TBnbDbu2t+qJbLCk9vGSsyT4VqUwpCOMmBkoYsOYupo9ktfGS0hDqacClXDEC5Le7QSUY1 NynZjG8+iwnwMmK71mTp6qhW0TYTj/LUTDIhldJMm7RhbjD2cBNdha3bttdouT770QtIJd KLDVDADVrTs/LSmgw/jBp88sbX9ym/8xQuGamqwMsICwvGoS9N1iuh3bFKAQMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587907; a=rsa-sha256; cv=none; b=AcwQwkcla84Sj2RfK92S2Qxj/2X5WEkQQ21n4FnXFwvp4nivTbVGi6z3q4kdZIDt4UPACd CGk0pz5FZnuHzuzjD4Nwnw/lNphgJ5m1GAjOz5lt7JFDVIU/Vtq/y66JtA+qvWC4jGti7v Q7Ul0griBFHFaAvyHQQZOmySPeyPGc3C8BJlGGmcv7hEZD1mkmvq788A6ztgrpQQF2mvVX NHVFhmSUscY7s4kz4nJOepAV3cMl3OgIOS9GCvsdQlgr0zeTwQvuFoNz9Qpq8e+EYASopo HYa+xr7OVjmn/63lZ6+29liq4Jtny6f2WGgRxlEO940RL/YgLhXFLCFre8dosw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWDg5C1Zz2rl; Wed, 9 Aug 2023 13:31: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 379DVlI1040199; Wed, 9 Aug 2023 13:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DVldB040192; Wed, 9 Aug 2023 13:31:47 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:31:47 GMT Message-Id: <202308091331.379DVldB040192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: cb7aa33ac6cd - main - Import device-tree files from Linux 6.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb7aa33ac6cd46a5434798e50363136e64f3ae98 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7aa33ac6cd46a5434798e50363136e64f3ae98 commit cb7aa33ac6cd46a5434798e50363136e64f3ae98 Merge: 8bab661a3316 4a8223f297bb Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:30:56 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:30:56 +0000 Import device-tree files from Linux 6.3 Sponsored by: Beckhoff Automation GmbH & Co. KG sys/contrib/device-tree/Bindings/Makefile | 2 +- sys/contrib/device-tree/Bindings/arm/altera.yaml | 1 + sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 3 + .../device-tree/Bindings/arm/aspeed/aspeed.yaml | 2 + .../device-tree/Bindings/arm/atmel-at91.yaml | 6 +- sys/contrib/device-tree/Bindings/arm/cpus.yaml | 4 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 96 +- sys/contrib/device-tree/Bindings/arm/mediatek.yaml | 4 + .../Bindings/arm/mediatek/mediatek,ethsys.txt | 1 + .../Bindings/arm/mediatek/mediatek,infracfg.yaml | 1 + .../Bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + .../arm/mediatek/mediatek,mt8195-clock.yaml | 16 - .../Bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + .../Bindings/arm/qcom,coresight-tpda.yaml | 129 + .../Bindings/arm/qcom,coresight-tpdm.yaml | 93 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 79 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 61 + .../device-tree/Bindings/arm/rockchip/pmu.yaml | 2 + .../Bindings/arm/samsung/samsung-boards.yaml | 1 + sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 15 + .../Bindings/ata/intel,ixp4xx-compact-flash.yaml | 1 + .../Bindings/bus/aspeed,ast2600-ahbc.yaml | 37 + .../Bindings/bus/nvidia,tegra210-aconnect.yaml | 4 +- .../Bindings/clock/idt,versaclock5.yaml | 1 + .../device-tree/Bindings/clock/imx8m-clock.yaml | 2 +- .../Bindings/clock/loongson,ls2k-clk.yaml | 63 + .../Bindings/clock/mediatek,apmixedsys.yaml | 1 + .../Bindings/clock/mediatek,topckgen.yaml | 1 + .../Bindings/clock/qcom,camcc-sm8250.yaml | 20 +- .../Bindings/clock/qcom,gcc-apq8084.yaml | 44 + .../Bindings/clock/qcom,gcc-msm8998.yaml | 6 +- .../Bindings/clock/qcom,gcc-qcs404.yaml | 38 +- .../Bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + .../device-tree/Bindings/clock/qcom,gcc-sdx55.yaml | 9 +- .../device-tree/Bindings/clock/qcom,gcc-sdx65.yaml | 8 +- .../Bindings/clock/qcom,gcc-sm8350.yaml | 2 - .../device-tree/Bindings/clock/qcom,gpucc.yaml | 2 + .../device-tree/Bindings/clock/qcom,mmcc.yaml | 46 +- .../Bindings/clock/qcom,msm8996-apcc.yaml | 6 +- .../Bindings/clock/qcom,msm8996-cbf.yaml | 53 + .../Bindings/clock/qcom,qdu1000-gcc.yaml | 51 + .../device-tree/Bindings/clock/qcom,rpmhcc.yaml | 2 + .../Bindings/clock/qcom,sa8775p-gcc.yaml | 84 + .../Bindings/clock/qcom,sm6350-camcc.yaml | 49 + .../Bindings/clock/qcom,sm8450-camcc.yaml | 1 + .../Bindings/clock/qcom,sm8550-dispcc.yaml | 105 + .../Bindings/clock/qcom,sm8550-tcsr.yaml | 55 + .../Bindings/clock/qcom,spmi-clkdiv.yaml | 71 + .../device-tree/Bindings/clock/qcom,videocc.yaml | 59 +- .../Bindings/clock/sifive/fu540-prci.yaml | 1 - .../Bindings/clock/socionext,uniphier-clock.yaml | 39 +- .../device-tree/Bindings/cpu/cpu-capacity.txt | 238 + .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 5 + .../Bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 81 +- .../Bindings/crypto/allwinner,sun8i-ce.yaml | 33 +- .../Bindings/crypto/aspeed,ast2600-acry.yaml | 49 + .../device-tree/Bindings/crypto/st,stm32-hash.yaml | 23 +- .../Bindings/display/bridge/cdns,dsi.yaml | 180 + .../Bindings/display/bridge/fsl,ldb.yaml | 16 +- .../Bindings/display/bridge/ite,it6505.yaml | 68 +- .../Bindings/display/bridge/ite,it66121.yaml | 4 +- .../display/bridge/renesas,dsi-csi2-tx.yaml | 3 +- .../Bindings/display/bridge/renesas,dsi.yaml | 1 + .../Bindings/display/bridge/sil,sii8620.yaml | 108 + .../Bindings/display/mediatek/mediatek,aal.yaml | 1 + .../Bindings/display/mediatek/mediatek,ccorr.yaml | 3 +- .../Bindings/display/mediatek/mediatek,color.yaml | 1 + .../Bindings/display/mediatek/mediatek,dither.yaml | 1 + .../Bindings/display/mediatek/mediatek,gamma.yaml | 1 + .../Bindings/display/mediatek/mediatek,ovl.yaml | 1 + .../display/mediatek/mediatek,postmask.yaml | 1 + .../Bindings/display/mediatek/mediatek,rdma.yaml | 4 + .../Bindings/display/msm/dp-controller.yaml | 34 +- .../Bindings/display/msm/dpu-common.yaml | 12 +- .../Bindings/display/msm/dsi-controller-main.yaml | 285 +- .../Bindings/display/msm/dsi-phy-28nm.yaml | 1 + .../Bindings/display/msm/dsi-phy-7nm.yaml | 5 +- .../Bindings/display/msm/dsi-phy-common.yaml | 7 +- .../device-tree/Bindings/display/msm/gpu.yaml | 4 +- .../Bindings/display/msm/mdss-common.yaml | 9 +- .../Bindings/display/msm/qcom,mdp5.yaml | 156 + .../Bindings/display/msm/qcom,mdss.yaml | 55 +- .../Bindings/display/msm/qcom,msm8998-dpu.yaml | 12 +- .../Bindings/display/msm/qcom,msm8998-mdss.yaml | 14 +- .../Bindings/display/msm/qcom,qcm2290-dpu.yaml | 12 +- .../Bindings/display/msm/qcom,qcm2290-mdss.yaml | 6 +- .../Bindings/display/msm/qcom,sc7180-dpu.yaml | 12 +- .../Bindings/display/msm/qcom,sc7180-mdss.yaml | 12 +- .../Bindings/display/msm/qcom,sc7280-dpu.yaml | 9 +- .../Bindings/display/msm/qcom,sc7280-mdss.yaml | 9 +- .../Bindings/display/msm/qcom,sc8280xp-dpu.yaml | 122 + .../Bindings/display/msm/qcom,sc8280xp-mdss.yaml | 151 + .../Bindings/display/msm/qcom,sdm845-dpu.yaml | 12 +- .../Bindings/display/msm/qcom,sdm845-mdss.yaml | 20 +- .../Bindings/display/msm/qcom,sm6115-dpu.yaml | 5 +- .../Bindings/display/msm/qcom,sm6115-mdss.yaml | 3 +- .../Bindings/display/msm/qcom,sm8150-dpu.yaml | 92 + .../Bindings/display/msm/qcom,sm8150-mdss.yaml | 332 ++ .../Bindings/display/msm/qcom,sm8250-dpu.yaml | 7 + .../Bindings/display/msm/qcom,sm8250-mdss.yaml | 14 +- .../Bindings/display/msm/qcom,sm8350-dpu.yaml | 120 + .../Bindings/display/msm/qcom,sm8350-mdss.yaml | 223 + .../Bindings/display/msm/qcom,sm8450-dpu.yaml | 139 + .../Bindings/display/msm/qcom,sm8450-mdss.yaml | 345 ++ .../Bindings/display/panel/auo,a030jtn01.yaml | 60 + .../Bindings/display/panel/focaltech,gpt3.yaml | 56 + .../Bindings/display/panel/himax,hx8394.yaml | 76 + .../Bindings/display/panel/panel-mipi-dbi-spi.yaml | 8 +- .../Bindings/display/panel/visionox,vtdr6130.yaml | 63 + .../device-tree/Bindings/display/renesas,du.yaml | 2 + .../Bindings/display/simple-framebuffer.yaml | 7 + .../display/tegra/nvidia,tegra186-display.yaml | 4 +- .../Bindings/display/tegra/nvidia,tegra20-dc.yaml | 3 +- .../Bindings/display/tegra/nvidia,tegra20-dsi.yaml | 3 +- .../Bindings/display/tegra/nvidia,tegra20-epp.yaml | 3 +- .../display/tegra/nvidia,tegra20-gr2d.yaml | 3 +- .../display/tegra/nvidia,tegra20-gr3d.yaml | 3 +- .../display/tegra/nvidia,tegra20-hdmi.yaml | 3 +- .../display/tegra/nvidia,tegra20-host1x.yaml | 3 +- .../Bindings/display/tegra/nvidia,tegra20-mpe.yaml | 3 +- .../Bindings/display/tegra/nvidia,tegra20-tvo.yaml | 3 +- .../Bindings/display/tegra/nvidia,tegra20-vi.yaml | 3 +- .../Bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- .../Bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- .../Bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- .../device-tree/Bindings/dma/altr,msgdma.yaml | 2 +- .../device-tree/Bindings/dma/apple,admac.yaml | 2 +- .../device-tree/Bindings/dma/arm-pl08x.yaml | 2 +- .../device-tree/Bindings/dma/dma-controller.yaml | 2 +- .../device-tree/Bindings/dma/dma-router.yaml | 2 +- sys/contrib/device-tree/Bindings/dma/fsl,edma.yaml | 2 +- .../device-tree/Bindings/dma/fsl,imx-sdma.yaml | 149 + .../device-tree/Bindings/dma/fsl,mxs-dma.yaml | 80 + .../device-tree/Bindings/dma/ingenic,dma.yaml | 2 +- .../device-tree/Bindings/dma/intel,ldma.yaml | 2 +- .../Bindings/dma/mediatek,uart-dma.yaml | 2 +- .../Bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- .../Bindings/dma/nvidia,tegra210-adma.yaml | 2 +- sys/contrib/device-tree/Bindings/dma/owl-dma.yaml | 2 +- .../device-tree/Bindings/dma/qcom,bam-dma.yaml | 2 +- sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 5 +- .../Bindings/dma/renesas,rcar-dmac.yaml | 2 +- .../device-tree/Bindings/dma/renesas,rz-dmac.yaml | 2 +- .../Bindings/dma/renesas,rzn1-dmamux.yaml | 2 +- .../device-tree/Bindings/dma/renesas,usb-dmac.yaml | 2 +- .../Bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- .../Bindings/dma/snps,dma-spear1340.yaml | 2 +- .../device-tree/Bindings/dma/snps,dw-axi-dmac.yaml | 38 +- .../Bindings/dma/socionext,uniphier-mio-dmac.yaml | 2 +- .../Bindings/dma/socionext,uniphier-xdmac.yaml | 2 +- .../device-tree/Bindings/dma/st,stm32-dma.yaml | 2 +- .../device-tree/Bindings/dma/st,stm32-dmamux.yaml | 2 +- .../device-tree/Bindings/dma/st,stm32-mdma.yaml | 2 +- .../device-tree/Bindings/dma/stericsson,dma40.yaml | 18 +- .../device-tree/Bindings/dma/ti/k3-bcdma.yaml | 77 +- .../device-tree/Bindings/dma/ti/k3-udma.yaml | 9 +- .../Bindings/dsp/mediatek,mt8186-dsp.yaml | 4 +- .../Bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 + .../device-tree/Bindings/firmware/arm,scmi.yaml | 43 +- .../device-tree/Bindings/firmware/qcom,scm.yaml | 68 +- .../Bindings/fuse/nvidia,tegra20-fuse.yaml | 3 +- .../Bindings/gpio/fujitsu,mb86s70-gpio.yaml | 50 + .../device-tree/Bindings/gpio/sprd,gpio-eic.yaml | 124 + .../device-tree/Bindings/gpio/sprd,gpio.yaml | 75 + .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 5 + .../device-tree/Bindings/hwmon/adi,adm1177.yaml | 12 +- .../device-tree/Bindings/hwmon/adi,adm1266.yaml | 6 +- .../Bindings/hwmon/adi,axi-fan-control.yaml | 20 +- .../device-tree/Bindings/hwmon/adi,ltc2945.yaml | 49 + .../device-tree/Bindings/hwmon/adi,ltc2947.yaml | 20 +- .../device-tree/Bindings/hwmon/adi,ltc2992.yaml | 28 +- .../device-tree/Bindings/hwmon/amd,sbrmi.yaml | 6 +- .../device-tree/Bindings/hwmon/amd,sbtsi.yaml | 6 +- .../Bindings/hwmon/hpe,gxp-fan-ctrl.yaml | 45 + .../device-tree/Bindings/hwmon/iio-hwmon.yaml | 8 +- .../device-tree/Bindings/hwmon/national,lm90.yaml | 44 +- .../device-tree/Bindings/hwmon/ntc-thermistor.yaml | 2 +- .../Bindings/hwmon/nuvoton,nct7802.yaml | 16 +- .../device-tree/Bindings/hwmon/nxp,mc34vr500.yaml | 36 + .../device-tree/Bindings/hwmon/ti,tmp513.yaml | 22 +- .../device-tree/Bindings/hwmon/ti,tps23861.yaml | 16 +- .../device-tree/Bindings/i2c/hpe,gxp-i2c.yaml | 59 + sys/contrib/device-tree/Bindings/i2c/i2c-gpio.yaml | 26 + .../device-tree/Bindings/i2c/i2c-mt65xx.yaml | 4 + .../Bindings/i2c/loongson,ls2x-i2c.yaml | 51 + .../device-tree/Bindings/i2c/qcom,i2c-cci.yaml | 49 +- .../Bindings/i2c/qcom,i2c-geni-qcom.yaml | 2 + .../Bindings/i2c/socionext,synquacer-i2c.yaml | 58 + .../Bindings/i2c/socionext,uniphier-fi2c.yaml | 3 + .../Bindings/i2c/socionext,uniphier-i2c.yaml | 3 + .../device-tree/Bindings/i2c/st,sti-i2c.yaml | 71 + .../Bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 11 +- .../Bindings/iio/accel/adi,adis16201.yaml | 2 +- .../Bindings/iio/accel/adi,adis16240.yaml | 2 +- .../Bindings/iio/accel/adi,adxl313.yaml | 2 +- .../Bindings/iio/accel/adi,adxl345.yaml | 4 +- .../Bindings/iio/accel/adi,adxl355.yaml | 52 +- .../Bindings/iio/accel/adi,adxl372.yaml | 48 +- .../Bindings/iio/accel/bosch,bma220.yaml | 2 +- .../Bindings/iio/accel/kionix,kxcjk1013.yaml | 2 +- .../Bindings/iio/accel/memsensing,msa311.yaml | 5 +- .../Bindings/iio/accel/nxp,fxls8962af.yaml | 4 +- .../device-tree/Bindings/iio/adc/adi,ad7091r5.yaml | 8 +- .../device-tree/Bindings/iio/adc/adi,ad7124.yaml | 2 +- .../device-tree/Bindings/iio/adc/adi,ad7192.yaml | 42 +- .../device-tree/Bindings/iio/adc/adi,ad7292.yaml | 2 +- .../device-tree/Bindings/iio/adc/adi,ad7606.yaml | 40 +- .../device-tree/Bindings/iio/adc/adi,ad7780.yaml | 2 +- .../device-tree/Bindings/iio/adc/adi,ad799x.yaml | 18 +- .../device-tree/Bindings/iio/adc/adi,ad9467.yaml | 8 +- .../device-tree/Bindings/iio/adc/adi,axi-adc.yaml | 10 +- .../Bindings/iio/adc/atmel,sama5d2-adc.yaml | 2 +- .../device-tree/Bindings/iio/adc/avia-hx711.yaml | 4 +- .../Bindings/iio/adc/cirrus,ep9301-adc.yaml | 47 + .../device-tree/Bindings/iio/adc/ingenic,adc.yaml | 18 +- .../Bindings/iio/adc/maxim,max1027.yaml | 4 +- .../Bindings/iio/adc/maxim,max1238.yaml | 2 +- .../Bindings/iio/adc/maxim,max1241.yaml | 4 +- .../Bindings/iio/adc/maxim,max1363.yaml | 2 +- .../Bindings/iio/adc/microchip,mcp3911.yaml | 4 +- .../Bindings/iio/adc/nxp,imx93-adc.yaml | 81 + .../Bindings/iio/adc/qcom,pm8018-adc.yaml | 2 +- .../Bindings/iio/adc/qcom,spmi-iadc.yaml | 3 +- .../Bindings/iio/adc/qcom,spmi-rradc.yaml | 16 +- .../Bindings/iio/adc/renesas,rzg2l-adc.yaml | 2 +- .../Bindings/iio/adc/samsung,exynos-adc.yaml | 6 +- .../device-tree/Bindings/iio/adc/st,stm32-adc.yaml | 8 +- .../device-tree/Bindings/iio/adc/st,stmpe-adc.yaml | 8 +- .../device-tree/Bindings/iio/adc/ti,adc081c.yaml | 55 + .../device-tree/Bindings/iio/adc/ti,ads1015.yaml | 8 +- .../device-tree/Bindings/iio/adc/ti,ads131e08.yaml | 2 +- .../device-tree/Bindings/iio/adc/ti,ads7924.yaml | 110 + .../device-tree/Bindings/iio/adc/ti,lmp92064.yaml | 70 + .../device-tree/Bindings/iio/adc/ti,tsc2046.yaml | 34 +- .../device-tree/Bindings/iio/dac/adi,ad3552r.yaml | 40 +- .../device-tree/Bindings/iio/dac/adi,ad5380.yaml | 1 + .../device-tree/Bindings/iio/dac/adi,ad5686.yaml | 1 + .../device-tree/Bindings/iio/dac/adi,ad5766.yaml | 22 +- .../device-tree/Bindings/iio/dac/adi,ad5770r.yaml | 88 +- .../device-tree/Bindings/iio/dac/adi,ltc2688.yaml | 52 +- .../device-tree/Bindings/iio/dac/lltc,ltc1660.yaml | 4 +- .../device-tree/Bindings/iio/dac/lltc,ltc2632.yaml | 20 +- .../Bindings/iio/dac/maxim,max5522.yaml | 49 + .../device-tree/Bindings/iio/dac/st,stm32-dac.yaml | 4 +- .../device-tree/Bindings/iio/dac/ti,dac5571.yaml | 2 +- .../Bindings/iio/frequency/adf4371.yaml | 12 +- .../Bindings/iio/gyroscope/adi,adxrs290.yaml | 14 +- .../Bindings/iio/gyroscope/nxp,fxas21002c.yaml | 30 +- .../Bindings/iio/health/ti,afe4403.yaml | 2 +- .../Bindings/iio/health/ti,afe4404.yaml | 2 +- .../device-tree/Bindings/iio/humidity/dht11.yaml | 2 +- .../Bindings/iio/humidity/ti,hdc2010.yaml | 16 +- .../Bindings/iio/imu/adi,adis16460.yaml | 2 +- .../Bindings/iio/imu/adi,adis16475.yaml | 24 +- .../device-tree/Bindings/iio/imu/bosch,bmi160.yaml | 32 +- .../Bindings/iio/imu/invensense,icm42600.yaml | 34 +- .../device-tree/Bindings/iio/imu/nxp,fxos8700.yaml | 26 +- .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 2 +- .../Bindings/iio/magnetometer/ti,tmag5273.yaml | 75 + .../Bindings/iio/magnetometer/yamaha,yas530.yaml | 18 +- .../Bindings/iio/potentiometer/adi,ad5272.yaml | 2 +- .../Bindings/iio/pressure/asc,dlhl60d.yaml | 2 +- .../device-tree/Bindings/iio/pressure/bmp085.yaml | 24 +- .../Bindings/iio/proximity/ams,as3935.yaml | 2 +- .../proximity/google,cros-ec-mkbp-proximity.yaml | 1 - .../Bindings/iio/proximity/semtech,sx9360.yaml | 2 +- .../device-tree/Bindings/iio/st,st-sensors.yaml | 2 + .../Bindings/iio/temperature/adi,ltc2983.yaml | 137 +- .../Bindings/iio/temperature/maxim,max31865.yaml | 12 +- .../Bindings/iio/temperature/ti,tmp117.yaml | 6 +- .../device-tree/Bindings/input/goodix,gt7375p.yaml | 7 + .../device-tree/Bindings/input/iqs626a.yaml | 94 +- .../Bindings/input/mediatek,pmic-keys.yaml | 1 + .../Bindings/input/microchip,cap11xx.yaml | 3 + .../Bindings/input/touchscreen/st,stmfts.yaml | 72 + .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + .../Bindings/interconnect/qcom,osm-l3.yaml | 1 + .../Bindings/interconnect/qcom,qdu1000-rpmh.yaml | 70 + .../Bindings/interconnect/qcom,rpm.yaml | 73 +- .../Bindings/interconnect/qcom,rpmh.yaml | 46 +- .../Bindings/interconnect/qcom,sa8775p-rpmh.yaml | 50 + .../Bindings/interconnect/qcom,sc7280-rpmh.yaml | 71 + .../Bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 49 + .../Bindings/interconnect/qcom,sm8450-rpmh.yaml | 124 + .../Bindings/interconnect/qcom,sm8550-rpmh.yaml | 139 + .../Bindings/interconnect/samsung,exynos-bus.yaml | 27 + .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 3 +- .../loongson,cpu-interrupt-controller.yaml | 34 + .../interrupt-controller/loongson,ls1x-intc.yaml | 51 + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 - .../socionext,synquacer-exiu.yaml | 53 + .../device-tree/Bindings/iommu/apple,dart.yaml | 1 + .../device-tree/Bindings/iommu/arm,smmu.yaml | 66 +- .../device-tree/Bindings/iommu/qcom,iommu.txt | 1 + .../Bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + .../Bindings/leds/backlight/kinetic,ktz8866.yaml | 76 + .../Bindings/leds/backlight/qcom-wled.yaml | 1 + sys/contrib/device-tree/Bindings/leds/common.yaml | 15 +- .../device-tree/Bindings/leds/leds-mt6323.txt | 2 +- .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 54 +- .../device-tree/Bindings/mailbox/qcom-ipcc.yaml | 2 + .../Bindings/mailbox/st,sti-mailbox.yaml | 53 + .../media/cec/amlogic,meson-gx-ao-cec.yaml | 92 + .../device-tree/Bindings/media/cec/cec-common.yaml | 28 + .../device-tree/Bindings/media/cec/cec-gpio.yaml | 74 + .../Bindings/media/cec/nvidia,tegra114-cec.yaml | 58 + .../Bindings/media/cec/samsung,s5p-cec.yaml | 66 + .../Bindings/media/cec/st,stih-cec.yaml | 66 + .../Bindings/media/cec/st,stm32-cec.yaml | 53 + .../Bindings/media/fsl,imx6ull-pxp.yaml | 88 + .../Bindings/media/i2c/asahi-kasei,ak7375.yaml | 52 + .../Bindings/media/i2c/chrontel,ch7322.yaml | 11 +- .../Bindings/media/i2c/maxim,max9286.yaml | 51 +- .../Bindings/media/i2c/ovti,ov5670.yaml | 93 + .../Bindings/media/i2c/ovti,ov5675.yaml | 122 + .../Bindings/media/i2c/ovti,ov8858.yaml | 106 + .../Bindings/media/i2c/sony,imx296.yaml | 106 + .../Bindings/media/i2c/sony,imx415.yaml | 122 + .../device-tree/Bindings/media/nxp,imx7-csi.yaml | 15 + .../intel,ixp4xx-expansion-bus-controller.yaml | 106 + .../intel,ixp4xx-expansion-peripheral-props.yaml | 80 + .../memory-controllers/mc-peripheral-props.yaml | 1 + .../Bindings/memory-controllers/ti,gpmc.yaml | 2 +- .../memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml | 45 + .../device-tree/Bindings/mfd/google,cros-ec.yaml | 20 + .../device-tree/Bindings/mfd/mediatek,mt6357.yaml | 111 + .../device-tree/Bindings/mfd/mscc,ocelot.yaml | 9 + sys/contrib/device-tree/Bindings/mfd/mt6397.txt | 2 +- .../device-tree/Bindings/mfd/nxp,bbnsm.yaml | 101 + .../device-tree/Bindings/mfd/omap-usb-host.txt | 8 +- .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 7 + .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 2 + sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 12 +- .../device-tree/Bindings/misc/xlnx,tmr-inject.yaml | 47 + .../Bindings/misc/xlnx,tmr-manager.yaml | 47 + .../Bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- .../Bindings/mmc/amlogic,meson-gx-mmc.yaml | 76 + .../Bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- .../device-tree/Bindings/mmc/arasan,sdhci.yaml | 6 +- .../device-tree/Bindings/mmc/cdns,sdhci.yaml | 25 +- .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 21 +- .../device-tree/Bindings/mmc/fsl-imx-mmc.yaml | 2 +- .../Bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 4 +- .../device-tree/Bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- .../Bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- .../Bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- .../device-tree/Bindings/mmc/mmc-spi-slot.yaml | 2 +- sys/contrib/device-tree/Bindings/mmc/mxs-mmc.yaml | 2 +- .../Bindings/mmc/nvidia,tegra20-sdhci.yaml | 37 +- sys/contrib/device-tree/Bindings/mmc/owl-mmc.yaml | 2 +- .../device-tree/Bindings/mmc/renesas,mmcif.yaml | 2 +- .../device-tree/Bindings/mmc/renesas,sdhi.yaml | 8 +- .../device-tree/Bindings/mmc/rockchip-dw-mshc.yaml | 3 +- .../Bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- .../device-tree/Bindings/mmc/sdhci-msm.yaml | 4 + .../device-tree/Bindings/mmc/sdhci-pxa.yaml | 19 +- .../Bindings/mmc/socionext,uniphier-sd.yaml | 10 + .../Bindings/mmc/starfive,jh7110-mmc.yaml | 77 + .../device-tree/Bindings/mmc/sunplus,mmc.yaml | 2 +- .../Bindings/mmc/synopsys-dw-mshc-common.yaml | 2 +- .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 7 + .../device-tree/Bindings/mtd/mediatek,mtk-nfc.yaml | 155 + .../Bindings/mtd/mediatek,nand-ecc-engine.yaml | 63 + .../device-tree/Bindings/mtd/mtd-physmap.yaml | 1 + .../Bindings/mtd/partitions/partitions.yaml | 2 +- .../Bindings/net/amlogic,g12a-mdio-mux.yaml | 80 + .../Bindings/net/amlogic,gxl-mdio-mux.yaml | 64 + .../device-tree/Bindings/net/asix,ax88796c.yaml | 3 +- .../Bindings/net/can/renesas,rcar-canfd.yaml | 16 +- .../Bindings/net/dsa/arrow,xrs700x.yaml | 2 +- .../device-tree/Bindings/net/dsa/brcm,b53.yaml | 2 +- .../device-tree/Bindings/net/dsa/brcm,sf2.yaml | 15 +- .../device-tree/Bindings/net/dsa/dsa-port.yaml | 30 +- sys/contrib/device-tree/Bindings/net/dsa/dsa.yaml | 49 +- .../Bindings/net/dsa/hirschmann,hellcreek.yaml | 2 +- .../Bindings/net/dsa/mediatek,mt7530.yaml | 58 +- .../Bindings/net/dsa/microchip,ksz.yaml | 2 +- .../Bindings/net/dsa/microchip,lan937x.yaml | 2 +- .../device-tree/Bindings/net/dsa/mscc,ocelot.yaml | 2 +- .../device-tree/Bindings/net/dsa/nxp,sja1105.yaml | 2 +- .../device-tree/Bindings/net/dsa/qca8k.yaml | 14 +- .../device-tree/Bindings/net/dsa/realtek.yaml | 2 +- .../Bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- .../Bindings/net/ethernet-switch-port.yaml | 26 + .../device-tree/Bindings/net/ethernet-switch.yaml | 62 + sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 1 + .../device-tree/Bindings/net/maxlinear,gpy2xx.yaml | 47 + .../device-tree/Bindings/net/micrel-ksz90x1.txt | 1 + .../device-tree/Bindings/net/motorcomm,yt8xxx.yaml | 117 + .../Bindings/net/mscc,vsc7514-switch.yaml | 140 +- .../device-tree/Bindings/net/nxp,dwmac-imx.yaml | 4 +- .../device-tree/Bindings/net/rfkill-gpio.yaml | 51 + .../device-tree/Bindings/net/rockchip-dwmac.yaml | 2 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 2 +- .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 33 +- .../device-tree/Bindings/net/ti,k3-am654-cpts.yaml | 8 + .../Bindings/net/wireless/esp,esp8089.yaml | 20 +- .../Bindings/net/wireless/ieee80211.yaml | 1 - .../Bindings/net/wireless/marvell-8xxx.txt | 4 +- .../Bindings/net/wireless/mediatek,mt76.yaml | 1 - .../Bindings/net/wireless/qcom,ath11k.yaml | 12 +- .../Bindings/net/wireless/silabs,wfx.yaml | 1 - .../Bindings/net/wireless/ti,wlcore.yaml | 70 +- .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 7 +- .../Bindings/nvmem/socionext,uniphier-efuse.yaml | 101 +- .../device-tree/Bindings/opp/opp-v2-kryo-cpu.yaml | 18 +- .../Bindings/opp/opp-v2-qcom-level.yaml | 4 +- .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 3 + .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 6 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 103 +- .../Bindings/pci/rockchip,rk3399-pcie-common.yaml | 69 + .../Bindings/pci/rockchip,rk3399-pcie-ep.yaml | 68 + .../Bindings/pci/rockchip,rk3399-pcie.yaml | 132 + .../Bindings/pci/socionext,uniphier-pcie-ep.yaml | 76 +- .../Bindings/pci/ti,j721e-pci-host.yaml | 14 +- .../device-tree/Bindings/perf/riscv,pmu.yaml | 161 + .../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 + .../Bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 5 + .../Bindings/phy/amlogic,meson-gxl-usb2-phy.yaml | 56 + .../Bindings/phy/hisilicon,hi3660-usb3.yaml | 3 +- .../Bindings/phy/hisilicon,hi3670-usb3.yaml | 3 +- .../device-tree/Bindings/phy/mediatek,tphy.yaml | 1 + .../Bindings/phy/nvidia,tegra124-xusb-padctl.yaml | 654 +++ .../Bindings/phy/nvidia,tegra186-xusb-padctl.yaml | 544 +++ .../Bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 632 +++ .../Bindings/phy/nvidia,tegra210-xusb-padctl.yaml | 786 ++++ .../Bindings/phy/qcom,hdmi-phy-other.yaml | 27 +- .../Bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 3 + .../Bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 3 + .../device-tree/Bindings/phy/qcom,pcie2-phy.yaml | 86 + .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 160 +- .../Bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 89 +- .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 52 +- .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 5 + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 4 + .../Bindings/phy/qcom,snps-eusb2-phy.yaml | 79 + .../Bindings/phy/qcom,snps-eusb2-repeater.yaml | 52 + .../Bindings/phy/qcom,usb-hsic-phy.yaml | 67 + .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +- .../Bindings/phy/rockchip,inno-usb2phy.yaml | 188 + .../Bindings/phy/rockchip,rk3288-dp-phy.yaml | 41 + .../Bindings/phy/samsung,dp-video-phy.yaml | 5 +- .../Bindings/phy/samsung,mipi-video-phy.yaml | 11 +- .../Bindings/phy/socionext,uniphier-ahci-phy.yaml | 24 +- .../Bindings/phy/socionext,uniphier-usb2-phy.yaml | 41 +- .../phy/socionext,uniphier-usb3hs-phy.yaml | 29 +- .../phy/socionext,uniphier-usb3ss-phy.yaml | 26 +- .../device-tree/Bindings/phy/ti,tcan104x-can.yaml | 1 + .../Bindings/pinctrl/fsl,imx8m-pinctrl.yaml | 90 + .../Bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 12 +- .../Bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 8 +- .../Bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 475 ++ .../Bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 8 +- .../Bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 197 + .../Bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 134 + .../Bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8909-tlmm.yaml | 8 +- .../Bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 6 +- .../Bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 18 + .../Bindings/pinctrl/qcom,pmic-mpp.yaml | 4 +- .../Bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 134 + .../Bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 138 + .../Bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 4 +- .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 4 +- .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 4 +- .../Bindings/pinctrl/qcom,sdm670-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 15 +- .../Bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 6 +- .../Bindings/pinctrl/qcom,sdx65-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,sm6115-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,sm6125-tlmm.yaml | 4 +- .../Bindings/pinctrl/qcom,sm6350-tlmm.yaml | 27 +- .../Bindings/pinctrl/qcom,sm6375-tlmm.yaml | 8 +- .../Bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 4 +- .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 6 +- .../Bindings/pinctrl/qcom,sm8350-tlmm.yaml | 18 +- .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 8 +- .../Bindings/pinctrl/qcom,sm8450-tlmm.yaml | 6 +- .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 150 + .../Bindings/pinctrl/qcom,sm8550-tlmm.yaml | 163 + .../Bindings/pinctrl/qcom,tlmm-common.yaml | 5 +- .../Bindings/pinctrl/ralink,mt7620-pinctrl.yaml | 633 ++- .../Bindings/pinctrl/ralink,mt7621-pinctrl.yaml | 205 +- .../Bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 86 +- .../Bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 236 +- .../Bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 205 +- .../Bindings/pinctrl/renesas,rzg2l-poeg.yaml | 86 + .../Bindings/pinctrl/rockchip,pinctrl.yaml | 4 +- .../pinctrl/socionext,uniphier-pinctrl.yaml | 17 +- .../pinctrl/starfive,jh7110-aon-pinctrl.yaml | 124 + .../pinctrl/starfive,jh7110-sys-pinctrl.yaml | 142 + .../Bindings/power/allwinner,sun20i-d1-ppu.yaml | 54 + .../Bindings/power/amlogic,meson-gx-pwrc.txt | 4 +- .../device-tree/Bindings/power/fsl,imx-gpc.yaml | 19 +- .../Bindings/power/mediatek,power-controller.yaml | 2 + .../device-tree/Bindings/power/power-domain.yaml | 3 - .../device-tree/Bindings/power/qcom,rpmpd.yaml | 2 +- .../Bindings/power/reset/syscon-reboot.yaml | 4 + .../Bindings/power/starfive,jh7110-pmu.yaml | 45 + .../power/supply/qcom,pm8941-coincell.yaml | 20 +- .../Bindings/power/supply/richtek,rt9467.yaml | 82 + .../Bindings/power/supply/richtek,rt9471.yaml | 73 + .../device-tree/Bindings/powerpc/nintendo/wii.txt | 10 - .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 93 + .../Bindings/pwm/nvidia,tegra20-pwm.yaml | 3 +- .../device-tree/Bindings/pwm/pwm-sifive.yaml | 1 - .../Bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 68 + .../Bindings/regulator/active-semi,act8600.yaml | 139 + .../Bindings/regulator/active-semi,act8846.yaml | 205 + .../Bindings/regulator/active-semi,act8865.yaml | 158 + .../Bindings/regulator/active-semi,act8945a.yaml | 258 ++ .../Bindings/regulator/fcs,fan53555.yaml | 64 + .../Bindings/regulator/fixed-regulator.yaml | 7 + .../Bindings/regulator/maxim,max20411.yaml | 58 + .../Bindings/regulator/mps,mpq7932.yaml | 68 + .../Bindings/regulator/qcom,rpm-regulator.yaml | 128 + .../regulator/qcom,usb-vbus-regulator.yaml | 2 +- .../Bindings/regulator/qcom-labibb-regulator.yaml | 6 +- .../regulator/socionext,uniphier-regulator.yaml | 21 +- .../device-tree/Bindings/remoteproc/qcom,adsp.yaml | 421 +- .../Bindings/remoteproc/qcom,glink-edge.yaml | 28 +- .../Bindings/remoteproc/qcom,glink-rpm-edge.yaml | 99 + .../Bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++ .../Bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 393 ++ .../Bindings/remoteproc/qcom,pas-common.yaml | 89 + .../device-tree/Bindings/remoteproc/qcom,q6v5.txt | 172 +- .../Bindings/remoteproc/qcom,qcs404-pas.yaml | 94 + .../Bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 3 +- .../Bindings/remoteproc/qcom,sc7180-pas.yaml | 133 + .../Bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 + .../Bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 3 +- .../Bindings/remoteproc/qcom,sc8180x-pas.yaml | 95 + .../Bindings/remoteproc/qcom,sc8280xp-pas.yaml | 147 + .../Bindings/remoteproc/qcom,sdx55-pas.yaml | 109 + .../Bindings/remoteproc/qcom,sm6115-pas.yaml | 143 + .../Bindings/remoteproc/qcom,sm6350-pas.yaml | 167 + .../Bindings/remoteproc/qcom,sm8150-pas.yaml | 174 + .../Bindings/remoteproc/qcom,sm8350-pas.yaml | 182 + .../Bindings/remoteproc/qcom,sm8550-pas.yaml | 178 + .../Bindings/remoteproc/qcom,wcnss-pil.yaml | 294 ++ .../Bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + .../Bindings/remoteproc/ti,pru-consumer.yaml | 60 + .../Bindings/reserved-memory/framebuffer.yaml | 52 + .../Bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- .../Bindings/reserved-memory/reserved-memory.yaml | 101 +- .../reset/socionext,uniphier-glue-reset.yaml | 23 +- .../Bindings/reset/socionext,uniphier-reset.yaml | 52 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 6 + .../device-tree/Bindings/riscv/microchip.yaml | 1 + .../device-tree/Bindings/riscv/sifive,ccache0.yaml | 12 +- .../device-tree/Bindings/riscv/starfive.yaml | 6 + sys/contrib/device-tree/Bindings/riscv/sunxi.yaml | 69 + .../Bindings/rng/starfive,jh7110-trng.yaml | 55 + .../Bindings/rtc/amlogic,meson-vrtc.yaml | 44 + .../Bindings/rtc/brcm,brcmstb-waketimer.yaml | 21 +- .../device-tree/Bindings/rtc/ingenic,rtc.yaml | 29 + .../Bindings/rtc/microcrystal,rv3028.yaml | 54 + .../device-tree/Bindings/rtc/moxa,moxart-rtc.txt | 12 +- .../device-tree/Bindings/rtc/nxp,pcf2127.yaml | 5 +- .../device-tree/Bindings/rtc/nxp,pcf85363.yaml | 60 + .../device-tree/Bindings/rtc/nxp,pcf8563.yaml | 2 - .../device-tree/Bindings/rtc/qcom-pm8xxx-rtc.yaml | 12 + .../device-tree/Bindings/rtc/trivial-rtc.yaml | 6 +- sys/contrib/device-tree/Bindings/serial/8250.yaml | 11 +- .../device-tree/Bindings/serial/8250_omap.yaml | 23 +- .../Bindings/serial/amlogic,meson-uart.yaml | 15 +- .../device-tree/Bindings/serial/cdns,uart.yaml | 27 +- .../Bindings/serial/fsl,s32-linflexuart.yaml | 2 +- .../device-tree/Bindings/serial/fsl-imx-uart.yaml | 11 +- .../device-tree/Bindings/serial/fsl-lpuart.yaml | 6 +- .../device-tree/Bindings/serial/fsl-mxs-auart.yaml | 2 +- sys/contrib/device-tree/Bindings/serial/pl011.yaml | 1 + .../device-tree/Bindings/serial/qcom,msm-uart.yaml | 56 + .../Bindings/serial/renesas,em-uart.yaml | 10 +- .../device-tree/Bindings/serial/renesas,hscif.yaml | 26 +- .../device-tree/Bindings/serial/renesas,sci.yaml | 24 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 28 +- .../device-tree/Bindings/serial/renesas,scifa.yaml | 22 +- .../device-tree/Bindings/serial/renesas,scifb.yaml | 12 +- sys/contrib/device-tree/Bindings/serial/rs485.yaml | 6 + .../device-tree/Bindings/serial/serial.yaml | 20 +- .../device-tree/Bindings/serial/sifive-serial.yaml | 6 +- .../Bindings/serial/snps-dw-apb-uart.yaml | 8 + .../device-tree/Bindings/serial/st,stm32-uart.yaml | 7 - .../Bindings/serial/xlnx,opb-uartlite.yaml | 6 +- .../Bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 57 + .../Bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 4 + .../Bindings/soc/mediatek/mediatek,mutex.yaml | 1 + .../Bindings/soc/mediatek/mediatek,pwrap.yaml | 147 + .../device-tree/Bindings/soc/qcom/qcom,dcc.yaml | 44 + .../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 + .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 95 + .../device-tree/Bindings/soc/qcom/qcom,rpm.yaml | 101 + .../Bindings/soc/qcom/qcom,rpmh-rsc.yaml | 3 +- .../Bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + .../Bindings/soc/renesas/renesas,rzv2m-pwc.yaml | 56 + .../device-tree/Bindings/soc/rockchip/grf.yaml | 12 +- .../Bindings/soc/samsung/exynos-pmu.yaml | 71 +- .../soc/samsung/samsung,exynos-sysreg.yaml | 87 + .../soc/socionext/socionext,uniphier-adamv.yaml | 50 + .../socionext/socionext,uniphier-ahci-glue.yaml | 77 + .../socionext/socionext,uniphier-dwc3-glue.yaml | 106 + .../soc/socionext/socionext,uniphier-mioctrl.yaml | 65 + .../soc/socionext/socionext,uniphier-perictrl.yaml | 64 + .../soc/socionext/socionext,uniphier-sdctrl.yaml | 61 + .../socionext,uniphier-soc-glue-debug.yaml | 68 + .../soc/socionext/socionext,uniphier-soc-glue.yaml | 114 + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 + .../device-tree/Bindings/soc/ti/k3-ringacc.yaml | 13 +- .../device-tree/Bindings/sound/adi,adau7002.yaml | 40 + sys/contrib/device-tree/Bindings/sound/ak4613.yaml | 7 + .../Bindings/sound/amlogic,axg-fifo.yaml | 112 + .../Bindings/sound/amlogic,axg-pdm.yaml | 82 + .../Bindings/sound/amlogic,axg-sound-card.yaml | 183 + .../Bindings/sound/amlogic,axg-spdifin.yaml | 86 + .../Bindings/sound/amlogic,axg-spdifout.yaml | 79 + .../Bindings/sound/amlogic,axg-tdm-formatters.yaml | 88 + .../Bindings/sound/amlogic,axg-tdm-iface.yaml | 55 + .../Bindings/sound/amlogic,gx-sound-card.yaml | 2 +- .../device-tree/Bindings/sound/apple,mca.yaml | 1 + .../Bindings/sound/audio-graph-port.yaml | 65 +- .../device-tree/Bindings/sound/awinic,aw88395.yaml | 53 + .../device-tree/Bindings/sound/cirrus,cs35l41.yaml | 43 +- .../Bindings/sound/component-common.yaml | 21 + .../device-tree/Bindings/sound/dai-common.yaml | 11 +- .../device-tree/Bindings/sound/fsl,sai.yaml | 38 +- .../device-tree/Bindings/sound/fsl,xcvr.yaml | 1 + .../Bindings/sound/google,sc7280-herobrine.yaml | 12 + .../Bindings/sound/infineon,peb2466.yaml | 91 + .../Bindings/sound/irondevice,sma1303.yaml | 48 + .../device-tree/Bindings/sound/maxim,max98090.yaml | 84 + .../device-tree/Bindings/sound/maxim,max98095.yaml | 54 + .../Bindings/sound/mediatek,mt8188-afe.yaml | 208 + .../Bindings/sound/mediatek,mt8188-mt6359.yaml | 97 + .../Bindings/sound/microchip,sama7g5-i2smcc.yaml | 110 + .../Bindings/sound/microchip,sama7g5-pdmc.yaml | 109 + .../Bindings/sound/microchip,sama7g5-spdifrx.yaml | 73 + .../Bindings/sound/microchip,sama7g5-spdiftx.yaml | 78 + .../Bindings/sound/nuvoton,nau8822.yaml | 46 + .../Bindings/sound/nvidia,tegra210-ahub.yaml | 4 +- .../Bindings/sound/nvidia,tegra210-ope.yaml | 4 +- .../device-tree/Bindings/sound/qcom,lpass-cpu.yaml | 136 +- .../Bindings/sound/qcom,lpass-va-macro.yaml | 4 +- .../device-tree/Bindings/sound/qcom,q6apm-dai.yaml | 3 +- .../device-tree/Bindings/sound/qcom,sm8250.yaml | 24 +- .../device-tree/Bindings/sound/qcom,wcd934x.yaml | 62 +- .../device-tree/Bindings/sound/qcom,wsa881x.yaml | 5 +- .../Bindings/sound/renesas,idt821034.yaml | 75 + .../device-tree/Bindings/sound/renesas,rsnd.yaml | 59 +- sys/contrib/device-tree/Bindings/sound/rt5640.txt | 3 + .../device-tree/Bindings/sound/samsung,odroid.yaml | 3 +- .../device-tree/Bindings/sound/samsung-i2s.yaml | 11 +- .../device-tree/Bindings/sound/simple-card.yaml | 18 +- sys/contrib/device-tree/Bindings/sound/tas5720.txt | 2 + .../device-tree/Bindings/sound/ti,pcm3168a.yaml | 107 + .../device-tree/Bindings/sound/ti,tlv320aic3x.yaml | 165 + .../Bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- .../Bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- .../Bindings/spi/amlogic,meson-gx-spicc.yaml | 32 +- .../Bindings/spi/amlogic,meson6-spifc.yaml | 28 +- .../Bindings/spi/aspeed,ast2600-fmc.yaml | 26 +- .../Bindings/spi/brcm,bcm63xx-hsspi.yaml | 134 + .../Bindings/spi/brcm,spi-bcm-qspi.yaml | 156 +- .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 36 +- .../device-tree/Bindings/spi/cdns,xspi.yaml | 6 +- .../device-tree/Bindings/spi/fsl,spi-fsl-qspi.yaml | 2 +- .../device-tree/Bindings/spi/fsl-imx-cspi.yaml | 2 +- .../Bindings/spi/mediatek,spi-mt65xx.yaml | 2 +- .../Bindings/spi/mediatek,spi-mtk-snfi.yaml | 54 +- .../Bindings/spi/mediatek,spi-slave-mt27xx.yaml | 2 +- .../Bindings/spi/mikrotik,rb4xx-spi.yaml | 2 +- .../Bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- sys/contrib/device-tree/Bindings/spi/mxs-spi.yaml | 2 +- .../Bindings/spi/nvidia,tegra210-quad.yaml | 44 +- .../Bindings/spi/qcom,spi-qcom-qspi.yaml | 11 +- .../device-tree/Bindings/spi/realtek,rtl-spi.yaml | 2 +- .../device-tree/Bindings/spi/renesas,rspi.yaml | 22 +- .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 2 +- .../device-tree/Bindings/spi/spi-cadence.yaml | 2 +- .../device-tree/Bindings/spi/spi-fsl-lpspi.yaml | 2 +- sys/contrib/device-tree/Bindings/spi/spi-gpio.yaml | 4 +- sys/contrib/device-tree/Bindings/spi/spi-mux.yaml | 4 +- .../device-tree/Bindings/spi/spi-nxp-fspi.yaml | 2 +- .../Bindings/spi/spi-peripheral-props.yaml | 10 + .../device-tree/Bindings/spi/spi-pl022.yaml | 18 +- .../device-tree/Bindings/spi/spi-rockchip.yaml | 2 +- .../device-tree/Bindings/spi/spi-sifive.yaml | 6 +- .../Bindings/spi/spi-sunplus-sp7021.yaml | 6 +- .../device-tree/Bindings/spi/spi-xilinx.yaml | 2 +- .../device-tree/Bindings/spi/spi-zynqmp-qspi.yaml | 2 +- .../device-tree/Bindings/spi/sprd,spi-adi.yaml | 5 +- .../device-tree/Bindings/spi/st,ssc-spi.yaml | 61 + .../device-tree/Bindings/spi/st,stm32-qspi.yaml | 2 +- .../device-tree/Bindings/spi/st,stm32-spi.yaml | 25 +- .../device-tree/Bindings/spi/xlnx,zynq-qspi.yaml | 2 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 1 + .../Bindings/thermal/mediatek,lvts-thermal.yaml | 142 + .../Bindings/thermal/qcom-spmi-adc-tm5.yaml | 1 + .../device-tree/Bindings/thermal/qcom-tsens.yaml | 153 +- .../Bindings/thermal/rcar-gen3-thermal.yaml | 3 + .../thermal/socionext,uniphier-thermal.yaml | 15 +- .../Bindings/timer/mediatek,mtk-timer.txt | 1 + .../device-tree/Bindings/timer/riscv,timer.yaml | 52 + .../Bindings/timer/rockchip,rk-timer.yaml | 1 + .../device-tree/Bindings/timer/sifive,clint.yaml | 8 + .../device-tree/Bindings/trivial-devices.yaml | 16 + sys/contrib/device-tree/Bindings/ufs/qcom,ufs.yaml | 7 + .../device-tree/Bindings/ufs/sprd,ums9620-ufs.yaml | 79 + .../Bindings/usb/allwinner,sun4i-a10-musb.yaml | 10 +- .../Bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml | 1 + .../device-tree/Bindings/usb/ci-hdrc-usb2.txt | 1 + .../device-tree/Bindings/usb/cypress,cypd4226.yaml | 98 + .../device-tree/Bindings/usb/faraday,fotg210.yaml | 7 +- .../device-tree/Bindings/usb/fcs,fsa4480.yaml | 2 +- .../device-tree/Bindings/usb/fcs,fusb302.yaml | 67 + .../device-tree/Bindings/usb/fsl,imx8mp-dwc3.yaml | 6 + .../device-tree/Bindings/usb/generic-ehci.yaml | 5 + .../device-tree/Bindings/usb/generic-ohci.yaml | 32 +- .../device-tree/Bindings/usb/genesys,gl850g.yaml | 1 + .../device-tree/Bindings/usb/gpio-sbu-mux.yaml | 110 + .../Bindings/usb/mediatek,mtk-xhci.yaml | 1 + .../device-tree/Bindings/usb/mediatek,mtu3.yaml | 1 + .../Bindings/usb/nvidia,tegra-xudc.yaml | 15 + .../Bindings/usb/nvidia,tegra234-xusb.yaml | 159 + sys/contrib/device-tree/Bindings/usb/pxa-usb.txt | 2 +- .../device-tree/Bindings/usb/qcom,dwc3.yaml | 3 + .../Bindings/usb/renesas,rzn1-usbf.yaml | 68 + .../Bindings/usb/renesas,rzv2m-usb3drd.yaml | 129 + .../device-tree/Bindings/usb/renesas,usb-xhci.yaml | 41 +- .../Bindings/usb/renesas,usb3-peri.yaml | 40 +- .../device-tree/Bindings/usb/rockchip,dwc3.yaml | 10 +- .../Bindings/usb/rockchip,rk3399-dwc3.yaml | 115 + .../Bindings/usb/samsung,exynos-dwc3.yaml | 8 +- .../device-tree/Bindings/usb/snps,dwc3.yaml | 10 + .../device-tree/Bindings/usb/ti,hd3ss3220.yaml | 1 - .../device-tree/Bindings/usb/ti,tps6598x.yaml | 3 + .../device-tree/Bindings/usb/usb-nop-xceiv.yaml | 2 +- .../device-tree/Bindings/usb/usbmisc-imx.txt | 1 + .../device-tree/Bindings/usb/vialab,vl817.yaml | 71 + .../device-tree/Bindings/vendor-prefixes.yaml | 30 + .../Bindings/watchdog/amlogic,meson6-wdt.yaml | 50 + .../device-tree/Bindings/watchdog/fsl-imx-wdt.yaml | 37 +- .../device-tree/Bindings/watchdog/gpio-wdt.yaml | 55 + .../Bindings/watchdog/maxim,max63xx.yaml | 1 + .../Bindings/watchdog/mediatek,mt7621-wdt.yaml | 7 + .../Bindings/watchdog/mediatek,mtk-wdt.yaml | 6 + .../device-tree/Bindings/watchdog/qcom-wdt.yaml | 96 +- .../device-tree/Bindings/watchdog/renesas,wdt.yaml | 2 +- .../Bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- .../device-tree/Bindings/watchdog/watchdog.yaml | 7 +- .../device-tree/include/dt-bindings/arm/qcom,ids.h | 83 + .../include/dt-bindings/clock/imx6qdl-clock.h | 4 +- .../include/dt-bindings/clock/imx6sll-clock.h | 2 +- .../include/dt-bindings/clock/imx6ul-clock.h | 7 +- .../include/dt-bindings/clock/imx8ulp-clock.h | 4 +- .../include/dt-bindings/clock/loongson,ls2k-clk.h | 29 + .../dt-bindings/clock/mediatek,mt7981-clk.h | 215 + .../include/dt-bindings/clock/qcom,gcc-apq8084.h | 1 + .../include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + .../include/dt-bindings/clock/qcom,gcc-sm8350.h | 1 - .../include/dt-bindings/clock/qcom,gcc-sm8450.h | 1 - .../include/dt-bindings/clock/qcom,qdu1000-gcc.h | 175 + .../include/dt-bindings/clock/qcom,rpmcc.h | 2 + .../include/dt-bindings/clock/qcom,sa8775p-gcc.h | 320 ++ .../include/dt-bindings/clock/qcom,sm6350-camcc.h | 109 + .../include/dt-bindings/clock/qcom,sm8550-dispcc.h | 101 + .../include/dt-bindings/clock/qcom,sm8550-tcsr.h | 18 + .../include/dt-bindings/clock/sun20i-d1-ccu.h | 2 + .../include/dt-bindings/firmware/qcom,scm.h | 16 + .../device-tree/include/dt-bindings/gpio/gpio.h | 2 +- .../dt-bindings/interconnect/qcom,qdu1000-rpmh.h | 98 + .../dt-bindings/interconnect/qcom,sa8775p-rpmh.h | 231 + .../include/dt-bindings/interconnect/qcom,sc7180.h | 3 - .../dt-bindings/interconnect/qcom,sc8180x.h | 3 - .../dt-bindings/interconnect/qcom,sc8280xp.h | 4 +- .../dt-bindings/interconnect/qcom,sdm670-rpmh.h | 136 + .../include/dt-bindings/interconnect/qcom,sdx55.h | 2 - .../include/dt-bindings/interconnect/qcom,sm8150.h | 3 - .../include/dt-bindings/interconnect/qcom,sm8250.h | 3 - .../dt-bindings/interconnect/qcom,sm8550-rpmh.h | 189 + .../device-tree/include/dt-bindings/pinctrl/k3.h | 3 + .../dt-bindings/pinctrl/starfive,jh7110-pinctrl.h | 137 + .../dt-bindings/power/allwinner,sun20i-d1-ppu.h | 10 + .../dt-bindings/power/mediatek,mt8188-power.h | 44 + .../include/dt-bindings/power/meson-g12a-power.h | 1 + .../include/dt-bindings/power/qcom-rpmpd.h | 31 +- .../include/dt-bindings/power/r8a779g0-sysc.h | 1 + .../dt-bindings/power/starfive,jh7110-pmu.h | 17 + .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 +- .../include/dt-bindings/reset/mt8195-resets.h | 45 + .../include/dt-bindings/reset/sun20i-d1-ccu.h | 2 + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 19 + sys/contrib/device-tree/src/arm/alpine.dtsi | 4 +- sys/contrib/device-tree/src/arm/am335x-nano.dts | 32 +- .../device-tree/src/arm/am3874-iceboard.dts | 4 +- .../src/arm/aspeed-bmc-amd-ethanolx.dts | 25 +- .../src/arm/aspeed-bmc-facebook-bletchley.dts | 13 +- .../src/arm/aspeed-bmc-facebook-greatlakes.dts | 241 + .../device-tree/src/arm/aspeed-bmc-ibm-bonnell.dts | 6 +- .../device-tree/src/arm/aspeed-bmc-ibm-everest.dts | 6 +- .../device-tree/src/arm/aspeed-bmc-ibm-rainier.dts | 6 +- .../device-tree/src/arm/aspeed-bmc-tyan-s8036.dts | 1 + .../src/arm/aspeed-bmc-ufispace-ncplite.dts | 360 ++ sys/contrib/device-tree/src/arm/aspeed-g6.dtsi | 13 + sys/contrib/device-tree/src/arm/at91-gatwick.dts | 12 +- .../device-tree/src/arm/at91-sam9x60_curiosity.dts | 503 ++ sys/contrib/device-tree/src/arm/at91-sam9x60ek.dts | 50 +- .../device-tree/src/arm/at91-sama5d27_som1_ek.dts | 6 +- .../src/arm/at91-sama5d27_wlsom1_ek.dts | 6 +- .../device-tree/src/arm/at91-sama5d2_icp.dts | 6 +- .../device-tree/src/arm/at91-sama5d2_ptc_ek.dts | 6 +- .../device-tree/src/arm/at91-sama5d2_xplained.dts | 6 +- .../device-tree/src/arm/at91-sama5d3_xplained.dts | 4 +- .../device-tree/src/arm/at91-sama5d4_ma5d4evk.dts | 6 +- .../device-tree/src/arm/at91-sama5d4_xplained.dts | 4 +- sys/contrib/device-tree/src/arm/at91-sama5d4ek.dts | 6 +- sys/contrib/device-tree/src/arm/at91-tse850-3.dts | 16 +- sys/contrib/device-tree/src/arm/axm55xx.dtsi | 8 +- sys/contrib/device-tree/src/arm/bcm11351.dtsi | 8 +- .../device-tree/src/arm/bcm21664-garnet.dts | 2 +- sys/contrib/device-tree/src/arm/bcm21664.dtsi | 6 +- sys/contrib/device-tree/src/arm/bcm28155-ap.dts | 2 +- sys/contrib/device-tree/src/arm/berlin2q.dtsi | 4 +- sys/contrib/device-tree/src/arm/cx92755.dtsi | 6 +- sys/contrib/device-tree/src/arm/dm814x.dtsi | 6 +- sys/contrib/device-tree/src/arm/dm816x.dtsi | 6 +- sys/contrib/device-tree/src/arm/dove-cm-a510.dtsi | 16 +- sys/contrib/device-tree/src/arm/dove-cubox.dts | 17 +- sys/contrib/device-tree/src/arm/dove-d2plug.dts | 6 +- sys/contrib/device-tree/src/arm/dove-d3plug.dts | 6 +- sys/contrib/device-tree/src/arm/dove.dtsi | 5 - sys/contrib/device-tree/src/arm/e60k02.dtsi | 1 + sys/contrib/device-tree/src/arm/e70k02.dtsi | 12 +- .../device-tree/src/arm/exynos-syscon-restart.dtsi | 2 +- .../device-tree/src/arm/exynos3250-monk.dts | 3 +- .../device-tree/src/arm/exynos3250-rinato.dts | 5 +- sys/contrib/device-tree/src/arm/exynos3250.dtsi | 386 +- .../device-tree/src/arm/exynos4-cpu-thermal.dtsi | 2 +- sys/contrib/device-tree/src/arm/exynos4.dtsi | 66 +- .../device-tree/src/arm/exynos4210-origen.dts | 2 +- .../device-tree/src/arm/exynos4210-smdkv310.dts | 2 +- sys/contrib/device-tree/src/arm/exynos4210.dtsi | 327 +- .../device-tree/src/arm/exynos4412-itop-elite.dts | 2 +- .../src/arm/exynos4412-itop-scp-core.dtsi | 2 +- .../device-tree/src/arm/exynos4412-midas.dtsi | 19 +- .../src/arm/exynos4412-odroid-common.dtsi | 2 +- .../device-tree/src/arm/exynos4412-odroidu3.dts | 2 +- .../device-tree/src/arm/exynos4412-odroidx.dts | 2 +- .../device-tree/src/arm/exynos4412-odroidx2.dts | 2 +- .../device-tree/src/arm/exynos4412-origen.dts | 2 +- .../device-tree/src/arm/exynos4412-p4note.dtsi | 7 +- .../device-tree/src/arm/exynos4412-pinctrl.dtsi | 2 +- .../device-tree/src/arm/exynos4412-tiny4412.dts | 8 + sys/contrib/device-tree/src/arm/exynos4412.dtsi | 381 +- sys/contrib/device-tree/src/arm/exynos5.dtsi | 22 +- .../device-tree/src/arm/exynos5250-arndale.dts | 35 +- .../device-tree/src/arm/exynos5250-smdk5250.dts | 2 +- .../device-tree/src/arm/exynos5250-snow-rev5.dts | 4 +- sys/contrib/device-tree/src/arm/exynos5250.dtsi | 86 +- .../device-tree/src/arm/exynos5260-xyref5260.dts | 2 +- sys/contrib/device-tree/src/arm/exynos5260.dtsi | 36 +- .../device-tree/src/arm/exynos5410-odroidxu.dts | 4 +- sys/contrib/device-tree/src/arm/exynos5410.dtsi | 2 +- .../src/arm/exynos5420-galaxy-tab-common.dtsi | 1 - sys/contrib/device-tree/src/arm/exynos5420.dtsi | 299 +- .../src/arm/exynos5422-odroid-core.dtsi | 34 +- .../device-tree/src/arm/exynos5422-odroidhc1.dts | 10 +- .../src/arm/exynos5422-odroidxu3-common.dtsi | 10 +- .../device-tree/src/arm/exynos5422-samsung-k3g.dts | 674 +++ sys/contrib/device-tree/src/arm/exynos54xx.dtsi | 16 +- sys/contrib/device-tree/src/arm/exynos5800.dtsi | 4 + .../device-tree/src/arm/gemini-dlink-dns-313.dts | 19 + sys/contrib/device-tree/src/arm/gemini-wbd111.dts | 31 +- sys/contrib/device-tree/src/arm/gemini-wbd222.dts | 31 +- sys/contrib/device-tree/src/arm/gemini.dtsi | 8 +- sys/contrib/device-tree/src/arm/imx23.dtsi | 2 - sys/contrib/device-tree/src/arm/imx28.dtsi | 8 - .../device-tree/src/arm/imx50-kobo-aura.dts | 2 +- sys/contrib/device-tree/src/arm/imx51-zii-rdu1.dts | 2 +- .../device-tree/src/arm/imx51-zii-scu2-mezz.dts | 2 +- .../device-tree/src/arm/imx51-zii-scu3-esb.dts | 2 +- sys/contrib/device-tree/src/arm/imx51.dtsi | 3 + sys/contrib/device-tree/src/arm/imx53-cx9020.dts | 10 +- sys/contrib/device-tree/src/arm/imx53-m53evk.dts | 4 +- sys/contrib/device-tree/src/arm/imx53-m53menlo.dts | 6 +- sys/contrib/device-tree/src/arm/imx53-sk-imx53.dts | 357 ++ sys/contrib/device-tree/src/arm/imx53-tx53.dtsi | 2 +- .../device-tree/src/arm/imx53-usbarmory.dts | 2 +- sys/contrib/device-tree/src/arm/imx53.dtsi | 3 + .../device-tree/src/arm/imx6dl-b1x5pv2.dtsi | 6 +- .../device-tree/src/arm/imx6dl-colibri-aster.dts | 2 + .../device-tree/src/arm/imx6dl-colibri-eval-v3.dts | 2 + .../device-tree/src/arm/imx6dl-colibri-iris.dts | 2 + .../device-tree/src/arm/imx6dl-riotboard.dts | 4 +- .../device-tree/src/arm/imx6dl-yapp4-common.dtsi | 6 +- .../device-tree/src/arm/imx6q-apalis-eval.dts | 2 + .../src/arm/imx6q-apalis-ixora-v1.2.dts | 2 + .../device-tree/src/arm/imx6q-apalis-ixora.dts | 2 + sys/contrib/device-tree/src/arm/imx6q-gw5400-a.dts | 6 +- sys/contrib/device-tree/src/arm/imx6q-h100.dts | 6 +- sys/contrib/device-tree/src/arm/imx6q-kp.dtsi | 4 +- .../device-tree/src/arm/imx6q-marsboard.dts | 4 +- sys/contrib/device-tree/src/arm/imx6q-tbs2910.dts | 2 +- .../device-tree/src/arm/imx6qdl-apalis.dtsi | 3 +- .../device-tree/src/arm/imx6qdl-colibri.dtsi | 5 +- sys/contrib/device-tree/src/arm/imx6qdl-emcon.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-gw51xx.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-gw52xx.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw53xx.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw54xx.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw551x.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-gw552x.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw553x.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-gw560x.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw5903.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-gw5904.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw5907.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-gw5910.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw5912.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-gw5913.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-nit6xlite.dtsi | 10 +- .../device-tree/src/arm/imx6qdl-nitrogen6_max.dtsi | 4 +- .../device-tree/src/arm/imx6qdl-phytec-mira.dtsi | 6 +- .../device-tree/src/arm/imx6qdl-phytec-pfla02.dtsi | 4 +- sys/contrib/device-tree/src/arm/imx6qdl-rex.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-sabreauto.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-sabresd.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-ts7970.dtsi | 4 +- sys/contrib/device-tree/src/arm/imx6qdl-tx6.dtsi | 2 +- .../device-tree/src/arm/imx6qdl-zii-rdu2.dtsi | 2 +- sys/contrib/device-tree/src/arm/imx6qdl.dtsi | 7 +- sys/contrib/device-tree/src/arm/imx6sl-evk.dts | 2 +- .../device-tree/src/arm/imx6sl-tolino-shine2hd.dts | 1 + .../device-tree/src/arm/imx6sl-tolino-vision5.dts | 7 + sys/contrib/device-tree/src/arm/imx6sll-evk.dts | 2 +- .../device-tree/src/arm/imx6sll-kobo-librah2o.dts | 7 + .../device-tree/src/arm/imx6sx-sabreauto.dts | 2 +- .../device-tree/src/arm/imx6sx-udoo-neo.dtsi | 4 +- sys/contrib/device-tree/src/arm/imx6sx.dtsi | 1 - .../device-tree/src/arm/imx6ul-14x14-evk.dtsi | 4 +- .../src/arm/imx6ul-phytec-phycore-som.dtsi | 2 +- .../device-tree/src/arm/imx6ul-tqma6ul-common.dtsi | 4 +- sys/contrib/device-tree/src/arm/imx6ul-tx6ul.dtsi | 2 +- sys/contrib/device-tree/src/arm/imx6ul.dtsi | 1 - .../device-tree/src/arm/imx6ull-colibri-aster.dtsi | 2 + .../src/arm/imx6ull-colibri-eval-v3.dtsi | 2 + .../device-tree/src/arm/imx6ull-colibri-iris.dtsi | 2 + .../device-tree/src/arm/imx6ull-colibri.dtsi | 16 +- .../device-tree/src/arm/imx6ull-dhcom-drc02.dts | 99 + .../device-tree/src/arm/imx6ull-dhcom-pdk2.dts | 222 + .../device-tree/src/arm/imx6ull-dhcom-picoitx.dts | 101 + .../src/arm/imx6ull-dhcom-som-cfg-sdcard.dtsi | 97 + .../device-tree/src/arm/imx6ull-dhcom-som.dtsi | 633 +++ *** 2528 LINES SKIPPED *** From nobody Wed Aug 9 13:32:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWFR2n1jz4q047 for ; Wed, 9 Aug 2023 13:32: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 4RLWFR2C3Gz4PH1; Wed, 9 Aug 2023 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JSDKfRabqeS6BVCX3tMs5DEdbcwMzc0//Ib4Q10/3U=; b=NqtTH1kvWn2UfZqedbggu1ylgsJ1jzdbUgLsz9BvO+XErFZnz9wpYOywc7Xy83FqmNqVqu flakxlQ9gsnpoSirRNIglrHy9t0TyEG9RnHsSsnrptZa0vDWSv9+el8uUNiqVr/DOQDPhA ngRpF9I0UZas6FfrZEtroGxmxzDliZ12xErr+923+F1hFAsh9Q1qmfrEf09DK7ozKWLhOV PnThKeybkSuE9fAu1VmGMQBZaQn+kfX5R+Twxl2CHHqhBITNCRy4rbBVcUEtlmTebGOgqk DrfuoVS3QF+GFqw2UZzlEftv6pAeY6oYwSWS03L5ketOEH747QyE53omkDhbpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JSDKfRabqeS6BVCX3tMs5DEdbcwMzc0//Ib4Q10/3U=; b=UzjTTmaS6zgT1+HEXVJpJS+5Ne4cRLiiGjrSnRyCA3SqmvryNhZSxk4Vr9PZqjEgPYNuC/ v1TI3gDzeks4UL8jyRJleyQw3kOGHNNnaPXHh9VYhYC3vkDWpYXnsDOa61CxY9QHTL3Pfv PFbUxwgif0Bams7BlCvfl67GaFvtG/wc7RQB1wJxz2oNo46ce/TEcRAIE5lLpvqHqJRiWI UdV5h33YMFFOxRx1iYai88QcoEsw4NAewQgAifRdSM/4QKNWwIDkQqyoPVpUF8S20zD95H 5+xGgK0taeVExuSN3bWyZKHUPKqavSqqWuVe4JBiDZXBOpJ3VsZo6FjvDZsuow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587947; a=rsa-sha256; cv=none; b=H4pFGcwCe2GUR8iPjvRspiDIpLvz7z0CkoPBhfoD26FqZ/KIZxRisbYGU9giACGBhEFasJ YCXm9e2n8cpNcmrcd7qxmSudMLY2PsVlBS9uowL/xZ7M3ZK0vmomkYkjvbmTZratRDTtRC lfhEZKylqKWvG0ssQCwwg70E3NbeR6ySoFD9ZzhtQLR4xjIN0OkSuGEmaALII3g8v3QJQD 34/4Ii66QDN80pJzeErVRvxTo0e7tX5sza2SzLPsFRbnfsLtlBeZZr5DiZXRCWdSZQh6Yh Nd6eRzGvj9w+2CtvfAJ3Fn5kBLG0o0SanA1JSgVe0bjSGVSEniiZ87zLtZ/LsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWFR1GBCz33H; Wed, 9 Aug 2023 13:32: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 379DWRVf041588; Wed, 9 Aug 2023 13:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DWRRX041587; Wed, 9 Aug 2023 13:32:27 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:32:27 GMT Message-Id: <202308091332.379DWRRX041587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 0900cf6ac317 - Create tag vendor/device-tree/6.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/tags/vendor/device-tree/6.4 X-Git-Reftype: annotated tag X-Git-Commit: 0900cf6ac3171dcb9921c91d44005d2a6c2a8154 Auto-Submitted: auto-generated The annotated tag vendor/device-tree/6.4 has been created by manu: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/device-tree/6.4 tag vendor/device-tree/6.4 Tagger: Emmanuel Vadot TaggerDate: 2023-08-09 13:32:00 +0000 Tag device tree files from Linux 6.4 commit c47d0ea183983e0631f8cc41e9d25e4854368a0a Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:31:58 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:31:58 +0000 Import device-tree files from Linux 6.4 From nobody Wed Aug 9 13:32:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWFR2n0Yz4pyw8 for ; Wed, 9 Aug 2023 13:32: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 4RLWFR22zjz4NxY; Wed, 9 Aug 2023 13:32:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7O9kWVDU4NfuEsI2QKrtnX5b8o1iMjbYteAOWW6w59k=; b=vjSzBa2NEzzU0OnpsJZw1MmEioXTh75cQCReMAhgaTLFy5oSaHrZUhN/8BWYnCg+0soHpr Cey7xl8afh1cnPhwqPo2QZsE6i9DTsEh42myibaYqWCigXxQzUZYZcUMgRmneukSjKSKG1 5vFsHb32aqMDlaMwaFaIxobkBGFzaL4bph7awZ6cT1Png2gdMwGizkgiQd44NJXKuX+ZUG MhM30dief67BkNNDlYusthnlQTwM+gBVGrgkK+IWN0OYPx5V0gt7C2j/UjRpMYYbceTjEt MkSKuxR/5w3kf6qFhQkE+7tbrNxA7OS9DPfFDLME46dGSFeBu72gG7HJG9oAHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7O9kWVDU4NfuEsI2QKrtnX5b8o1iMjbYteAOWW6w59k=; b=BG32HlCDPA3rNMJ6KbcopEOCwCEnPifH4j2Fh+g1wEJjvsDU3rqDDsYef9vDXIG7lLtEXW dnWpp+8QNcUfJicq+46VI0yabI5waMJets3XAjoPiGD/MZo0A+tUc3/DAx/5s6AxiK59hY RC6MYGIIS79MP2eVUEYnS3DVEmkHdZacWq/tLCCTaLo/5K+unFi94xArkj+1tfdFS8+Cfa ObC3Kvbhk2c93YPzwuhZ39nmDKK2/w6T0OerDd568AMW7E2UqDB6fA5AjGyGOaxDkQiy0c TbfAUJsX3jztWQV00rhl5URxleyKO6yEOaHyVM6NRNoAq7fS4i4bYFyk31Nxaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587947; a=rsa-sha256; cv=none; b=r0gM+nnW7KsAmN3hIxhO7CI5SHGha2GrZ0MyVKSCytEOpYKjIWpQ8mwcNUKDK1vSDf5A5y PZAwjCRZbB3ovTGT9U4lcDBoIUf7xSvzXIcH5gZWWyrMMVACwTi/1i5Odbj2Fkas+kTW6A Z9LxsOMeOaiZ/fAoKBX+51sVK7+awh5Te/R98ZaKf77CCry6WSX1m7LPmadaZwt/OhGmk1 kKG0pz1vNgEYFBFytYh0f4K5byt4YjLcH4evyHZc6psDsDSh1ZXjMTJcjsUGCslTAthDfi AWQaL9vw+J0t4LSr+RAT4HG+4+xKVebpLnBsxBxBGaQsuVUBwrpY4WywjpT+Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWFR0q6Xz2mx; Wed, 9 Aug 2023 13:32: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 379DWRXe041569; Wed, 9 Aug 2023 13:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DWRKW041568; Wed, 9 Aug 2023 13:32:27 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:32:27 GMT Message-Id: <202308091332.379DWRKW041568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Emmanuel Vadot Subject: git: 4a8223f297bb..c47d0ea18398 - vendor/device-tree - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/vendor/device-tree X-Git-Reftype: branch X-Git-Commit: c47d0ea183983e0631f8cc41e9d25e4854368a0a X-Git-Oldrev: 4a8223f297bb7dff7a684da702777d7e94d054fe X-Git-Newrev: c47d0ea183983e0631f8cc41e9d25e4854368a0a Auto-Submitted: auto-generated The branch vendor/device-tree has been updated by manu: URL: https://cgit.FreeBSD.org/src/log/?id=4a8223f297bb..c47d0ea18398 c47d0ea18398 Import device-tree files from Linux 6.4 From nobody Wed Aug 9 13:33:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWGN6725z4q0JX; Wed, 9 Aug 2023 13:33: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 4RLWGN5Y98z4PSm; Wed, 9 Aug 2023 13:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnESMmHYtyuLQIwA2EiZI+bltKCKM0vmezJah+sPhg0=; b=i99bQmzNqk97cUjLoinelD3hBkj3s3Ww9VA4k7W2sqD1RQIegbAM8FnbrIX3kjIuuCb3O6 bUXpdyz/UfIIl+haPZshUH0ZRcDooKaH1hr30PqeIJXQRTrYvJxQbtK+awPwSLwbb4Klgl hYeQksLfzQbc1IUuI9NfTwyK2+ThfuMzaOn3RFC80NQSD33OrC6/10+XDPkD2SES4GSjMo OHN3pShfZkTeXNzKR7BpiR2xcT6/bE+3prH2ZKE5rSXRij8nEBUUQO/DOsDt+Q/SJQfspU 1v/F+/JSwZRGSdUOSbCmcmNNbEbZAyHyfTTTPoT59EPvJtOVKm2TPHTB2Cyq4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691587996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qnESMmHYtyuLQIwA2EiZI+bltKCKM0vmezJah+sPhg0=; b=ibnImvpwFk7hwVgI2aM+IffRaN04lnTshYuAvTzEDzjJIW1T9xJ8Zu79hwqcAxLwI1uFQe VOFhiJvQMeuxMYYgNT8KP6pGv79fBzFkgxEg1Xu1dINL+PJMweuKvflFsWyk2KaeDiPDe5 3J87ukKSNXEnFK1V1nCVb2b9CFZxE6dteP7DblyQiNWEpEiwq7KTi6Nd8jYIv/GDLcDlkR WlXcT5E9AGMTpE14cnurA8QTqLrKJa2S4FdYjpUL9HiAMf6GQWawXcrq+T9iHnz1q1I0yN nIK2vn4Gx8uamRmQglPTsAO/XYLlTn4htAZzjsmqLAFNPtbrcTmcRypAU7q5tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691587996; a=rsa-sha256; cv=none; b=p9MXZBeC2JzGvQBhZCQzlRab/w+JbxYtR6gvBjD/VjXtJqFBdEQCe/Y2n27bChKSj9aTUe olkjxGsexQ3SzKw46aXMymH9vzFdXDHyIUqiV2lpyuEaXNVv7nnjk41/Izj6Qk2vAZrKcI 5Ky2vnifFrcZTBMQxQumlReDBieSLZKE1F2kgzfHOVMrEg8fghvxy4GKgWmvKW4RN9EQC8 SqPdzQwqEu7ScEho9NNl3/o08A8sjGVh9/09kuqTBn7xP5NdDybGWYdB0GGAPANAqEtTpv HNLNs3Dsi1Nobx7Z70ntButVB8FJkveEETwGvKdYo+scCDDUIc+3uhUB7aOfcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWGN4cvZz2my; Wed, 9 Aug 2023 13:33: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 379DXGH9041883; Wed, 9 Aug 2023 13:33:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DXGL8041877; Wed, 9 Aug 2023 13:33:16 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:33:16 GMT Message-Id: <202308091333.379DXGL8041877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: fac71e4e0988 - main - Import device-tree files from Linux 6.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fac71e4e09885bb2afa3d984a0c239a52e1a7418 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=fac71e4e09885bb2afa3d984a0c239a52e1a7418 commit fac71e4e09885bb2afa3d984a0c239a52e1a7418 Merge: cb7aa33ac6cd c47d0ea18398 Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:32:31 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:32:31 +0000 Import device-tree files from Linux 6.4 Sponsored by: Beckhoff Automation GmbH & Co. KG sys/contrib/device-tree/Bindings/.yamllint | 2 +- sys/contrib/device-tree/Bindings/arm/amlogic.yaml | 10 + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 4 +- .../arm/amlogic/amlogic,meson-mx-secbus2.yaml | 4 +- sys/contrib/device-tree/Bindings/arm/apple.yaml | 15 + .../device-tree/Bindings/arm/apple/apple,pmgr.yaml | 1 + .../Bindings/arm/arm,vexpress-juno.yaml | 1 + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 5 +- sys/contrib/device-tree/Bindings/arm/cpus.yaml | 4 + .../Bindings/arm/firmware/linaro,optee-tz.yaml | 3 +- sys/contrib/device-tree/Bindings/arm/fsl.yaml | 45 +- .../Bindings/arm/mediatek/mediatek,infracfg.yaml | 4 +- .../Bindings/arm/mediatek/mediatek,mmsys.yaml | 4 +- .../arm/mediatek/mediatek,mt7622-pcie-mirror.yaml | 4 +- .../Bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 5 +- .../arm/mediatek/mediatek,mt7986-wed-pcie.yaml | 4 +- .../arm/mediatek/mediatek,mt8186-clock.yaml | 4 +- .../arm/mediatek/mediatek,mt8186-sys-clock.yaml | 4 +- .../arm/mediatek/mediatek,mt8192-clock.yaml | 4 +- .../arm/mediatek/mediatek,mt8192-sys-clock.yaml | 4 +- .../arm/mediatek/mediatek,mt8195-clock.yaml | 4 +- .../arm/mediatek/mediatek,mt8195-sys-clock.yaml | 4 +- .../Bindings/arm/mediatek/mediatek,pericfg.yaml | 4 +- .../Bindings/arm/nvidia,tegra194-ccplex.yaml | 6 +- sys/contrib/device-tree/Bindings/arm/pmu.yaml | 2 + sys/contrib/device-tree/Bindings/arm/qcom.yaml | 36 + sys/contrib/device-tree/Bindings/arm/rockchip.yaml | 24 +- .../Bindings/arm/stm32/st,stm32-syscon.yaml | 2 + sys/contrib/device-tree/Bindings/arm/sunxi.yaml | 18 + sys/contrib/device-tree/Bindings/arm/tegra.yaml | 9 + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 6 +- .../arm/tegra/nvidia,tegra194-axi2apb.yaml | 4 +- .../Bindings/arm/tegra/nvidia,tegra194-cbb.yaml | 8 +- .../Bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 4 + .../Bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 +- sys/contrib/device-tree/Bindings/arm/ti/k3.yaml | 2 + .../device-tree/Bindings/ata/ahci-common.yaml | 8 +- .../device-tree/Bindings/ata/ahci-platform.yaml | 49 +- .../device-tree/Bindings/ata/ceva,ahci-1v84.yaml | 2 +- .../Bindings/ata/renesas,rcar-sata.yaml | 4 +- .../Bindings/auxdisplay/holtek,ht16k33.yaml | 4 +- .../Bindings/bus/allwinner,sun50i-a64-de2.yaml | 1 + .../Bindings/bus/allwinner,sun8i-a23-rsb.yaml | 1 + .../device-tree/Bindings/bus/microsoft,vmbus.yaml | 54 + sys/contrib/device-tree/Bindings/bus/palmbus.yaml | 1 + .../Bindings/bus/xlnx,versal-net-cdx.yaml | 82 + .../Bindings/cache/baikal,bt1-l2-ctl.yaml | 63 + .../Bindings/cache/freescale-l2cache.txt | 55 + sys/contrib/device-tree/Bindings/cache/l2c2x0.yaml | 242 +++ .../Bindings/cache/marvell,feroceon-cache.txt | 16 + .../Bindings/cache/marvell,tauros2-cache.txt | 17 + .../device-tree/Bindings/cache/qcom,llcc.yaml | 169 +++ .../device-tree/Bindings/cache/sifive,ccache0.yaml | 170 +++ .../cache/socionext,uniphier-system-cache.yaml | 101 ++ .../Bindings/chrome/google,cros-ec-typec.yaml | 2 +- .../chrome/google,cros-kbd-led-backlight.yaml | 2 +- .../device-tree/Bindings/clock/apple,nco.yaml | 1 + .../Bindings/clock/arm,syscon-icst.yaml | 4 +- .../Bindings/clock/brcm,bcm63268-timer-clocks.yaml | 40 + .../Bindings/clock/canaan,k210-clk.yaml | 2 +- .../Bindings/clock/imx8mp-audiomix.yaml | 79 + .../Bindings/clock/loongson,ls1x-clk.yaml | 45 + .../Bindings/clock/mediatek,apmixedsys.yaml | 4 +- .../Bindings/clock/mediatek,mt8186-fhctl.yaml | 7 +- .../Bindings/clock/mediatek,mt8188-clock.yaml | 71 + .../Bindings/clock/mediatek,mt8188-sys-clock.yaml | 55 + .../Bindings/clock/mediatek,topckgen.yaml | 4 +- .../device-tree/Bindings/clock/qcom,a53pll.yaml | 5 +- .../Bindings/clock/qcom,gcc-ipq4019.yaml | 53 + .../Bindings/clock/qcom,gcc-msm8909.yaml | 13 +- .../device-tree/Bindings/clock/qcom,gcc-other.yaml | 2 - .../device-tree/Bindings/clock/qcom,gpucc.yaml | 2 + .../Bindings/clock/qcom,ipq5332-gcc.yaml | 53 + .../Bindings/clock/qcom,ipq9574-gcc.yaml | 61 + .../Bindings/clock/qcom,kpss-acc-v1.yaml | 72 + .../device-tree/Bindings/clock/qcom,kpss-gcc.yaml | 88 ++ .../device-tree/Bindings/clock/qcom,rpmcc.yaml | 2 + .../Bindings/clock/qcom,sc7280-lpasscc.yaml | 7 + .../Bindings/clock/qcom,sm6115-gpucc.yaml | 58 + .../Bindings/clock/qcom,sm6125-gpucc.yaml | 64 + .../Bindings/clock/qcom,sm6375-gpucc.yaml | 60 + .../Bindings/clock/qcom,sm7150-gcc.yaml | 52 + .../Bindings/clock/renesas,9series.yaml | 6 + .../Bindings/clock/renesas,cpg-mssr.yaml | 4 +- .../Bindings/clock/renesas,r9a06g032-sysctrl.yaml | 2 +- .../clock/renesas,rcar-usb2-clock-sel.yaml | 4 +- .../Bindings/clock/renesas,rzg2l-cpg.yaml | 4 +- .../Bindings/clock/samsung,exynos850-clock.yaml | 21 +- .../Bindings/clock/skyworks,si521xx.yaml | 59 + .../Bindings/clock/sprd,sc9863a-clk.yaml | 4 +- .../Bindings/clock/sprd,ums512-clk.yaml | 4 +- .../Bindings/clock/starfive,jh7110-aoncrg.yaml | 107 ++ .../Bindings/clock/starfive,jh7110-syscrg.yaml | 104 ++ .../device-tree/Bindings/clock/ti,lmk04832.yaml | 2 +- .../Bindings/clock/xlnx,clocking-wizard.yaml | 4 +- .../Bindings/cpufreq/cpufreq-qcom-hw.yaml | 119 +- .../Bindings/crypto/fsl,sec-v4.0-mon.yaml | 156 ++ .../device-tree/Bindings/crypto/fsl,sec-v4.0.yaml | 266 ++++ .../Bindings/crypto/qcom,inline-crypto-engine.yaml | 42 + .../device-tree/Bindings/crypto/qcom-qce.yaml | 123 ++ .../device-tree/Bindings/crypto/ti,sa2ul.yaml | 4 +- .../Bindings/display/amlogic,meson-dw-hdmi.yaml | 4 +- .../Bindings/display/amlogic,meson-vpu.yaml | 4 +- .../Bindings/display/bridge/analogix,anx7625.yaml | 9 +- .../Bindings/display/bridge/analogix,dp.yaml | 63 + .../Bindings/display/bridge/anx6345.yaml | 2 +- .../Bindings/display/bridge/cdns,mhdp8546.yaml | 4 +- .../Bindings/display/bridge/lontium,lt8912b.yaml | 2 +- .../Bindings/display/bridge/nxp,ptn3460.yaml | 4 +- .../Bindings/display/bridge/parade,ps8622.yaml | 115 ++ .../Bindings/display/bridge/ps8640.yaml | 2 +- .../Bindings/display/bridge/samsung,mipi-dsim.yaml | 255 ++++ .../Bindings/display/bridge/sil,sii9234.yaml | 2 +- .../Bindings/display/bridge/snps,dw-mipi-dsi.yaml | 16 +- .../Bindings/display/bridge/ti,dlpc3433.yaml | 2 +- .../Bindings/display/bridge/ti,sn65dsi86.yaml | 6 +- .../Bindings/display/bridge/toshiba,tc358762.yaml | 2 +- .../Bindings/display/bridge/toshiba,tc358764.yaml | 89 ++ .../Bindings/display/bridge/toshiba,tc358767.yaml | 2 +- .../Bindings/display/bridge/toshiba,tc358768.yaml | 2 +- .../device-tree/Bindings/display/dp-aux-bus.yaml | 2 +- .../Bindings/display/dsi-controller.yaml | 18 +- .../Bindings/display/exynos/exynos_dp.txt | 2 +- .../Bindings/display/imx/fsl,imx-lcdc.yaml | 46 +- .../Bindings/display/imx/nxp,imx8mq-dcss.yaml | 4 +- .../Bindings/display/mediatek/mediatek,ccorr.yaml | 12 +- .../Bindings/display/mediatek/mediatek,color.yaml | 10 +- .../Bindings/display/mediatek/mediatek,dither.yaml | 4 +- .../Bindings/display/mediatek/mediatek,dsc.yaml | 4 +- .../Bindings/display/mediatek/mediatek,ethdr.yaml | 182 +++ .../Bindings/display/mediatek/mediatek,gamma.yaml | 7 +- .../Bindings/display/mediatek/mediatek,hdmi.yaml | 2 +- .../Bindings/display/mediatek/mediatek,merge.yaml | 7 +- .../Bindings/display/mediatek/mediatek,od.yaml | 7 +- .../Bindings/display/mediatek/mediatek,ovl-2l.yaml | 7 +- .../Bindings/display/mediatek/mediatek,ovl.yaml | 13 +- .../display/mediatek/mediatek,postmask.yaml | 4 +- .../Bindings/display/mediatek/mediatek,rdma.yaml | 13 +- .../Bindings/display/mediatek/mediatek,split.yaml | 4 +- .../Bindings/display/mediatek/mediatek,ufoe.yaml | 4 +- .../Bindings/display/mediatek/mediatek,wdma.yaml | 4 +- .../Bindings/display/msm/dp-controller.yaml | 25 +- .../Bindings/display/msm/dsi-controller-main.yaml | 29 +- .../Bindings/display/msm/dsi-phy-10nm.yaml | 2 +- .../device-tree/Bindings/display/msm/gmu.yaml | 4 +- .../device-tree/Bindings/display/msm/gpu.yaml | 4 +- .../device-tree/Bindings/display/msm/mdp4.yaml | 4 +- .../Bindings/display/msm/qcom,mdp5.yaml | 2 +- .../Bindings/display/msm/qcom,mdss.yaml | 4 + .../Bindings/display/msm/qcom,sm6115-mdss.yaml | 10 +- .../Bindings/display/msm/qcom,sm8450-mdss.yaml | 6 +- .../Bindings/display/msm/qcom,sm8550-dpu.yaml | 133 ++ .../Bindings/display/msm/qcom,sm8550-mdss.yaml | 333 +++++ .../display/panel/advantech,idk-1110wr.yaml | 2 +- .../Bindings/display/panel/boe,tv101wum-nl6.yaml | 3 + .../Bindings/display/panel/elida,kd35t133.yaml | 9 + .../display/panel/feiyang,fy07024di26a30d.yaml | 8 + .../display/panel/innolux,ee101ia-01d.yaml | 2 +- .../Bindings/display/panel/jadard,jd9365da-h3.yaml | 2 + .../display/panel/mitsubishi,aa104xd12.yaml | 2 +- .../display/panel/mitsubishi,aa121td01.yaml | 2 +- .../Bindings/display/panel/nec,nl8048hl11.yaml | 2 +- .../Bindings/display/panel/novatek,nt36523.yaml | 85 ++ .../Bindings/display/panel/novatek,nt36672a.yaml | 6 +- .../Bindings/display/panel/panel-lvds.yaml | 2 +- .../Bindings/display/panel/panel-simple-dsi.yaml | 24 +- .../Bindings/display/panel/panel-simple.yaml | 2 + .../Bindings/display/panel/panel-timing.yaml | 46 +- .../Bindings/display/panel/ronbo,rb070d30.yaml | 2 +- .../Bindings/display/panel/samsung,ams495qa01.yaml | 57 + .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 8 + .../Bindings/display/panel/seiko,43wvf1g.yaml | 4 +- .../Bindings/display/panel/sgd,gktw70sdae4se.yaml | 2 +- .../Bindings/display/panel/sharp,lq101r1sx01.yaml | 4 +- .../Bindings/display/panel/sitronix,st7701.yaml | 10 + .../Bindings/display/panel/sitronix,st7789v.yaml | 4 + .../Bindings/display/panel/sony,td4353-jdi.yaml | 82 + .../Bindings/display/panel/visionox,rm69299.yaml | 25 +- .../Bindings/display/panel/xinpeng,xpp055c272.yaml | 8 + .../device-tree/Bindings/display/renesas,du.yaml | 4 +- .../display/rockchip/rockchip,analogix-dp.yaml | 103 ++ .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 166 +++ .../Bindings/display/rockchip/rockchip,lvds.yaml | 170 +++ .../Bindings/display/simple-framebuffer.yaml | 9 + .../Bindings/display/solomon,ssd1307fb.yaml | 28 +- .../display/tegra/nvidia,tegra114-mipi.yaml | 2 +- .../display/tegra/nvidia,tegra124-sor.yaml | 12 +- .../Bindings/display/tegra/nvidia,tegra186-dc.yaml | 4 +- .../display/tegra/nvidia,tegra186-dsi-padctl.yaml | 2 +- .../Bindings/display/tegra/nvidia,tegra20-dsi.yaml | 12 +- .../display/tegra/nvidia,tegra20-hdmi.yaml | 6 +- .../Bindings/display/ti/ti,am65x-dss.yaml | 6 +- .../Bindings/display/ti/ti,j721e-dss.yaml | 4 +- .../Bindings/display/ti/ti,k2g-dss.yaml | 4 +- .../Bindings/display/xylon,logicvc-display.yaml | 22 +- .../device-tree/Bindings/dma/apple,admac.yaml | 1 + sys/contrib/device-tree/Bindings/dma/qcom,gpi.yaml | 1 + .../device-tree/Bindings/dma/renesas,rz-dmac.yaml | 14 + .../device-tree/Bindings/dma/snps,dw-axi-dmac.yaml | 23 +- .../device-tree/Bindings/dma/ti/k3-udma.yaml | 2 +- .../Bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 2 +- .../Bindings/dma/xilinx/xlnx,zynqmp-dpdma.yaml | 2 +- sys/contrib/device-tree/Bindings/eeprom/at25.yaml | 2 +- .../device-tree/Bindings/example-schema.yaml | 2 + .../Bindings/extcon/extcon-usbc-cros-ec.yaml | 2 +- .../Bindings/extcon/extcon-usbc-tusb320.yaml | 2 +- .../device-tree/Bindings/firmware/arm,scmi.yaml | 48 +- .../device-tree/Bindings/firmware/qcom,scm.yaml | 9 + .../Bindings/fpga/lattice,sysconfig.yaml | 2 +- .../Bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml | 2 +- .../Bindings/fpga/xlnx,fpga-slave-serial.yaml | 80 + .../Bindings/fpga/xlnx,pr-decoupler.yaml | 64 + .../device-tree/Bindings/gpio/fcs,fxl6408.yaml | 58 + .../device-tree/Bindings/gpio/gpio-pca9570.yaml | 2 +- .../device-tree/Bindings/gpio/gpio-pca95xx.yaml | 8 +- sys/contrib/device-tree/Bindings/gpio/gpio.txt | 41 +- .../Bindings/gpio/loongson,ls-gpio.yaml | 126 ++ .../Bindings/gpio/loongson,ls1x-gpio.yaml | 49 + .../device-tree/Bindings/gpio/nxp,pcf8575.yaml | 4 + .../Bindings/gpio/x-powers,axp209-gpio.yaml | 1 + .../device-tree/Bindings/gpu/arm,mali-bifrost.yaml | 87 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 4 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 4 +- .../Bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 4 +- .../Bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 4 +- .../device-tree/Bindings/hwmon/adi,ltc2992.yaml | 1 + sys/contrib/device-tree/Bindings/hwmon/pwm-fan.txt | 68 +- .../device-tree/Bindings/hwmon/pwm-fan.yaml | 97 ++ .../Bindings/hwmon/starfive,jh71x0-temp.yaml | 70 + .../device-tree/Bindings/hwmon/ti,ina2xx.yaml | 5 + .../device-tree/Bindings/hwmon/ti,tmp464.yaml | 2 +- .../Bindings/i2c/amlogic,meson6-i2c.yaml | 4 +- .../device-tree/Bindings/i2c/apple,i2c.yaml | 5 +- .../device-tree/Bindings/i2c/aspeed,i2c.yaml | 2 +- .../Bindings/i2c/atmel,at91sam-i2c.yaml | 2 +- .../device-tree/Bindings/i2c/brcm,kona-i2c.yaml | 59 + .../device-tree/Bindings/i2c/cdns,i2c-r1p10.yaml | 16 +- .../Bindings/i2c/google,cros-ec-i2c-tunnel.yaml | 2 +- sys/contrib/device-tree/Bindings/i2c/i2c-mpc.yaml | 3 +- .../device-tree/Bindings/i2c/i2c-mt65xx.yaml | 5 + .../device-tree/Bindings/i2c/i2c-mux-gpio.yaml | 4 +- .../Bindings/i2c/opencores,i2c-ocores.yaml | 1 + .../Bindings/i2c/qcom,i2c-geni-qcom.yaml | 4 +- .../device-tree/Bindings/i2c/renesas,rzv2m.yaml | 2 +- .../Bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- .../device-tree/Bindings/i2c/st,stm32-i2c.yaml | 2 +- .../Bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 4 +- .../Bindings/i3c/aspeed,ast2600-i3c.yaml | 72 + .../Bindings/i3c/silvaco,i3c-master.yaml | 2 +- .../Bindings/iio/adc/nxp,imx8qxp-adc.yaml | 7 + .../Bindings/iio/adc/renesas,rcar-gyroadc.yaml | 62 +- .../device-tree/Bindings/iio/adc/ti,ads1100.yaml | 46 + .../Bindings/iio/addac/adi,ad74413r.yaml | 9 + .../device-tree/Bindings/iio/imu/st,lsm6dsx.yaml | 3 + .../Bindings/iio/light/rohm,bu27034.yaml | 46 + .../device-tree/Bindings/iio/pressure/bmp085.yaml | 2 + .../device-tree/Bindings/iio/st,st-sensors.yaml | 6 +- .../Bindings/iio/temperature/adi,ltc2983.yaml | 67 +- .../Bindings/iio/temperature/ti,tmp117.yaml | 8 +- .../device-tree/Bindings/input/adc-joystick.yaml | 4 +- .../Bindings/input/google,cros-ec-keyb.yaml | 4 +- .../device-tree/Bindings/input/imx-keypad.yaml | 2 +- .../device-tree/Bindings/input/matrix-keymap.yaml | 2 +- .../Bindings/input/mediatek,mt6779-keypad.yaml | 2 +- .../Bindings/input/microchip,cap11xx.yaml | 4 +- .../device-tree/Bindings/input/pwm-beeper.yaml | 41 + .../device-tree/Bindings/input/pwm-vibrator.yaml | 4 +- .../Bindings/input/regulator-haptic.yaml | 4 +- .../input/touchscreen/elan,elants_i2c.yaml | 4 +- .../Bindings/interconnect/qcom,msm8998-bwmon.yaml | 41 +- .../Bindings/interconnect/qcom,osm-l3.yaml | 1 + .../Bindings/interconnect/qcom,rpm.yaml | 1 + .../interrupt-controller/actions,owl-sirq.yaml | 4 +- .../Bindings/interrupt-controller/apple,aic2.yaml | 22 +- .../Bindings/interrupt-controller/arm,gic-v3.yaml | 8 + .../Bindings/interrupt-controller/arm,gic.yaml | 4 +- .../interrupt-controller/fsl,irqsteer.yaml | 4 +- .../interrupt-controller/intel,ce4100-ioapic.yaml | 4 +- .../interrupt-controller/intel,ce4100-lapic.yaml | 4 +- .../intel,ixp4xx-interrupt.yaml | 4 +- .../interrupt-controller/loongson,htpic.yaml | 4 +- .../interrupt-controller/loongson,htvec.yaml | 4 +- .../interrupt-controller/loongson,liointc.yaml | 8 +- .../interrupt-controller/loongson,pch-msi.yaml | 10 +- .../interrupt-controller/loongson,pch-pic.yaml | 6 +- .../interrupt-controller/mediatek,sysirq.txt | 1 + .../Bindings/interrupt-controller/mrvl,intc.yaml | 4 +- .../mscc,ocelot-icpu-intr.yaml | 4 +- .../Bindings/interrupt-controller/qcom,pdc.yaml | 4 +- .../interrupt-controller/sifive,plic-1.0.0.yaml | 3 +- .../interrupt-controller/st,sti-irq-syscfg.txt | 9 +- .../Bindings/interrupt-controller/ti,sci-inta.yaml | 3 + .../device-tree/Bindings/iommu/apple,sart.yaml | 10 +- .../device-tree/Bindings/iommu/arm,smmu.yaml | 45 +- .../device-tree/Bindings/iommu/qcom,iommu.yaml | 113 ++ .../Bindings/iommu/renesas,ipmmu-vmsa.yaml | 32 +- sys/contrib/device-tree/Bindings/leds/common.yaml | 35 +- .../Bindings/leds/cznic,turris-omnia-leds.yaml | 2 +- .../device-tree/Bindings/leds/issi,is31fl319x.yaml | 2 +- .../device-tree/Bindings/leds/leds-aw2013.yaml | 2 +- .../device-tree/Bindings/leds/leds-qcom-lpg.yaml | 1 + .../device-tree/Bindings/leds/leds-rt4505.yaml | 2 +- .../device-tree/Bindings/leds/nxp,pca953x.yaml | 90 ++ .../Bindings/leds/qcom,spmi-flash-led.yaml | 117 ++ .../device-tree/Bindings/leds/rohm,bd2606mvv.yaml | 81 + .../device-tree/Bindings/leds/ti,tca6507.yaml | 2 +- .../Bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 4 +- .../Bindings/mailbox/apple,mailbox.yaml | 2 + .../Bindings/mailbox/mediatek,gce-mailbox.yaml | 20 +- .../Bindings/mailbox/microchip,mpfs-mailbox.yaml | 4 +- .../Bindings/mailbox/qcom,apcs-kpss-global.yaml | 44 +- .../device-tree/Bindings/mailbox/sprd-mailbox.yaml | 4 +- .../Bindings/mailbox/st,stm32-ipcc.yaml | 4 +- .../Bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 5 +- .../Bindings/media/allwinner,sun4i-a10-ir.yaml | 2 +- .../Bindings/media/allwinner,sun50i-h6-vpu-g2.yaml | 4 +- .../Bindings/media/amlogic,axg-ge2d.yaml | 4 +- .../Bindings/media/amlogic,gx-vdec.yaml | 4 +- .../Bindings/media/amlogic,meson-ir-tx.yaml | 4 +- .../Bindings/media/amlogic,meson6-ir.yaml | 47 + .../Bindings/media/gpio-ir-receiver.yaml | 3 + .../Bindings/media/i2c/aptina,mt9p031.yaml | 2 +- .../Bindings/media/i2c/aptina,mt9v111.yaml | 2 +- .../Bindings/media/i2c/chrontel,ch7322.yaml | 4 +- .../Bindings/media/i2c/dongwoon,dw9768.yaml | 6 +- .../device-tree/Bindings/media/i2c/imx219.yaml | 2 +- .../device-tree/Bindings/media/i2c/imx258.yaml | 4 +- .../Bindings/media/i2c/maxim,max9286.yaml | 9 +- .../device-tree/Bindings/media/i2c/mipi-ccs.yaml | 2 +- .../device-tree/Bindings/media/i2c/ov8856.yaml | 2 +- .../Bindings/media/i2c/ovti,ov02a10.yaml | 2 +- .../Bindings/media/i2c/ovti,ov2685.yaml | 102 ++ .../Bindings/media/i2c/ovti,ov5648.yaml | 2 +- .../Bindings/media/i2c/ovti,ov772x.yaml | 2 +- .../Bindings/media/i2c/ovti,ov8865.yaml | 2 +- .../Bindings/media/i2c/ovti,ov9282.yaml | 2 +- .../Bindings/media/i2c/rda,rda5807.yaml | 2 +- .../Bindings/media/i2c/samsung,s5k5baf.yaml | 101 ++ .../Bindings/media/i2c/samsung,s5k6a3.yaml | 98 ++ .../Bindings/media/i2c/sony,imx214.yaml | 2 +- .../Bindings/media/i2c/sony,imx274.yaml | 2 +- .../Bindings/media/i2c/sony,imx290.yaml | 25 +- .../Bindings/media/i2c/sony,imx334.yaml | 4 +- .../Bindings/media/i2c/sony,imx335.yaml | 2 +- .../Bindings/media/i2c/sony,imx412.yaml | 2 +- .../Bindings/media/mediatek,mdp3-rdma.yaml | 2 +- .../Bindings/media/mediatek,mt8195-jpegdec.yaml | 7 - .../Bindings/media/mediatek,mt8195-jpegenc.yaml | 7 - .../Bindings/media/mediatek,vcodec-decoder.yaml | 5 - .../Bindings/media/mediatek,vcodec-encoder.yaml | 5 - .../media/mediatek,vcodec-subdev-decoder.yaml | 117 +- .../Bindings/media/mediatek-jpeg-encoder.yaml | 5 - .../Bindings/media/microchip,sama5d4-vdec.yaml | 4 +- .../device-tree/Bindings/media/nxp,imx8-isi.yaml | 173 +++ .../device-tree/Bindings/media/nxp,imx8mq-vpu.yaml | 4 +- .../Bindings/media/qcom,msm8916-camss.yaml | 4 +- .../Bindings/media/qcom,msm8916-venus.yaml | 86 +- .../Bindings/media/qcom,msm8996-camss.yaml | 4 +- .../Bindings/media/qcom,msm8996-venus.yaml | 146 +- .../Bindings/media/qcom,sc7180-venus.yaml | 97 +- .../Bindings/media/qcom,sc7280-venus.yaml | 132 +- .../Bindings/media/qcom,sdm660-camss.yaml | 4 +- .../Bindings/media/qcom,sdm660-venus.yaml | 144 +- .../Bindings/media/qcom,sdm845-camss.yaml | 4 +- .../Bindings/media/qcom,sdm845-venus-v2.yaml | 108 +- .../Bindings/media/qcom,sdm845-venus.yaml | 104 +- .../Bindings/media/qcom,sm8250-camss.yaml | 4 +- .../Bindings/media/qcom,sm8250-venus.yaml | 122 +- .../Bindings/media/qcom,venus-common.yaml | 73 + sys/contrib/device-tree/Bindings/media/rc.yaml | 4 +- .../device-tree/Bindings/media/renesas,csi2.yaml | 1 + .../device-tree/Bindings/media/renesas,fcp.yaml | 45 +- .../device-tree/Bindings/media/renesas,isp.yaml | 1 + .../device-tree/Bindings/media/renesas,vin.yaml | 5 +- .../device-tree/Bindings/media/renesas,vsp1.yaml | 13 +- .../Bindings/media/rockchip,rk3568-vepu.yaml | 4 +- .../device-tree/Bindings/media/rockchip-isp1.yaml | 19 +- .../device-tree/Bindings/media/rockchip-vpu.yaml | 4 +- .../Bindings/media/samsung,exynos4210-csis.yaml | 170 +++ .../Bindings/media/samsung,exynos4210-fimc.yaml | 152 ++ .../Bindings/media/samsung,exynos4212-fimc-is.yaml | 220 +++ .../media/samsung,exynos4212-fimc-lite.yaml | 63 + .../device-tree/Bindings/media/samsung,fimc.yaml | 279 ++++ .../Bindings/media/samsung,s5c73m3.yaml | 165 +++ .../device-tree/Bindings/media/silabs,si470x.yaml | 48 + sys/contrib/device-tree/Bindings/media/ti,cal.yaml | 6 +- .../Bindings/memory-controllers/arm,pl35x-smc.yaml | 2 +- .../Bindings/memory-controllers/exynos-srom.yaml | 1 + .../intel,ixp4xx-expansion-bus-controller.yaml | 1 + .../memory-controllers/mediatek,smi-common.yaml | 2 + .../memory-controllers/mediatek,smi-larb.yaml | 4 + .../memory-controllers/nvidia,tegra124-emc.yaml | 1 + .../Bindings/memory-controllers/renesas,dbsc.yaml | 4 +- .../memory-controllers/renesas,rpc-if.yaml | 2 +- .../memory-controllers/samsung,exynos5422-dmc.yaml | 6 +- .../memory-controllers/st,stm32-fmc2-ebi.yaml | 1 + .../device-tree/Bindings/mfd/actions,atc260x.yaml | 2 +- .../Bindings/mfd/canaan,k210-sysctl.yaml | 8 +- .../device-tree/Bindings/mfd/dlg,da9063.yaml | 17 +- .../device-tree/Bindings/mfd/google,cros-ec.yaml | 28 +- .../Bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml | 2 +- .../device-tree/Bindings/mfd/maxim,max5970.yaml | 151 ++ .../device-tree/Bindings/mfd/mediatek,mt6357.yaml | 1 + .../device-tree/Bindings/mfd/mediatek,mt6370.yaml | 2 + .../device-tree/Bindings/mfd/qcom,spmi-pmic.yaml | 15 +- .../device-tree/Bindings/mfd/qcom,tcsr.yaml | 4 + .../device-tree/Bindings/mfd/qcom-pm8xxx.yaml | 2 +- .../Bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- .../Bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- sys/contrib/device-tree/Bindings/mfd/syscon.yaml | 2 + .../Bindings/mfd/ti,j721e-system-controller.yaml | 11 + .../device-tree/Bindings/mfd/ti,nspire-misc.yaml | 51 + .../device-tree/Bindings/mfd/ti,tps65086.yaml | 2 +- .../device-tree/Bindings/mfd/wlf,arizona.yaml | 2 +- .../device-tree/Bindings/mfd/x-powers,ac100.yaml | 4 +- .../device-tree/Bindings/mfd/x-powers,axp152.yaml | 36 +- .../device-tree/Bindings/mfd/xylon,logicvc.yaml | 4 +- .../Bindings/mips/loongson/devices.yaml | 12 + .../device-tree/Bindings/mmc/arasan,sdhci.yaml | 30 +- .../device-tree/Bindings/mmc/aspeed,sdhci.yaml | 1 + .../device-tree/Bindings/mmc/cdns,sdhci.yaml | 27 +- .../device-tree/Bindings/mmc/fsl-imx-esdhc.yaml | 2 +- .../Bindings/mmc/fujitsu,sdhci-fujitsu.yaml | 15 +- sys/contrib/device-tree/Bindings/mmc/mtk-sd.yaml | 1 + .../device-tree/Bindings/mmc/sdhci-msm.yaml | 2 + .../Bindings/mtd/allwinner,sun4i-a10-nand.yaml | 2 +- .../Bindings/mtd/arasan,nand-controller.yaml | 4 +- .../Bindings/mtd/arm,pl353-nand-r2p1.yaml | 3 +- .../device-tree/Bindings/mtd/gpmi-nand.yaml | 2 +- .../Bindings/mtd/intel,lgm-ebunand.yaml | 2 +- .../device-tree/Bindings/mtd/jedec,spi-nor.yaml | 2 +- .../device-tree/Bindings/mtd/mtd-physmap.yaml | 2 +- sys/contrib/device-tree/Bindings/mtd/mtd.yaml | 1 + sys/contrib/device-tree/Bindings/mtd/mxc-nand.yaml | 2 +- .../device-tree/Bindings/mtd/nand-chip.yaml | 2 +- .../device-tree/Bindings/mtd/nand-controller.yaml | 2 +- .../mtd/partitions/brcm,bcm4908-partitions.yaml | 2 +- .../mtd/partitions/linksys,ns-partitions.yaml | 2 +- .../device-tree/Bindings/mtd/qcom,nandc.yaml | 2 +- .../device-tree/Bindings/mtd/renesas-nandc.yaml | 2 +- .../Bindings/mtd/rockchip,nand-controller.yaml | 2 +- sys/contrib/device-tree/Bindings/mtd/spi-nand.yaml | 2 +- .../Bindings/mtd/st,stm32-fmc2-nand.yaml | 2 +- .../device-tree/Bindings/mtd/ti,gpmc-nand.yaml | 4 +- .../device-tree/Bindings/mtd/ti,gpmc-onenand.yaml | 4 +- .../device-tree/Bindings/net/actions,owl-emac.yaml | 2 +- .../Bindings/net/allwinner,sun4i-a10-emac.yaml | 2 +- .../Bindings/net/allwinner,sun4i-a10-mdio.yaml | 2 +- sys/contrib/device-tree/Bindings/net/altr,tse.yaml | 2 +- .../Bindings/net/amlogic,meson-dwmac.yaml | 4 +- .../device-tree/Bindings/net/asix,ax88796c.yaml | 2 +- .../Bindings/net/aspeed,ast2600-mdio.yaml | 2 +- .../Bindings/net/bluetooth/nxp,88w8987-bt.yaml | 45 + .../Bindings/net/bluetooth/qualcomm-bluetooth.yaml | 17 + .../device-tree/Bindings/net/brcm,amac.yaml | 2 +- .../device-tree/Bindings/net/brcm,bcmgenet.yaml | 2 - .../device-tree/Bindings/net/brcm,systemport.yaml | 2 +- .../Bindings/net/broadcom-bluetooth.yaml | 2 +- .../device-tree/Bindings/net/can/fsl,flexcan.yaml | 3 + .../Bindings/net/can/microchip,mcp251xfd.yaml | 2 +- .../Bindings/net/can/st,stm32-bxcan.yaml | 96 ++ .../device-tree/Bindings/net/can/xilinx,can.yaml | 6 +- .../Bindings/net/cortina,gemini-ethernet.yaml | 6 +- .../device-tree/Bindings/net/dsa/brcm,b53.yaml | 4 + .../device-tree/Bindings/net/dsa/brcm,sf2.yaml | 12 +- .../Bindings/net/dsa/mediatek,mt7530.yaml | 32 +- .../Bindings/net/dsa/microchip,ksz.yaml | 2 +- .../device-tree/Bindings/net/dsa/qca8k.yaml | 24 +- .../device-tree/Bindings/net/engleder,tsnep.yaml | 2 +- .../Bindings/net/ethernet-controller.yaml | 37 +- .../device-tree/Bindings/net/ethernet-phy.yaml | 45 +- .../device-tree/Bindings/net/ethernet-switch.yaml | 6 +- sys/contrib/device-tree/Bindings/net/fsl,fec.yaml | 3 + .../Bindings/net/fsl,qoriq-mc-dpmac.yaml | 2 +- .../Bindings/net/intel,ixp46x-ptp-timer.yaml | 4 +- .../Bindings/net/intel,ixp4xx-ethernet.yaml | 12 +- .../device-tree/Bindings/net/intel,ixp4xx-hss.yaml | 18 +- .../device-tree/Bindings/net/marvell,mvusb.yaml | 2 +- .../Bindings/net/marvell-bluetooth.yaml | 24 +- .../device-tree/Bindings/net/mdio-gpio.yaml | 6 +- .../device-tree/Bindings/net/mediatek,net.yaml | 55 +- .../Bindings/net/mediatek,star-emac.yaml | 2 +- .../Bindings/net/microchip,lan966x-switch.yaml | 2 +- .../Bindings/net/microchip,sparx5-switch.yaml | 4 +- .../device-tree/Bindings/net/mscc,miim.yaml | 2 +- .../device-tree/Bindings/net/nfc/marvell,nci.yaml | 2 +- .../device-tree/Bindings/net/nfc/nxp,pn532.yaml | 2 +- .../Bindings/net/nfc/samsung,s3fwrn5.yaml | 2 +- .../Bindings/net/pcs/mediatek,sgmiisys.yaml | 55 + .../Bindings/net/pse-pd/podl-pse-regulator.yaml | 2 +- .../device-tree/Bindings/net/qcom,ethqos.yaml | 111 ++ sys/contrib/device-tree/Bindings/net/qcom,ipa.yaml | 1 + .../Bindings/net/qcom,ipq4019-mdio.yaml | 2 +- .../Bindings/net/qcom,ipq8064-mdio.yaml | 6 +- .../Bindings/net/realtek-bluetooth.yaml | 24 +- .../device-tree/Bindings/net/rockchip,emac.yaml | 2 +- .../device-tree/Bindings/net/rockchip-dwmac.yaml | 4 +- sys/contrib/device-tree/Bindings/net/sff,sfp.yaml | 4 +- .../device-tree/Bindings/net/snps,dwmac.yaml | 28 +- .../Bindings/net/starfive,jh7110-dwmac.yaml | 144 ++ sys/contrib/device-tree/Bindings/net/sti-dwmac.txt | 3 +- .../device-tree/Bindings/net/stm32-dwmac.yaml | 8 +- .../device-tree/Bindings/net/ti,cpsw-switch.yaml | 10 +- .../device-tree/Bindings/net/ti,davinci-mdio.yaml | 2 +- .../device-tree/Bindings/net/ti,dp83822.yaml | 6 +- .../device-tree/Bindings/net/ti,dp83867.yaml | 6 +- .../device-tree/Bindings/net/ti,dp83869.yaml | 6 +- .../Bindings/net/ti,k3-am654-cpsw-nuss.yaml | 25 +- .../Bindings/net/toshiba,visconti-dwmac.yaml | 4 +- .../Bindings/net/vertexcom-mse102x.yaml | 6 +- .../Bindings/net/wireless/mediatek,mt76.yaml | 5 + .../Bindings/net/wireless/qcom,ath10k.yaml | 358 +++++ .../Bindings/net/wireless/qcom,ath11k-pci.yaml | 58 + .../Bindings/net/wireless/ti,wlcore.yaml | 10 +- .../device-tree/Bindings/nvme/apple,nvme-ans.yaml | 5 +- .../Bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 2 +- .../Bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 57 + .../Bindings/nvmem/amlogic,meson6-efuse.yaml | 57 + .../device-tree/Bindings/nvmem/apple,efuses.yaml | 2 +- .../device-tree/Bindings/nvmem/brcm,nvram.yaml | 2 +- .../Bindings/nvmem/fsl,layerscape-sfp.yaml | 2 +- .../device-tree/Bindings/nvmem/imx-iim.yaml | 2 +- .../device-tree/Bindings/nvmem/imx-ocotp.yaml | 2 +- .../Bindings/nvmem/ingenic,jz4780-efuse.yaml | 2 +- .../Bindings/nvmem/layouts/onie,tlv-layout.yaml | 2 +- .../device-tree/Bindings/nvmem/mediatek,efuse.yaml | 2 +- .../Bindings/nvmem/microchip,sama7g5-otpc.yaml | 2 +- .../device-tree/Bindings/nvmem/mxs-ocotp.yaml | 2 +- .../device-tree/Bindings/nvmem/nintendo-otp.yaml | 2 +- .../device-tree/Bindings/nvmem/qcom,qfprom.yaml | 4 +- .../device-tree/Bindings/nvmem/qcom,spmi-sdam.yaml | 33 +- sys/contrib/device-tree/Bindings/nvmem/rmem.yaml | 2 +- .../device-tree/Bindings/nvmem/rockchip-efuse.yaml | 2 +- .../Bindings/nvmem/socionext,uniphier-efuse.yaml | 2 +- .../device-tree/Bindings/nvmem/st,stm32-romem.yaml | 2 +- .../Bindings/nvmem/sunplus,sp7021-ocotp.yaml | 2 +- .../device-tree/Bindings/nvmem/u-boot,env.yaml | 7 +- .../device-tree/Bindings/pci/amlogic,axg-pcie.yaml | 134 ++ .../device-tree/Bindings/pci/apple,pcie.yaml | 1 + .../Bindings/pci/cdns,cdns-pcie-ep.yaml | 2 +- .../Bindings/pci/cdns,cdns-pcie-host.yaml | 2 +- .../device-tree/Bindings/pci/cdns-pcie-ep.yaml | 8 +- .../device-tree/Bindings/pci/cdns-pcie-host.yaml | 8 +- .../device-tree/Bindings/pci/cdns-pcie.yaml | 4 +- .../Bindings/pci/fsl,imx6q-pcie-common.yaml | 270 ++++ .../Bindings/pci/fsl,imx6q-pcie-ep.yaml | 123 ++ .../device-tree/Bindings/pci/fsl,imx6q-pcie.yaml | 233 +-- .../Bindings/pci/intel,keembay-pcie-ep.yaml | 4 +- .../Bindings/pci/intel,keembay-pcie.yaml | 4 +- .../device-tree/Bindings/pci/qcom,pcie-ep.yaml | 4 +- .../device-tree/Bindings/pci/qcom,pcie.yaml | 91 +- .../device-tree/Bindings/pci/rockchip-dw-pcie.yaml | 6 +- .../device-tree/Bindings/pci/ti,j721e-pci-ep.yaml | 6 +- .../Bindings/pci/ti,j721e-pci-host.yaml | 6 +- .../device-tree/Bindings/perf/riscv,pmu.yaml | 1 - .../Bindings/phy/allwinner,sun50i-h6-usb3-phy.yaml | 4 +- .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 2 +- .../Bindings/phy/amlogic,axg-mipi-dphy.yaml | 4 +- .../phy/amlogic,g12a-mipi-dphy-analog.yaml | 4 +- .../Bindings/phy/amlogic,g12a-usb2-phy.yaml | 4 +- .../Bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 4 +- .../phy/amlogic,meson-axg-mipi-pcie-analog.yaml | 4 +- .../Bindings/phy/amlogic,meson-axg-pcie.yaml | 4 +- .../Bindings/phy/amlogic,meson8-hdmi-tx-phy.yaml | 4 +- .../Bindings/phy/amlogic,meson8b-usb2-phy.yaml | 4 +- .../Bindings/phy/brcm,bcm63xx-usbh-phy.yaml | 4 +- .../device-tree/Bindings/phy/brcm,sata-phy.yaml | 4 +- .../device-tree/Bindings/phy/cdns,salvo-phy.yaml | 4 +- .../Bindings/phy/hisilicon,hi3660-usb3.yaml | 4 +- .../Bindings/phy/hisilicon,hi3670-usb3.yaml | 6 +- .../Bindings/phy/marvell,armada-3700-utmi-phy.yaml | 4 +- .../phy/marvell,armada-cp110-utmi-phy.yaml | 6 +- .../Bindings/phy/marvell,mmp3-hsic-phy.yaml | 4 +- .../Bindings/phy/mediatek,hdmi-phy.yaml | 1 + .../Bindings/phy/mediatek,mt7621-pci-phy.yaml | 4 +- .../Bindings/phy/phy-cadence-sierra.yaml | 12 +- .../Bindings/phy/phy-cadence-torrent.yaml | 10 +- .../Bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + .../Bindings/phy/phy-stm32-usbphyc.yaml | 2 +- .../device-tree/Bindings/phy/phy-tegra194-p2u.yaml | 4 +- .../device-tree/Bindings/phy/qcom,edp-phy.yaml | 4 +- .../device-tree/Bindings/phy/qcom,qusb2-phy.yaml | 4 +- .../Bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 2 +- .../Bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 1 + .../Bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 27 +- .../device-tree/Bindings/phy/qcom,usb-hs-28nm.yaml | 4 +- .../Bindings/phy/qcom,usb-snps-femto-v2.yaml | 4 +- .../device-tree/Bindings/phy/qcom,usb-ss.yaml | 4 +- .../Bindings/phy/qcom-usb-ipq4019-phy.yaml | 4 +- .../Bindings/phy/samsung,exynos-pcie-phy.yaml | 4 +- .../device-tree/Bindings/phy/samsung,ufs-phy.yaml | 2 +- .../Bindings/phy/sunplus,sp7021-usb2-phy.yaml | 4 +- .../Bindings/phy/ti,phy-am654-serdes.yaml | 5 - .../device-tree/Bindings/phy/ti,phy-gmii-sel.yaml | 8 +- .../device-tree/Bindings/phy/ti,phy-j721e-wiz.yaml | 25 +- .../device-tree/Bindings/phy/ti,tcan104x-can.yaml | 4 +- .../Bindings/pinctrl/actions,s500-pinctrl.yaml | 2 +- .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- .../Bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 67 + .../pinctrl/amlogic,meson-pinctrl-common.yaml | 57 + .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 68 + .../amlogic,meson-pinctrl-g12a-periphs.yaml | 72 + .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 76 + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 78 + .../Bindings/pinctrl/apple,pinctrl.yaml | 3 +- .../Bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 4 +- .../Bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 4 +- .../Bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 6 +- .../Bindings/pinctrl/brcm,bcm6318-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,bcm63268-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,bcm6328-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,bcm6358-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,bcm6362-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,bcm6368-pinctrl.yaml | 2 +- .../Bindings/pinctrl/brcm,ns-pinmux.yaml | 2 +- .../Bindings/pinctrl/canaan,k210-fpioa.yaml | 4 +- .../Bindings/pinctrl/cirrus,lochnagar.yaml | 2 +- .../Bindings/pinctrl/cirrus,madera.yaml | 4 +- .../Bindings/pinctrl/cypress,cy8c95x0.yaml | 2 +- .../Bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 2 +- .../Bindings/pinctrl/fsl,imx8m-pinctrl.yaml | 2 +- .../Bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 2 +- .../Bindings/pinctrl/fsl,imx93-pinctrl.yaml | 2 +- .../Bindings/pinctrl/ingenic,pinctrl.yaml | 2 +- .../device-tree/Bindings/pinctrl/intel,lgm-io.yaml | 2 +- .../Bindings/pinctrl/lantiq,pinctrl-xway.txt | 35 +- .../Bindings/pinctrl/marvell,ac5-pinctrl.yaml | 4 +- .../Bindings/pinctrl/mediatek,mt65xx-pinctrl.yaml | 32 +- .../Bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 39 +- .../Bindings/pinctrl/mediatek,mt6795-pinctrl.yaml | 228 +++ .../Bindings/pinctrl/mediatek,mt7620-pinctrl.yaml | 298 ++++ .../Bindings/pinctrl/mediatek,mt7621-pinctrl.yaml | 261 ++++ .../Bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 34 +- .../Bindings/pinctrl/mediatek,mt76x8-pinctrl.yaml | 450 ++++++ .../Bindings/pinctrl/mediatek,mt7981-pinctrl.yaml | 35 +- .../Bindings/pinctrl/mediatek,mt7986-pinctrl.yaml | 80 +- .../Bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 40 +- .../Bindings/pinctrl/mediatek,mt8186-pinctrl.yaml | 275 ++++ .../Bindings/pinctrl/mediatek,mt8188-pinctrl.yaml | 80 +- .../Bindings/pinctrl/mediatek,mt8192-pinctrl.yaml | 184 +++ .../Bindings/pinctrl/mediatek,mt8195-pinctrl.yaml | 286 ++++ .../Bindings/pinctrl/mediatek,mt8365-pinctrl.yaml | 69 +- .../Bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 6 +- .../Bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 123 ++ .../device-tree/Bindings/pinctrl/pinmux-node.yaml | 2 +- .../Bindings/pinctrl/qcom,ipq5332-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,ipq9574-tlmm.yaml | 130 ++ .../Bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 12 +- .../Bindings/pinctrl/qcom,msm8909-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,pmic-gpio.yaml | 9 +- .../Bindings/pinctrl/qcom,pmic-mpp.yaml | 9 +- .../Bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 1 + .../Bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 11 +- .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 12 +- .../Bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 11 +- .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 1 + .../Bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,sdm670-tlmm.yaml | 12 +- .../Bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 10 +- .../Bindings/pinctrl/qcom,sdx65-tlmm.yaml | 10 +- .../Bindings/pinctrl/qcom,sm6115-tlmm.yaml | 10 +- .../Bindings/pinctrl/qcom,sm6125-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,sm6350-tlmm.yaml | 12 +- .../Bindings/pinctrl/qcom,sm6375-tlmm.yaml | 12 +- .../Bindings/pinctrl/qcom,sm7150-tlmm.yaml | 162 ++ .../Bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 13 +- .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 11 +- .../Bindings/pinctrl/qcom,sm8350-tlmm.yaml | 13 +- .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sm8450-tlmm.yaml | 11 +- .../pinctrl/qcom,sm8550-lpass-lpi-pinctrl.yaml | 2 +- .../Bindings/pinctrl/qcom,sm8550-tlmm.yaml | 11 +- .../Bindings/pinctrl/qcom,tlmm-common.yaml | 6 +- .../Bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 11 +- .../Bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 89 +- .../Bindings/pinctrl/ralink,rt3352-pinctrl.yaml | 243 +++ .../Bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 11 +- .../Bindings/pinctrl/ralink,rt5350-pinctrl.yaml | 206 +++ .../device-tree/Bindings/pinctrl/renesas,pfc.yaml | 2 +- .../Bindings/pinctrl/renesas,rza1-ports.yaml | 2 +- .../Bindings/pinctrl/renesas,rza2-pinctrl.yaml | 2 +- .../Bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 +- .../Bindings/pinctrl/renesas,rzn1-pinctrl.yaml | 4 +- .../Bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 4 +- .../Bindings/pinctrl/rockchip,pinctrl.yaml | 10 +- .../Bindings/pinctrl/samsung,pinctrl.yaml | 2 +- .../Bindings/pinctrl/semtech,sx1501q.yaml | 6 +- .../pinctrl/socionext,uniphier-pinctrl.yaml | 2 +- .../Bindings/pinctrl/st,stm32-pinctrl.yaml | 10 +- .../Bindings/pinctrl/starfive,jh7100-pinctrl.yaml | 8 +- .../Bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 6 +- .../Bindings/pinctrl/toshiba,visconti-pinctrl.yaml | 8 +- .../Bindings/pinctrl/xlnx,zynq-pinctrl.yaml | 2 +- .../Bindings/power/apple,pmgr-pwrstate.yaml | 1 + .../Bindings/power/qcom,kpss-acc-v2.yaml | 42 + .../device-tree/Bindings/power/qcom,rpmpd.yaml | 1 + .../Bindings/power/supply/adc-battery.yaml | 70 + .../device-tree/Bindings/power/supply/bq2415x.yaml | 2 +- .../device-tree/Bindings/power/supply/bq24190.yaml | 2 +- .../device-tree/Bindings/power/supply/bq24257.yaml | 4 +- .../device-tree/Bindings/power/supply/bq24735.yaml | 2 +- .../device-tree/Bindings/power/supply/bq2515x.yaml | 2 +- .../device-tree/Bindings/power/supply/bq25890.yaml | 2 +- .../device-tree/Bindings/power/supply/bq25980.yaml | 2 +- .../device-tree/Bindings/power/supply/bq27xxx.yaml | 15 +- .../Bindings/power/supply/lltc,ltc294x.yaml | 2 +- .../Bindings/power/supply/ltc4162-l.yaml | 2 +- .../Bindings/power/supply/maxim,max14656.yaml | 2 +- .../Bindings/power/supply/maxim,max17040.yaml | 4 +- .../Bindings/power/supply/maxim,max17042.yaml | 2 +- .../Bindings/power/supply/richtek,rt9455.yaml | 2 +- .../Bindings/power/supply/ti,lp8727.yaml | 3 +- .../device-tree/Bindings/pwm/apple,s5l-fpwm.yaml | 51 + .../Bindings/pwm/mediatek,mt2712-pwm.yaml | 1 + .../device-tree/Bindings/pwm/pwm-amlogic.yaml | 70 + .../Bindings/regulator/active-semi,act8865.yaml | 2 +- .../Bindings/regulator/anatop-regulator.yaml | 22 +- .../device-tree/Bindings/regulator/dlg,da9121.yaml | 2 +- .../Bindings/regulator/fcs,fan53555.yaml | 21 +- .../Bindings/regulator/fixed-regulator.yaml | 2 +- .../regulator/google,cros-ec-regulator.yaml | 4 +- .../Bindings/regulator/gpio-regulator.yaml | 2 +- .../Bindings/regulator/max77650-regulator.yaml | 2 +- .../device-tree/Bindings/regulator/max8660.yaml | 2 +- .../device-tree/Bindings/regulator/max8893.yaml | 2 +- .../regulator/mediatek,mt6331-regulator.yaml | 12 +- .../regulator/mediatek,mt6332-regulator.yaml | 4 +- .../device-tree/Bindings/regulator/mps,mp5416.yaml | 4 +- .../device-tree/Bindings/regulator/mps,mp886x.yaml | 2 +- .../Bindings/regulator/mps,mpq7920.yaml | 6 +- .../Bindings/regulator/mt6315-regulator.yaml | 2 +- .../Bindings/regulator/mt6359-regulator.yaml | 16 +- .../Bindings/regulator/mt6360-regulator.yaml | 4 +- .../Bindings/regulator/nxp,pca9450-regulator.yaml | 12 +- .../Bindings/regulator/nxp,pf8x00-regulator.yaml | 23 +- .../device-tree/Bindings/regulator/pfuze100.yaml | 8 +- .../Bindings/regulator/qcom,rpmh-regulator.yaml | 45 +- .../Bindings/regulator/qcom,smd-rpm-regulator.yaml | 2 +- ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 2 +- .../device-tree/Bindings/regulator/regulator.yaml | 22 +- .../Bindings/regulator/richtek,rt4803.yaml | 68 + .../Bindings/regulator/richtek,rt5739.yaml | 72 + .../regulator/richtek,rt6245-regulator.yaml | 8 +- .../regulator/richtek,rtmv20-regulator.yaml | 2 +- .../Bindings/regulator/rohm,bd71815-regulator.yaml | 8 +- .../Bindings/regulator/rohm,bd71828-regulator.yaml | 28 +- .../Bindings/regulator/rohm,bd71837-regulator.yaml | 12 +- .../Bindings/regulator/rohm,bd71847-regulator.yaml | 12 +- .../Bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- .../regulator/socionext,uniphier-regulator.yaml | 2 +- .../Bindings/regulator/st,stm32-booster.yaml | 4 +- .../Bindings/regulator/st,stm32-vrefbuf.yaml | 2 +- .../Bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- .../Bindings/regulator/ti,tps62360.yaml | 2 +- .../regulator/vqmmc-ipq4019-regulator.yaml | 2 +- .../Bindings/regulator/wlf,arizona.yaml | 6 +- .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 4 +- .../Bindings/remoteproc/fsl,imx-rproc.yaml | 4 +- .../Bindings/remoteproc/ingenic,vpu.yaml | 4 +- .../Bindings/remoteproc/qcom,glink-edge.yaml | 2 +- .../Bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 2 + .../Bindings/remoteproc/qcom,smd-edge.yaml | 2 +- .../Bindings/remoteproc/renesas,rcar-rproc.yaml | 4 +- .../Bindings/remoteproc/st,stm32-rproc.yaml | 18 +- .../Bindings/remoteproc/ti,k3-r5f-rproc.yaml | 76 +- .../Bindings/reserved-memory/google,open-dice.yaml | 2 +- .../reserved-memory/nvidia,tegra210-emc-table.yaml | 2 +- .../Bindings/reserved-memory/phram.yaml | 4 +- .../Bindings/reserved-memory/qcom,cmd-db.yaml | 6 +- .../Bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- .../Bindings/reserved-memory/ramoops.yaml | 6 +- .../Bindings/reserved-memory/shared-dma-pool.yaml | 2 +- .../reset/amlogic,meson-axg-audio-arb.yaml | 4 +- .../Bindings/reset/amlogic,meson-reset.yaml | 4 +- .../Bindings/reset/bitmain,bm1880-reset.yaml | 4 +- .../Bindings/reset/brcm,bcm6345-reset.yaml | 4 +- .../reset/brcm,bcm7216-pcie-sata-rescal.yaml | 4 +- .../Bindings/reset/brcm,brcmstb-reset.yaml | 4 +- .../Bindings/reset/canaan,k210-rst.yaml | 2 +- .../Bindings/reset/marvell,berlin2-reset.yaml | 4 +- .../device-tree/Bindings/reset/microchip,rst.yaml | 6 +- .../Bindings/reset/qca,ar7100-reset.yaml | 4 +- .../device-tree/Bindings/reset/renesas,rst.yaml | 4 +- .../device-tree/Bindings/reset/sunplus,reset.yaml | 4 +- sys/contrib/device-tree/Bindings/riscv/canaan.yaml | 2 +- sys/contrib/device-tree/Bindings/riscv/cpus.yaml | 13 + sys/contrib/device-tree/Bindings/riscv/sunxi.yaml | 5 + .../Bindings/rng/amlogic,meson-rng.yaml | 4 +- .../Bindings/rng/brcm,iproc-rng200.yaml | 4 +- sys/contrib/device-tree/Bindings/rng/mtk-rng.yaml | 4 +- .../device-tree/Bindings/rng/ti,keystone-rng.yaml | 2 +- .../Bindings/rtc/allwinner,sun4i-a10-rtc.yaml | 2 +- .../Bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 2 +- .../Bindings/rtc/atmel,at91rm9200-rtc.yaml | 2 +- .../Bindings/rtc/atmel,at91sam9260-rtt.yaml | 2 +- .../Bindings/rtc/brcm,brcmstb-waketimer.yaml | 2 +- .../device-tree/Bindings/rtc/faraday,ftrtc010.yaml | 4 +- .../Bindings/rtc/microcrystal,rv3032.yaml | 2 +- .../device-tree/Bindings/rtc/mstar,msc313-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/nuvoton,nct3018y.yaml | 2 +- .../device-tree/Bindings/rtc/nxp,pcf2127.yaml | 2 +- sys/contrib/device-tree/Bindings/rtc/rtc-mxc.yaml | 2 +- .../device-tree/Bindings/rtc/rtc-mxc_v2.yaml | 2 +- .../device-tree/Bindings/rtc/sa1100-rtc.yaml | 4 +- .../device-tree/Bindings/rtc/st,stm32-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/ti,k3-rtc.yaml | 2 +- .../device-tree/Bindings/rtc/trivial-rtc.yaml | 2 +- .../device-tree/Bindings/serial/8250_omap.yaml | 1 + .../Bindings/serial/amlogic,meson-uart.yaml | 13 +- .../device-tree/Bindings/serial/fsl-imx-uart.yaml | 27 + .../device-tree/Bindings/serial/fsl-lpuart.yaml | 3 + .../device-tree/Bindings/serial/mediatek,uart.yaml | 1 + .../Bindings/serial/qcom,serial-geni-qcom.yaml | 4 +- .../Bindings/serial/renesas,em-uart.yaml | 4 +- .../device-tree/Bindings/serial/renesas,hscif.yaml | 4 +- .../device-tree/Bindings/serial/renesas,sci.yaml | 4 +- .../device-tree/Bindings/serial/renesas,scif.yaml | 4 +- .../device-tree/Bindings/serial/renesas,scifa.yaml | 4 +- .../device-tree/Bindings/serial/renesas,scifb.yaml | 4 +- .../device-tree/Bindings/serial/serial.yaml | 4 +- .../Bindings/serial/snps-dw-apb-uart.yaml | 4 +- .../device-tree/Bindings/serial/sprd-uart.yaml | 4 +- .../Bindings/serial/sunplus,sp7021-uart.yaml | 4 +- .../Bindings/soc/amlogic/amlogic,canvas.yaml | 4 +- .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 40 + .../Bindings/soc/fsl/cpm_qe/fsl,cpm1-scc-qmc.yaml | 162 ++ .../Bindings/soc/fsl/cpm_qe/fsl,cpm1-tsa.yaml | 205 +++ .../Bindings/soc/imx/fsl,imx8mm-disp-blk-ctrl.yaml | 2 +- .../Bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml | 2 +- .../Bindings/soc/imx/fsl,imx8mn-disp-blk-ctrl.yaml | 2 +- .../Bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 2 +- .../soc/imx/fsl,imx8mp-media-blk-ctrl.yaml | 53 +- .../Bindings/soc/imx/fsl,imx8mq-vpu-blk-ctrl.yaml | 2 +- .../Bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 2 +- .../Bindings/soc/imx/fsl,imx93-src.yaml | 3 +- .../device-tree/Bindings/soc/mediatek/devapc.yaml | 4 +- .../Bindings/soc/mediatek/mediatek,mutex.yaml | 22 +- .../soc/microchip/atmel,at91rm9200-tcb.yaml | 1 + .../Bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + .../device-tree/Bindings/soc/qcom/qcom,apr.yaml | 13 +- .../device-tree/Bindings/soc/qcom/qcom,eud.yaml | 4 +- .../Bindings/soc/qcom/qcom,geni-se.yaml | 4 +- .../Bindings/soc/qcom/qcom,pmic-glink.yaml | 2 + .../Bindings/soc/qcom/qcom,smd-rpm.yaml | 7 +- .../device-tree/Bindings/soc/qcom/qcom,smem.yaml | 4 +- .../device-tree/Bindings/soc/qcom/qcom,spm.yaml | 4 +- .../device-tree/Bindings/soc/qcom/qcom,wcnss.yaml | 2 +- .../device-tree/Bindings/soc/renesas/renesas.yaml | 17 +- .../device-tree/Bindings/soc/rockchip/grf.yaml | 10 +- .../Bindings/soc/samsung/exynos-pmu.yaml | 23 +- .../device-tree/Bindings/soc/ti/ti,pruss.yaml | 3 +- .../device-tree/Bindings/sound/adi,adau1372.yaml | 2 +- .../device-tree/Bindings/sound/adi,adau17x1.yaml | 52 + .../device-tree/Bindings/sound/adi,max98363.yaml | 60 + .../device-tree/Bindings/sound/adi,max98396.yaml | 8 +- .../Bindings/sound/amlogic,axg-tdm-iface.yaml | 2 +- .../Bindings/sound/asahi-kasei,ak4458.yaml | 73 + .../Bindings/sound/asahi-kasei,ak5558.yaml | 48 + .../Bindings/sound/audio-graph-port.yaml | 22 +- .../device-tree/Bindings/sound/audio-graph.yaml | 8 +- .../device-tree/Bindings/sound/cirrus,cs35l41.yaml | 10 +- .../device-tree/Bindings/sound/cirrus,cs35l45.yaml | 80 +- .../device-tree/Bindings/sound/cirrus,cs42l42.yaml | 12 +- .../Bindings/sound/cirrus,ep9301-i2s.yaml | 66 + .../device-tree/Bindings/sound/everest,es8316.yaml | 6 +- .../device-tree/Bindings/sound/fsl,qmc-audio.yaml | 117 ++ .../Bindings/sound/marvell,mmp-sspa.yaml | 1 + .../device-tree/Bindings/sound/maxim,max9759.yaml | 45 + .../device-tree/Bindings/sound/maxim,max98371.yaml | 42 + .../device-tree/Bindings/sound/maxim,max9867.yaml | 60 + .../device-tree/Bindings/sound/mt8186-afe-pcm.yaml | 6 +- .../sound/mt8186-mt6366-da7219-max98357.yaml | 2 +- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 2 +- .../device-tree/Bindings/sound/mt8192-afe-pcm.yaml | 6 +- .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 4 +- .../device-tree/Bindings/sound/mt8195-afe-pcm.yaml | 2 +- .../device-tree/Bindings/sound/mt8195-mt6359.yaml | 8 +- sys/contrib/device-tree/Bindings/sound/nau8825.txt | 3 + .../Bindings/sound/nvidia,tegra-audio-alc5632.yaml | 8 +- .../Bindings/sound/nvidia,tegra-audio-common.yaml | 4 + .../sound/nvidia,tegra-audio-max9808x.yaml | 90 ++ .../sound/nvidia,tegra-audio-max98090.yaml | 8 +- .../Bindings/sound/nvidia,tegra-audio-rt5631.yaml | 85 ++ .../Bindings/sound/nvidia,tegra-audio-rt5640.yaml | 6 +- .../Bindings/sound/nvidia,tegra-audio-rt5677.yaml | 26 +- .../sound/nvidia,tegra-audio-sgtl5000.yaml | 6 +- .../Bindings/sound/nvidia,tegra-audio-wm8753.yaml | 6 +- .../Bindings/sound/nvidia,tegra-audio-wm8903.yaml | 8 +- .../Bindings/sound/nvidia,tegra-audio-wm9712.yaml | 8 +- .../Bindings/sound/qcom,lpass-rx-macro.yaml | 77 +- .../Bindings/sound/qcom,lpass-tx-macro.yaml | 81 +- .../Bindings/sound/qcom,lpass-va-macro.yaml | 86 +- .../Bindings/sound/qcom,lpass-wsa-macro.yaml | 23 +- .../Bindings/sound/qcom,q6asm-dais.yaml | 2 +- .../Bindings/sound/qcom,q6dsp-lpass-ports.yaml | 2 +- .../device-tree/Bindings/sound/qcom,wcd9335.yaml | 156 ++ .../device-tree/Bindings/sound/qcom,wcd934x.yaml | 2 + .../Bindings/sound/realtek,alc5632.yaml | 63 + .../device-tree/Bindings/sound/renesas,rsnd.yaml | 129 +- .../device-tree/Bindings/sound/renesas,rz-ssi.yaml | 21 +- .../Bindings/sound/rockchip,i2s-tdm.yaml | 7 + .../device-tree/Bindings/sound/rockchip-i2s.yaml | 5 + .../device-tree/Bindings/sound/samsung,odroid.yaml | 2 + .../device-tree/Bindings/sound/sgtl5000.yaml | 6 +- .../device-tree/Bindings/sound/simple-card.yaml | 26 +- .../Bindings/sound/socionext,uniphier-aio.yaml | 2 +- .../device-tree/Bindings/sound/tas2562.yaml | 8 +- .../device-tree/Bindings/sound/tas2770.yaml | 8 +- .../device-tree/Bindings/sound/tas27xx.yaml | 8 +- sys/contrib/device-tree/Bindings/sound/tas571x.txt | 1 + .../device-tree/Bindings/sound/tas5805m.yaml | 2 +- .../device-tree/Bindings/sound/tlv320adcx140.yaml | 2 +- .../device-tree/Bindings/sound/tlv320aic32x4.txt | 2 +- .../device-tree/Bindings/sound/wlf,wm8510.yaml | 41 + .../device-tree/Bindings/sound/wlf,wm8523.yaml | 40 + .../device-tree/Bindings/sound/wlf,wm8524.yaml | 40 + .../device-tree/Bindings/sound/wlf,wm8580.yaml | 42 + .../device-tree/Bindings/sound/wlf,wm8711.yaml | 40 + .../device-tree/Bindings/sound/wlf,wm8728.yaml | 40 + .../device-tree/Bindings/sound/wlf,wm8737.yaml | 40 + .../device-tree/Bindings/sound/wlf,wm8753.yaml | 62 + .../device-tree/Bindings/sound/wlf,wm8960.yaml | 88 ++ .../device-tree/Bindings/sound/wlf,wm8994.yaml | 194 +++ .../device-tree/Bindings/sound/zl38060.yaml | 2 +- .../Bindings/soundwire/qcom,soundwire.yaml | 1 + .../Bindings/spi/allwinner,sun4i-a10-spi.yaml | 1 + .../Bindings/spi/allwinner,sun6i-a31-spi.yaml | 1 + .../device-tree/Bindings/spi/amlogic,a1-spifc.yaml | 41 + .../device-tree/Bindings/spi/cdns,qspi-nor.yaml | 37 +- .../Bindings/spi/microchip,mpfs-spi.yaml | 2 +- .../device-tree/Bindings/spi/renesas,sh-msiof.yaml | 23 +- .../device-tree/Bindings/spi/snps,dw-apb-ssi.yaml | 19 + .../device-tree/Bindings/spi/spi-controller.yaml | 1 + .../sram/allwinner,sun4i-a10-system-control.yaml | 10 +- .../device-tree/Bindings/sram/qcom,imem.yaml | 1 + .../device-tree/Bindings/sram/qcom,ocmem.yaml | 1 + .../Bindings/thermal/amlogic,thermal.yaml | 2 +- .../device-tree/Bindings/thermal/imx-thermal.yaml | 18 +- .../Bindings/thermal/mediatek-thermal.txt | 1 + .../Bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 4 +- .../Bindings/thermal/qcom-spmi-adc-tm5.yaml | 9 +- .../device-tree/Bindings/thermal/qcom-tsens.yaml | 4 +- .../Bindings/thermal/qoriq-thermal.yaml | 4 +- .../Bindings/thermal/rockchip-thermal.yaml | 1 + .../Bindings/thermal/thermal-zones.yaml | 1 + .../Bindings/timer/amlogic,meson6-timer.yaml | 54 + .../Bindings/timer/arm,arch_timer_mmio.yaml | 2 +- .../device-tree/Bindings/timer/cdns,ttc.yaml | 2 +- .../Bindings/timer/intel,ixp4xx-timer.yaml | 4 +- .../Bindings/timer/nvidia,tegra-timer.yaml | 4 +- .../Bindings/timer/nvidia,tegra186-timer.yaml | 4 +- *** 2137 LINES SKIPPED *** From nobody Wed Aug 9 13:43:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWV41j2dz4q0f7; Wed, 9 Aug 2023 13:43: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 4RLWV41B7sz4QW3; Wed, 9 Aug 2023 13:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691588604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrzuPSYudAzmvDeh7yWmZOv+t8Xh05/kD3+KG3HU9iU=; b=kFKHcB3qNwKkx2apbAVCicAbrJop+90v0NfHVXjztJdBe/Yzeb27F0xLNojGWEcRjxbqG4 I5LzNB2nx6xmq2096em9cCsxhq64f0bXOI44Ek0w2hyBkB7cw9QRQW6DYthTT/nqOUkhAm YQ7GQB+OFV7UnfzdbFModGbyGlETrRwNHRWfJG/mGPYZD7gBiDJC5/dQs6CBwNMnoM/U3f UOeX98C4jGIfjWfkBk6KVawXRf5lHMoaEMuj95hDFNezqfxgCtD/ntv5zpmGxtO4Z69/Yw xXEVjby89FM8r3trtuLxgxj2Urn+athc++DNLdjgeWtashj8UIGwNnGBGUYGYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691588604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TrzuPSYudAzmvDeh7yWmZOv+t8Xh05/kD3+KG3HU9iU=; b=s4/6AlPK3lJ1CC7rrE8vCBemD5cnbtyrg2JQw0nPbXc1ihqGtrjjZlRNu8Xtve+c/mTd71 IKsLwmIBDxPNEJj0C5m4FSLq2zPK0b0aHBb16ApHkcebz8+y0ljgMsFTJgJTI9DjkshVKv tLsCYhL5KD3Gk8WVKK9I2M/NHukQ/udqAnZyvWUwbJsvaw9WbhwWhcOKNyEwY0qpSGN6Ou yvz7FTqh3a+SKRon6QPnw4TEhjNy4o8zyR6L0iQNenXh65o9WhI+iadzqxrFgQiZGXrmjO Te0uHqqN9eZ70DP9obzJvpUlN+eQAqr0NVBf9a9yICJIFESrLH7jYrlZaOxKMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691588604; a=rsa-sha256; cv=none; b=C8FvikKp1oojz56LfqVq4UL+W77r5p/pKHWp+CRT8XtACqGY+mzipQE+e7p08MFIXdI73C k5ZpkdKwp8EWbl0HdbfEhOBHbhs+dRiWPjUuw4dLRguw6StpbfbIUwbj+/HKGmbydo4N5v zlXPLZPiFirNogSAwO3opIkoVy7LR7nIBoZq1gDFjX3GYZQLIrgmA0K1FAP7XuXThsNjKV XOqVrzsnRfsHFhNjFBJDMuVk+nctakcW2LqYYzslOPCid0P7qHuJws6yxLmpM5WVnkMfoh sLsnuJy9+ME155f7DawNYg0sf64y1SR/PhP7kytUxP4iMEOuRA0IE0HB67YmOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWV40Fgsz3Cg; Wed, 9 Aug 2023 13:43: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 379DhNr8058851; Wed, 9 Aug 2023 13:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DhNP1058848; Wed, 9 Aug 2023 13:43:23 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:43:23 GMT Message-Id: <202308091343.379DhNP1058848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 0befc55cdf4b - main - dts: Bump the freebsd branding version to 6.4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0befc55cdf4b7235df9c1c1a476e1aebc93ca7f1 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0befc55cdf4b7235df9c1c1a476e1aebc93ca7f1 commit 0befc55cdf4b7235df9c1c1a476e1aebc93ca7f1 Author: Emmanuel Vadot AuthorDate: 2023-08-09 13:36:55 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-09 13:36:55 +0000 dts: Bump the freebsd branding version to 6.4 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dts/freebsd-compatible.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dts/freebsd-compatible.dts b/sys/dts/freebsd-compatible.dts index eb1a50401d6e..c81f963c7872 100644 --- a/sys/dts/freebsd-compatible.dts +++ b/sys/dts/freebsd-compatible.dts @@ -1,3 +1,3 @@ / { - freebsd,dts-version = "5.13"; + freebsd,dts-version = "6.4"; }; From nobody Wed Aug 9 16:05:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLZdd4gQCz4Ts1Y; Wed, 9 Aug 2023 16:05: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 4RLZdd4STFz3GXt; Wed, 9 Aug 2023 16:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691597109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYSR5oLltf3Gn4FFwTLRHZ4bEKFSUzyq9zrq9jnmsUI=; b=BpriiGHmkZcVqdQpKtRThupavxmou9m3xK/FsN15XKi1W6hxH/Rsi5SSEQH8nD7jLzecyS tc4wErlyt2e71xwabZnv5IYgoXGIsRPqDCyz3DrlT/+CoRlh36/+oYASELTX202Jy6cx1w vpkKzp+3NTS+oMCaOMVv77Vrd+txZUKv0aswPttNI/XqGBNSURXZs6ic3PxkhQTycvzA1f YAeHJX6i4gaM2Yp+hT2TIQHou16DYXVtgLO5r1JQxldKTGvQa8V+xDbuIlO/CaXZNaU3EN oyQAp7Vz99ukhXtoJgLE19CVyY4gcwid9SeVZjihoXKT7L/7i/D5BNo9vqpmKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691597109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NYSR5oLltf3Gn4FFwTLRHZ4bEKFSUzyq9zrq9jnmsUI=; b=w+BGfty/mmY+TrstHZZSrz/w/xeudt2AUaXI2pYsF1MMjXhNVISxi1S3erDWvkGesdnRPH sb/QpFSKR6EfXcmn2qyneGtS6ldU6oNmOtvAsjxWUE1FzYlVWHRp/v21xK/IG+3fGhwtJh yRSuNY1AZSJiRTdy1oaSVkGg4UaGSxZDq2Pc5sOgdJjBL+5TIFF+PfWJlU7Odq2AZoYune GaUWLyrhTZXTttLA6QRFiR6IZU+DO9Pkr2mKqEI69iasyzz2I64OUhGBjwd9qWSW0QvUBH zP48jFuxsBnK4aemkSQAvHLB+9tDm8uyR52iAsRe7lt0gMmIdfw77+x8pINeMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691597109; a=rsa-sha256; cv=none; b=JMaswUooXYVlsh4xnzWhEs2zCdXukS6qWDmarauxKjYWgLBgJMEx549zZOiiKgU/sE5yXa OET6ky8OCC97mUamIYkot9ML3QZZZq77w615vYzlXRySgU6xHp+7CqqCQww0iqYjTdOsnf UQIM804nLMri30ALMx1kErAWR3J95HzJ1idkJ+r6xNbnb8xIxLmmJo2zh5/3wKFGFL8tTE 58L9CIesMpYcggkgmVlHR6l2mRN5F8ZS/X1DEzzeKDY+7XAo0URRmfV/1nA8gFPMaa+RtW foFPUcXGd4AFI433rQXj0MpXJWDvpB79ZvKDgBWV/5vykF2PZWbcoTAv9JSJhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLZdd3QSPz6qW; Wed, 9 Aug 2023 16:05: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 379G59f1094321; Wed, 9 Aug 2023 16:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379G59u4094318; Wed, 9 Aug 2023 16:05:09 GMT (envelope-from git) Date: Wed, 9 Aug 2023 16:05:09 GMT Message-Id: <202308091605.379G59u4094318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 077ef5b445f1 - main - ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 077ef5b445f10f41723b63ab9c24a9809c61afb8 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=077ef5b445f10f41723b63ab9c24a9809c61afb8 commit 077ef5b445f10f41723b63ab9c24a9809c61afb8 Author: Marius Strobl AuthorDate: 2023-08-07 19:16:11 +0000 Commit: Marius Strobl CommitDate: 2023-08-09 15:44:46 +0000 ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL All of these are obsoleted by the general removal of MIPS support. Actually, corresponding to the removed AH_SUPPORT_x, there is more superfluous support sprinkled across the HAL source. However, that code is left in place for now in order to ease a sync to NetBSD. Reviewed by: emaste (w/ man page fix) Approved by: adrian Differential Revision: https://reviews.freebsd.org/D41355 --- share/man/man4/ath_hal.4 | 5 +- sys/conf/files | 10 - sys/conf/options | 11 - .../dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h | 13 - sys/dev/ath/ah_osdep_ar5416.c | 3 - sys/dev/ath/ath_hal/ar9001/ar9130.ini | 669 --------------------- sys/dev/ath/ath_hal/ar9001/ar9130_attach.c | 324 ---------- sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c | 20 - sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h | 24 - sys/dev/ath/ath_hal/ar9001/ar9130_phy.c | 49 -- sys/dev/ath/ath_hal/ar9001/ar9130_phy.h | 27 - sys/dev/ath/ath_hal/ar9001/ar9130reg.h | 29 - sys/modules/ath_hal_ar5416/Makefile | 9 - 13 files changed, 2 insertions(+), 1191 deletions(-) diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4 index 940809a9c3c9..daf787d412a9 100644 --- a/share/man/man4/ath_hal.4 +++ b/share/man/man4/ath_hal.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd January 25, 2019 +.Dd August 7, 2023 .Dt ATH_HAL 4 .Os .Sh NAME @@ -50,7 +50,6 @@ or .\".Cd "device ath_ar5312" .\".Cd "device ath_rf2136" .\".Cd "device ath_rf2137" -.Cd "device ath_ar9130" .Cd "device ath_ar9160" .Cd "device ath_ar9280" .Cd "device ath_ar9285" @@ -59,7 +58,7 @@ or .Sh DESCRIPTION The hal provides hardware support for wireless network adapters based on the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425, -AR5413, AR5416, AR5418, AR5424, AR9130, AR9160, AR9220, AR9280, AR9285, +AR5413, AR5416, AR5418, AR5424, AR9160, AR9220, AR9280, AR9285, AR9287, AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565 chips (and companion RF/baseband parts). This code is part of the diff --git a/sys/conf/files b/sys/conf/files index 5d75f819a5f5..80384fe1f5b1 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1132,16 +1132,6 @@ dev/ath/ath_hal/ar5416/ar5416_xmit.c \ optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \ ath_ar9287 \ compile-with "${ATH_C} -I$S/dev/ath/ath_hal" -# ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130 -# -# Since this is an embedded MAC SoC, there's no need to compile it into the -# default HAL. -dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \ - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" -dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \ - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" -dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \ - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" # ar9160 (depends on ar5416) dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \ compile-with "${ATH_C} -I$S/dev/ath/ath_hal" diff --git a/sys/conf/options b/sys/conf/options index c06060f4bea0..9e8db5632ec4 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -820,17 +820,6 @@ ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h ATH_DEBUG_ALQ opt_ath.h ATH_KTR_INTR_DEBUG opt_ath.h -# options for the Atheros hal -# XXX For now, this breaks non-AR9130 chipsets, so only use it -# XXX when actually targeting AR9130. -AH_SUPPORT_AR9130 opt_ah.h - -# This is required for AR933x SoC support -AH_SUPPORT_AR9330 opt_ah.h -AH_SUPPORT_AR9340 opt_ah.h -AH_SUPPORT_QCA9530 opt_ah.h -AH_SUPPORT_QCA9550 opt_ah.h - AH_DEBUG opt_ah.h AH_ASSERT opt_ah.h AH_DEBUG_ALQ opt_ah.h diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h index 71a3388b04f3..229bb0ba56c5 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h @@ -51,19 +51,6 @@ #define AH_SUPPORT_POSEIDON 1 #define AH_SUPPORT_AR9300 1 -/* These are the embedded boards */ -#ifdef AH_SUPPORT_AR9330 -#define AH_SUPPORT_HORNET 1 -#endif /* AH_SUPPORT_AR9330 */ -#ifdef AH_SUPPORT_AR9340 -#define AH_SUPPORT_WASP 1 -#endif /* AH_SUPPORT_AR9340 */ -#ifdef AH_SUPPORT_QCA9550 -#define AH_SUPPORT_SCORPION 1 -#endif /* AH_SUPPORT_QCA9550 */ -#ifdef AH_SUPPORT_QCA9530 -#define AH_SUPPORT_HONEYBEE 1 -#endif /* AH_SUPPORT_QCA9530 */ #define FIX_NOISE_FLOOR 1 /* XXX this needs to be removed! No atomics in the HAL! */ diff --git a/sys/dev/ath/ah_osdep_ar5416.c b/sys/dev/ath/ah_osdep_ar5416.c index 058027b44c8f..be9e709d6449 100644 --- a/sys/dev/ath/ah_osdep_ar5416.c +++ b/sys/dev/ath/ah_osdep_ar5416.c @@ -41,7 +41,6 @@ #include extern struct ath_hal_chip AR5416_chip; -extern struct ath_hal_chip AR9130_chip; extern struct ath_hal_chip AR9160_chip; extern struct ath_hal_chip AR9280_chip; extern struct ath_hal_chip AR9285_chip; @@ -60,7 +59,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int type, void *data __unused) switch (type) { case MOD_LOAD: ath_hal_add_chip(&AR5416_chip); - ath_hal_add_chip(&AR9130_chip); ath_hal_add_chip(&AR9160_chip); ath_hal_add_chip(&AR9280_chip); ath_hal_add_chip(&AR9285_chip); @@ -74,7 +72,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int type, void *data __unused) case MOD_UNLOAD: ath_hal_remove_chip(&AR5416_chip); - ath_hal_remove_chip(&AR9130_chip); ath_hal_remove_chip(&AR9160_chip); ath_hal_remove_chip(&AR9280_chip); ath_hal_remove_chip(&AR9285_chip); diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130.ini b/sys/dev/ath/ath_hal/ar9001/ar9130.ini deleted file mode 100644 index 0bd9f8e0a879..000000000000 --- a/sys/dev/ath/ath_hal/ar9001/ar9130.ini +++ /dev/null @@ -1,669 +0,0 @@ -/* - * Copyright (c) 2010 Atheros Communications Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $FreeBSD$ - */ - -static const uint32_t ar5416Modes_9100[][6] = { - { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 }, - { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 }, - { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 }, - { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 }, - { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 }, - { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf }, - { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 }, - { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a }, - { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 }, - { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 }, - { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e }, - { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 }, - { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e }, - { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 }, - { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 }, - { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, - { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, - { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 }, - { 0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, 0x6c48b0e2 }, - { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e }, - { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e }, - { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 }, - { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 }, - { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 }, - { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 }, - { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 }, - { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 }, - { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d }, - { 0x00009940, 0x00750604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204 }, - { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020 }, - { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e }, - { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff }, - { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 }, - { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 }, - { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 }, - { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 }, - { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00 }, - { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be }, - { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 }, - { 0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329 }, - { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 }, - { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 }, - { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, - { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 }, - { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 }, - { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 }, - { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 }, - { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 }, - { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a }, - { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 }, - { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa }, - { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 }, - { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 }, - { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 }, - { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b }, - { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b }, - { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a }, - { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf }, - { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f }, - { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f }, - { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f }, - { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, - { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, -}; - -static const uint32_t ar5416Common_9100[][2] = { - /* Addr allmodes */ - { 0x0000000c, 0x00000000 }, - { 0x00000030, 0x00020015 }, - { 0x00000034, 0x00000005 }, - { 0x00000040, 0x00000000 }, - { 0x00000044, 0x00000008 }, - { 0x00000048, 0x00000008 }, - { 0x0000004c, 0x00000010 }, - { 0x00000050, 0x00000000 }, - { 0x00000054, 0x0000001f }, - { 0x00000800, 0x00000000 }, - { 0x00000804, 0x00000000 }, - { 0x00000808, 0x00000000 }, - { 0x0000080c, 0x00000000 }, - { 0x00000810, 0x00000000 }, - { 0x00000814, 0x00000000 }, - { 0x00000818, 0x00000000 }, - { 0x0000081c, 0x00000000 }, - { 0x00000820, 0x00000000 }, - { 0x00000824, 0x00000000 }, - { 0x00001040, 0x002ffc0f }, - { 0x00001044, 0x002ffc0f }, - { 0x00001048, 0x002ffc0f }, - { 0x0000104c, 0x002ffc0f }, - { 0x00001050, 0x002ffc0f }, - { 0x00001054, 0x002ffc0f }, - { 0x00001058, 0x002ffc0f }, - { 0x0000105c, 0x002ffc0f }, - { 0x00001060, 0x002ffc0f }, - { 0x00001064, 0x002ffc0f }, - { 0x00001230, 0x00000000 }, - { 0x00001270, 0x00000000 }, - { 0x00001038, 0x00000000 }, - { 0x00001078, 0x00000000 }, - { 0x000010b8, 0x00000000 }, - { 0x000010f8, 0x00000000 }, - { 0x00001138, 0x00000000 }, - { 0x00001178, 0x00000000 }, - { 0x000011b8, 0x00000000 }, - { 0x000011f8, 0x00000000 }, - { 0x00001238, 0x00000000 }, - { 0x00001278, 0x00000000 }, - { 0x000012b8, 0x00000000 }, - { 0x000012f8, 0x00000000 }, - { 0x00001338, 0x00000000 }, - { 0x00001378, 0x00000000 }, - { 0x000013b8, 0x00000000 }, - { 0x000013f8, 0x00000000 }, - { 0x00001438, 0x00000000 }, - { 0x00001478, 0x00000000 }, - { 0x000014b8, 0x00000000 }, - { 0x000014f8, 0x00000000 }, - { 0x00001538, 0x00000000 }, - { 0x00001578, 0x00000000 }, - { 0x000015b8, 0x00000000 }, - { 0x000015f8, 0x00000000 }, - { 0x00001638, 0x00000000 }, - { 0x00001678, 0x00000000 }, - { 0x000016b8, 0x00000000 }, - { 0x000016f8, 0x00000000 }, - { 0x00001738, 0x00000000 }, - { 0x00001778, 0x00000000 }, - { 0x000017b8, 0x00000000 }, - { 0x000017f8, 0x00000000 }, - { 0x0000103c, 0x00000000 }, - { 0x0000107c, 0x00000000 }, - { 0x000010bc, 0x00000000 }, - { 0x000010fc, 0x00000000 }, - { 0x0000113c, 0x00000000 }, - { 0x0000117c, 0x00000000 }, - { 0x000011bc, 0x00000000 }, - { 0x000011fc, 0x00000000 }, - { 0x0000123c, 0x00000000 }, - { 0x0000127c, 0x00000000 }, - { 0x000012bc, 0x00000000 }, - { 0x000012fc, 0x00000000 }, - { 0x0000133c, 0x00000000 }, - { 0x0000137c, 0x00000000 }, - { 0x000013bc, 0x00000000 }, - { 0x000013fc, 0x00000000 }, - { 0x0000143c, 0x00000000 }, - { 0x0000147c, 0x00000000 }, - { 0x00020010, 0x00000003 }, - { 0x00020038, 0x000004c2 }, - { 0x00008004, 0x00000000 }, - { 0x00008008, 0x00000000 }, - { 0x0000800c, 0x00000000 }, - { 0x00008018, 0x00000700 }, - { 0x00008020, 0x00000000 }, - { 0x00008038, 0x00000000 }, - { 0x0000803c, 0x00000000 }, - { 0x00008048, 0x40000000 }, - { 0x00008054, 0x00004000 }, - { 0x00008058, 0x00000000 }, - { 0x0000805c, 0x000fc78f }, - { 0x00008060, 0x0000000f }, - { 0x00008064, 0x00000000 }, - { 0x000080c0, 0x2a82301a }, - { 0x000080c4, 0x05dc01e0 }, - { 0x000080c8, 0x1f402710 }, - { 0x000080cc, 0x01f40000 }, - { 0x000080d0, 0x00001e00 }, - { 0x000080d4, 0x00000000 }, - { 0x000080d8, 0x00400000 }, - { 0x000080e0, 0xffffffff }, - { 0x000080e4, 0x0000ffff }, - { 0x000080e8, 0x003f3f3f }, - { 0x000080ec, 0x00000000 }, - { 0x000080f0, 0x00000000 }, - { 0x000080f4, 0x00000000 }, - { 0x000080f8, 0x00000000 }, - { 0x000080fc, 0x00020000 }, - { 0x00008100, 0x00020000 }, - { 0x00008104, 0x00000001 }, - { 0x00008108, 0x00000052 }, - { 0x0000810c, 0x00000000 }, - { 0x00008110, 0x00000168 }, - { 0x00008118, 0x000100aa }, - { 0x0000811c, 0x00003210 }, - { 0x00008120, 0x08f04800 }, - { 0x00008124, 0x00000000 }, - { 0x00008128, 0x00000000 }, - { 0x0000812c, 0x00000000 }, - { 0x00008130, 0x00000000 }, - { 0x00008134, 0x00000000 }, - { 0x00008138, 0x00000000 }, - { 0x0000813c, 0x00000000 }, - { 0x00008144, 0x00000000 }, - { 0x00008168, 0x00000000 }, - { 0x0000816c, 0x00000000 }, - { 0x00008170, 0x32143320 }, - { 0x00008174, 0xfaa4fa50 }, - { 0x00008178, 0x00000100 }, - { 0x0000817c, 0x00000000 }, - { 0x000081c4, 0x00000000 }, - { 0x000081d0, 0x00003210 }, - { 0x000081ec, 0x00000000 }, - { 0x000081f0, 0x00000000 }, - { 0x000081f4, 0x00000000 }, - { 0x000081f8, 0x00000000 }, - { 0x000081fc, 0x00000000 }, - { 0x00008200, 0x00000000 }, - { 0x00008204, 0x00000000 }, - { 0x00008208, 0x00000000 }, - { 0x0000820c, 0x00000000 }, - { 0x00008210, 0x00000000 }, - { 0x00008214, 0x00000000 }, - { 0x00008218, 0x00000000 }, - { 0x0000821c, 0x00000000 }, - { 0x00008220, 0x00000000 }, - { 0x00008224, 0x00000000 }, - { 0x00008228, 0x00000000 }, - { 0x0000822c, 0x00000000 }, - { 0x00008230, 0x00000000 }, - { 0x00008234, 0x00000000 }, - { 0x00008238, 0x00000000 }, - { 0x0000823c, 0x00000000 }, - { 0x00008240, 0x00100000 }, - { 0x00008244, 0x0010f400 }, - { 0x00008248, 0x00000100 }, - { 0x0000824c, 0x0001e800 }, - { 0x00008250, 0x00000000 }, - { 0x00008254, 0x00000000 }, - { 0x00008258, 0x00000000 }, - { 0x0000825c, 0x400000ff }, - { 0x00008260, 0x00080922 }, - { 0x00008270, 0x00000000 }, - { 0x00008274, 0x40000000 }, - { 0x00008278, 0x003e4180 }, - { 0x0000827c, 0x00000000 }, - { 0x00008284, 0x0000002c }, - { 0x00008288, 0x0000002c }, - { 0x0000828c, 0x00000000 }, - { 0x00008294, 0x00000000 }, - { 0x00008298, 0x00000000 }, - { 0x00008300, 0x00000000 }, - { 0x00008304, 0x00000000 }, - { 0x00008308, 0x00000000 }, - { 0x0000830c, 0x00000000 }, - { 0x00008310, 0x00000000 }, - { 0x00008314, 0x00000000 }, - { 0x00008318, 0x00000000 }, - { 0x00008328, 0x00000000 }, - { 0x0000832c, 0x00000007 }, - { 0x00008330, 0x00000302 }, - { 0x00008334, 0x00000e00 }, - { 0x00008338, 0x00000000 }, - { 0x0000833c, 0x00000000 }, - { 0x00008340, 0x000107ff }, - { 0x00009808, 0x00000000 }, - { 0x0000980c, 0xad848e19 }, - { 0x00009810, 0x7d14e000 }, - { 0x00009814, 0x9c0a9f6b }, - { 0x0000981c, 0x00000000 }, - { 0x0000982c, 0x0000a000 }, - { 0x00009830, 0x00000000 }, - { 0x0000983c, 0x00200400 }, - { 0x00009840, 0x206a01ae }, - { 0x0000984c, 0x1284233c }, - { 0x00009854, 0x00000859 }, - { 0x00009900, 0x00000000 }, - { 0x00009904, 0x00000000 }, - { 0x00009908, 0x00000000 }, - { 0x0000990c, 0x00000000 }, - { 0x0000991c, 0x10000fff }, - { 0x00009920, 0x05100000 }, - { 0x0000a920, 0x05100000 }, - { 0x0000b920, 0x05100000 }, - { 0x00009928, 0x00000001 }, - { 0x0000992c, 0x00000004 }, - { 0x00009934, 0x1e1f2022 }, - { 0x00009938, 0x0a0b0c0d }, - { 0x0000993c, 0x00000000 }, - { 0x00009948, 0x9280b212 }, - { 0x0000994c, 0x00020028 }, - { 0x0000c95c, 0x004b6a8e }, - { 0x0000c968, 0x000003ce }, - { 0x00009970, 0x190fb515 }, - { 0x00009974, 0x00000000 }, - { 0x00009978, 0x00000001 }, - { 0x0000997c, 0x00000000 }, - { 0x00009980, 0x00000000 }, - { 0x00009984, 0x00000000 }, - { 0x00009988, 0x00000000 }, - { 0x0000998c, 0x00000000 }, - { 0x00009990, 0x00000000 }, - { 0x00009994, 0x00000000 }, - { 0x00009998, 0x00000000 }, - { 0x0000999c, 0x00000000 }, - { 0x000099a0, 0x00000000 }, - { 0x000099a4, 0x00000001 }, - { 0x000099a8, 0x201fff00 }, - { 0x000099ac, 0x006f0000 }, - { 0x000099b0, 0x03051000 }, - { 0x000099dc, 0x00000000 }, - { 0x000099e0, 0x00000200 }, - { 0x000099e4, 0xaaaaaaaa }, - { 0x000099e8, 0x3c466478 }, - { 0x000099ec, 0x0cc80caa }, - { 0x000099fc, 0x00001042 }, - { 0x00009b00, 0x00000000 }, - { 0x00009b04, 0x00000001 }, - { 0x00009b08, 0x00000002 }, - { 0x00009b0c, 0x00000003 }, - { 0x00009b10, 0x00000004 }, - { 0x00009b14, 0x00000005 }, - { 0x00009b18, 0x00000008 }, - { 0x00009b1c, 0x00000009 }, - { 0x00009b20, 0x0000000a }, - { 0x00009b24, 0x0000000b }, - { 0x00009b28, 0x0000000c }, - { 0x00009b2c, 0x0000000d }, - { 0x00009b30, 0x00000010 }, - { 0x00009b34, 0x00000011 }, - { 0x00009b38, 0x00000012 }, - { 0x00009b3c, 0x00000013 }, - { 0x00009b40, 0x00000014 }, - { 0x00009b44, 0x00000015 }, - { 0x00009b48, 0x00000018 }, - { 0x00009b4c, 0x00000019 }, - { 0x00009b50, 0x0000001a }, - { 0x00009b54, 0x0000001b }, - { 0x00009b58, 0x0000001c }, - { 0x00009b5c, 0x0000001d }, - { 0x00009b60, 0x00000020 }, - { 0x00009b64, 0x00000021 }, - { 0x00009b68, 0x00000022 }, - { 0x00009b6c, 0x00000023 }, - { 0x00009b70, 0x00000024 }, - { 0x00009b74, 0x00000025 }, - { 0x00009b78, 0x00000028 }, - { 0x00009b7c, 0x00000029 }, - { 0x00009b80, 0x0000002a }, - { 0x00009b84, 0x0000002b }, - { 0x00009b88, 0x0000002c }, - { 0x00009b8c, 0x0000002d }, - { 0x00009b90, 0x00000030 }, - { 0x00009b94, 0x00000031 }, - { 0x00009b98, 0x00000032 }, - { 0x00009b9c, 0x00000033 }, - { 0x00009ba0, 0x00000034 }, - { 0x00009ba4, 0x00000035 }, - { 0x00009ba8, 0x00000035 }, - { 0x00009bac, 0x00000035 }, - { 0x00009bb0, 0x00000035 }, - { 0x00009bb4, 0x00000035 }, - { 0x00009bb8, 0x00000035 }, - { 0x00009bbc, 0x00000035 }, - { 0x00009bc0, 0x00000035 }, - { 0x00009bc4, 0x00000035 }, - { 0x00009bc8, 0x00000035 }, - { 0x00009bcc, 0x00000035 }, - { 0x00009bd0, 0x00000035 }, - { 0x00009bd4, 0x00000035 }, - { 0x00009bd8, 0x00000035 }, - { 0x00009bdc, 0x00000035 }, - { 0x00009be0, 0x00000035 }, - { 0x00009be4, 0x00000035 }, - { 0x00009be8, 0x00000035 }, - { 0x00009bec, 0x00000035 }, - { 0x00009bf0, 0x00000035 }, - { 0x00009bf4, 0x00000035 }, - { 0x00009bf8, 0x00000010 }, - { 0x00009bfc, 0x0000001a }, - { 0x0000a210, 0x40806333 }, - { 0x0000a214, 0x00106c10 }, - { 0x0000a218, 0x009c4060 }, - { 0x0000a220, 0x018830c6 }, - { 0x0000a224, 0x00000400 }, - { 0x0000a228, 0x001a0bb5 }, - { 0x0000a22c, 0x00000000 }, - { 0x0000a234, 0x20202020 }, - { 0x0000a238, 0x20202020 }, - { 0x0000a23c, 0x13c889af }, - { 0x0000a240, 0x38490a20 }, - { 0x0000a244, 0x00007bb6 }, - { 0x0000a248, 0x0fff3ffc }, - { 0x0000a24c, 0x00000001 }, - { 0x0000a250, 0x0000e000 }, - { 0x0000a254, 0x00000000 }, - { 0x0000a258, 0x0cc75380 }, - { 0x0000a25c, 0x0f0f0f01 }, - { 0x0000a260, 0xdfa91f01 }, - { 0x0000a268, 0x00000001 }, - { 0x0000a26c, 0x0ebae9c6 }, - { 0x0000b26c, 0x0ebae9c6 }, - { 0x0000c26c, 0x0ebae9c6 }, - { 0x0000d270, 0x00820820 }, - { 0x0000a278, 0x1ce739ce }, - { 0x0000a27c, 0x050701ce }, - { 0x0000a338, 0x00000000 }, - { 0x0000a33c, 0x00000000 }, - { 0x0000a340, 0x00000000 }, - { 0x0000a344, 0x00000000 }, - { 0x0000a348, 0x3fffffff }, - { 0x0000a34c, 0x3fffffff }, - { 0x0000a350, 0x3fffffff }, - { 0x0000a354, 0x0003ffff }, - { 0x0000a358, 0x79a8aa33 }, - { 0x0000d35c, 0x07ffffef }, - { 0x0000d360, 0x0fffffe7 }, - { 0x0000d364, 0x17ffffe5 }, - { 0x0000d368, 0x1fffffe4 }, - { 0x0000d36c, 0x37ffffe3 }, - { 0x0000d370, 0x3fffffe3 }, - { 0x0000d374, 0x57ffffe3 }, - { 0x0000d378, 0x5fffffe2 }, - { 0x0000d37c, 0x7fffffe2 }, - { 0x0000d380, 0x7f3c7bba }, - { 0x0000d384, 0xf3307ff0 }, - { 0x0000a388, 0x0c000000 }, - { 0x0000a38c, 0x20202020 }, - { 0x0000a390, 0x20202020 }, - { 0x0000a394, 0x1ce739ce }, - { 0x0000a398, 0x000001ce }, - { 0x0000a39c, 0x00000001 }, - { 0x0000a3a0, 0x00000000 }, - { 0x0000a3a4, 0x00000000 }, - { 0x0000a3a8, 0x00000000 }, - { 0x0000a3ac, 0x00000000 }, - { 0x0000a3b0, 0x00000000 }, - { 0x0000a3b4, 0x00000000 }, - { 0x0000a3b8, 0x00000000 }, - { 0x0000a3bc, 0x00000000 }, - { 0x0000a3c0, 0x00000000 }, - { 0x0000a3c4, 0x00000000 }, - { 0x0000a3c8, 0x00000246 }, - { 0x0000a3cc, 0x20202020 }, - { 0x0000a3d0, 0x20202020 }, - { 0x0000a3d4, 0x20202020 }, - { 0x0000a3dc, 0x1ce739ce }, - { 0x0000a3e0, 0x000001ce }, -}; - -static const uint32_t ar5416Bank0_9100[][2] = { - /* Addr allmodes */ - { 0x000098b0, 0x1e5795e5 }, - { 0x000098e0, 0x02008020 }, -}; - -static const uint32_t ar5416BB_RfGain_9100[][3] = { - /* Addr 5G_HT20 5G_HT40 */ - { 0x00009a00, 0x00000000, 0x00000000 }, - { 0x00009a04, 0x00000040, 0x00000040 }, - { 0x00009a08, 0x00000080, 0x00000080 }, - { 0x00009a0c, 0x000001a1, 0x00000141 }, - { 0x00009a10, 0x000001e1, 0x00000181 }, - { 0x00009a14, 0x00000021, 0x000001c1 }, - { 0x00009a18, 0x00000061, 0x00000001 }, - { 0x00009a1c, 0x00000168, 0x00000041 }, - { 0x00009a20, 0x000001a8, 0x000001a8 }, - { 0x00009a24, 0x000001e8, 0x000001e8 }, - { 0x00009a28, 0x00000028, 0x00000028 }, - { 0x00009a2c, 0x00000068, 0x00000068 }, - { 0x00009a30, 0x00000189, 0x000000a8 }, - { 0x00009a34, 0x000001c9, 0x00000169 }, - { 0x00009a38, 0x00000009, 0x000001a9 }, - { 0x00009a3c, 0x00000049, 0x000001e9 }, - { 0x00009a40, 0x00000089, 0x00000029 }, - { 0x00009a44, 0x00000170, 0x00000069 }, - { 0x00009a48, 0x000001b0, 0x00000190 }, - { 0x00009a4c, 0x000001f0, 0x000001d0 }, - { 0x00009a50, 0x00000030, 0x00000010 }, - { 0x00009a54, 0x00000070, 0x00000050 }, - { 0x00009a58, 0x00000191, 0x00000090 }, - { 0x00009a5c, 0x000001d1, 0x00000151 }, - { 0x00009a60, 0x00000011, 0x00000191 }, - { 0x00009a64, 0x00000051, 0x000001d1 }, - { 0x00009a68, 0x00000091, 0x00000011 }, - { 0x00009a6c, 0x000001b8, 0x00000051 }, - { 0x00009a70, 0x000001f8, 0x00000198 }, - { 0x00009a74, 0x00000038, 0x000001d8 }, - { 0x00009a78, 0x00000078, 0x00000018 }, - { 0x00009a7c, 0x00000199, 0x00000058 }, - { 0x00009a80, 0x000001d9, 0x00000098 }, - { 0x00009a84, 0x00000019, 0x00000159 }, - { 0x00009a88, 0x00000059, 0x00000199 }, - { 0x00009a8c, 0x00000099, 0x000001d9 }, - { 0x00009a90, 0x000000d9, 0x00000019 }, - { 0x00009a94, 0x000000f9, 0x00000059 }, - { 0x00009a98, 0x000000f9, 0x00000099 }, - { 0x00009a9c, 0x000000f9, 0x000000d9 }, - { 0x00009aa0, 0x000000f9, 0x000000f9 }, - { 0x00009aa4, 0x000000f9, 0x000000f9 }, - { 0x00009aa8, 0x000000f9, 0x000000f9 }, - { 0x00009aac, 0x000000f9, 0x000000f9 }, - { 0x00009ab0, 0x000000f9, 0x000000f9 }, - { 0x00009ab4, 0x000000f9, 0x000000f9 }, - { 0x00009ab8, 0x000000f9, 0x000000f9 }, - { 0x00009abc, 0x000000f9, 0x000000f9 }, - { 0x00009ac0, 0x000000f9, 0x000000f9 }, - { 0x00009ac4, 0x000000f9, 0x000000f9 }, - { 0x00009ac8, 0x000000f9, 0x000000f9 }, - { 0x00009acc, 0x000000f9, 0x000000f9 }, - { 0x00009ad0, 0x000000f9, 0x000000f9 }, - { 0x00009ad4, 0x000000f9, 0x000000f9 }, - { 0x00009ad8, 0x000000f9, 0x000000f9 }, - { 0x00009adc, 0x000000f9, 0x000000f9 }, - { 0x00009ae0, 0x000000f9, 0x000000f9 }, - { 0x00009ae4, 0x000000f9, 0x000000f9 }, - { 0x00009ae8, 0x000000f9, 0x000000f9 }, - { 0x00009aec, 0x000000f9, 0x000000f9 }, - { 0x00009af0, 0x000000f9, 0x000000f9 }, - { 0x00009af4, 0x000000f9, 0x000000f9 }, - { 0x00009af8, 0x000000f9, 0x000000f9 }, - { 0x00009afc, 0x000000f9, 0x000000f9 }, -}; - -static const uint32_t ar5416Bank1_9100[][2] = { - /* Addr allmodes */ - { 0x000098b0, 0x02108421 }, - { 0x000098ec, 0x00000008 }, -}; - -static const uint32_t ar5416Bank2_9100[][2] = { - /* Addr allmodes */ - { 0x000098b0, 0x0e73ff17 }, - { 0x000098e0, 0x00000420 }, -}; - -static const uint32_t ar5416Bank3_9100[][3] = { - /* Addr 5G_HT20 5G_HT40 */ - { 0x000098f0, 0x01400018, 0x01c00018 }, -}; - -static const uint32_t ar5416Bank6_9100[][3] = { - /* Addr 5G_HT20 5G_HT40 */ - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00e00000, 0x00e00000 }, - { 0x0000989c, 0x005e0000, 0x005e0000 }, - { 0x0000989c, 0x00120000, 0x00120000 }, - { 0x0000989c, 0x00620000, 0x00620000 }, - { 0x0000989c, 0x00020000, 0x00020000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x005f0000, 0x005f0000 }, - { 0x0000989c, 0x00870000, 0x00870000 }, - { 0x0000989c, 0x00f90000, 0x00f90000 }, - { 0x0000989c, 0x007b0000, 0x007b0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00f50000, 0x00f50000 }, - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, - { 0x0000989c, 0x00110000, 0x00110000 }, - { 0x0000989c, 0x006100a8, 0x006100a8 }, - { 0x0000989c, 0x004210a2, 0x004210a2 }, - { 0x0000989c, 0x0014000f, 0x0014000f }, - { 0x0000989c, 0x00c40002, 0x00c40002 }, - { 0x0000989c, 0x003000f2, 0x003000f2 }, - { 0x0000989c, 0x00440016, 0x00440016 }, - { 0x0000989c, 0x00410040, 0x00410040 }, - { 0x0000989c, 0x000180d6, 0x000180d6 }, - { 0x0000989c, 0x0000c0aa, 0x0000c0aa }, - { 0x0000989c, 0x000000b1, 0x000000b1 }, - { 0x0000989c, 0x00002000, 0x00002000 }, - { 0x0000989c, 0x000000d4, 0x000000d4 }, - { 0x000098d0, 0x0000000f, 0x0010000f }, -}; - -static const uint32_t ar5416Bank6TPC_9100[][3] = { - /* Addr 5G_HT20 5G_HT40 */ - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00000000, 0x00000000 }, - { 0x0000989c, 0x00e00000, 0x00e00000 }, - { 0x0000989c, 0x005e0000, 0x005e0000 }, - { 0x0000989c, 0x00120000, 0x00120000 }, - { 0x0000989c, 0x00620000, 0x00620000 }, - { 0x0000989c, 0x00020000, 0x00020000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x40ff0000, 0x40ff0000 }, - { 0x0000989c, 0x005f0000, 0x005f0000 }, - { 0x0000989c, 0x00870000, 0x00870000 }, - { 0x0000989c, 0x00f90000, 0x00f90000 }, - { 0x0000989c, 0x007b0000, 0x007b0000 }, - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, - { 0x0000989c, 0x00f50000, 0x00f50000 }, - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, - { 0x0000989c, 0x00110000, 0x00110000 }, - { 0x0000989c, 0x006100a8, 0x006100a8 }, - { 0x0000989c, 0x00423022, 0x00423022 }, - { 0x0000989c, 0x2014008f, 0x2014008f }, - { 0x0000989c, 0x00c40002, 0x00c40002 }, - { 0x0000989c, 0x003000f2, 0x003000f2 }, - { 0x0000989c, 0x00440016, 0x00440016 }, - { 0x0000989c, 0x00410040, 0x00410040 }, - { 0x0000989c, 0x0001805e, 0x0001805e }, - { 0x0000989c, 0x0000c0ab, 0x0000c0ab }, - { 0x0000989c, 0x000000e1, 0x000000e1 }, - { 0x0000989c, 0x00007080, 0x00007080 }, - { 0x0000989c, 0x000000d4, 0x000000d4 }, - { 0x000098d0, 0x0000000f, 0x0010000f }, -}; - -static const uint32_t ar5416Bank7_9100[][2] = { - /* Addr allmodes */ - { 0x0000989c, 0x00000500 }, - { 0x0000989c, 0x00000800 }, - { 0x000098cc, 0x0000000e }, -}; - -static const uint32_t ar5416Addac_9100[][2] = { - /* Addr allmodes */ - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000010 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x000000c0 }, - { 0x0000989c, 0x00000015 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x0000989c, 0x00000000 }, - { 0x000098cc, 0x00000000 }, -}; diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c deleted file mode 100644 index 70277cc6ca2a..000000000000 --- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c +++ /dev/null @@ -1,324 +0,0 @@ -/*- - * SPDX-License-Identifier: ISC - * - * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd - * Copyright (c) 2008 Sam Leffler, Errno Consulting - * Copyright (c) 2008 Atheros Communications, Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * $FreeBSD$ - */ -#include "opt_ah.h" - -#include "ah.h" -#include "ah_internal.h" -#include "ah_devid.h" - -#include "ar5416/ar5416.h" -#include "ar5416/ar5416reg.h" -#include "ar5416/ar5416phy.h" - -#include "ar9001/ar9130reg.h" -#include "ar9001/ar9130_phy.h" -#include "ar9001/ar9130_eeprom.h" - -#include "ar9001/ar9130.ini" - -static const HAL_PERCAL_DATA ar9130_iq_cal = { /* multi sample */ - .calName = "IQ", .calType = IQ_MISMATCH_CAL, - .calNumSamples = MAX_CAL_SAMPLES, - .calCountMax = PER_MIN_LOG_COUNT, - .calCollect = ar5416IQCalCollect, - .calPostProc = ar5416IQCalibration -}; -static const HAL_PERCAL_DATA ar9130_adc_gain_cal = { /* multi sample */ - .calName = "ADC Gain", .calType = ADC_GAIN_CAL, - .calNumSamples = MAX_CAL_SAMPLES, - .calCountMax = PER_MIN_LOG_COUNT, - .calCollect = ar5416AdcGainCalCollect, - .calPostProc = ar5416AdcGainCalibration -}; -static const HAL_PERCAL_DATA ar9130_adc_dc_cal = { /* multi sample */ - .calName = "ADC DC", .calType = ADC_DC_CAL, - .calNumSamples = MAX_CAL_SAMPLES, - .calCountMax = PER_MIN_LOG_COUNT, - .calCollect = ar5416AdcDcCalCollect, - .calPostProc = ar5416AdcDcCalibration -}; -static const HAL_PERCAL_DATA ar9130_adc_init_dc_cal = { - .calName = "ADC Init DC", .calType = ADC_DC_INIT_CAL, - .calNumSamples = MIN_CAL_SAMPLES, - .calCountMax = INIT_LOG_COUNT, - .calCollect = ar5416AdcDcCalCollect, - .calPostProc = ar5416AdcDcCalibration -}; - -static HAL_BOOL ar9130FillCapabilityInfo(struct ath_hal *ah); - -/* - * Attach for an AR9130 part. - */ -static struct ath_hal * -ar9130Attach(uint16_t devid, HAL_SOFTC sc, - HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata, - HAL_OPS_CONFIG *ah_config, - HAL_STATUS *status) -{ - struct ath_hal_5416 *ahp5416; - struct ath_hal_5212 *ahp; - struct ath_hal *ah; - uint32_t val; - HAL_STATUS ecode; - HAL_BOOL rfStatus; - - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", - __func__, sc, (void*) st, (void*) sh); - - /* NB: memory is returned zero'd */ - ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416)); - if (ahp5416 == AH_NULL) { - HALDEBUG(AH_NULL, HAL_DEBUG_ANY, - "%s: cannot allocate memory for state block\n", __func__); - *status = HAL_ENOMEM; - return AH_NULL; - } - ar5416InitState(ahp5416, devid, sc, st, sh, status); - ahp = &ahp5416->ah_5212; - ah = &ahp->ah_priv.h; - - /* XXX override with 9100 specific state */ - AH5416(ah)->ah_initPLL = ar9130InitPLL; - /* XXX should force chainmasks to 0x7, as per ath9k calibration bugs */ - - /* override 5416 methods for our needs */ - - AH5416(ah)->ah_cal.iqCalData.calData = &ar9130_iq_cal; - AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9130_adc_gain_cal; - AH5416(ah)->ah_cal.adcDcCalData.calData = &ar9130_adc_dc_cal; - AH5416(ah)->ah_cal.adcDcCalInitData.calData = &ar9130_adc_init_dc_cal; - AH5416(ah)->ah_cal.suppCals = ADC_GAIN_CAL | ADC_DC_CAL | IQ_MISMATCH_CAL; - - /* - * This was hard-set because the initial ath9k port of this - * code kept their runtime conditional register #defines. - * AR_SREV and the RTC registers have shifted for Howl; - * they detected this and changed the values at runtime. - * The current port doesn't yet do this; it may do at a - * later stage, so this is set early so any routines which - * manipulate the registers have ah_macVersion set to base - * the above decision upon. - */ - AH_PRIVATE((ah))->ah_macVersion = AR_XSREV_VERSION_HOWL; - - /* - * Use the "local" EEPROM data given to us by the higher layers. - * This is a private copy out of system flash. - * By this stage the SoC SPI flash may have disabled the memory- - * mapping and rely purely on port-based SPI IO. - */ - AH_PRIVATE((ah))->ah_eepromRead = ath_hal_EepromDataRead; - AH_PRIVATE((ah))->ah_eepromWrite = NULL; - ah->ah_eepromdata = eepromdata; - - if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) { - /* reset chip */ - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n", - __func__); - ecode = HAL_EIO; - goto bad; - } - - if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) { - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't wakeup chip\n", *** 380 LINES SKIPPED *** From nobody Wed Aug 9 16:23:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLb3366mQz4TtKd; Wed, 9 Aug 2023 16:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLb335LKqz3HVr; Wed, 9 Aug 2023 16:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691598223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bhE+zqB1HpFwm+8XVbezMkHo6yNUiQoSXuqQG9QxUI=; b=q+pwpx/aneC18u1lpStrEt0gOK98O1Pn4JSiVXCPtXLh+rw3BURJ9fF2FRjruZ8z0FQCyH 5NhvguORjm1Me769zbw8cpGxcVD4kQ0d/gQX22f6E2oZMC77W0j7wLDulEi8E72TCOJnh+ QAo2Gm74wX6pZT0XApO0XyLCkoi/gxOcz2T6NBWFFRPMUO3y2e/zhQ2gOvwDN4/CbaxeWj LRTjRsdpXzPcbdcwV55FKuMwDbKIi3+LEJeeWMBunGSeLKFt22gDLLF3mrEDSoj8zb36vg cpRzkgF55tyoUW/za9LimOhetyN1bRczWcqzoymkZbzZoplQXkwdNJnCjb1v8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691598223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bhE+zqB1HpFwm+8XVbezMkHo6yNUiQoSXuqQG9QxUI=; b=re+7LYZm1zlggAaSHNgNHK2YHAz6M20PTC+XQ1PzT+uq9cx6boys+NW1w+gokBH9g0Au04 re9XKVRUp60vUwEtTcFPEehg2FDRol/NlZo4cweGa7sTX4NQcocWjuPCJbk2eyiAF0bbo2 tzbsKAH7ka++cJ2QF9W2HK0Csrqyw+28AdJQDZEEQGczIXM7JU0Ky3KSEG7AraSDlmREjp uWyHEekV5sPmF45Ll4FnBj3NH+2n5CAFzWUCVWbGjQQlTUYFgjzgSyxV9KQ6HEYlHPmt/U VuEe9t6Z8jaFLXs2uaQJbDRv26T6RWRCDS0jIm7gIlSOmY7GrI6IRCD/mL0SaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691598223; a=rsa-sha256; cv=none; b=H2aCkiUsu//1Vy2eDH4TfmLFQnrdB4ZzDVDctuw8DyyDfTf/lK7DsFhiKiu+YDv0+pvKFj jN4A3NMSvxVUvLXVTsvkTUSmq5NWKO6tNQz+G1Otjfy2ikJNqqdBSFo98jRNH8FlX3Z1DB AMpv4XIKvGDdBO6eY5bynBd1eJ9FipfNZvseicg75y6DWP/7mcGcta22gdWWwKSUXGxRx3 JXXGnMI7Z+VDfkw59dikbaIjjGxZ6fTYG4xIcsesezHIzfHUPkTllplbRMY+azrXL7Poj9 /yKrPcwrk3zsRZlQCIihGXczkIt7+uwpyp8XPw1bKSGjzqIOG1hL2p9oOIXJ4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLb334NvWz7bV; Wed, 9 Aug 2023 16:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379GNhDb026495; Wed, 9 Aug 2023 16:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379GNhCu026492; Wed, 9 Aug 2023 16:23:43 GMT (envelope-from git) Date: Wed, 9 Aug 2023 16:23:43 GMT Message-Id: <202308091623.379GNhCu026492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 8f5dbc22e595 - main - arswitch(4): Remove support for AR{7240,9340} found in MIPS SoCs only List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f5dbc22e595e09a8beb81ff532df58f006b91cd Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=8f5dbc22e595e09a8beb81ff532df58f006b91cd commit 8f5dbc22e595e09a8beb81ff532df58f006b91cd Author: Marius Strobl AuthorDate: 2023-08-08 20:35:02 +0000 Commit: Marius Strobl CommitDate: 2023-08-09 16:22:13 +0000 arswitch(4): Remove support for AR{7240,9340} found in MIPS SoCs only With the general removal of MIPS support there's no longer a need to support these integrated switches. Approved by: adrian Differential Revision: https://reviews.freebsd.org/D41394 --- share/man/man4/arswitch.4 | 8 +- sys/conf/files | 2 - sys/dev/etherswitch/arswitch/arswitch.c | 28 +--- sys/dev/etherswitch/arswitch/arswitch_7240.c | 147 ----------------- sys/dev/etherswitch/arswitch/arswitch_7240.h | 37 ----- sys/dev/etherswitch/arswitch/arswitch_9340.c | 234 --------------------------- sys/dev/etherswitch/arswitch/arswitch_9340.h | 37 ----- sys/dev/etherswitch/arswitch/arswitch_reg.c | 9 -- sys/dev/etherswitch/arswitch/arswitchreg.h | 47 ------ sys/dev/etherswitch/arswitch/arswitchvar.h | 3 - 10 files changed, 3 insertions(+), 549 deletions(-) diff --git a/share/man/man4/arswitch.4 b/share/man/man4/arswitch.4 index 481a3a08f339..f07d1dec0040 100644 --- a/share/man/man4/arswitch.4 +++ b/share/man/man4/arswitch.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 19, 2021 +.Dd August 8, 2023 .Dt ARSWITCH 4 .Os .Sh NAME @@ -39,9 +39,7 @@ The .Nm device driver provides a management interface to multiple Atheros fast ethernet switch chips: -.Bl -tag -compact -width "AR7240" -.It AR7240 -Wireless Network Processor SOC with five Fast Ethernet PHYs +.Bl -tag -compact -width "AR8216" .It AR8216 Fast Ethernet Switch .It AR8226 @@ -49,8 +47,6 @@ Fast Ethernet Switch Six-port Gigabit Ethernet Switch .It AR8327 Seven-port Gigabit Ethernet Switch -.It AR9340 -Wireless networking SoC .El .Pp The driver uses an diff --git a/sys/conf/files b/sys/conf/files index 80384fe1f5b1..f831ee2b5275 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1648,8 +1648,6 @@ dev/etherswitch/arswitch/arswitch_8216.c optional arswitch dev/etherswitch/arswitch/arswitch_8226.c optional arswitch dev/etherswitch/arswitch/arswitch_8316.c optional arswitch dev/etherswitch/arswitch/arswitch_8327.c optional arswitch -dev/etherswitch/arswitch/arswitch_7240.c optional arswitch -dev/etherswitch/arswitch/arswitch_9340.c optional arswitch dev/etherswitch/arswitch/arswitch_vlans.c optional arswitch dev/etherswitch/etherswitch.c optional etherswitch dev/etherswitch/etherswitch_if.m optional etherswitch diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c index 6a95c7a8ad80..2d39553b0d9c 100644 --- a/sys/dev/etherswitch/arswitch/arswitch.c +++ b/sys/dev/etherswitch/arswitch/arswitch.c @@ -64,12 +64,10 @@ #include #include -#include #include #include #include #include -#include #include "mdio_if.h" #include "miibus_if.h" @@ -105,24 +103,6 @@ arswitch_probe(device_t dev) bzero(sc, sizeof(*sc)); sc->page = -1; - /* AR7240 probe */ - if (ar7240_probe(dev) == 0) { - chipname = "AR7240"; - sc->sc_switchtype = AR8X16_SWITCH_AR7240; - sc->is_internal_switch = 1; - id = 0; - goto done; - } - - /* AR9340 probe */ - if (ar9340_probe(dev) == 0) { - chipname = "AR9340"; - sc->sc_switchtype = AR8X16_SWITCH_AR9340; - sc->is_internal_switch = 1; - id = 0; - goto done; - } - /* AR8xxx probe */ id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL); sc->chip_rev = (id & AR8X16_MASK_CTRL_REV_MASK); @@ -152,8 +132,6 @@ arswitch_probe(device_t dev) chipname = NULL; } -done: - DPRINTF(sc, ARSWITCH_DBG_ANY, "chipname=%s, id=%08x\n", chipname, id); if (chipname != NULL) { snprintf(desc, sizeof(desc), @@ -589,11 +567,7 @@ arswitch_attach(device_t dev) /* * Attach switch related functions */ - if (AR8X16_IS_SWITCH(sc, AR7240)) - ar7240_attach(sc); - else if (AR8X16_IS_SWITCH(sc, AR9340)) - ar9340_attach(sc); - else if (AR8X16_IS_SWITCH(sc, AR8216)) + if (AR8X16_IS_SWITCH(sc, AR8216)) ar8216_attach(sc); else if (AR8X16_IS_SWITCH(sc, AR8226)) ar8226_attach(sc); diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.c b/sys/dev/etherswitch/arswitch/arswitch_7240.c deleted file mode 100644 index 2096d16c0913..000000000000 --- a/sys/dev/etherswitch/arswitch/arswitch_7240.c +++ /dev/null @@ -1,147 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2011-2012 Stefan Bethke. - * Copyright (c) 2012 Adrian Chadd. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include /* XXX for probe */ -#include - -#include "mdio_if.h" -#include "miibus_if.h" -#include "etherswitch_if.h" - -/* - * AR7240 specific functions - */ -static int -ar7240_hw_setup(struct arswitch_softc *sc) -{ - - return (0); -} - -/* - * Initialise other global values for the AR7240. - */ -static int -ar7240_hw_global_setup(struct arswitch_softc *sc) -{ - - ARSWITCH_LOCK(sc); - - /* Enable CPU port; disable mirror port */ - arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, - AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); - - /* Setup TAG priority mapping */ - arswitch_writereg(sc->sc_dev, AR8X16_REG_TAG_PRIO, 0xfa50); - - /* Enable broadcast frames transmitted to the CPU */ - arswitch_writereg(sc->sc_dev, AR8X16_REG_FLOOD_MASK, - AR8X16_FLOOD_MASK_BCAST_TO_CPU | 0x003f003f); - - /* Setup MTU */ - arswitch_modifyreg(sc->sc_dev, AR8X16_REG_GLOBAL_CTRL, - AR7240_GLOBAL_CTRL_MTU_MASK, - SM(1536, AR7240_GLOBAL_CTRL_MTU_MASK)); - - /* Service Tag */ - arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, - AR8X16_SERVICE_TAG_MASK, 0); - - ARSWITCH_UNLOCK(sc); - - return (0); -} - -/* - * The AR7240 probes the same as the AR8216. - * - * However, the support is slightly different. - * - * So instead of checking the PHY revision or mask register contents, - * we simply fall back to a hint check. - */ -int -ar7240_probe(device_t dev) -{ - int is_7240 = 0; - - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "is_7240", &is_7240) != 0) - return (ENXIO); - - if (is_7240 == 0) - return (ENXIO); - - return (0); -} - -void -ar7240_attach(struct arswitch_softc *sc) -{ - - sc->hal.arswitch_hw_setup = ar7240_hw_setup; - sc->hal.arswitch_hw_global_setup = ar7240_hw_global_setup; - - /* Set the switch vlan capabilities. */ - sc->info.es_vlan_caps = ETHERSWITCH_VLAN_DOT1Q | - ETHERSWITCH_VLAN_PORT | ETHERSWITCH_VLAN_DOUBLE_TAG; - sc->info.es_nvlangroups = AR8X16_MAX_VLANS; -} diff --git a/sys/dev/etherswitch/arswitch/arswitch_7240.h b/sys/dev/etherswitch/arswitch/arswitch_7240.h deleted file mode 100644 index 7d8181aeb353..000000000000 --- a/sys/dev/etherswitch/arswitch/arswitch_7240.h +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2011-2012 Stefan Bethke. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ -#ifndef __ARSWITCH_7240_H__ -#define __ARSWITCH_7240_H__ - -extern int ar7240_probe(device_t dev); -extern void ar7240_attach(struct arswitch_softc *sc); - -#endif /* __ARSWITCH_7240_H__ */ - diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.c b/sys/dev/etherswitch/arswitch/arswitch_9340.c deleted file mode 100644 index 8b1e5c390fb5..000000000000 --- a/sys/dev/etherswitch/arswitch/arswitch_9340.c +++ /dev/null @@ -1,234 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2011-2012 Stefan Bethke. - * Copyright (c) 2013 Adrian Chadd - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include /* XXX for probe */ -#include - -#include "mdio_if.h" -#include "miibus_if.h" -#include "etherswitch_if.h" - -/* - * AR9340 specific functions - */ -static int -ar9340_hw_setup(struct arswitch_softc *sc) -{ - - return (0); -} - -static int -ar9340_atu_learn_default(struct arswitch_softc *sc) -{ - - /* Enable aging, MAC replacing */ - arswitch_writereg(sc->sc_dev, AR934X_REG_AT_CTRL, - 0x2b /* 5 min age time */ | - AR934X_AT_CTRL_AGE_EN | - AR934X_AT_CTRL_LEARN_CHANGE); - - /* Enable ARP frame acknowledge */ - arswitch_modifyreg(sc->sc_dev, AR934X_REG_QM_CTRL, - AR934X_QM_CTRL_ARP_EN, AR934X_QM_CTRL_ARP_EN); - -#if 0 - /* Copy frame to CPU port, not just redirect it */ - arswitch_modifyreg(sc->sc_dev, AR934X_REG_QM_CTRL, - AR934X_QM_CTRL_ARP_COPY_EN, AR934X_QM_CTRL_ARP_COPY_EN); -#endif - - return (0); -} - -/* - * Initialise other global values for the AR9340. - */ -static int -ar9340_hw_global_setup(struct arswitch_softc *sc) -{ - - ARSWITCH_LOCK(sc); - - /* Enable CPU port; disable mirror port */ - arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT, - AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS); - - /* Setup TAG priority mapping */ - arswitch_writereg(sc->sc_dev, AR8X16_REG_TAG_PRIO, 0xfa50); - - /* Enable Broadcast frames transmitted to the CPU */ - arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, - AR934X_FLOOD_MASK_BC_DP(0), - AR934X_FLOOD_MASK_BC_DP(0)); - arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, - AR934X_FLOOD_MASK_MC_DP(0), - AR934X_FLOOD_MASK_MC_DP(0)); -#if 0 - arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK, - AR934X_FLOOD_MASK_UC_DP(0), - AR934X_FLOOD_MASK_UC_DP(0)); -#endif - - /* Enable MIB counters */ - arswitch_modifyreg(sc->sc_dev, AR8X16_REG_MIB_FUNC0, - AR934X_MIB_ENABLE, AR934X_MIB_ENABLE); - - /* Setup MTU */ - arswitch_modifyreg(sc->sc_dev, AR8X16_REG_GLOBAL_CTRL, - AR7240_GLOBAL_CTRL_MTU_MASK, - SM(1536, AR7240_GLOBAL_CTRL_MTU_MASK)); - - /* Service Tag */ - arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG, - AR8X16_SERVICE_TAG_MASK, 0); - - /* Settle time */ - DELAY(1000); - - /* - * Check PHY mode bits. - * - * This dictates whether the connected port is to be wired - * up via GMII or MII. I'm not sure why - this is an internal - * wiring issue. - */ - if (sc->is_gmii) { - device_printf(sc->sc_dev, "%s: GMII\n", __func__); - arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, - AR934X_OPER_MODE0_MAC_GMII_EN, - AR934X_OPER_MODE0_MAC_GMII_EN); - } else if (sc->is_mii) { - device_printf(sc->sc_dev, "%s: MII\n", __func__); - arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0, - AR934X_OPER_MODE0_PHY_MII_EN, - AR934X_OPER_MODE0_PHY_MII_EN); - } else { - device_printf(sc->sc_dev, "%s: need is_gmii or is_mii set\n", - __func__); - ARSWITCH_UNLOCK(sc); - return (ENXIO); - } - - /* - * Whether to connect PHY 4 via MII (ie a switch port) or - * treat it as a CPU port. - */ - if (sc->phy4cpu) { - device_printf(sc->sc_dev, "%s: PHY4 - CPU\n", __func__); - arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE1, - AR934X_REG_OPER_MODE1_PHY4_MII_EN, - AR934X_REG_OPER_MODE1_PHY4_MII_EN); - sc->info.es_nports = 5; - } else { - device_printf(sc->sc_dev, "%s: PHY4 - Local\n", __func__); - sc->info.es_nports = 6; - } - - /* Settle time */ - DELAY(1000); - - ARSWITCH_UNLOCK(sc); - return (0); -} - -/* - * The AR9340 switch probes (almost) the same as the AR7240 on-chip switch. - * - * However, the support is slightly different. - * - * So instead of checking the PHY revision or mask register contents, - * we simply fall back to a hint check. - */ -int -ar9340_probe(device_t dev) -{ - int is_9340 = 0; - - if (resource_int_value(device_get_name(dev), device_get_unit(dev), - "is_9340", &is_9340) != 0) - return (ENXIO); - - if (is_9340 == 0) - return (ENXIO); - - return (0); -} - -void -ar9340_attach(struct arswitch_softc *sc) -{ - - sc->hal.arswitch_hw_setup = ar9340_hw_setup; - sc->hal.arswitch_hw_global_setup = ar9340_hw_global_setup; - sc->hal.arswitch_atu_learn_default = ar9340_atu_learn_default; - /* - * Note: the ar9340 table fetch code/registers matche - * the ar8216/ar8316 for now because we're not supporting - * static entry programming that includes any of the extra - * bits in the AR9340. - */ - - /* Set the switch vlan capabilities. */ - sc->info.es_vlan_caps = ETHERSWITCH_VLAN_DOT1Q | - ETHERSWITCH_VLAN_PORT | ETHERSWITCH_VLAN_DOUBLE_TAG; - sc->info.es_nvlangroups = AR8X16_MAX_VLANS; -} diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.h b/sys/dev/etherswitch/arswitch/arswitch_9340.h deleted file mode 100644 index faf5ef8c1cbb..000000000000 --- a/sys/dev/etherswitch/arswitch/arswitch_9340.h +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2011-2012 Stefan Bethke. - * Copyright (c) 2031 Adrian Chadd - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ -#ifndef __ARSWITCH_9340_H__ -#define __ARSWITCH_9340_H__ - -extern int ar9340_probe(device_t dev); -extern void ar9340_attach(struct arswitch_softc *sc); - -#endif /* __ARSWITCH_9340_H__ */ diff --git a/sys/dev/etherswitch/arswitch/arswitch_reg.c b/sys/dev/etherswitch/arswitch/arswitch_reg.c index 06f41a29213f..5adbe9cd7108 100644 --- a/sys/dev/etherswitch/arswitch/arswitch_reg.c +++ b/sys/dev/etherswitch/arswitch/arswitch_reg.c @@ -107,15 +107,6 @@ arswitch_writereg16(device_t dev, int addr, int data) return (MDIO_WRITEREG(device_get_parent(dev), 0x10 | phy, reg, data)); } -/* - * XXX NOTE: - * - * This may not work for AR7240 series embedded switches - - * the per-PHY register space doesn't seem to be exposed. - * - * In that instance, it may be required to speak via - * the internal switch PHY MDIO bus indirection. - */ void arswitch_writedbg(device_t dev, int phy, uint16_t dbg_addr, uint16_t dbg_data) diff --git a/sys/dev/etherswitch/arswitch/arswitchreg.h b/sys/dev/etherswitch/arswitch/arswitchreg.h index 5f8b04dea94e..c6f86425a980 100644 --- a/sys/dev/etherswitch/arswitch/arswitchreg.h +++ b/sys/dev/etherswitch/arswitch/arswitchreg.h @@ -113,8 +113,6 @@ #define AR8316_GLOBAL_CTRL_MTU_MASK_S 0 #define AR8236_GLOBAL_CTRL_MTU_MASK 0x00007fff #define AR8236_GLOBAL_CTRL_MTU_MASK_S 0 -#define AR7240_GLOBAL_CTRL_MTU_MASK 0x00003fff -#define AR7240_GLOBAL_CTRL_MTU_MASK_S 0 #define AR8X16_REG_VLAN_CTRL 0x0040 #define AR8X16_VLAN_OP 0x00000007 @@ -365,51 +363,6 @@ #define AR8X16_MAX_VLANS 16 -/* - * AR9340 switch specific definitions. - */ - -#define AR934X_REG_OPER_MODE0 0x04 -#define AR934X_OPER_MODE0_MAC_GMII_EN (1 << 6) -#define AR934X_OPER_MODE0_PHY_MII_EN (1 << 10) - -#define AR934X_REG_OPER_MODE1 0x08 -#define AR934X_REG_OPER_MODE1_PHY4_MII_EN (1 << 28) - -#define AR934X_REG_FLOOD_MASK 0x2c -#define AR934X_FLOOD_MASK_UC_DP(_p) (1 << (0 + (_p))) -#define AR934X_FLOOD_MASK_MC_DP(_p) (1 << (16 + (_p))) -#define AR934X_FLOOD_MASK_BC_DP(_p) (1 << (25 + (_p))) - -#define AR934X_REG_QM_CTRL 0x3c -#define AR934X_QM_CTRL_ARP_EN (1 << 15) -#define AR934X_QM_CTRL_ARP_COPY_EN (1 << 14) - -#define AR934X_REG_AT_CTRL 0x5c -#define AR934X_AT_CTRL_AGE_TIME BITS(0, 15) -#define AR934X_AT_CTRL_AGE_EN (1 << 17) -#define AR934X_AT_CTRL_LEARN_CHANGE (1 << 18) - -#define AR934X_REG_PORT_BASE(_port) (0x100 + (_port) * 0x100) - -#define AR934X_REG_PORT_VLAN1(_port) (AR934X_REG_PORT_BASE((_port)) + 0x08) -#define AR934X_PORT_VLAN1_DEFAULT_SVID_S 0 -#define AR934X_PORT_VLAN1_FORCE_DEFAULT_VID_EN (1 << 12) -#define AR934X_PORT_VLAN1_PORT_TLS_MODE (1 << 13) -#define AR934X_PORT_VLAN1_PORT_VLAN_PROP_EN (1 << 14) -#define AR934X_PORT_VLAN1_PORT_CLONE_EN (1 << 15) -#define AR934X_PORT_VLAN1_DEFAULT_CVID_S 16 -#define AR934X_PORT_VLAN1_FORCE_PORT_VLAN_EN (1 << 28) -#define AR934X_PORT_VLAN1_ING_PORT_PRI_S 29 - -#define AR934X_REG_PORT_VLAN2(_port) (AR934X_REG_PORT_BASE((_port)) + 0x0c) -#define AR934X_PORT_VLAN2_PORT_VID_MEM_S 16 -#define AR934X_PORT_VLAN2_8021Q_MODE_S 30 -#define AR934X_PORT_VLAN2_8021Q_MODE_PORT_ONLY 0 -#define AR934X_PORT_VLAN2_8021Q_MODE_PORT_FALLBACK 1 -#define AR934X_PORT_VLAN2_8021Q_MODE_VLAN_ONLY 2 -#define AR934X_PORT_VLAN2_8021Q_MODE_SECURE 3 - /* * AR8327 specific registers */ diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h index e7aec9d99513..821d79bb89b1 100644 --- a/sys/dev/etherswitch/arswitch/arswitchvar.h +++ b/sys/dev/etherswitch/arswitch/arswitchvar.h @@ -32,11 +32,9 @@ typedef enum { AR8X16_SWITCH_NONE, - AR8X16_SWITCH_AR7240, AR8X16_SWITCH_AR8216, AR8X16_SWITCH_AR8226, AR8X16_SWITCH_AR8316, - AR8X16_SWITCH_AR9340, AR8X16_SWITCH_AR8327, AR8X16_SWITCH_AR8337, } ar8x16_switch_type; @@ -68,7 +66,6 @@ struct arswitch_softc { int is_gmii; /* PHY mode is GMII (XXX which PHY?) */ int is_mii; /* PHY mode is MII (XXX which PHY?) */ int page; - int is_internal_switch; int chip_ver; int chip_rev; int mii_lo_first; /* Send low data DWORD before high */ From nobody Wed Aug 9 17:20:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLcJb2dnpz4Txk5; Wed, 9 Aug 2023 17: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 4RLcJb25C5z3P6h; Wed, 9 Aug 2023 17: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=1691601631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmwP78/yLbhppjWNpiLCUcXOYNuwTSIbcMcjPN3N8Tg=; b=p5CONoJvtgOS1Yof09TYFhcZZ9Vh2RuNuY1B87eQfP1M2GBm22fNmmNGuZOxee0KkwyVHS A+OBfiush5xaF+f/PyPT7ZUPjUXQtERHJv1mLhgKe2r6i10+7GG9pDBcHMI31BzlzDUldq KihMFtCodKMbeeuEvKNpY/2AJaWAb+D1lFPxCMK0ecZBqjR2PacZPCFe7kDLIV9HjmH1c1 ZofHOsRkxnEPLsLWmuBM+nFeCKaDM8VlF0Kxi2Gi8/P1wyxjBijfRWnnwz8Zx1CJRjPuCJ wx6FiDYVzemCLfRAw6XlhQDa2a5X3O/mwzaShIbcPeN+LOq5yYsESznuuQ8aeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691601631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gmwP78/yLbhppjWNpiLCUcXOYNuwTSIbcMcjPN3N8Tg=; b=e/zUwyvQ+jCGAr+t7lxFeZRohAfDqyU41gM8Qr+koXcevxHUgWR8LZuiiTe8d/v54Ld467 XLVEgkL5heewQaz6ytyxH1SPmArOWZ4InTRHWCXXj15XhWKe7FXcXUS3flqXeDTi8ap4N9 Ut19FT+rF16+TxVqd3c8on/o3poEhfjOvHg+Ew0fQQrENK8/lS02EtVPrwlar56ZYww0R/ P1jqjqRYvbwteqvXWSCaBIOmcBbHICVfCEyMbx5CA8Aff4fSAkmxHtLUu9Nz+f68BXwZRd fAgKnD5HuJ+0qDmzhkJhJic8Hh9yaAcGzHf9+gBCyQiwHRVAS0TVvrsU+BsaIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691601631; a=rsa-sha256; cv=none; b=XEJCibUjdTXASBXcg4i8W6JxprBKjS1vpwQ/PRlEv1x1HggtUW1zVgbz1xaxmCCULiawCo ME2hvkcYMKsyh06LATXTz2gcM2YuajUKh2eS038M/qtCehhhAyvMkNSa8FeN6o0twKRNXc sE4dToEOt20kX7ycyGVZoTpmFrwz6mDLmdpVuor45ibcDskAH9fxlVLGO9ENt6W6tiV/5J DG+NHHhmvwOHcvGccVFxM9MqNH4gnRa1Z8ReaeEoN5/MYFa0z6YbqDJU0MbFjf/asZ5jGJ V8AghlA3crnOHAsO2EsR/J3UsuKnrscb7MHWwAlqeAss4CthYMmGr7QhIFlulw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLcJb17Zfz8TR; Wed, 9 Aug 2023 17: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 379HKVHo019972; Wed, 9 Aug 2023 17: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 379HKV7j019969; Wed, 9 Aug 2023 17:20:31 GMT (envelope-from git) Date: Wed, 9 Aug 2023 17:20:31 GMT Message-Id: <202308091720.379HKV7j019969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 13da84237a37 - main - e1000: Enable TSO on 82574 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13da84237a37961938e9e237171ac111ddc1897c Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=13da84237a37961938e9e237171ac111ddc1897c commit 13da84237a37961938e9e237171ac111ddc1897c Author: Kevin Bowling AuthorDate: 2023-08-09 17:18:37 +0000 Commit: Kevin Bowling CommitDate: 2023-08-09 17:19:37 +0000 e1000: Enable TSO on 82574 Further testing indicates something wrong with particular reciever, enabling TSO 82574 for wider testing. Tested by: karels MFC after: 3 months --- sys/dev/e1000/if_em.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index fefd1e3f411c..069ff37c6a75 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -906,9 +906,6 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; - /* Disable TSO on 82574L due to performance loss being investigated */ - if (hw->mac.type == e1000_82574) - scctx->isc_capenable &= ~IFCAP_TSO; /* * Disable TSO on SPT due to errata that downclocks DMA performance * i218-i219 Specification Update 1.5.4.5 From nobody Wed Aug 9 18:17:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLdZ04KHgz4m64w; Wed, 9 Aug 2023 18:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLdZ03gqLz3TZV; Wed, 9 Aug 2023 18:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691605032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPFwY6g7WsQuXlSUY7oXPIcGRvojOGHr7kDE09aksM4=; b=JeX++kEv+CQfOZ3r7LW7AfXyE012b2lw24m51UOScKQ3vKghbx7lniApX1MgWfWZuW9CB5 CsGWn1ReAwfsKQYgeZNTQMtrJx8Li5z+xCZ5uUwr0yaOgtpOUfgu1cMfVtMT3vUZFyxEdp KJxg45oiVkl0g7Luqd6x6hO08zoQLZ5kTLc5FGZcWbHJuN9dqAgrEuEfHRF8AWwRVJZ+au m55iWPpW3K2Hb8+Cj+M4Xg2QUptM2i+9cQTr3Xv3vTytt6YkvJbYoP2Rq8RdyqPD564M37 BzYtG/twPqJ+m448AExkmL8iQg6pPXgQHHm0IeJGOEFgXrHz5LTgt3mwusqe0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691605032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPFwY6g7WsQuXlSUY7oXPIcGRvojOGHr7kDE09aksM4=; b=oBKVsI7CTXWFIPQXeDbU9htxr1x/HzrOZ9n2O041eDJY9vpkj0RKbGyxbq2X+hz0B7qKNm RYnWSo1H1sJGsHpjFUrghhQkuUSzvY8l4PJmOiBwKnCQwD3F5D21W8ngifVE/zxINZfJ4Y ccJ0tpSBp3l/xnHZahWvIs4c2SPXpsBaqT+jbsDs3OYARHn7ufHE0Rpphy+yr5zevlOx7e Jl2tbQgdpLKudjMreHQatuMfAysCUufLqSb4SURuFrTAndJdKJUhTZU6ufhiCDJ5S09Lyg STDw7FYbcZvdhY+w8S8goy+WnNiuqI44qcSY8erfTqd5cBJ3GLlJi55EEbuw1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691605032; a=rsa-sha256; cv=none; b=CrrjMyGrmT1RUqxKHmUwQkRiCxSztjxXjGf3WeSTJmg5JauYP2Em5pV+xFD+Jb30Sayl1O 94ppvtgwbOQsx+rlqx8VkvFZkvNfrdYKa9f6DM4AjVU4ds3YACPrcWal2MVOJNrE7V07jm q0rGyHedr8y0HIlmBWMHCEAmvPQMUlr+r2MRs2y2bfB9WxHN2twqj870Am3ZSZvKw4TXwr hdvEUoVpIL2pJucduxrtpivQj+MZ5d7zzhpWwpNQUfozn0P4zGu8u/ZROR5oLIXNDmA4k9 bXq1G1s8XWQFNkL+LlFwTYoN9snQD6oHAnSPUncB2rcsK+5wCVjSJq45PxPgAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLdZ02nKWz9Z8; Wed, 9 Aug 2023 18:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379IHCqv010487; Wed, 9 Aug 2023 18:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379IHCL9010484; Wed, 9 Aug 2023 18:17:12 GMT (envelope-from git) Date: Wed, 9 Aug 2023 18:17:12 GMT Message-Id: <202308091817.379IHCL9010484@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: cbf845052f1c - main - msi: report error for attempt to use APIC ID > 255 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbf845052f1c2862a64e66dbaf38e887a7592474 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf845052f1c2862a64e66dbaf38e887a7592474 commit cbf845052f1c2862a64e66dbaf38e887a7592474 Author: Ed Maste AuthorDate: 2023-08-08 23:42:09 +0000 Commit: Ed Maste CommitDate: 2023-08-09 17:52:43 +0000 msi: report error for attempt to use APIC ID > 255 The MSI/MSI-X address includes 8 bits to encode the Destination ID. Previously IDs over 255 overlapped with the fixed portion of the address, resulting in an invalid value (and a nonfunctional interrupt). Instead, print an error message and return EINVAL. The interrupt will still not work, but the user will have a clue as to why. PR: 273022 Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41395 --- sys/x86/x86/msi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index f85d4a5161e5..de8f42c0fa68 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -620,6 +620,11 @@ msi_map(int irq, uint64_t *addr, uint32_t *data) mtx_unlock(&msi_lock); error = EOPNOTSUPP; #endif + if (error == EOPNOTSUPP && msi->msi_cpu > 0xff) { + printf("%s: unsupported destination APIC ID %u\n", __func__, + msi->msi_cpu); + error = EINVAL; + } if (error == EOPNOTSUPP) { *addr = INTEL_ADDR(msi); *data = INTEL_DATA(msi); From nobody Wed Aug 9 20:57:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLj6Z0L93z4mJ34; Wed, 9 Aug 2023 20:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLj6Y6y5Jz4D8N; Wed, 9 Aug 2023 20:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691614630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0h3RUK3gxET5jqrMWH5S2qz9EPabHCAiwf6uqAEUuw=; b=gRpdzvRz79uhJ7fZsQYpfKkuAHkKW9oZIG3o4d104ppUL8NAKRRExrn/Tgl3fiUKTA+U/u PG5JW+3JZ4/vtzZ8VAq1+EAKATKC/aV/BVq3p4JNplHs1Cb0ERXixwUvOehB42XLlqj5c2 w/k4n3IUGiKYaHPfKN0/rE8JespRH5sL+agMINe6yWoxY0rWN3MX8E5+cRxshmz7q2ImaO kJi84Yzv5Y0na2Xc8t8upH202104l5WBe/keWYhdyHubYRrHK33EEEeXfUZdbHhYo6h78K qS3rIVY1b7m59nqOMHORyOgi1XP/WFWUNkeXB7N/jI3XTD+xxbMhXo5NbO92cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691614630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K0h3RUK3gxET5jqrMWH5S2qz9EPabHCAiwf6uqAEUuw=; b=T086jRe5UmuFCixVy4AiMJxSWW6Q0sNqPTidcHBoRHvZofRYaU060dpqGwG8cwaGrY+89l +n0/CitAbNJ47fojGPeT56DjaA0+YUees/r09z1RoQFKYXKQJB16JEQmKX8G2vCGfQ9kL5 E8208U6/9DWGbYloZjkJhLD+DG7GMCPrpeytQbrC+Q/0inIgrQdSlqf8KFbgoFQ0xxhT+i I8h47/WBJOl2gFNQ8jzhdqW5sDLcwZXbTw5ds/rgWLF5HyG8bQ2gGLwyEn6MHroedx5vY9 emBW2TJvXRJiZG/n96rDgDkP062SD+BpXKSQy+Soova4ZKdZyi2/pz1NVU08tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691614630; a=rsa-sha256; cv=none; b=Szq9xoKEYHF2DDv0QN8R8EXziDWRp5/bcrsEMSDUvYMt7x0K3mdPe4BhcyhxegbcbPUrzI hYYCjxyu2fPKSFOY9f02dBQ79d2QVUFY1vzsvMf5RpJiWxYmwy6+Vgil0YYCOrRIQk1a0c JSZ5JSp6+u+QGGZZnlhoGKRDRlNgMGBtpkqr2dc/uTwegNJGKNKi8NIajyC88/tjdEorYJ THuEv6VLGk+D4YNaZzKBvcVvlFbbsEunuMkLtaxOkrMJjYGxhkivQE3AOi8PPR9EnsRW1q EnpHf5xlmA3YwfsOVthJOjsGrub6fZuqO2gygpxnXfLzKwIQIJ7njnQfZDpSIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLj6Y5hZjzWPw; Wed, 9 Aug 2023 20:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379Kv9Od076074; Wed, 9 Aug 2023 20:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Kv9pR076072; Wed, 9 Aug 2023 20:57:09 GMT (envelope-from git) Date: Wed, 9 Aug 2023 20:57:09 GMT Message-Id: <202308092057.379Kv9pR076072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 5abba9619cbb - stable/13 - vm_map: Add a macro to fetch a map entry's split boundary index List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 commit 5abba9619cbb6f1cdd598d6eaa80ebd1947fa7f5 Author: Mark Johnston AuthorDate: 2023-05-09 14:07:15 +0000 Commit: Mark Johnston CommitDate: 2023-08-09 20:48:18 +0000 vm_map: Add a macro to fetch a map entry's split boundary index The resulting code is a bit more concise. No functional change intended. Reviewed by: alc, dougm, kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41249 (cherry picked from commit d0e4e53ebd6499d420c19426586eeeafec157150) --- sys/vm/vm_fault.c | 3 +-- sys/vm/vm_map.c | 13 ++++--------- sys/vm/vm_map.h | 4 +++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 51fb51f69f3d..86ffd8d141b6 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -486,8 +486,7 @@ vm_fault_populate(struct faultstate *fs) MPASS(pager_last < fs->first_object->size); vm_fault_restore_map_lock(fs); - bdry_idx = (fs->entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(fs->entry); if (fs->map->timestamp != fs->map_generation) { if (bdry_idx == 0) { vm_fault_populate_cleanup(fs->first_object, pager_first, diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index ce520de160ef..c2b7dd81d3ca 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2445,8 +2445,7 @@ vm_map_clip_start(vm_map_t map, vm_map_entry_t entry, vm_offset_t startaddr) KASSERT(entry->end > startaddr && entry->start < startaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((startaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -2519,8 +2518,7 @@ vm_map_clip_end(vm_map_t map, vm_map_entry_t entry, vm_offset_t endaddr) KASSERT(entry->start < endaddr && entry->end > endaddr, ("%s: invalid clip of entry %p", __func__, entry)); - bdry_idx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0) { if ((endaddr & (pagesizes[bdry_idx] - 1)) != 0) return (KERN_INVALID_ARGUMENT); @@ -3513,8 +3511,7 @@ vm_map_wire_locked(vm_map_t map, vm_offset_t start, vm_offset_t end, int flags) saved_start = entry->start; saved_end = entry->end; last_timestamp = map->timestamp; - bidx = (entry->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) - >> MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bidx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); incr = pagesizes[bidx]; vm_map_busy(map); vm_map_unlock(map); @@ -3712,9 +3709,7 @@ vm_map_sync( vm_map_unlock_read(map); return (KERN_INVALID_ARGUMENT); } - bdry_idx = (entry->eflags & - MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> - MAP_ENTRY_SPLIT_BOUNDARY_SHIFT; + bdry_idx = MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry); if (bdry_idx != 0 && ((start & (pagesizes[bdry_idx] - 1)) != 0 || (end & (pagesizes[bdry_idx] - 1)) != 0)) { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 8f318b34e601..7854a91f36a9 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -150,8 +150,10 @@ struct vm_map_entry { #define MAP_ENTRY_HEADER 0x00080000 #define MAP_ENTRY_SPLIT_BOUNDARY_MASK 0x00300000 - #define MAP_ENTRY_SPLIT_BOUNDARY_SHIFT 20 +#define MAP_ENTRY_SPLIT_BOUNDARY_INDEX(entry) \ + (((entry)->eflags & MAP_ENTRY_SPLIT_BOUNDARY_MASK) >> \ + MAP_ENTRY_SPLIT_BOUNDARY_SHIFT) #ifdef _KERNEL static __inline u_char From nobody Wed Aug 9 21:59:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLkW3400zz4mM4d for ; Wed, 9 Aug 2023 21:59:59 +0000 (UTC) (envelope-from lily.rodriguez@techtrade-attendees.org) Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01on2104.outbound.protection.outlook.com [40.107.239.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLkW22CPPz4Ht8 for ; Wed, 9 Aug 2023 21:59:58 +0000 (UTC) (envelope-from lily.rodriguez@techtrade-attendees.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of lily.rodriguez@techtrade-attendees.org designates 40.107.239.104 as permitted sender) smtp.mailfrom=lily.rodriguez@techtrade-attendees.org; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YU1nmNDI79eTxtq0JZtD/tnbt0mSAcBThJxMY8HxM7nujQsmlAXqAPQYMAWrWw9fFJjp0UyZVjNQRn//TUOM9YWhxIvp6p3gQyLrUi7jypMkNo30neBg457RjuxYPrZ92e1dIqSkkjdsvVOEu+SxjkIOjDMkphSyvNsBQzWLB0sgaaDbdyGPlSHBzIaj9BGBPxvASU4A6Mt5P1jO0fECyBxBQSN/N2R4er9U5lM9HhjMbFtqfaMzoT9k9DqQwfm8ZedrbpvoXl2khhJMhZszbRjpmhsLSjznb0n9wIWUTN6nS9kKEz7PC2FaC623/oY1Hawkq+2+Hrecm7DmjyX8Cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3OHm0m8hqEyPpbM2LneAUv3GTiBD/YNiCE6lue3gIX0=; b=e1kJilMyWRp96yGeQ+Iv7g9McrKT1Xu6sWgPUtLIy+5q3/NFQeS01+KrJGR91EU7DsVkvAQYPo4gJ4sfwIs5mUjFYaFpyqfpyMlqi5Y40nIcltN4V/EcyI1egDzkUu/kq8pijIxpZ7mRWm1RgqDdpAWKwnJmko65pOG7BwFeqJjsHTbIJ/+i52rXQp9ToS7XoiLLyZ3tUGwD88FH9Lc4koidhQ06YZkZsgwYmjoCZ9FUDy2i6XlgsK3x7H6LE+UJ27MSqEJLgdWHtkQjtn6/mHAJH/4edXLdW9xafPIRDlv7mv2QTAzTavHpx/XqadIpn99E3e4F+UECA8cQ7C4bLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=techtrade-attendees.org; dmarc=pass action=none header.from=techtrade-attendees.org; dkim=pass header.d=techtrade-attendees.org; arc=none Received: from MA0P287MB0364.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:b4::9) by PN0P287MB1442.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:189::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 21:59:53 +0000 Received: from MA0P287MB0364.INDP287.PROD.OUTLOOK.COM ([fe80::16dd:e49d:a3bf:57aa]) by MA0P287MB0364.INDP287.PROD.OUTLOOK.COM ([fe80::16dd:e49d:a3bf:57aa%5]) with mapi id 15.20.6652.029; Wed, 9 Aug 2023 21:59:53 +0000 From: Lily Rodriguez To: FLASH MEMORY SUMMIT 2023 Subject: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Topic: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Index: AdnLDSUlCMmXlFnUTs64Wz2QTDvjLw== Return-Receipt-To: Date: Wed, 9 Aug 2023 21:59:53 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MA0P287MB0364:EE_|PN0P287MB1442:EE_ x-ms-office365-filtering-correlation-id: 04680199-4193-4ea6-ff15-08db9923f630 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 5BF0I+8fj9FLMWY0c/CErT2jYUQsJshApKzq2RF+HM/guQ8N2vjorkI4EoEJJDveG9+/tRoTOc5ypy9OFCgdEKCT2Uytp2SfvtkFIjBIIztj63IUrEunOOCGqXh9Bi0ugerMjpvNx94LgtJMGcEOLVIWeYOXbEqCbqdQ3Boje61W80bdAkhVGQ9SLE4qynJtkXMTl96bneoEUHetT0SX470IZU8cX3XnHLGGqsN6SInxkE4iLJngIN5BN0JgznHkjGyTTC10QBOgEA8g7M9crVVfD5OJ8ME9csXOCb801g2tcu6l5PjCDs4lIR1M3Et92osD50OlOl+Fx/6C1hF7ktshYpvraRP3/M7ubJURqCLzStYdDPl3HLIkfkRBXyZtgN65NeDQSvAssZawjCoy+bR8nh68QLH2wFpDJqbl/MwoTMp3GUKliiI9k+Ihm1QndsctMznJsWkIYQ0fwRCQau87rVyYcoVIYQKUh2s7E8Y1yXKmICtKVNXK45w/3RzCyicp4x8UloIB3Xz/+SQUo7NeUmT28q+LO2Vj3byEOy2l3OxXAScPvAgFMjFGS+zWQGLn7yiEU9rLVP8CqtNFMCpLh0QTvvGVAHY3ZnWv3JJgBoBpx2X7tFlSBOBKVXNE x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MA0P287MB0364.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(346002)(376002)(396003)(39850400004)(186006)(1800799006)(451199021)(55016003)(64756008)(26005)(66946007)(66446008)(76116006)(6916009)(66476007)(66556008)(55236004)(6506007)(71200400001)(478600001)(33656002)(83380400001)(41300700001)(9326002)(44832011)(316002)(7696005)(9686003)(2906002)(4744005)(38070700005)(86362001)(122000001)(8676002)(5660300002)(52536014)(38100700002)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?8fgUSO0oAyZ8X3+DvHvG0NkJ33zoeJO9Nq3+zw0BBQKVzhM2Zi2+AWrTZ8Ej?= =?us-ascii?Q?1XIfd5et1ozVYpJQkk2YaggQA7QARCGmvd6NxaN4l999MqSiNULTKjwfjeQe?= =?us-ascii?Q?F5ZZPcoEXT6g1QDVcQsMGN+jAcrtd/Bqbc6m17UfmXr0BxQSHEaetBObYm9I?= =?us-ascii?Q?cNNMTOw+5uC/4hWl2SisYGxG4iAqA5zfHlEN2b/8RJcTxmbV2vfB9Ld1Pe9w?= =?us-ascii?Q?W69mXljujVs5mn2UDgkFtizjJ55kuwKemfQfgHsct2/DX3Y2OekLpQHf3jd8?= =?us-ascii?Q?7Qwa9/CCVyjYY6RkHbZK8DMzvZr8wfWCqz4OA2i+sX+zPKI42cmtJiSdE2AG?= =?us-ascii?Q?wDFWS+Fp04gWFNYOIT+6qHeG7ICKDvQWNmWe5FqShLnDCBUCSW7GJVQhFYnw?= =?us-ascii?Q?5qtRpa/cTB2SreZezk+YLNmBYJsAdcbZ7Bb7Lgg7+vG5nHnqMbVXht0KrPD0?= =?us-ascii?Q?0SzeXvJSfO+Txc8Ryz9gK/3Ydqeo0Kf4VdtOTcsq9xaiKQf/gWjAzwED86qr?= =?us-ascii?Q?IQP76DPMbOufepNcW69WAfAD5lyh24dqk8aR2P0vME5ugdhQNs+8y8vaMNVB?= =?us-ascii?Q?S8WYkw8FxlJaUBmfKTmSQAzhuXGwfU8L50udPsDlnX3dXIUPBJX7m4wSR+iM?= =?us-ascii?Q?DCKEG7eG4Y/qDc0DqlKBfvPxGlbobP+5GjhL6zozo2u6jm4I5ete4kyXpAb/?= =?us-ascii?Q?bzvo191RCT81zbte4HMo3DbEo0sUckdujuv8cjKlh/MAAdA5La9TBSxfXaYd?= =?us-ascii?Q?nv/chF0s3B0f28tKq9TCWL9zcmdLyRAMRer0T/1/tCZpj9KW3OnX0GrmkN3n?= =?us-ascii?Q?yf0O1KaJAZLx/k8RJUW8sVkeraPAH4mh3NTYxeqS51ESqb4NzBefmF9hjGuc?= =?us-ascii?Q?bYR5MxNuT68pLIlPeEVXTdBrwZem3CNR7RTN7hE9cvDQCA5EpWrxw78CHjI6?= =?us-ascii?Q?BFQIElGGWjCEqq2cMJjnecLDxeXXe2cvp8k9e1444hqN870/6uhowXgUdahL?= =?us-ascii?Q?6RLzOSmlYC7YsA8y/VOA7jCNiDGwCSmKDDRFu6xOsChkAIjnkgJhqTCROuB4?= =?us-ascii?Q?er+xzYTX26z9g4eEfzf1kkyza1HcIY9t5dfY93BkFuhqfJIyIIbpjW9KILO8?= =?us-ascii?Q?/4x13ouj8tciK91/vq+1cr2rTRJ0+P4Dy7jTLxpqE8Vg5J0lV5EfgNXq20Z1?= =?us-ascii?Q?Z80or/584ALlZna18HBA/9T5XnfB/TrMYUoSWaf0+9YzfZsMVqcIxpLCawnD?= =?us-ascii?Q?HX/yQ8LRKk563BtUzAJrnK+fS0BVk4xo4U4xg48yseYofDCDs5dpqrWvxt6q?= =?us-ascii?Q?ZeZ03LcAh7A8ob3mTXOsuZQqRRPcHD5mFHKC6sffy/NNtyI73fo7ZgVe9WuL?= =?us-ascii?Q?Y94nqadAnuyo2y8GEaFD1+njfo0aIgOdmlghlkRrH07nFeb69o+sAVn73CUb?= =?us-ascii?Q?lcwwm+wZhPZdpp0N2VdgG0bJquMHUU0RnxL7SIl+gPw3HUVTHQxUunw1gXpe?= =?us-ascii?Q?04bxLNY/beQWEHZBt4hJYGpLpkzmNPb1fnIu7sxxKRrezS5Mvycgc/XpvFQ3?= =?us-ascii?Q?kzWTIUNBrWGeDXmXruVOC70lJgnDCVfCqM3ABXEmcNKpvIg+1ToQ+Yn3mMDJ?= =?us-ascii?Q?rwkb2HFCtvVh7CspknRSeOg=3D?= Content-Type: multipart/alternative; boundary="_000_MA0P287MB036463DB53BB1BAF7B08231CD312AMA0P287MB0364INDP_" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: techtrade-attendees.org X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB0364.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 04680199-4193-4ea6-ff15-08db9923f630 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Aug 2023 21:59:53.6094 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bc3f376f-4a59-443b-ab97-1c94c03222a6 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: wqi5kl/CFJgiaoVyl4Rcw9+7zmaYSVOdiC+cLSRdg0AoIa/MfAW7Tc2B68hJZjsf4qThmSGmsjQ0T4NlcRZ1mSIoGePj5vzorgTaFhqETJH/F/1P/tpKQn/EFcvb+WGZ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0P287MB1442 X-Spamd-Result: default: False [0.13 / 15.00]; RBL_SENDERSCORE(2.00)[40.107.239.104:from]; NEURAL_HAM_SHORT(-0.99)[-0.989]; NEURAL_HAM_LONG(-0.99)[-0.986]; NEURAL_SPAM_MEDIUM(0.11)[0.106]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[40.107.239.104:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; TO_DN_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.239.104:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[techtrade-attendees.org]; R_SPF_ALLOW(0.00)[+ip4:40.107.0.0/16]; ARC_ALLOW(0.00)[microsoft.com:s=arcselector9901:i=1] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4RLkW22CPPz4Ht8 --_000_MA0P287MB036463DB53BB1BAF7B08231CD312AMA0P287MB0364INDP_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Maximize the success of your business at FLASH MEMORY SUMMIT 2023 with our = reliable and segmented attendees contact database. If yes, I can share the = counts and pricing. Looking for your reply. Thanks in advance, Lily Rodriguez - Research Analyst If you do not wish to receive these messages, reply back with remove and we= will make sure you don't receive any more emails from our end. --_000_MA0P287MB036463DB53BB1BAF7B08231CD312AMA0P287MB0364INDP_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hi= ,

Ma= ximize the success of your business at FLASH MEMORY SUMM= IT 2023 with our reliable and segmented attendees contact database. If yes, I c= an share the counts and pricing.

Lo= oking for your reply.

Th= anks in advance,

Lily Rodriguez -<= /span> Research Analyst

If you do not wish to rece= ive these messages, reply back with remove and we will make sure you don= 217;t receive any more emails from our end.

 

--_000_MA0P287MB036463DB53BB1BAF7B08231CD312AMA0P287MB0364INDP_-- From nobody Wed Aug 9 22:45:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLlWJ5fwXz4mPmF; Wed, 9 Aug 2023 22:45: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 4RLlWJ5BLtz4MSB; Wed, 9 Aug 2023 22:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnzPT5ULxnqep/GymR0pOrUr8chTdRx40d3+21ySxdE=; b=nGIcG5zyblGtt0hoCMIU9hZQl+IMYZO+TPag84Fcw2Uhd8XJPPR30bVxdQq1ZeXkenJWkB uUJiABLf9M0qoVQ2cEJnUIj3nnQYITYwX2g7/5CPLDiAaEZZBzGlirET2kt/XltizRvJEb KCI5WyJOHbtz87599bs1JhBfjf9yxv0zYzy31CFPWo5hymoqbzscMCTfuBC+7KlHR5FFm4 2YPliojNCObOaz3biURtw9ZFccLnMZ0BXrfSjqeAmM0HB71lDoGrH9vm7VuWvZVLQEi2OJ YC61BIHV8WtbaYGh3Axq2aUi8bdOk46h1dIvPxRYnJAKb4YRdjiLQMLnh8oyxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RnzPT5ULxnqep/GymR0pOrUr8chTdRx40d3+21ySxdE=; b=ynbdFPnvbvsUB366KXihjckLxTNdXAXIHpEaoMlShDgU5fp73N2HmY5rOD+L4KfSWoWQRx jHbEmyAvHOEQh6DTrHOn6D0uhqPVkryYd48SMuH3U4iBG38y9pz1gTyK05gptrNFFZzzrS a8R33EmVTFpR/yQ5jvpOje5pqYWTU+uqnGGfFoeMFLcJkLd0Q6/8oTWx6ZmRzyoPac/2qx mtC9jOEn6dTHFqZKetDu3fvwQ1Un19NUA8hx+zFuLkw2Olf23DC0riDzjBdlnrC4d9EMOW oiCG3JzMrzM6Wke+tHvM629ESEj4s/LQqsAde7EEteuyy8/mgMYl6T0lKB86aw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621116; a=rsa-sha256; cv=none; b=IjZrScFL8GK8RG846snMk0vmHpjYVav4TlrSqtRibGKYuYqPsNlT2Zt4yxWrYZyN4252nD PjzzlEw7ZG/VCjVwySQEBbdataH4Bv3hUANB1t/fhZen+Uqub3QdXBI9QbmV/sjXBap1Yb UpZJVsTpFN905V9EV8YXo3xcxJ8TAuhPXRAkPWubnEqF6FtjUV8PCTvA6H9HiLAdBnocQz 0DrqE/rHFLRUEzyk71Jy71Ya1jl4mJ5DgITu34GofHgnYKhStfpk5Mf8JXLbzgvi0sRmRc Gl9SI2Y7Vgs7xyyhto7U1QbVHxaIq21txy4yc74/V7k6Z6q/+fhcRz+lVGnYMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLlWJ3qRvzYpy; Wed, 9 Aug 2023 22:45: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 379MjGE1058558; Wed, 9 Aug 2023 22:45:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjGFW058555; Wed, 9 Aug 2023 22:45:16 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:16 GMT Message-Id: <202308092245.379MjGFW058555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 32ae9a6b3937 - main - release: Build UFS and ZFS VM images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32ae9a6b39372808f3d662300c15157513704aff Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=32ae9a6b39372808f3d662300c15157513704aff commit 32ae9a6b39372808f3d662300c15157513704aff Author: Colin Percival AuthorDate: 2023-08-07 01:53:16 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 release: Build UFS and ZFS VM images A new option 'VMFSLIST' controls the list of filesystems for which VM images will be built; the default is to build both UFS and ZFS. The vm-install target installs these as ${OSRELEASE}-${FS}.${FORMAT}, e.g. FreeBSD-14.0-CURRENT-amd64-zfs.vmdk. For backwards compatibility, the ${VMFS} image is linked to the previously used ${OSRELEASE}.${FORMAT} name. Cloudware building will be updated in a later commit. Reviewed by: gjb Reviewed by: emaste, markj (previous version) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41340 --- release/Makefile.vm | 33 +++++++++++++++++++++++++-------- share/man/man7/release.7 | 13 ++++++++++++- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index ce86fabdfe5e..0ab683c090ef 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -9,6 +9,7 @@ VMTARGETS= vm-image VMFORMATS?= vhd vmdk qcow2 raw VMSIZE?= 5120m VMFS?= ufs +VMFSLIST?= ufs zfs SWAPSIZE?= 1g VMBASE?= vm @@ -112,8 +113,10 @@ cw${_CW:tl}-package: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) CLEANDIRS+= ${VMTARGETS} . for FORMAT in ${VMFORMATS} -CLEANFILES+= ${FORMAT}.img -CLEANFILES+= ${VMBASE}.${FORMAT} +. for FS in ${VMFSLIST} +CLEANFILES+= ${FORMAT}.${FS}.img +CLEANFILES+= ${VMBASE}.${FS}.${FORMAT} +. endfor . endfor .endif @@ -122,12 +125,14 @@ vm-base: vm-image vm-image: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) . for FORMAT in ${VMFORMATS} +. for FS in ${VMFSLIST} mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${VMFS} \ - -i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT} + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${FS} \ + -i ${.OBJDIR}/${FORMAT}.${FS}.img -s ${VMSIZE} -f ${FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FS}.${FORMAT} +. endfor . endfor .endif touch ${.TARGET} @@ -154,15 +159,27 @@ vm-install: .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES) mkdir -p ${DESTDIR}/vmimages . for FORMAT in ${VMFORMATS} - cp -p ${VMBASE}.${FORMAT} \ - ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} +. for FS in ${VMFSLIST} + cp -p ${VMBASE}.${FS}.${FORMAT} \ + ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT} +. endfor . endfor . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) . for FORMAT in ${VMFORMATS} +. for FS in ${VMFSLIST} # Don't keep the originals. There is a copy in ${.OBJDIR} if needed. - ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} + ${XZ_CMD} ${DESTDIR}/vmimages/${OSRELEASE}-${FS}.${FORMAT} +. endfor . endfor . endif + # Compatibility hardlinks from "foo.bar" to "foo-${VMFS}.bar". +. for FORMAT in ${VMFORMATS} +. if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES) + ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT}.xz ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}.xz +. else + ln -f ${DESTDIR}/vmimages/${OSRELEASE}-${VMFS}.${FORMAT} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT} +. endif +. endfor cd ${DESTDIR}/vmimages && sha512 ${OSRELEASE}* > \ ${DESTDIR}/vmimages/CHECKSUM.SHA512 cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \ diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 8ce2cf47b4fd..068837ff682f 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -366,13 +366,24 @@ is used, the resulting files compressed with compress to roughly the same size, regardless of the specified disk image size. .It Va VMFS -Set to specify the file system type to use. +(Deprecated.) +Set to specify which of the filesystem(s) listed in +.Va VMFSLIST +is linked to the historical non-filesystem-labelled file name. Valid values are .Va ufs and .Va zfs . The default value is .Va ufs . +.It Va VMFSLIST +Set to specify the list of file system types to build images for. +Valid values are one or both of +.Va ufs +and +.Va zfs . +The default value is +.Va ufs zfs . .It Va VMFORMATS Set to the target virtual disk image format(s) to create. By default, the From nobody Wed Aug 9 22:45:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLlWL2Ghzz4mPWG; Wed, 9 Aug 2023 22:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLlWK61yLz4MQS; Wed, 9 Aug 2023 22:45:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yeN9w/X+j8+VkOuKQyOxV3NtRqqBgx7LCaQbxZCpqs=; b=ejDeKF1ylfPqyypj5vJvLiWMsjOlDe+tzrboUpOZGCQOTLduK96GxvJJEe4AZdzup74ewO eSzQFONAmXsntxC/67QKk9OY0jlRprBL7ksDa+mS6pMwwlU9qHW5vxZ9V8s85p/WmP7MM4 hW6IBYdpPwgdygSuFZyIYxifJyz6CVGvKaJdZWMpw707tkrCdK8hxKbZrlIa3PVOhtFbz3 wB7t8WrGyswNS8Div0+81+rhcU0jPO1QjFE/DDPXAY6TAczmpJc8cQiLDsgKevAdrzckdQ A4eglEIJwVtKUYrTTKI1Alnyd/d5gXpg166h68idT3SdCBHu3166qpIE/kYCIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yeN9w/X+j8+VkOuKQyOxV3NtRqqBgx7LCaQbxZCpqs=; b=uoOX+JRCFo6QFktPNarhXk7ipzr9QIfvITNG0wLsRifWoK4LxiHysuS3UIQWMgQRqbMFSX Hdcd8YgZEyDA583VoViexWHILJFSnnGWOmoKrFzGpo4MlSq/ZYXZr4VGJ839liEHnc4KV6 M16g8YkLVO3G/n/PXVg6eqe21UF1lvUEcGubVqjC7eC5+JcuU2gkpHe8t8s11lBoYywxch oMqoekIub2ZIip6POTHiYYMA7JY6n7oh6huCa8f40K3ByVM7RNQcpKonuKUzVJMb8BZsJ9 fXblKBwcvD6ljOhsPdep5hLvlka9tskFFSoHkpPLdV49twWnLVc4kzlYQfHw6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621117; a=rsa-sha256; cv=none; b=fkM+veKAeUYzwPsi+oaGK+zcrkUJrQd3frZBk64ZqlmEYxRmVMwqbXLTSGN4gkqGA97ZjG PTdOGKfsSsvkbM89RnlHTTCf86CdS1Ou8GFUxszcsJXnKySyQ6gkDOif97KAK58rdxEIZm NW1yUDYM42cTmFiieTdRzh9HvwtJhHgMtLKBgSD/dulE9JYA06LQmIZojg9YO1isZCV6os ADZYT4MGOkO7KYGoK1GrU3a76mw5E0hVw6+LyrKaTX0LTx2vdejNqWWSIYuOkdV8Z8nyl5 wx2E6C3dyaZim8r3SuQZ3gFayl8haLU9UnoFkUgaXrj733j+fFR9/kgHeEe6Iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLlWK4pClzYwX; Wed, 9 Aug 2023 22:45: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 379MjH08058607; Wed, 9 Aug 2023 22:45:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjH8e058604; Wed, 9 Aug 2023 22:45:17 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:17 GMT Message-Id: <202308092245.379MjH8e058604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 8dec47387b25 - main - release: Build cloudware with multiple FS types List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8dec47387b251006df45b7ee3080c62816139850 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8dec47387b251006df45b7ee3080c62816139850 commit 8dec47387b251006df45b7ee3080c62816139850 Author: Colin Percival AuthorDate: 2023-08-07 01:54:39 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 release: Build cloudware with multiple FS types New ${CW}_FSLIST settings control the list of filesystem types with which each cloudware image will be built; currently these are all set to "ufs", i.e. no change from previous. The cloudware images have their filesystem type as part of their file name; for backwards compatibilty the ${VMFS} image is linked to the previously used file name. This compatibility can be removed once all the cloudware uploading/publishing code has been updated to use the new image names (possibly more than one of them). Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41341 --- release/Makefile.vm | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 0ab683c090ef..a76e78a20f21 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -25,27 +25,35 @@ CLOUDWARE?= BASIC-CI \ VAGRANT-VIRTUALBOX \ VAGRANT-VMWARE AZURE_FORMAT= vhdf +AZURE_FSLIST= ufs AZURE_DESC= Microsoft Azure platform image AZURE_DISK= ${OSRELEASE}.${AZURE_FORMAT} BASIC-CI_FORMAT= raw +BASIC-CI_FSLIST= ufs BASIC-CI_DESC= Image for CI BASIC-CI_DISK= ${OSRELEASE}.${BASIC-CI_FORMAT} EC2_FORMAT= raw +EC2_FSLIST= ufs EC2_DESC= Amazon EC2 image EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} GCE_FORMAT= raw +GCE_FSLIST= ufs GCE_DESC= Google Compute Engine image GCE_DISK= disk.${GCE_FORMAT} OCI_FORMAT= qcow2 +OCI_FSLIST= ufs OCI_DESC= Oracle Cloud Infrastructure image OCI_DISK= ${OSRELEASE}.${OCI_FORMAT} OPENSTACK_FORMAT=qcow2 +OPENSTACK_FSLIST= ufs OPENSTACK_DESC= OpenStack platform image OPENSTACK_DISK= ${OSRELEASE}.${OPENSTACK_FORMAT} VAGRANT-VIRTUALBOX_FORMAT= vmdk +VAGRANT-VIRTUALBOX_FSLIST= ufs VAGRANT-VIRTUALBOX_DESC= Vagrant Image for VirtualBox VAGRANT-VIRTUALBOX_DISK= ${OSRELEASE}.vbox.${VAGRANT_FORMAT} VAGRANT-VMWARE_FORMAT= vmdk +VAGRANT-VMWARE_FSLIST= ufs VAGRANT-VMWARE_DESC= Vagrant Image for VMWare VAGRANT-VMWARE_DISK= ${OSRELEASE}.vmware.${VAGRANT_FORMAT} @@ -75,27 +83,38 @@ QEMUSTATIC=/usr/local/bin/qemu-${TARGET_ARCH}-static .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE) . for _CW in ${CLOUDWARE} -CLOUDTARGETS+= cw-${_CW:tl} -CLEANDIRS+= cw-${_CW:tl} -CLEANFILES+= ${_CW:tl}.img \ - ${_CW:tl}.${${_CW:tu}_FORMAT} \ - ${_CW:tl}.${${_CW:tu}_FORMAT}.raw \ - cw${_CW:tl}-package -CLOUDPACKAGE+= cw${_CW:tl}-package -${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} . if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF) ${_CW:tu}CONF?= ${.CURDIR}/tools/${_CW:tl}.conf . endif +. for _FS in ${${_CW:tu}_FSLIST} +CLOUDTARGETS+= cw-${_CW:tl}-${_FS} +CLEANDIRS+= cw-${_CW:tl}-${_FS} +CLEANFILES+= ${_CW:tl}.${_FS}.img \ + ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} \ + ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT}.raw \ + cw${_CW:tl}-package +CLOUDPACKAGE+= cw${_CW:tl}-package +${_CW:tu}${_FS:tu}IMAGE= ${_CW:tl}.${_FS}.${${_CW:tu}_FORMAT} -cw-${_CW:tl}: emulator-portinstall +cw-${_CW:tl}-${_FS}: emulator-portinstall mkdir -p ${.OBJDIR}/${.TARGET} env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} SWAPSIZE=${SWAPSIZE} \ QEMUSTATIC=${QEMUSTATIC} \ ${.CURDIR}/scripts/mk-vmimage.sh \ - -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${VMFS} \ - -i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \ - -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}IMAGE} -c ${${_CW:tu}CONF} + -C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} -F ${_FS} \ + -i ${.OBJDIR}/${_CW:tl}.${_FS}.img -s ${VMSIZE} -f ${${_CW:tu}_FORMAT} \ + -S ${WORLDDIR} -o ${.OBJDIR}/${${_CW:tu}${_FS:tu}IMAGE} -c ${${_CW:tu}CONF} touch ${.TARGET} +. endfor + +# Hardlinks from "foo.bar" to "foo-${VMFS}.bar". These can go away once all +# of the cloudware code knows how to handle multiple filesystem images (or +# at least knows the name of the UFS image). +CLOUDTARGETS+= cw-${_CW:tl} +CLEANFILES+= ${_CW:tl}.${${_CW:tu}_FORMAT} +${_CW:tu}IMAGE= ${_CW:tl}.${${_CW:tu}_FORMAT} +cw-${_CW:tl}: cw-${_CW:tl}-${VMFS} + ln -f ${${_CW:tu}${VMFS:tu}IMAGE} ${${_CW:tu}IMAGE} cw${_CW:tl}-package: @# Special target to handle packaging cloud images in the formats From nobody Wed Aug 9 22:45:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLlWM5pxwz4mPp6; Wed, 9 Aug 2023 22:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLlWL6x6mz4MND; Wed, 9 Aug 2023 22:45:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BrFi0P/DHwUGa2DTVuRHc7RlSlOnGDvGvG3aRtrprr8=; b=LfGNcH/dJGY0B2e+jNvOVftL9SITf24wtNGjZKT67TjQEkqx/685sS2xblkL0qPx0PShcK wqJzhh6bHr6srEgw0PjTu8Wne3hdj/MHflKy3x9/CUCMOVU19tUw1ZKYLfd2Sjo3PFvPzN 2ULxi26B6lCgruDZcIaSZGZ32JPPAUihu3GySSgTkfR/N8OK1/npAcBLET7AS1OLYu399b tlvNeIQoXIbUqTHZ/vqpw/mrrtHR/YF9YIi4dtvvsIopdWCW9DsPyBTK7HbAJUVsWcTYDZ CenmFJ3Q70vD9zF5s/O0CuqHuZ7P6goFhoFT0SEaIwIR3jcrXvunKtOYJVNZeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BrFi0P/DHwUGa2DTVuRHc7RlSlOnGDvGvG3aRtrprr8=; b=V8v4aHxxt9X52qvKLGBAQR4Zg1tuIhYl0Guq10/l7SKc9t5gHGbif1FueMpEoFGBJ6lvkv NRa0WZ7TRPKL6E/g3Y51nttngToPfhY7yWW/O35l/YOOu7dG9vZLBWQZ8t4rMGSkNtMHyU mz2EqgbyP/32smQ3MFaGZUr150GKCziWTm/1mPQ2IORz+M6GNWD+gcMrkbFPcPv6qHVXnZ SKt9qfMg0CXpPRo0c8CVerLMxTafPf/QJARfXvVJ9eaqnM5qg965hNpKXj9UcgI8X2bhAm 0lXHcWKGAzLWUIhkJU3d+nU65UCATeMF5+9QHXl4DG8lNwuVGB/0cWUtR/qcOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621119; a=rsa-sha256; cv=none; b=wY1L1g8xq//V+PcoEdm1cpUR2ehINOo/zsMivHfO+G5c9s1a4/WvmcH/deWOR6cYJtl6x3 JG0Ddzbf44sIxUbP7Ra5Ud7G2ZYDvdq9OGcB0WyHHHJGUDKOXmv1bLhxbJJ3HX/9ISrg6W a95Yvga7vdjj8mcv0QdfLmfH/H35991nFfr78dzq/7kqwD2dC7zGvOczYMNkz38jlqqcZR 90TOVD5ETakwmdrkA69TrApDDi3X5yvOO3xrSivbveYy71K0SEePQyMqYDQqb4uM9pc+Py H19P944Tfu4Y5gpNIsFcAtBu89/kT9kyxhrM70wXi3ou9HWHWiClCXFOolrurg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLlWL5lldzYVV; Wed, 9 Aug 2023 22:45: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 379MjIBN058646; Wed, 9 Aug 2023 22:45:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjIEu058643; Wed, 9 Aug 2023 22:45:18 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:18 GMT Message-Id: <202308092245.379MjIEu058643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4c9c9b4b7480 - main - EC2: Respect ${VMFS} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 commit 4c9c9b4b7480b8a0bc40451bc15b2bacd7aba356 Author: Colin Percival AuthorDate: 2023-08-07 01:55:37 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 EC2: Respect ${VMFS} Prior to this commit, ${VMFS} controlled the filesystem used for building EC2 images, but the AMIs were recorded with SSM Parameter paths which indicated that they were UFS. This commit (a) uses ${VMFS} in the SSM parameter path instead of a hard-coded "ufs", and (b) adds the filesystem to the AMI name. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41342 --- release/Makefile.ec2 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index e26f4f705cc6..bedc0b6221ad 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -19,7 +19,7 @@ EC2SNSREL= ${REVISION}-${BRANCH} EC2SNSVERS= ${GITBRANCH}@${GITREV} .endif .if defined(SSMPREFIX) && !empty(SSMPREFIX) -SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/ufs/${REVISION}/${BRANCH} +SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${VMFS}/${REVISION}/${BRANCH} .endif .if ${TARGET_ARCH} != "amd64" EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/} @@ -54,7 +54,7 @@ cw-ec2-portinstall: .endif @touch ${.TARGET} -ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} +ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -76,8 +76,10 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \ ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD}" \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${VMFS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} @touch ${.TARGET} + +ec2ami: ec2ami-${VMFS} From nobody Wed Aug 9 22:45:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLlWN2Ch8z4mPt6; Wed, 9 Aug 2023 22:45: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 4RLlWN0Xgkz4MJQ; Wed, 9 Aug 2023 22:45:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjUqrVHOFQ1vtfJ//gG4VCgH0KglVe5JM4byoqLrN8I=; b=YJ2RL6jlLrlX2zu2nhSI7QOmnKxDFlWZ4rWwo9uZM8IbbnDfI7q1tBS+mW89rM4bQnvyYe gy1Z+D3PeCwM2iGVpt+Y58Kv02PJGPAJIAlV7u/AY27ee1M8QsG4GX/Cuzqxzdje4N/FO2 s7HmMRspeUYV+vK1QTwElV2Xb1UMmXpaeAkKdygHeZ8PKNRlVQubnUOVNCdEx23UwR/Tty SaiQcC0S2jYmpeKrvlmTp3Gk+ejuIzriTEdqz1xeuWNCn4w8yqGSm02fEoTd2hZcYWjW/L 1WriHj9E5wpP8fpbEGneKrB9emfiwxHuOdxeaCF/Mh/n7Iq0I8wqGRmGQ3pbdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691621120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bjUqrVHOFQ1vtfJ//gG4VCgH0KglVe5JM4byoqLrN8I=; b=TO9b6N2ObScotisLwrvueYeb2OTSVtzD0uCdyspEHXE7WUfHiLt7yBBcfwHoftwgaXg83e +GecDI48tIK8qxrc9J0zLp6p3kht0Q/JVOEMhFUsCMKbTSjAn5pB+KOFVnLnEBjpIDSlLt 2MVeb8519GT8181xzmFWq0tlkhdqys1GXPgkr0FzGOpSZHbxmTtIo8C61+RGnqWTOT7Wmf LkEKAirXqzMa128iBfOz01vhUrFFosm9bB0fim08uTCJ3SK42BFgD9Gn9y1pnMXC0x6Wsa MKB10MgsAMPX9hSGv7mgchtGKO19C988/CCeTbNfymHDreA0EhypULazHaCuCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691621120; a=rsa-sha256; cv=none; b=MabEKYjc9Y/5xf68ZNDFtnRr1vSQBcCE28sHbitgTNAgGEl+3S/w4OcEqVQlHlKbdUXNHl N8FoKRJEqiDBRxGXm0+JbJO/xwo6/3IUSYZiCFwzOZjLlb5KraIU7f7MC29wyhaWJYKUN5 0D9FhvFJHIVosi5IQPkwDVFDOmKmUMkxy/X9fDg4kPRNdoUNr3nCLoJ+1Pxcx6jp1rM4bU NZzLVs+STRntOuR0CLb5jixMdDjSkupgU0Jn7vVj66lzq8r/oN32HR/cIH44cdq2z6O6LZ dY4VEJ2fecJNEg0SeomiJRVIMZiwE+SUrZWf12RTHAR/+ER5uCPJtQUMTSkJ5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLlWM6lZjzYdV; Wed, 9 Aug 2023 22:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379MjJ56058709; Wed, 9 Aug 2023 22:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379MjJfA058707; Wed, 9 Aug 2023 22:45:19 GMT (envelope-from git) Date: Wed, 9 Aug 2023 22:45:19 GMT Message-Id: <202308092245.379MjJfA058707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 219caac69a2a - main - EC2: Build and upload AMIs for both UFS and ZFS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 219caac69a2a620086baa13b0663ac1ae2203451 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=219caac69a2a620086baa13b0663ac1ae2203451 commit 219caac69a2a620086baa13b0663ac1ae2203451 Author: Colin Percival AuthorDate: 2023-08-07 01:56:18 +0000 Commit: Colin Percival CommitDate: 2023-08-09 22:44:54 +0000 EC2: Build and upload AMIs for both UFS and ZFS The pre-existing "ec2ami" target builds and uploads a single AMI (with filesystem determined by ${VMFS}) as before; a new "ec2amis" target does both UFS and ZFS. Reviewed by: gjb Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D41343 --- release/Makefile.ec2 | 18 +++++++++++------- release/Makefile.vm | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index bedc0b6221ad..eeea35eac213 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -18,9 +18,6 @@ PUBLICSNAP= --publicsnap EC2SNSREL= ${REVISION}-${BRANCH} EC2SNSVERS= ${GITBRANCH}@${GITREV} .endif -.if defined(SSMPREFIX) && !empty(SSMPREFIX) -SSMOPTS= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${VMFS}/${REVISION}/${BRANCH} -.endif .if ${TARGET_ARCH} != "amd64" EC2ARCH= --${TARGET_ARCH:S/aarch64/arm64/} .endif @@ -54,7 +51,12 @@ cw-ec2-portinstall: .endif @touch ${.TARGET} -ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} +.for _FS in ${EC2_FSLIST} +.if defined(SSMPREFIX) && !empty(SSMPREFIX) +SSMOPTS_${_FS}= --ssm-name ${SSMPREFIX}/${TARGET_ARCH:S/aarch64/arm64/}/base/${_FS}/${REVISION}/${BRANCH} +.endif +EC2AMILIST+= ec2ami-${_FS} +ec2ami-${_FS}: cw-ec2-${_FS} ${CW_EC2_PORTINSTALL} .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE}) @echo "--------------------------------------------------------------" @echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation" @@ -74,12 +76,14 @@ ec2ami-${VMFS}: cw-ec2-${VMFS} ${CW_EC2_PORTINSTALL} @false .endif /usr/local/bin/bsdec2-image-upload ${PUBLISH} ${PUBLICSNAP} \ - ${EC2ARCH} ${SSMOPTS} ${BOOTMODEOPT} --sriov --ena \ - ${.OBJDIR}/ec2.raw \ - "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${VMFS:tu}" \ + ${EC2ARCH} ${SSMOPTS_${_FS}} ${BOOTMODEOPT} --sriov --ena \ + ${.OBJDIR}/${EC2${_FS:tu}IMAGE} \ + "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX} ${AMIBOOTMETHOD} ${_FS:tu}" \ "${TYPE}/${TARGET} ${GITBRANCH}@${GITREV}" \ ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE} \ ${EC2SNSTOPIC} ${EC2SNSREL} ${EC2SNSVERS} @touch ${.TARGET} +.endfor ec2ami: ec2ami-${VMFS} +ec2amis: ${EC2AMILIST} diff --git a/release/Makefile.vm b/release/Makefile.vm index a76e78a20f21..17c79a214af9 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -33,7 +33,7 @@ BASIC-CI_FSLIST= ufs BASIC-CI_DESC= Image for CI BASIC-CI_DISK= ${OSRELEASE}.${BASIC-CI_FORMAT} EC2_FORMAT= raw -EC2_FSLIST= ufs +EC2_FSLIST= ufs zfs EC2_DESC= Amazon EC2 image EC2_DISK= ${OSRELEASE}.${EC2_FORMAT} GCE_FORMAT= raw From nobody Wed Aug 9 23:44:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLmqv499Nz4mSyZ; Wed, 9 Aug 2023 23:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLmqv3gCWz4Rnt; Wed, 9 Aug 2023 23:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691624683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAwUeBXVJ7iotCnpXfl0irMH/oYUpTKZgykXUlEXAgY=; b=cCrLpisipVh80Oa7hoyQKCflSrlG5wdGhh8RqLEtULXIKF1ce7u4WuRyZtQYPshAreRMih wry6q6fUTIcrk266THt/UoVIQoIruAX8Niulek/dR+nlD9bVrBE0HLeOFWaeE6E9U1DRQ4 8xTYieBBN22uNArpieq1A+uAPK72aApfqDuKXi3p0JFe7S6v7C148aRzucxvaWiCjI5MpK M3DfWJbPDeDwrxzPpLnuM3JnDjqdtU+hFWC90FVTPOSM9pG/te/sTbmPRomWPMi3L1a8x4 g6b0zlU1prY64vtQIq1FTHEaoipVUWf+lLiUXRMnxCa7n/UQnRiOLR6a4lQxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691624683; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PAwUeBXVJ7iotCnpXfl0irMH/oYUpTKZgykXUlEXAgY=; b=ZWORih70b457+YVFPGxaCL9M+qvYb+u7JYado8piu0hPO4oj0hrYbv5bgf9mIBCiUfh4bX qYeJSXkU2PonZrBLY+Q5pU+7I4izFYkfdFPVcxcCuuNV8k4QWzBKOQNSCA3Yc/O++9JIWy c7pKEdBmXKkabE1/lxlafqGEl4InGNXvsv8nd7nAy8VINtABkF4mvK4HMiCTTkY3De5RMO Et9j/tCtkIWrJy/ogDlnVYd+F41oj5Kv/tQ+89mRv6q99EBmjP6Zh0KII7lFd/hSWVL4Y/ 6Dk9YWGgkbco1NrE/YRlN5pCcoYclfBiVFaJ23VBijmvVSm0MEapReX5YX00jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691624683; a=rsa-sha256; cv=none; b=toPKh0kWQl+u1br82oLgM0xjXKWadgdxbNGmzjkIv0UkiGlxFl0wngA9BccgXbw5NczUUb ZvGU/QpMsLH3TLhMDSna6lX09e+xbabFi0ZkFalFjNXbRh4OzKqlEJILKRATorJX5JEYIM zqx680gGRYPN8jHGP+9mSz+jZtw0BNwazZ9K/VQlFn6zn9dguzgIKTTzvycmNUeRgKIZB5 r3DbweCIy14OLmmEphXoS0bcbvLGKAqM75cn9jJCy7MtakCClMpG481mPNLLA7Y0U5Znj/ N+GRwjFbDu4P32PSaW0YXNgZAs1Pw87AUNynDRXMK5B/dQ70uDNL8zorAPaTaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLmqv2dy5zbL7; Wed, 9 Aug 2023 23:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379NihAb058234; Wed, 9 Aug 2023 23:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379Nih86058231; Wed, 9 Aug 2023 23:44:43 GMT (envelope-from git) Date: Wed, 9 Aug 2023 23:44:43 GMT Message-Id: <202308092344.379Nih86058231@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: c52b5d16ccf2 - main - Remove a partial UFS/FFS snapshot if it fails to build successfully. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 commit c52b5d16ccf29ad0e999a1f5f813ed6472aa3771 Author: Kirk McKusick AuthorDate: 2023-08-09 23:43:41 +0000 Commit: Kirk McKusick CommitDate: 2023-08-09 23:44:24 +0000 Remove a partial UFS/FFS snapshot if it fails to build successfully. When taking a UFS/FFS snapshot, it may not succeed for example if the filesystem is too full to hold it. When a snapshot is unable to be successfully taken, the partial snapshot should be removed. Reported-by: Peter Holm Tested-by: Peter Holm MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_snapshot.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 26eecfcc5875..6a3329078817 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -851,7 +851,6 @@ done: free(copy_fs, M_UFSMNT); copy_fs = NULL; out: - NDFREE_PNBUF(&nd); if (saved_nice > 0) { struct proc *p; @@ -869,14 +868,30 @@ out: MNT_ILOCK(mp); mp->mnt_flag = (mp->mnt_flag & MNT_QUOTA) | (flag & ~MNT_QUOTA); MNT_IUNLOCK(mp); - if (error) - (void) ffs_truncate(vp, (off_t)0, 0, NOCRED); - (void) ffs_syncvnode(vp, MNT_WAIT, 0); - if (error) - vput(vp); - else - VOP_UNLOCK(vp); + NDFREE_PNBUF(&nd); vrele(nd.ni_dvp); + if (error == 0) { + (void) ffs_syncvnode(vp, MNT_WAIT, 0); + VOP_UNLOCK(vp); + } else if (VN_IS_DOOMED(vp)) { + vput(vp); + } else { + int rmerr; + + /* Remove snapshot as its creation has failed. */ + vput(vp); + NDINIT(&nd, DELETE, LOCKPARENT | LOCKLEAF, UIO_SYSSPACE, + snapfile); + if ((rmerr = namei(&nd)) != 0 || + (rmerr = VOP_REMOVE(nd.ni_dvp, nd.ni_vp, &nd.ni_cnd)) != 0) + printf("Delete of %s failed with error %d\n", + nd.ni_dirp, rmerr); + NDFREE_PNBUF(&nd); + if (nd.ni_dvp != NULL) + vput(nd.ni_dvp); + if (nd.ni_vp != NULL) + vput(nd.ni_vp); + } vn_finished_write(wrtmp); process_deferred_inactive(mp); return (error); From nobody Thu Aug 10 00:06:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLnKV2w7Zz4mVHB; Thu, 10 Aug 2023 00:06: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 4RLnKV2PFdz4VJ8; Thu, 10 Aug 2023 00:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691626014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUaEfplowvTQZwb+VICgrqq9ueEjKU+CXTfLxRq55cI=; b=hfW0nMV2uif7lOQZGTz/ARqfezGep+MpeQGo4cJiEcmzi8C4Riz5YCH3jSPgY1+MGnxFp+ mYbZq3axP4hAefDcw0WUjbye+UBosBS0VoVIussQ3EzlHKvR4u9PIC5qxHfNv6J6yYUDq6 Br6ioEa7MfmDaA8NcUE9nuDy6nZ5pWxYMGOR+syBtUInk8HCa0whNkONThcSxV6v46anCL sErcQZuVLDSx5CdvgFo0lpgHIAo9gNg6ZcOkBe1lVZ1BghJsBa4PR26FMRSv3Zh9bpdKe5 UNrAM3IbfzLG4QEzCedTvsZ4a7HupAqzmTDg1X24GPJHS0XPwRFrj9QyQukKIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691626014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LUaEfplowvTQZwb+VICgrqq9ueEjKU+CXTfLxRq55cI=; b=caeJvuOAT+BNEYgdbhb6FxpqHW+4UAw8Q08yt5ANUECiheb6dDQzJLWh3cEzNcLGA7X9NH yfooNqLgZwm5qahQib9R66T8NalcbdgoiHHDKJiABWYrf0qTV3BbpZ1B6FL5Gwp4f3oJjO tD/pNdXFD7dgaYTKZWKET8T7ECfskfIp3qid1NdyTWlSG8Y6izLsH2IhjzMgbcwM9MNRFc yZDbK6JHVzwHgg/ZYOJaAyYLphm9lOTTLol2GkZRqcUZ3lIlOQxloOpd8VhDOW69zocyCx EIJ0pDuY9qZAD9pjmwnKAJ0lYqI0XWUEVwk41lXipSaQScpxcOHrCbYkwtvwdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691626014; a=rsa-sha256; cv=none; b=vt8eOXEzk5ZuVEHqSA8vSwc4oSI3EU8GZr8N8UovhOCLxwtBbe5BKVArpAkNN2WEb5+yTN NQkMcCeiI0cr5t2jqE9zPzQlUGnBXRU0eZOQ3VcDJgfdVB3W+UNQODPlQ33l90sd7cCEaT ChmzeHADpN4F5/4BL7PwCY74DTx6xm79AFz8TN7U48TPWLSf8J5ytRGl0m/VnH7fteGQ4W SFUI1d/ZZQHRr21/jDC1Vv2dE80KNYyBUN8tynDvlE6f4nVzXKI0ubkiDqNXr3ubZVoPhd N1DVL/m3vIXY+9ZJAi3g2M9j2Niun4V7o8SQ8f142hu6cwrTIoa5JPKVK15ooA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLnKV1S4kzbYv; Thu, 10 Aug 2023 00:06: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 37A06sMV092169; Thu, 10 Aug 2023 00:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A06sow092166; Thu, 10 Aug 2023 00:06:54 GMT (envelope-from git) Date: Thu, 10 Aug 2023 00:06:54 GMT Message-Id: <202308100006.37A06sow092166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 517e0978db1f - main - LinuxKPI: add page pool skeleton List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 517e0978db1ff92d9f2b86fe735aba24bca72038 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=517e0978db1ff92d9f2b86fe735aba24bca72038 commit 517e0978db1ff92d9f2b86fe735aba24bca72038 Author: Bjoern A. Zeeb AuthorDate: 2023-05-23 23:15:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-10 00:05:48 +0000 LinuxKPI: add page pool skeleton Add the page pool skeleton based on a wireless driver. We have to sort out some struct page problems first before we can start implementing this but that should happen independent of all other changes. MFC after: 10 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40250 --- sys/compat/linuxkpi/common/include/net/page_pool.h | 119 +++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/net/page_pool.h b/sys/compat/linuxkpi/common/include/net/page_pool.h new file mode 100644 index 000000000000..4377ec1d53d4 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/net/page_pool.h @@ -0,0 +1,119 @@ +/*- + * Copyright (c) 2023 Bjoern A. Zeeb + * + * 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. + * + * $FreeBSD$ + */ + +#ifndef _LINUXKPI_NET_PAGE_POOL_H +#define _LINUXKPI_NET_PAGE_POOL_H + +#include /* pr_debug */ +#include +#include + +struct device; + +struct page_pool_params { + struct device *dev; + uint32_t flags; + uint32_t order; + uint32_t pool_size; + uint32_t max_len; + uint32_t offset; + int nid; /* NUMA */ + enum dma_data_direction dma_dir; +}; + +struct page_pool { +}; + +#define PP_FLAG_DMA_MAP BIT(0) +#define PP_FLAG_DMA_SYNC_DEV BIT(1) +#define PP_FLAG_PAGE_FRAG BIT(2) + +static inline struct page_pool * +page_pool_create(const struct page_pool_params *ppparams) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline void +page_pool_destroy(struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline struct page * +page_pool_dev_alloc_frag(struct page_pool *ppool, uint32_t *offset, + size_t size) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline dma_addr_t +page_pool_get_dma_addr(struct page *page) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline enum dma_data_direction +page_pool_get_dma_dir(const struct page_pool *ppool) +{ + + pr_debug("%s: TODO\n", __func__); + return (DMA_BIDIRECTIONAL); +} + +static inline void +page_pool_put_full_page(struct page_pool *ppool, struct page *page, + bool allow_direct) +{ + + pr_debug("%s: TODO\n", __func__); +} + +static inline int +page_pool_ethtool_stats_get_count(void) +{ + + pr_debug("%s: TODO\n", __func__); + return (0); +} + +static inline uint8_t * +page_pool_ethtool_stats_get_strings(uint8_t *x) +{ + + pr_debug("%s: TODO\n", __func__); + return (x); +} + +#endif /* _LINUXKPI_NET_PAGE_POOL_H */ From nobody Thu Aug 10 00:28:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLnp463XLz4mWbQ; Thu, 10 Aug 2023 00:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLnp45Z2yz4YfX; Thu, 10 Aug 2023 00:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cxFzrFtSs3OSjvkJNl6JVdeUrO97bY1WXuRY4OFnZ0=; b=EPtNJ1iFUhSsyRrCbirueu0Kp2bHM1Yz+/TyoW1rhxdwhnRxRnIICFkK1Z+BtxeFgc/hxD yQPWo66PdS4HVpzpFH7fmgjNf2Zwr2RDDqfZ978NsDkVemC3ereisoN3Af7vIopcWeg2lu KqtoISEV/m5wSGDHER8bM3kQmWieCrd7IgFpeT3CG0VT3hFf8F7g0T38y9DK/Ib7lMz4+4 IxwlJg/RNNFR4fG1djRpbZNca2Vnj/4XpgVw/BoLLJjqsW0lkJ/FVnAXSS0G1ht5bcgcQy O95R8WhhFJoXVK+9OxveHURkMG8vitSlDmVpWeiNGqquKf8ZQhOuzFNpjjN7Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cxFzrFtSs3OSjvkJNl6JVdeUrO97bY1WXuRY4OFnZ0=; b=D/PGJSxj/fcq3SEb6BkSfcR5QeEWvOHL2etZ4NcV5SjReQ8DCIBhoTLtfZCgJD9VZ/yJAN Xu1Clo7QYSx0bXAu2WBLU8BmchXa+ueqKIXQRBk/xILwBSA3uOY4IfQ/KsjQsDGa1a4EsX X1yR+EK+SFY4U7OFikGTx0zNejiB9ohVudSNz1M1ebZKG+o255waGEqCoviSf7aaZw39c4 YpIjKY268p/82lEKgmy6XzycsKidoMfkwpb9/xgwU5Hfs3S3gaG1WQidcGCVdJFaZWUGGc S0tguuhJK2qcWBUHlZ5WgAmrzvWjrKn4Dsg79GoplNwGW0jnC2lHSzNH41s1TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691627292; a=rsa-sha256; cv=none; b=gyx3IWj7kbvf/hJIGEh2RYjFRiiKN8ktNC7vKi58vAy4TjS0JlLX4gYHz+K+Urx8J5p4Ue BW56qtZr0xx9vdCVa2m+fDWJLVlo5oYBOmQtCX7Bd8spnLAwU/g3ZlyLsBOui51330X4Lb h0ktdFtIIrzJN45WU6Sv70+cyhySGxSOZzofQFZclzGf8Xuf6kbLK32+nwrrb3EY4AdP0b SgeUgILjQ0cBd7KVhJCbQ8DChB8rFM86tNajmiSiAEOYFl2/iTlj4ShmrmHOCQrLKRZA4u tDwgBnsjyp1kQJl566u1SCeSAqIC1RXjL+6AqykUYuct/S1dqisu6fnGMWkTEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLnp44dL7zcDt; Thu, 10 Aug 2023 00:28:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37A0SClA025527; Thu, 10 Aug 2023 00:28:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A0SCfN025524; Thu, 10 Aug 2023 00:28:12 GMT (envelope-from git) Date: Thu, 10 Aug 2023 00:28:12 GMT Message-Id: <202308100028.37A0SCfN025524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: c68db90db192 - stable/13 - e1000: Automask TSO on lem(4)/em(4) 10/100 Ethernet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c68db90db19230cdc579c88003d69bf515f4dd92 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=c68db90db19230cdc579c88003d69bf515f4dd92 commit c68db90db19230cdc579c88003d69bf515f4dd92 Author: Kevin Bowling AuthorDate: 2023-08-03 05:47:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 00:27:12 +0000 e1000: Automask TSO on lem(4)/em(4) 10/100 Ethernet This feature masks TSO capability when a link comes up at 10 or 100mbit due to errata on the chips. This behavior matches previous versions of FreeBSD as well as NetBSD and Linux. A tunable, hw.em.unsupported_tso may be set if the admin desires to disabling automasking and configure TSO settings manually. Differential Revision: https://reviews.freebsd.org/D41170 (cherry picked from commit 2ddf24f8f52559b08da700ab044c33d0a9ed5601) --- sys/dev/e1000/if_em.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- sys/dev/e1000/if_em.h | 1 + 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 88738e5f0a08..bf5fec7e9e3a 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -330,6 +330,7 @@ static int em_sysctl_debug_info(SYSCTL_HANDLER_ARGS); static int em_get_rs(SYSCTL_HANDLER_ARGS); static void em_print_debug_info(struct e1000_softc *); static int em_is_valid_ether_addr(u8 *); +static bool em_automask_tso(if_ctx_t); static int em_sysctl_int_delay(SYSCTL_HANDLER_ARGS); static void em_add_int_delay_sysctl(struct e1000_softc *, const char *, const char *, struct em_int_delay_info *, int, int); @@ -535,6 +536,10 @@ static int em_smart_pwr_down = false; SYSCTL_INT(_hw_em, OID_AUTO, smart_pwr_down, CTLFLAG_RDTUN, &em_smart_pwr_down, 0, "Set to true to leave smart power down enabled on newer adapters"); +static bool em_unsupported_tso = false; +SYSCTL_BOOL(_hw_em, OID_AUTO, unsupported_tso, CTLFLAG_RDTUN, + &em_unsupported_tso, 0, "Allow unsupported em(4) TSO configurations"); + /* Controls whether promiscuous also shows bad packets */ static int em_debug_sbp = false; SYSCTL_INT(_hw_em, OID_AUTO, sbp, CTLFLAG_RDTUN, &em_debug_sbp, 0, @@ -939,6 +944,8 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; + if (em_unsupported_tso) + scctx->isc_capabilities |= IFCAP_TSO6; /* * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} * by default as we don't have workarounds for all associated @@ -1081,6 +1088,9 @@ em_if_attach_pre(if_ctx_t ctx) goto err_late; } + /* Clear the IFCAP_TSO auto mask */ + sc->tso_automasked = 0; + /* Check SOL/IDER usage */ if (e1000_check_reset_block(hw)) device_printf(dev, "PHY reset is blocked" @@ -1819,6 +1829,7 @@ em_if_update_admin_status(if_ctx_t ctx) struct e1000_hw *hw = &sc->hw; device_t dev = iflib_get_dev(ctx); u32 link_check, thstat, ctrl; + bool automasked = false; link_check = thstat = ctrl = 0; /* Get the cached link value or read phy for real */ @@ -1896,8 +1907,14 @@ em_if_update_admin_status(if_ctx_t ctx) sc->flags |= IGB_MEDIA_RESET; em_reset(ctx); } - iflib_link_state_change(ctx, LINK_STATE_UP, - IF_Mbps(sc->link_speed)); + /* Only do TSO on gigabit Ethernet for older chips due to errata */ + if (hw->mac.type < igb_mac_min) + automasked = em_automask_tso(ctx); + + /* Automasking resets the interface, so don't mark it up yet */ + if (!automasked) + iflib_link_state_change(ctx, LINK_STATE_UP, + IF_Mbps(sc->link_speed)); } else if (!link_check && (sc->link_active == 1)) { sc->link_speed = 0; sc->link_duplex = 0; @@ -3878,6 +3895,35 @@ em_is_valid_ether_addr(u8 *addr) return (true); } +static bool +em_automask_tso(if_ctx_t ctx) +{ + struct e1000_softc *sc = iflib_get_softc(ctx); + if_softc_ctx_t scctx = iflib_get_softc_ctx(ctx); + if_t ifp = iflib_get_ifp(ctx); + + if (!em_unsupported_tso && sc->link_speed && + sc->link_speed != SPEED_1000 && scctx->isc_capenable & IFCAP_TSO) { + device_printf(sc->dev, "Disabling TSO for 10/100 Ethernet.\n"); + sc->tso_automasked = scctx->isc_capenable & IFCAP_TSO; + scctx->isc_capenable &= ~IFCAP_TSO; + if_setcapenablebit(ifp, 0, IFCAP_TSO); + /* iflib_init_locked handles ifnet hwassistbits */ + iflib_request_reset(ctx); + return true; + } else if (sc->link_speed == SPEED_1000 && sc->tso_automasked) { + device_printf(sc->dev, "Re-enabling TSO for GbE.\n"); + scctx->isc_capenable |= sc->tso_automasked; + if_setcapenablebit(ifp, sc->tso_automasked, 0); + sc->tso_automasked = 0; + /* iflib_init_locked handles ifnet hwassistbits */ + iflib_request_reset(ctx); + return true; + } + + return false; +} + /* ** Parse the interface capabilities with regard ** to both system management and wake-on-lan for diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h index 8c5abf5b48cb..d3c3bc0da097 100644 --- a/sys/dev/e1000/if_em.h +++ b/sys/dev/e1000/if_em.h @@ -509,6 +509,7 @@ struct e1000_softc { u32 smartspeed; u32 dmac; int link_mask; + int tso_automasked; u64 que_mask; From nobody Thu Aug 10 00:28:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLnp60Hxwz4mW9v; Thu, 10 Aug 2023 00:28: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 4RLnp56ZXZz4Yjd; Thu, 10 Aug 2023 00:28:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FYnYoovI0g0HQJY+2rvjr8CbaSi+KkmakJTZy5VXt8I=; b=vz0gajZvlQtiogYavJDKxxbdNrDl1PHiMidgqlHfexDn67y8pSfBlKHJ9KICcCXo7kI8R6 AH5Pka3lO+yKUEOMpq3TmxDL/seqJI2Xg7OKXWW66Mnhd8wFAdBlg0EL5TTo9N0sT/L/CZ DqyWX8Ki/5pKbo4zkkn4laylNwSr2rD9nZjFxVR8iyQM5q9h4hbwXUetOEZYVxC5TmP8VK 1/gPuXcotDDPa7N3DLdmhZIQSx53bxVbJmN4ByfdRW9ed22a2GciorU5R3Jq0u8eThaYIk I9s6IXu/KmaF6BHcnyBteKzaDgS/9juKknFltNQ46ffjrk3WDNuM+lSIMJyu9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FYnYoovI0g0HQJY+2rvjr8CbaSi+KkmakJTZy5VXt8I=; b=RlcxEYsqHvXZbOk9RPYkDMe/49gOLEKecKdzKrVhfHsInvitq6eTMNoy0VuKuQxV058PF9 /+nULLYh69jxcfUKEDe+UCvQvpdSlrWuI80tBHLhu7DSH/nML4Epfeg/pn/9W/190PjxEY QJ6RiM4n3UgNFjdTOWU0Ql0NP7yycCWFUqbtgSNp+X9YWmSxOivRC5FNrN4/zSpN47qSLj kRyebvhDgWzeDx7SUz0wDIIgCJlobNyZYQIgv7c7BMTi/ivrlwpk7RxXR1fnOD5N/+Vj2m EdmjAKmei6rwTX87qEj4ZVMSOwPCU94OHOSemUMZvlqvsZWgTiugn/HiL1vx+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691627293; a=rsa-sha256; cv=none; b=eu//GjyEZvHadHX0F++2M4Nt4RZ0XkJ26VgBS8lIUH7iSppe1ftJRAY4OPHtQeZ9JzQviN rsxEnWweWWMquQHBUNK72dpR65t6sJN6dyfdFI0TKIDV/DHecl8OvyP1HQa/amjkj5VtZr p1tJOvJ7pv0ghxhhIlKKQFYTFJg7NSVhqiY1K2NMlSMQDgD8fCYt8l8e8Xj75GNVxdgTHy h9xSV8cwhoSeg/bcT79sqobWzMwMRXyJha5/A3tvtWxOA7FhxaAeEaPXdhYgLTuyvCqI3w +8dWDTDLjfIobuUei2GXw5Q0uMHPjwXr2/9RprUHGEFvM9QnfofDtnWHThW9fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLnp55dMKzcGy; Thu, 10 Aug 2023 00:28: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 37A0SDDp025579; Thu, 10 Aug 2023 00:28:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A0SD4H025576; Thu, 10 Aug 2023 00:28:13 GMT (envelope-from git) Date: Thu, 10 Aug 2023 00:28:13 GMT Message-Id: <202308100028.37A0SD4H025576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f5255126772e - stable/13 - ixgbe: Warn once for unsupported SFPs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5255126772e3c03442220939c7d2b12b12c2a3a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f5255126772e3c03442220939c7d2b12b12c2a3a commit f5255126772e3c03442220939c7d2b12b12c2a3a Author: Kevin Bowling AuthorDate: 2023-08-03 05:59:37 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 00:27:31 +0000 ixgbe: Warn once for unsupported SFPs The driver belabors the point about unsupported SFPs, printing multiple times on link up. Limit it to once. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D39785 (cherry picked from commit a93409fc3cd7b4d4aeb35d7ef27f84c1ae13a42d) --- sys/dev/ixgbe/ixgbe_phy.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_phy.c b/sys/dev/ixgbe/ixgbe_phy.c index eef1d40448d3..1ab4f057f810 100644 --- a/sys/dev/ixgbe/ixgbe_phy.c +++ b/sys/dev/ixgbe/ixgbe_phy.c @@ -1302,6 +1302,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) u8 cable_tech = 0; u8 cable_spec = 0; u16 enforce_sfp = 0; + static bool warned_once = false; DEBUGFUNC("ixgbe_identify_sfp_module_generic"); @@ -1536,13 +1537,16 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw) status = IXGBE_SUCCESS; } else { if (hw->allow_unsupported_sfp == true) { - EWARN(hw, - "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " - "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " - "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + if (!warned_once) + EWARN(hw, + "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " + "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " + "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + warned_once = true; status = IXGBE_SUCCESS; } else { - DEBUGOUT("SFP+ module not supported\n"); + DEBUGOUT + ("SFP+ module not supported\n"); hw->phy.type = ixgbe_phy_sfp_unsupported; status = IXGBE_ERR_SFP_NOT_SUPPORTED; @@ -1647,6 +1651,7 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) u8 cable_length = 0; u8 device_tech = 0; bool active_cable = false; + static bool warned_once = false; DEBUGFUNC("ixgbe_identify_qsfp_module_generic"); @@ -1792,10 +1797,12 @@ s32 ixgbe_identify_qsfp_module_generic(struct ixgbe_hw *hw) status = IXGBE_SUCCESS; } else { if (hw->allow_unsupported_sfp == true) { - EWARN(hw, - "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " - "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " - "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + if (!warned_once) + EWARN(hw, + "WARNING: Intel (R) Network Connections are quality tested using Intel (R) Ethernet Optics. " + "Using untested modules is not supported and may cause unstable operation or damage to the module or the adapter. " + "Intel Corporation is not responsible for any harm caused by using untested modules.\n"); + warned_once = true; status = IXGBE_SUCCESS; } else { DEBUGOUT("QSFP module not supported\n"); From nobody Thu Aug 10 00:28:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLnp710jGz4mWWR; Thu, 10 Aug 2023 00:28: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 4RLnp6745qz4YgH; Thu, 10 Aug 2023 00:28:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUyVK5dlEthTojMHLHMzpkaFeRWyLENKqwL+fx7b8dc=; b=HHoPczMM8mLAgAoJ2XclwWu+1VpL2LNBCxZtWoV+eh2dKKkNfUREtO9xmp6udpTFkxuMBJ tWZaYuPbXoMTIWBYKCHsdxPyZEY5S/GM+B0l1ZgVR7bQX9VlU/QC7DW1ohH3RfnMHUCdmo pJ8VkF5TSElqBXpWvaFrMHJGPZA1IyKLu6S+Z2UhtuuvEeIibYTsi3MTLpB3p6TRkT9YPE rmHwC5En+jBsbEsCuJcjuF9iKVUfTC/FvwdTXyfYyEzI/+wGdx7RaLN0GVNONW3oV/J1xD i8AULKbD1p92na+o/5FkslpTiC8weYGl3SslkjrTb9qpNUy524IuAuz+SWrj5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUyVK5dlEthTojMHLHMzpkaFeRWyLENKqwL+fx7b8dc=; b=lxNN+BHF8Ol4AmcKDXbe+sD7CTJWu3HsREMXDQA4I62FgTP9uCJSnOcL3yM6UUE0dtfJSt 6j7spd6AXQa2J/IdYrGIJpggIGgj24xqj1C8W1iUxqFqhbPyHB+DxrywJGGc/7QoMuaiRS YETcpRnSYr9J5bM0s4qHsXlTzCR1I8aV01G0uNC8inpxlCWYuRHEwq+Z8nHm8HQUUdeTCR WfzIMzUqZ7VdxYarUEvbQ2qetWhn0XNt83j+eX0HNQz2EPZEGm09DIIQnLe1pur1W5oWqy qu+ZgNHAk3rbxydeeDR3E5lR92lsX+ZEY2MHgw4JYh1Qjcs8gZhuvB92A4WpzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691627295; a=rsa-sha256; cv=none; b=iQSBh2ckCOiZpRYqrMLbxX2LT8/v3NrBFRMzcUKSCL79D/fY3tdNqoQtuh9e/MBhmFNCf5 GlnL4KY4ygj1RPH/weyALn8bNwIrI/4EqCWRK6Xr3YukeP15dXXFlT74tOsZmt4MlzWfkA OTa2RM/bdP5/JjkIz0E9tPbb0UvQHoigmqcQkFXjgb89ZZjVScPunBaDWLaCrBpLV8oAa0 xrmUdlMlNVwbQDKEfQovF2GTmHlEfjzlxxYPd9rDsH+na1YDvkow3Yu7GsHJr2M+6OIfk2 TS1YwvqNM453L6yPmIRMdlSyqJXkFgb+KmEw8UpeTh0wbkEDl7QpXZlEtOWNTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLnp667QGzcKM; Thu, 10 Aug 2023 00:28: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 37A0SEc1025627; Thu, 10 Aug 2023 00:28:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A0SENd025624; Thu, 10 Aug 2023 00:28:14 GMT (envelope-from git) Date: Thu, 10 Aug 2023 00:28:14 GMT Message-Id: <202308100028.37A0SENd025624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: fd2b36319c1f - stable/13 - ixv: Separate VFTA table for each interface List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd2b36319c1fee3ac8f914548705cfc0a79011d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=fd2b36319c1fee3ac8f914548705cfc0a79011d9 commit fd2b36319c1fee3ac8f914548705cfc0a79011d9 Author: Yuichiro Naito AuthorDate: 2023-08-03 20:36:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 00:27:45 +0000 ixv: Separate VFTA table for each interface The vlan setting is independent for each interface. Use VFTA table in 'struct ixgbe_softc' that is already defined. This pull request fixes following bug scenario. create ixv0.10 create ixv1.10 destroy ixv1.10 create ixv0.11 ixv0.10 no longer receives vlan 10 packets. In this case, destroying ixv1.10 affects to ixv0. Pull Request: https://github.com/freebsd/freebsd-src/pull/774 (cherry picked from commit 61a8231d152c38ac96b697ea3ca8ff220f3aa536) --- sys/dev/ixgbe/if_ixv.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 813a8d5fc3ed..5bd71ab2b5eb 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -198,12 +198,6 @@ TUNABLE_INT("hw.ixv.flow_control", &ixv_flow_control); static int ixv_header_split = false; TUNABLE_INT("hw.ixv.hdr_split", &ixv_header_split); -/* - * Shadow VFTA table, this is needed because - * the real filter table gets cleared during - * a soft reset and we need to repopulate it. - */ -static u32 ixv_shadow_vfta[IXGBE_VFTA_SIZE]; extern struct if_txrx ixgbe_txrx; static struct if_shared_ctx ixv_sctx_init = { @@ -1541,9 +1535,9 @@ ixv_setup_vlan_support(if_ctx_t ctx) * we need to repopulate it now. */ for (int i = 0; i < IXGBE_VFTA_SIZE; i++) { - if (ixv_shadow_vfta[i] == 0) + if (sc->shadow_vfta[i] == 0) continue; - vfta = ixv_shadow_vfta[i]; + vfta = sc->shadow_vfta[i]; /* * Reconstruct the vlan id's * based on the bits set in each @@ -1579,7 +1573,7 @@ ixv_if_register_vlan(if_ctx_t ctx, u16 vtag) index = (vtag >> 5) & 0x7F; bit = vtag & 0x1F; - ixv_shadow_vfta[index] |= (1 << bit); + sc->shadow_vfta[index] |= (1 << bit); ++sc->num_vlans; } /* ixv_if_register_vlan */ @@ -1597,7 +1591,7 @@ ixv_if_unregister_vlan(if_ctx_t ctx, u16 vtag) index = (vtag >> 5) & 0x7F; bit = vtag & 0x1F; - ixv_shadow_vfta[index] &= ~(1 << bit); + sc->shadow_vfta[index] &= ~(1 << bit); --sc->num_vlans; } /* ixv_if_unregister_vlan */ From nobody Thu Aug 10 00:39:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLp3J6L9xz4plhX; Thu, 10 Aug 2023 00:39: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 4RLp3J5sNZz4ZjJ; Thu, 10 Aug 2023 00:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K31MVOjgiKb1dMXMDc/umSfL6OnLVT6bJpmYrx/OfM=; b=SYU/iKKhI3RNay1g/AA4L5n+mMwB+16S5S1aXQl7OcPZd7UIRKAi9EgsmTj4UxSA/XUumM HHgKzS5yayrXg9tpj+CpiH5OGICaNSY81X6DIZEAvyoYLJdvxr01Hb0+CR69GQPEFgDvQk WniNgvD2W2VcWZWe8Cm2BaV5FTcgG+wWAIhBL1AkeVRJURJIirqHtNMhQfAO9DGTcaSOyl UVncOwEo5ClmsazgRTrSfUjKopkQD0mijHingVdES0KyHn2yAHgvzW6sLT3eQQBNojqRcz 4Jh1vLq4ksuqdpd8vNOV9/gxe3AK3NN1Xbkh1die3EcE5Vp8GgG3HBbvjeLeow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691627980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6K31MVOjgiKb1dMXMDc/umSfL6OnLVT6bJpmYrx/OfM=; b=Uftt54qV8TWYxMhzUr0RAb3smTUoJ9+P30L+iKOqkvQsGjXSm+IrBWv02/p/FpSceqo7GL lgooC1bmpe6LsunMlvYTPA6nOB+JBQqEMpORHQiZNDfmNRMB0aeUE4DIh0+Ft2ltfLmD5t E3friqRvkd/bIwMVSDalmnpWuZSxr7g27YnSkBdPjA5jGMa2iyCCVqp/BMqZwtjHcadOPH 9ZNyCveQjx4UO4/p27cBVxa0O4p66BoaJdICPoviKRb74XIsvS+V1OYmVrJLv9zltxq6qk LJDLNN/lTImau9kQwFzIWatGCHl05suxJc4jharFCnJtNkX4B870VONeK2AL3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691627980; a=rsa-sha256; cv=none; b=AlDKVBTzEf8XOW4u1Fq7Hs07JOyIMCzhLeSK2ioN/m2pfyrI1HX+kvoqAMYOOOPDlD/FKS ZW8SZkRDJLlDZoApOgRN1R4je5/vpM9QsTiMc/otVWrBNcDRb77S0SueWYkwpR+3AQUKWt Es4G8juCFzFbC8ICoUJmi60xM9CTaRbE9S+gV3M261cGQDKUlaGFruGJ4iDbkbIrXKP1fR dzhMe7jzoS5WTuiyL4b0PnOhwKTucLCofHLMZQeO6BdfCVW5FKHSep3iqKFYJRnkS4iRJI UsF7xz7+F6fm59X5fTnqY1o59CRjv+Gq/hSlt/Vc7F7fVV97LEuhdG0FnaW0FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLp3J4w68zcBc; Thu, 10 Aug 2023 00:39: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 37A0dev2041918; Thu, 10 Aug 2023 00:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A0de3g041915; Thu, 10 Aug 2023 00:39:40 GMT (envelope-from git) Date: Thu, 10 Aug 2023 00:39:40 GMT Message-Id: <202308100039.37A0de3g041915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 8b4a3fbdd572 - main - ixgbe: Check for fw_recovery List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b4a3fbdd57215cffde530e2fa3098c272a985fe Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4a3fbdd57215cffde530e2fa3098c272a985fe commit 8b4a3fbdd57215cffde530e2fa3098c272a985fe Author: Kevin Bowling AuthorDate: 2023-08-10 00:31:49 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 00:38:00 +0000 ixgbe: Check for fw_recovery The x550 uses an upgradable flash code. Check for recovery condition like other flashable intel cards do in case of fw errors. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31869 --- sys/dev/ixgbe/if_ix.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 487a5625dd3a..36651fdd2263 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -919,6 +919,15 @@ ixgbe_if_attach_pre(if_ctx_t ctx) goto err_pci; } + if (hw->mac.ops.fw_recovery_mode && hw->mac.ops.fw_recovery_mode(hw)) { + device_printf(dev, "Firmware recovery mode detected. Limiting " + "functionality.\nRefer to the Intel(R) Ethernet Adapters " + "and Devices User Guide for details on firmware recovery " + "mode."); + error = ENOSYS; + goto err_pci; + } + if (hw->mbx.ops.init_params) hw->mbx.ops.init_params(hw); From nobody Thu Aug 10 01:32:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLqCy4BBNz4ppmf; Thu, 10 Aug 2023 01:32: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 4RLqCy3j8Gz4fLM; Thu, 10 Aug 2023 01:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691631134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPCRVxN02wVTstq+yL+ayA+d471cRVsfYSKqD8rv9rY=; b=MM0JDuEYSenFIW+RX4Vop1JUtDWu1J+4I6g0gycyxYj6PI9ofWVUyNXiPWddFUggrpXyB2 8W56WP9aILJ+43jBwbQodnNjs+cWqZ65+3adRUJLN9669aJ2FSlndAxuud98ewDFR+zkGw CfWMgGdZAA8BVc/TzTS0T35+UwbuZdcsHWA+2tAgzftKPiMyA66y73nzPmj/aU4QDv/h+m BH3mTx7Ap6LeabJmV9Rg0tnaP+gTLRjzeJyzi+lal6BJYIUx3bkJsjadrFedg5Su1PPMh/ qjOkO99DkwnwtG1LQefzuJHcYhNDGUNrv3P8EZBSqKWGGMGrIwycq7TluI542A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691631134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gPCRVxN02wVTstq+yL+ayA+d471cRVsfYSKqD8rv9rY=; b=aXOo4M370nIjHRrYSkC5zYaVRTcOWQ5+U3pjdijoLA0PUHIFxeXxU7Us6VsF6op0x3kxFE LngucxTEQIc67Y5eDYQIZE/Xq0KNqwk3uvtLqBIlJUrlKy0a6CkFhAkzzBgUOAQzcr6K1Q 6Lvrxv8NUvzkgdGlsEDKKZcSc+ePxwouJMbZExNj8eG7SCzAr9DcFkR2Asd04HXl/uJqit vrVi441jsdItficy8yARN93mEOW0gtaCyi7MRQaLuhNL1CH54K+menD73r5/1ol2AEQ0X/ hj8dS2pffNxax07TMONlNe3RklA/pwJlC2PnYqovAodpDGhh+ry8ediL9N7Vsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691631134; a=rsa-sha256; cv=none; b=kojCz/eFvDG/FFkMZOnxaGbzSsOqPWS8f5Dcvra5rAqcKd3uaXG2FRo+qakaWDSBfmQ/CO NYSEhTPCLZRvpu6Jdfv9Y71LLLW59QJ2Fyt8dEi+0un4omD1LY19rITNHEuB++vwynBPx/ 1el4X1M6d5DeXi9FQDZabewFDNQnOJobyIFPwgdr3tK5uLYApZxFv4Cj0IIe2ZOISqa2bt 5VqRbuIspZnnWXradrV3iTK4IbruvxgwMuqnydQaYV9dpv4jeQCS7yYG62t6/HcKiZGeSs xJ2ZeUB7MYXNx+qzCKqFFPooDqcaml22ORYFZY/m7C/mAYo8+rry/7B735ARFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLqCy2mKpzdb2; Thu, 10 Aug 2023 01:32: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 37A1WEFI039980; Thu, 10 Aug 2023 01:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A1WEQ2039978; Thu, 10 Aug 2023 01:32:14 GMT (envelope-from git) Date: Thu, 10 Aug 2023 01:32:14 GMT Message-Id: <202308100132.37A1WEQ2039978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 9228ac3a69c4 - main - ixgbe: Add support for 82599 LS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9228ac3a69c4c7401a743e6465e118101a2beeb0 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9228ac3a69c4c7401a743e6465e118101a2beeb0 commit 9228ac3a69c4c7401a743e6465e118101a2beeb0 Author: Kevin Bowling AuthorDate: 2023-08-10 01:30:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 01:31:39 +0000 ixgbe: Add support for 82599 LS Obtained from: DPDK 549ccd3dc01539e060597b503f2b65b272de3347 MFC after: 1 week --- sys/dev/ixgbe/if_ix.c | 1 + sys/dev/ixgbe/ixgbe_82599.c | 3 +++ sys/dev/ixgbe/ixgbe_type.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 36651fdd2263..c2a911773f4b 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -76,6 +76,7 @@ static pci_vendor_info_t ixgbe_vendor_info_array[] = PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_XAUI_LOM, "Intel(R) X520 82599 (XAUI/BX4)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_CX4, "Intel(R) X520 82599 (Dual CX4)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_T3_LOM, "Intel(R) X520-T 82599 LOM"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_LS, "Intel(R) X520 82599 LS"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, "Intel(R) X520 82599 (Combined Backplane)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, "Intel(R) X520 82599 (Backplane w/FCoE)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, "Intel(R) X520 82599 (Dual SFP+)"), diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index 698602080592..7afb440b556d 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -568,6 +568,9 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) case IXGBE_DEV_ID_82599_T3_LOM: media_type = ixgbe_media_type_copper; break; + case IXGBE_DEV_ID_82599_LS: + media_type = ixgbe_media_type_fiber_lco; + break; case IXGBE_DEV_ID_82599_QSFP_SF_QP: media_type = ixgbe_media_type_fiber_qsfp; break; diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index 9fb800560e43..7d39e391855a 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -100,6 +100,7 @@ #define IXGBE_DEV_ID_82599_KR 0x1517 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8 #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C +#define IXGBE_DEV_ID_82599_LS 0x154F #define IXGBE_DEV_ID_82599_CX4 0x10F9 #define IXGBE_DEV_ID_82599_SFP 0x10FB #define IXGBE_SUBDEV_ID_82599_SFP 0x11A9 @@ -3758,6 +3759,7 @@ enum ixgbe_media_type { ixgbe_media_type_fiber, ixgbe_media_type_fiber_fixed, ixgbe_media_type_fiber_qsfp, + ixgbe_media_type_fiber_lco, ixgbe_media_type_copper, ixgbe_media_type_backplane, ixgbe_media_type_cx4, From nobody Thu Aug 10 02:32:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLrYj2m5jz4ptBT; Thu, 10 Aug 2023 02:32: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 4RLrYj2KnRz3Dv3; Thu, 10 Aug 2023 02:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691634761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQ682pjC/gStpbH2DlPMV9fEUW69ip25HM5jmQTHjxw=; b=AYiy1tFZ36mP+HqpjztDfNFG+a27mYR7BzADXdEK9WrZdLct4ymiWgAIgvMqRxsBPE+Ief rGBK+SQYnpQ2mmDGwnHvxdlSH3hJfWC1/iYWOEdxNSAqcXOhaORo5Et+76K5XB76j4VFL1 jDHAGTxOzydj1NDsbKi1Lq4C54+KkiWiHDMyLlmnlDF6JuneYckSLZwo/15K+IVqJ9W9Ae 8OtJqx3SuYGKvz8oEWQIv/3UMDjSliTRjx6EfkaCK/80Or85sETbK+BLw3Sd9sLUWN96fi xALnyY81PqovZtFu8q5vJjZqd1DvVzfkLdtVNInm6NAkVHiHn1XmWJvaaUZ0uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691634761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RQ682pjC/gStpbH2DlPMV9fEUW69ip25HM5jmQTHjxw=; b=Wfk83kSBX3RBkxUAcShTkC135c9K7nIaehn4xj6LgMyupvlc9qXObD5UICw3VtGjpeQd/z n7tJIUdhFALvNBi75ZckrLZH/mQNk4m6kX8pO9gvkeFxpN7dAwncrDhT0wVdZnXYOVbWR+ r6UiZ8go7RI8tiMRaSxfjhahOcmhWvLNzZO3XB93F5IIdiGokUQ+ZBj7S+uAD9xPaof3HB Nh5yd9lwbGgsVvfBUg/hSLKrcf3TXOFAXUB3BI8xCGOqx51KXzCx14Wrq2WPF854fzIWw0 3QjKZasssLZ2p+FiLl54kUwa4uwYbfCrqPQ3jC2HOxxOnNw5DyKpODprwbMeXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691634761; a=rsa-sha256; cv=none; b=Ttee3O33OKQYjQy8+nBPQr2+VxbQz7HOGm0J7o1K3MWs5mOj/ArM587EIEt5HOsYdiDY16 9uohrSHCCOkktQeZGmpcid62F0KmnE0aAkFmrdJP5vJgYhZ5OddWbmBFvxk9SGAZiCovza R2YEC56PSG7hqGYNebgIWib9YsHwHoRfb3mNBDofAp1vpKbThkLlX/vnOkA7QEYAUNWKWA EHdEltcw7sWDqBIQPAEG5emVs72K7lfKbjCdl2wtG4vab851hkFTy9yKHmWla7ZzbyenTQ pwAc9I3HW8OXT7CXmCyuRioLt+sIQ+bhQJeSO2c4/AyyHcl8FXuMjh6XZz8l3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLrYj1P1QzgP4; Thu, 10 Aug 2023 02:32: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 37A2WfTC040442; Thu, 10 Aug 2023 02:32:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2Wdaw040438; Thu, 10 Aug 2023 02:32:39 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:32:39 GMT Message-Id: <202308100232.37A2Wdaw040438@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: 28f6c2f29280 - main - Import GoogleTest 1.14.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28f6c2f292806bf31230a959bc4b19d7081669a7 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7 commit 28f6c2f292806bf31230a959bc4b19d7081669a7 Author: Enji Cooper AuthorDate: 2023-08-08 06:17:32 +0000 Commit: Enji Cooper CommitDate: 2023-08-10 09:32:33 +0000 Import GoogleTest 1.14.0 GoogleTest 1.14.0 now requires C++14 to build. Change `googletest.test.inc.mk` to reflect this requirement. Adjust the build integration logic to handle the new version of GoogleTest (add/remove headers/sources as needed). Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all warnings. Some new warnings snuck in after I did my last round of fix submissions upstream. Also address some overlinking added in the previous version import by removing superfluous libraries. =============================== Expect WhenDynamicCastToTest.AmbiguousCast to fail This change reapplies the expected failure from 1.10.0. Ref: https://github.com/google/googletest/issues/2172 MFC after: 2 weeks Reviewed by: asomers, emaste Differential Revision: https://reviews.freebsd.org/D41399 Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into googletest-v1.14.0-import --- contrib/googletest/.clang-format | 4 + .../.github/ISSUE_TEMPLATE/00-bug_report.yml | 53 + .../.github/ISSUE_TEMPLATE/10-feature_request.yml | 33 + .../googletest/.github/ISSUE_TEMPLATE/config.yml | 5 + contrib/googletest/.github/workflows/gtest-ci.yml | 43 + contrib/googletest/.gitignore | 34 + contrib/googletest/BUILD.bazel | 127 +- contrib/googletest/CMakeLists.txt | 14 +- contrib/googletest/CONTRIBUTING.md | 203 +- contrib/googletest/{googletest => }/CONTRIBUTORS | 28 + contrib/googletest/Makefile.am | 14 - contrib/googletest/README.md | 240 +- contrib/googletest/WORKSPACE | 27 +- contrib/googletest/appveyor.yml | 104 - contrib/googletest/ci/build-linux-bazel.sh | 36 - contrib/googletest/ci/env-linux.sh | 41 - contrib/googletest/ci/env-osx.sh | 40 - contrib/googletest/ci/get-nprocessors.sh | 48 - contrib/googletest/ci/install-linux.sh | 49 - contrib/googletest/ci/install-osx.sh | 39 - contrib/googletest/ci/linux-presubmit.sh | 137 + .../Scripts/runtests.sh => ci/macos-presubmit.sh} | 71 +- contrib/googletest/ci/travis.sh | 44 - contrib/googletest/ci/windows-presubmit.bat | 58 + contrib/googletest/configure.ac | 16 - contrib/googletest/docs/_config.yml | 1 + contrib/googletest/docs/_data/navigation.yml | 43 + contrib/googletest/docs/_layouts/default.html | 58 + contrib/googletest/docs/_sass/main.scss | 200 + .../googletest/{googletest => }/docs/advanced.md | 1608 +++-- contrib/googletest/docs/assets/css/style.scss | 5 + .../docs/community_created_documentation.md | 7 + contrib/googletest/{googletest => }/docs/faq.md | 362 +- contrib/googletest/docs/gmock_cheat_sheet.md | 241 + contrib/googletest/docs/gmock_cook_book.md | 4344 +++++++++++++ contrib/googletest/docs/gmock_faq.md | 390 ++ contrib/googletest/docs/gmock_for_dummies.md | 700 ++ contrib/googletest/docs/index.md | 22 + contrib/googletest/docs/pkgconfig.md | 144 + contrib/googletest/docs/platforms.md | 8 + contrib/googletest/docs/primer.md | 483 ++ contrib/googletest/docs/quickstart-bazel.md | 153 + contrib/googletest/docs/quickstart-cmake.md | 157 + contrib/googletest/docs/reference/actions.md | 115 + contrib/googletest/docs/reference/assertions.md | 633 ++ contrib/googletest/docs/reference/matchers.md | 302 + contrib/googletest/docs/reference/mocking.md | 589 ++ contrib/googletest/docs/reference/testing.md | 1432 ++++ .../googletest/{googletest => }/docs/samples.md | 6 +- contrib/googletest/googlemock/CHANGES | 126 - contrib/googletest/googlemock/CMakeLists.txt | 74 +- contrib/googletest/googlemock/CONTRIBUTORS | 40 - contrib/googletest/googlemock/LICENSE | 28 - contrib/googletest/googlemock/Makefile.am | 224 - contrib/googletest/googlemock/README.md | 353 +- contrib/googletest/googlemock/build-aux/.keep | 0 contrib/googletest/googlemock/cmake/gmock.pc.in | 3 +- .../googletest/googlemock/cmake/gmock_main.pc.in | 3 +- contrib/googletest/googlemock/configure.ac | 146 - contrib/googletest/googlemock/docs/CheatSheet.md | 564 -- contrib/googletest/googlemock/docs/CookBook.md | 3660 ----------- contrib/googletest/googlemock/docs/DesignDoc.md | 280 - .../googletest/googlemock/docs/Documentation.md | 15 - contrib/googletest/googlemock/docs/ForDummies.md | 447 -- .../googlemock/docs/FrequentlyAskedQuestions.md | 627 -- contrib/googletest/googlemock/docs/KnownIssues.md | 19 - contrib/googletest/googlemock/docs/README.md | 4 + .../googlemock/include/gmock/gmock-actions.h | 2000 ++++-- .../googlemock/include/gmock/gmock-cardinalities.h | 40 +- .../include/gmock/gmock-function-mocker.h | 518 ++ .../include/gmock/gmock-generated-actions.h | 2567 -------- .../include/gmock/gmock-generated-actions.h.pump | 833 --- .../gmock/gmock-generated-function-mockers.h | 1380 ---- .../gmock/gmock-generated-function-mockers.h.pump | 348 - .../include/gmock/gmock-generated-matchers.h | 2260 ------- .../include/gmock/gmock-generated-matchers.h.pump | 678 -- .../include/gmock/gmock-generated-nice-strict.h | 459 -- .../gmock/gmock-generated-nice-strict.h.pump | 179 - .../googlemock/include/gmock/gmock-matchers.h | 3681 ++++++----- .../googlemock/include/gmock/gmock-more-actions.h | 795 ++- .../googlemock/include/gmock/gmock-more-matchers.h | 74 +- .../googlemock/include/gmock/gmock-nice-strict.h | 277 + .../googlemock/include/gmock/gmock-spec-builders.h | 1120 ++-- .../googletest/googlemock/include/gmock/gmock.h | 28 +- .../include/gmock/internal/custom/README.md | 2 + .../internal/custom/gmock-generated-actions.h | 13 +- .../internal/custom/gmock-generated-actions.h.pump | 12 - .../include/gmock/internal/custom/gmock-matchers.h | 13 +- .../include/gmock/internal/custom/gmock-port.h | 11 +- .../internal/gmock-generated-internal-utils.h | 287 - .../internal/gmock-generated-internal-utils.h.pump | 137 - .../include/gmock/internal/gmock-internal-utils.h | 433 +- .../googlemock/include/gmock/internal/gmock-port.h | 97 +- .../googlemock/include/gmock/internal/gmock-pp.h | 279 + contrib/googletest/googlemock/make/Makefile | 101 - contrib/googletest/googlemock/msvc/2005/gmock.sln | 32 - .../googletest/googlemock/msvc/2005/gmock.vcproj | 191 - .../googlemock/msvc/2005/gmock_config.vsprops | 15 - .../googlemock/msvc/2005/gmock_main.vcproj | 187 - .../googlemock/msvc/2005/gmock_test.vcproj | 201 - contrib/googletest/googlemock/msvc/2010/gmock.sln | 46 - .../googletest/googlemock/msvc/2010/gmock.vcxproj | 145 - .../googlemock/msvc/2010/gmock_config.props | 19 - .../googlemock/msvc/2010/gmock_main.vcxproj | 151 - .../googlemock/msvc/2010/gmock_test.vcxproj | 176 - contrib/googletest/googlemock/msvc/2015/gmock.sln | 46 - .../googletest/googlemock/msvc/2015/gmock.vcxproj | 145 - .../googlemock/msvc/2015/gmock_config.props | 19 - .../googlemock/msvc/2015/gmock_main.vcxproj | 151 - .../googlemock/msvc/2015/gmock_test.vcxproj | 176 - .../googlemock/scripts/fuse_gmock_files.py | 240 - .../googlemock/scripts/generator/LICENSE | 203 - .../googletest/googlemock/scripts/generator/README | 34 - .../googlemock/scripts/generator/README.cppclean | 115 - .../googlemock/scripts/generator/cpp/__init__.py | 0 .../googlemock/scripts/generator/cpp/ast.py | 1736 ----- .../scripts/generator/cpp/gmock_class.py | 227 - .../scripts/generator/cpp/gmock_class_test.py | 466 -- .../googlemock/scripts/generator/cpp/keywords.py | 59 - .../googlemock/scripts/generator/cpp/tokenize.py | 287 - .../googlemock/scripts/generator/cpp/utils.py | 41 - .../googlemock/scripts/generator/gmock_gen.py | 31 - .../googletest/googlemock/scripts/gmock-config.in | 303 - .../googletest/googlemock/scripts/gmock_doctor.py | 640 -- contrib/googletest/googlemock/scripts/upload.py | 1387 ---- .../googletest/googlemock/scripts/upload_gmock.py | 78 - .../googlemock/src/gmock-cardinalities.cc | 22 +- .../googlemock/src/gmock-internal-utils.cc | 132 +- .../googletest/googlemock/src/gmock-matchers.cc | 143 +- .../googlemock/src/gmock-spec-builders.cc | 321 +- contrib/googletest/googlemock/src/gmock.cc | 89 +- contrib/googletest/googlemock/src/gmock_main.cc | 25 +- contrib/googletest/googlemock/test/BUILD.bazel | 49 +- .../googlemock/test/gmock-actions_test.cc | 1439 ++++- .../googlemock/test/gmock-cardinalities_test.cc | 127 +- .../googlemock/test/gmock-function-mocker_test.cc | 998 +++ .../test/gmock-generated-actions_test.cc | 1229 ---- .../test/gmock-generated-function-mockers_test.cc | 646 -- .../test/gmock-generated-internal-utils_test.cc | 128 - .../test/gmock-generated-matchers_test.cc | 1341 ---- .../googlemock/test/gmock-internal-utils_test.cc | 441 +- .../test/gmock-matchers-arithmetic_test.cc | 1516 +++++ .../test/gmock-matchers-comparisons_test.cc | 2371 +++++++ .../test/gmock-matchers-containers_test.cc | 3137 +++++++++ .../googlemock/test/gmock-matchers-misc_test.cc | 1823 ++++++ .../googlemock/test/gmock-matchers_test.cc | 6814 -------------------- .../googlemock/test/gmock-matchers_test.h | 192 + .../googlemock/test/gmock-more-actions_test.cc | 1155 +++- .../googlemock/test/gmock-nice-strict_test.cc | 201 +- .../googletest/googlemock/test/gmock-port_test.cc | 2 +- .../googlemock/test/gmock-pp-string_test.cc | 205 + .../googletest/googlemock/test/gmock-pp_test.cc | 83 + .../googlemock/test/gmock-spec-builders_test.cc | 1142 ++-- .../googletest/googlemock/test/gmock_all_test.cc | 9 +- .../googletest/googlemock/test/gmock_ex_test.cc | 4 +- .../googletest/googlemock/test/gmock_leak_test.py | 61 +- .../googletest/googlemock/test/gmock_leak_test_.cc | 8 +- .../googletest/googlemock/test/gmock_link2_test.cc | 1 - .../googletest/googlemock/test/gmock_link_test.cc | 1 - .../googletest/googlemock/test/gmock_link_test.h | 96 +- .../googlemock/test/gmock_output_test.py | 21 +- .../googlemock/test/gmock_output_test_.cc | 83 +- .../googlemock/test/gmock_output_test_golden.txt | 32 +- .../googlemock/test/gmock_stress_test.cc | 142 +- contrib/googletest/googlemock/test/gmock_test.cc | 190 +- .../googletest/googlemock/test/gmock_test_utils.py | 19 +- contrib/googletest/googletest/CHANGES | 157 - contrib/googletest/googletest/CMakeLists.txt | 97 +- contrib/googletest/googletest/LICENSE | 28 - contrib/googletest/googletest/Makefile.am | 345 - contrib/googletest/googletest/README.md | 348 +- contrib/googletest/googletest/cmake/gtest.pc.in | 2 +- .../googletest/googletest/cmake/gtest_main.pc.in | 4 +- .../googletest/cmake/internal_utils.cmake | 166 +- contrib/googletest/googletest/cmake/libgtest.la.in | 21 + .../googletest/googletest/codegear/gtest.cbproj | 138 - .../googletest/googletest/codegear/gtest.groupproj | 54 - .../googletest/googletest/codegear/gtest_link.cc | 40 - .../googletest/codegear/gtest_main.cbproj | 82 - .../googletest/codegear/gtest_unittest.cbproj | 88 - contrib/googletest/googletest/configure.ac | 68 - contrib/googletest/googletest/docs/Pkgconfig.md | 146 - contrib/googletest/googletest/docs/PumpManual.md | 177 - contrib/googletest/googletest/docs/README.md | 4 + contrib/googletest/googletest/docs/XcodeGuide.md | 93 - contrib/googletest/googletest/docs/primer.md | 569 -- .../include/gtest/gtest-assertion-result.h | 237 + .../googletest/include/gtest/gtest-death-test.h | 145 +- .../googletest/include/gtest/gtest-matchers.h | 923 +++ .../googletest/include/gtest/gtest-message.h | 115 +- .../googletest/include/gtest/gtest-param-test.h | 1264 +--- .../include/gtest/gtest-param-test.h.pump | 500 -- .../googletest/include/gtest/gtest-printers.h | 1074 +-- .../googletest/include/gtest/gtest-spi.h | 143 +- .../googletest/include/gtest/gtest-test-part.h | 51 +- .../googletest/include/gtest/gtest-typed-test.h | 225 +- .../googletest/googletest/include/gtest/gtest.h | 1319 ++-- .../googletest/include/gtest/gtest_pred_impl.h | 276 +- .../googletest/include/gtest/gtest_prod.h | 15 +- .../include/gtest/internal/custom/README.md | 12 - .../include/gtest/internal/custom/gtest-port.h | 6 +- .../include/gtest/internal/custom/gtest-printers.h | 6 +- .../include/gtest/internal/custom/gtest.h | 6 +- .../gtest/internal/gtest-death-test-internal.h | 193 +- .../include/gtest/internal/gtest-filepath.h | 44 +- .../include/gtest/internal/gtest-internal.h | 1107 ++-- .../include/gtest/internal/gtest-linked_ptr.h | 243 - .../gtest/internal/gtest-param-util-generated.h | 5552 ---------------- .../internal/gtest-param-util-generated.h.pump | 282 - .../include/gtest/internal/gtest-param-util.h | 762 ++- .../include/gtest/internal/gtest-port-arch.h | 120 +- .../googletest/include/gtest/internal/gtest-port.h | 2211 +++---- .../include/gtest/internal/gtest-string.h | 53 +- .../include/gtest/internal/gtest-tuple.h | 1021 --- .../include/gtest/internal/gtest-tuple.h.pump | 348 - .../include/gtest/internal/gtest-type-util.h | 3352 +--------- .../include/gtest/internal/gtest-type-util.h.pump | 314 - contrib/googletest/googletest/m4/acx_pthread.m4 | 363 -- contrib/googletest/googletest/m4/gtest.m4 | 74 - contrib/googletest/googletest/make/Makefile | 82 - .../googletest/googletest/msvc/2010/gtest-md.sln | 55 - .../googletest/msvc/2010/gtest-md.vcxproj | 149 - .../googletest/msvc/2010/gtest-md.vcxproj.filters | 18 - contrib/googletest/googletest/msvc/2010/gtest.sln | 55 - .../googletest/googletest/msvc/2010/gtest.vcxproj | 149 - .../googletest/msvc/2010/gtest.vcxproj.filters | 18 - .../googletest/msvc/2010/gtest_main-md.vcxproj | 154 - .../msvc/2010/gtest_main-md.vcxproj.filters | 18 - .../googletest/msvc/2010/gtest_main.vcxproj | 162 - .../msvc/2010/gtest_main.vcxproj.filters | 18 - .../msvc/2010/gtest_prod_test-md.vcxproj | 199 - .../msvc/2010/gtest_prod_test-md.vcxproj.filters | 26 - .../googletest/msvc/2010/gtest_prod_test.vcxproj | 191 - .../msvc/2010/gtest_prod_test.vcxproj.filters | 26 - .../googletest/msvc/2010/gtest_unittest-md.vcxproj | 188 - .../msvc/2010/gtest_unittest-md.vcxproj.filters | 18 - .../googletest/msvc/2010/gtest_unittest.vcxproj | 180 - .../msvc/2010/gtest_unittest.vcxproj.filters | 18 - .../googletest/googletest/samples/prime_tables.h | 39 +- contrib/googletest/googletest/samples/sample1.cc | 6 +- contrib/googletest/googletest/samples/sample1.h | 8 +- .../googletest/samples/sample10_unittest.cc | 15 +- .../googletest/samples/sample1_unittest.cc | 11 +- contrib/googletest/googletest/samples/sample2.cc | 4 +- contrib/googletest/googletest/samples/sample2.h | 18 +- .../googletest/samples/sample2_unittest.cc | 10 +- .../googletest/googletest/samples/sample3-inl.h | 31 +- .../googletest/samples/sample3_unittest.cc | 23 +- contrib/googletest/googletest/samples/sample4.cc | 14 +- contrib/googletest/googletest/samples/sample4.h | 6 +- .../googletest/samples/sample4_unittest.cc | 2 +- .../googletest/samples/sample5_unittest.cc | 29 +- .../googletest/samples/sample6_unittest.cc | 30 +- .../googletest/samples/sample7_unittest.cc | 20 +- .../googletest/samples/sample8_unittest.cc | 61 +- .../googletest/samples/sample9_unittest.cc | 46 +- contrib/googletest/googletest/scripts/common.py | 83 - .../googletest/scripts/fuse_gtest_files.py | 253 - .../googletest/scripts/gen_gtest_pred_impl.py | 730 --- .../googletest/googletest/scripts/gtest-config.in | 274 - contrib/googletest/googletest/scripts/pump.py | 855 --- .../googletest/googletest/scripts/release_docs.py | 158 - .../googletest/googletest/scripts/test/Makefile | 59 - contrib/googletest/googletest/scripts/upload.py | 1387 ---- .../googletest/googletest/scripts/upload_gtest.py | 78 - contrib/googletest/googletest/src/gtest-all.cc | 4 +- .../gtest-assertion-result.cc} | 69 +- .../googletest/googletest/src/gtest-death-test.cc | 986 +-- .../googletest/googletest/src/gtest-filepath.cc | 239 +- .../googletest/googletest/src/gtest-internal-inl.h | 548 +- .../googletest/googletest/src/gtest-matchers.cc | 98 + contrib/googletest/googletest/src/gtest-port.cc | 714 +- .../googletest/googletest/src/gtest-printers.cc | 294 +- .../googletest/googletest/src/gtest-test-part.cc | 35 +- .../googletest/googletest/src/gtest-typed-test.cc | 40 +- contrib/googletest/googletest/src/gtest.cc | 4271 +++++++----- contrib/googletest/googletest/src/gtest_main.cc | 31 +- contrib/googletest/googletest/test/BUILD.bazel | 169 +- .../test/googletest-break-on-failure-unittest.py | 79 +- .../test/googletest-break-on-failure-unittest_.cc | 25 +- .../test/googletest-catch-exceptions-test.py | 316 +- .../test/googletest-catch-exceptions-test_.cc | 122 +- .../googletest/test/googletest-color-test.py | 70 +- .../googletest/test/googletest-color-test_.cc | 4 +- .../googletest/test/googletest-death-test-test.cc | 613 +- .../test/googletest-death-test_ex_test.cc | 31 +- .../googletest/test/googletest-env-var-test.py | 11 +- .../googletest/test/googletest-env-var-test_.cc | 36 +- .../test/googletest-failfast-unittest.py | 461 ++ .../test/googletest-failfast-unittest_.cc | 166 + .../googletest/test/googletest-filepath-test.cc | 226 +- .../googletest/test/googletest-filter-unittest.py | 448 +- .../googletest/test/googletest-filter-unittest_.cc | 75 +- .../test/googletest-global-environment-unittest.py | 141 + .../googletest-global-environment-unittest_.cc} | 47 +- .../test/googletest-json-outfiles-test.py | 138 +- .../test/googletest-json-output-unittest.py | 950 +-- .../googletest/test/googletest-linked-ptr-test.cc | 151 - .../test/googletest-list-tests-unittest.py | 102 +- .../test/googletest-list-tests-unittest_.cc | 103 +- .../googletest/test/googletest-listener-test.cc | 480 +- .../googletest/test/googletest-message-test.cc | 48 +- .../googletest/test/googletest-options-test.cc | 103 +- .../test/googletest-output-test-golden-lin.txt | 247 +- .../googletest/test/googletest-output-test.py | 182 +- .../googletest/test/googletest-output-test_.cc | 539 +- .../googletest-param-test-invalid-name1-test.py | 4 +- .../googletest-param-test-invalid-name1-test_.cc | 12 +- .../googletest-param-test-invalid-name2-test.py | 5 +- .../googletest-param-test-invalid-name2-test_.cc | 15 +- .../googletest/test/googletest-param-test-test.cc | 556 +- .../googletest/test/googletest-param-test-test.h | 14 +- .../googletest/test/googletest-param-test2-test.cc | 13 +- .../googletest/test/googletest-port-test.cc | 315 +- .../googletest/test/googletest-printers-test.cc | 1176 ++-- .../test/googletest-setuptestsuite-test.py} | 38 +- .../googletest-setuptestsuite-test_.cc} | 26 +- .../googletest/test/googletest-shuffle-test.py | 203 +- .../googletest/test/googletest-shuffle-test_.cc | 13 +- .../googletest/test/googletest-test-part-test.cc | 26 +- .../googletest/test/googletest-test2_test.cc | 61 - .../test/googletest-throw-on-failure-test.py | 77 +- .../test/googletest-throw-on-failure-test_.cc | 12 +- .../googletest/test/googletest-tuple-test.cc | 319 - .../test/googletest-uninitialized-test.py | 13 +- .../test/googletest-uninitialized-test_.cc | 5 +- .../googletest/test/gtest-typed-test2_test.cc | 11 +- .../googletest/test/gtest-typed-test_test.cc | 246 +- .../googletest/test/gtest-typed-test_test.h | 24 +- .../googletest/test/gtest-unittest-api_test.cc | 272 +- .../googletest/googletest/test/gtest_all_test.cc | 1 - .../test/gtest_assert_by_exception_test.cc | 28 +- .../googletest/googletest/test/gtest_dirs_test.cc | 101 + .../googletest/test/gtest_environment_test.cc | 29 +- .../googletest/googletest/test/gtest_help_test.py | 129 +- .../googletest/googletest/test/gtest_help_test_.cc | 3 +- .../googletest/test/gtest_json_test_utils.py | 4 + .../googletest/test/gtest_list_output_unittest.py | 184 +- .../googletest/test/gtest_list_output_unittest_.cc | 26 + .../googletest/test/gtest_main_unittest.cc | 4 +- .../googletest/test/gtest_pred_impl_unittest.cc | 1793 +++-- .../googletest/test/gtest_premature_exit_test.cc | 30 +- .../googletest/test/gtest_repeat_test.cc | 76 +- .../gtest_skip_check_output_test.py} | 66 +- .../gtest_skip_environment_check_output_test.py} | 40 +- .../test/gtest_skip_in_environment_setup_test.cc | 26 +- .../googletest/googletest/test/gtest_skip_test.cc | 10 +- .../googletest/test/gtest_sole_header_test.cc | 4 +- .../googletest/test/gtest_stress_test.cc | 36 +- .../test/gtest_test_macro_stack_footprint_test.cc | 58 +- .../googletest/googletest/test/gtest_test_utils.py | 142 +- .../googletest/test/gtest_testbridge_test.py | 4 +- .../googletest/test/gtest_testbridge_test_.cc | 1 - .../test/gtest_throw_on_failure_ex_test.cc | 19 +- .../googletest/googletest/test/gtest_unittest.cc | 3944 ++++++----- .../googletest/test/gtest_xml_outfile1_test_.cc | 8 +- .../googletest/test/gtest_xml_outfile2_test_.cc | 46 +- .../googletest/test/gtest_xml_outfiles_test.py | 55 +- .../googletest/test/gtest_xml_output_unittest.py | 338 +- .../googletest/test/gtest_xml_output_unittest_.cc | 56 +- .../googletest/test/gtest_xml_test_utils.py | 170 +- contrib/googletest/googletest/test/production.h | 7 +- .../googletest/xcode/Config/DebugProject.xcconfig | 30 - .../xcode/Config/FrameworkTarget.xcconfig | 17 - .../googletest/xcode/Config/General.xcconfig | 41 - .../xcode/Config/ReleaseProject.xcconfig | 32 - .../xcode/Config/StaticLibraryTarget.xcconfig | 18 - .../googletest/xcode/Config/TestTarget.xcconfig | 8 - .../googletest/xcode/Resources/Info.plist | 30 - .../xcode/Samples/FrameworkSample/Info.plist | 28 - .../WidgetFramework.xcodeproj/project.pbxproj | 457 -- .../xcode/Samples/FrameworkSample/widget.cc | 63 - .../googletest/xcode/Scripts/versiongenerate.py | 100 - .../xcode/gtest.xcodeproj/project.pbxproj | 1182 ---- contrib/googletest/googletest_deps.bzl | 22 + lib/googletest/gmock/Makefile | 18 +- lib/googletest/gtest/Makefile | 5 +- lib/googletest/tests/gmock/Makefile | 5 +- lib/googletest/tests/gmock_main/Makefile | 20 +- lib/googletest/tests/gtest/Makefile | 11 +- lib/googletest/tests/gtest_main/Makefile | 15 +- share/mk/googletest.test.inc.mk | 2 +- 382 files changed, 51489 insertions(+), 78609 deletions(-) diff --git a/contrib/googletest/.clang-format b/contrib/googletest/.clang-format new file mode 100644 index 000000000000..5b9bfe6d2242 --- /dev/null +++ b/contrib/googletest/.clang-format @@ -0,0 +1,4 @@ +# Run manually to reformat a file: +# clang-format -i --style=file +Language: Cpp +BasedOnStyle: Google diff --git a/contrib/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml b/contrib/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml new file mode 100644 index 000000000000..586779ad2d61 --- /dev/null +++ b/contrib/googletest/.github/ISSUE_TEMPLATE/00-bug_report.yml @@ -0,0 +1,53 @@ +name: Bug Report +description: Let us know that something does not work as expected. +title: "[Bug]: Please title this bug report" +body: + - type: textarea + id: what-happened + attributes: + label: Describe the issue + description: What happened, and what did you expect to happen? + validations: + required: true + - type: textarea + id: steps + attributes: + label: Steps to reproduce the problem + description: It is important that we are able to reproduce the problem that you are experiencing. Please provide all code and relevant steps to reproduce the problem, including your `BUILD`/`CMakeLists.txt` file and build commands. Links to a GitHub branch or [godbolt.org](https://godbolt.org/) that demonstrate the problem are also helpful. + validations: + required: true + - type: textarea + id: version + attributes: + label: What version of GoogleTest are you using? + description: Please include the output of `git rev-parse HEAD` or the GoogleTest release version number that you are using. + validations: + required: true + - type: textarea + id: os + attributes: + label: What operating system and version are you using? + description: If you are using a Linux distribution please include the name and version of the distribution as well. + validations: + required: true + - type: textarea + id: compiler + attributes: + label: What compiler and version are you using? + description: Please include the output of `gcc -v` or `clang -v`, or the equivalent for your compiler. + validations: + required: true + - type: textarea + id: buildsystem + attributes: + label: What build system are you using? + description: Please include the output of `bazel --version` or `cmake --version`, or the equivalent for your build system. + validations: + required: true + - type: textarea + id: additional + attributes: + label: Additional context + description: Add any other context about the problem here. + validations: + required: false diff --git a/contrib/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml b/contrib/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml new file mode 100644 index 000000000000..f3bbc091e8e9 --- /dev/null +++ b/contrib/googletest/.github/ISSUE_TEMPLATE/10-feature_request.yml @@ -0,0 +1,33 @@ +name: Feature request +description: Propose a new feature. +title: "[FR]: Please title this feature request" +labels: "enhancement" +body: + - type: textarea + id: version + attributes: + label: Does the feature exist in the most recent commit? + description: We recommend using the latest commit from GitHub in your projects. + validations: + required: true + - type: textarea + id: why + attributes: + label: Why do we need this feature? + description: Ideally, explain why a combination of existing features cannot be used instead. + validations: + required: true + - type: textarea + id: proposal + attributes: + label: Describe the proposal. + description: Include a detailed description of the feature, with usage examples. + validations: + required: true + - type: textarea + id: platform + attributes: + label: Is the feature specific to an operating system, compiler, or build system version? + description: If it is, please specify which versions. + validations: + required: true diff --git a/contrib/googletest/.github/ISSUE_TEMPLATE/config.yml b/contrib/googletest/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000000..65170d10a782 --- /dev/null +++ b/contrib/googletest/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: Get Help + url: https://github.com/google/googletest/discussions + about: Please ask and answer questions here. diff --git a/contrib/googletest/.github/workflows/gtest-ci.yml b/contrib/googletest/.github/workflows/gtest-ci.yml new file mode 100644 index 000000000000..03a8cc5e287b --- /dev/null +++ b/contrib/googletest/.github/workflows/gtest-ci.yml @@ -0,0 +1,43 @@ +name: ci + +on: + push: + pull_request: + +env: + BAZEL_CXXOPTS: -std=c++14 + +jobs: + Linux: + runs-on: ubuntu-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... + + macOS: + runs-on: macos-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=-std=c++14 --features=external_include_paths --test_output=errors ... + + + Windows: + runs-on: windows-latest + steps: + + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Tests + run: bazel test --cxxopt=/std:c++14 --features=external_include_paths --test_output=errors ... diff --git a/contrib/googletest/.gitignore b/contrib/googletest/.gitignore index 73cdd2c203ff..fede02f65093 100644 --- a/contrib/googletest/.gitignore +++ b/contrib/googletest/.gitignore @@ -12,6 +12,7 @@ bazel-testlogs *.pyc # Visual Studio files +.vs *.sdf *.opensdf *.VC.opendb @@ -23,6 +24,10 @@ Win32-Release/ x64-Debug/ x64-Release/ +# VSCode files +.cache/ +cmake-variants.yaml + # Ignore autoconf / automake files Makefile.in aclocal.m4 @@ -34,6 +39,7 @@ googletest/m4/ltoptions.m4 googletest/m4/ltsugar.m4 googletest/m4/ltversion.m4 googletest/m4/lt~obsolete.m4 +googlemock/m4 # Ignore generated directories. googlemock/fused-src/ @@ -41,6 +47,8 @@ googletest/fused-src/ # macOS files .DS_Store +googletest/.DS_Store +googletest/xcode/.DS_Store # Ignore cmake generated directories and files. CMakeFiles @@ -52,3 +60,29 @@ googlemock/CTestTestfile.cmake googlemock/Makefile googlemock/cmake_install.cmake googlemock/gtest +/bin +/googlemock/gmock.dir +/googlemock/gmock_main.dir +/googlemock/RUN_TESTS.vcxproj.filters +/googlemock/RUN_TESTS.vcxproj +/googlemock/INSTALL.vcxproj.filters +/googlemock/INSTALL.vcxproj +/googlemock/gmock_main.vcxproj.filters +/googlemock/gmock_main.vcxproj +/googlemock/gmock.vcxproj.filters +/googlemock/gmock.vcxproj +/googlemock/gmock.sln +/googlemock/ALL_BUILD.vcxproj.filters +/googlemock/ALL_BUILD.vcxproj +/lib +/Win32 +/ZERO_CHECK.vcxproj.filters +/ZERO_CHECK.vcxproj +/RUN_TESTS.vcxproj.filters +/RUN_TESTS.vcxproj +/INSTALL.vcxproj.filters +/INSTALL.vcxproj +/googletest-distribution.sln +/CMakeCache.txt +/ALL_BUILD.vcxproj.filters +/ALL_BUILD.vcxproj diff --git a/contrib/googletest/BUILD.bazel b/contrib/googletest/BUILD.bazel index 41a098579818..b1e3b7fba89a 100644 --- a/contrib/googletest/BUILD.bazel +++ b/contrib/googletest/BUILD.bazel @@ -28,22 +28,40 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Author: misterg@google.com (Gennadiy Civil) -# # Bazel Build for Google C++ Testing Framework(Google Test) package(default_visibility = ["//visibility:public"]) licenses(["notice"]) +exports_files(["LICENSE"]) + +config_setting( + name = "qnx", + constraint_values = ["@platforms//os:qnx"], +) + config_setting( name = "windows", - values = {"cpu": "x64_windows"}, + constraint_values = ["@platforms//os:windows"], +) + +config_setting( + name = "freebsd", + constraint_values = ["@platforms//os:freebsd"], ) config_setting( - name = "windows_msvc", - values = {"cpu": "x64_windows_msvc"}, + name = "openbsd", + constraint_values = ["@platforms//os:openbsd"], +) + +config_setting( + name = "msvc_compiler", + flag_values = { + "@bazel_tools//tools/cpp:compiler": "msvc-cl", + }, + visibility = [":__subpackages__"], ) config_setting( @@ -51,6 +69,13 @@ config_setting( values = {"define": "absl=1"}, ) +# Library that defines the FRIEND_TEST macro. +cc_library( + name = "gtest_prod", + hdrs = ["googletest/include/gtest/gtest_prod.h"], + includes = ["googletest/include"], +) + # Google Test including Google Mock cc_library( name = "gtest", @@ -73,21 +98,19 @@ cc_library( "googletest/include/gtest/*.h", "googlemock/include/gmock/*.h", ]), - copts = select( - { - ":windows": [], - ":windows_msvc": [], - "//conditions:default": ["-pthread"], - }, - ), - defines = select( - { - ":has_absl": [ - "GTEST_HAS_ABSL=1", - ], - "//conditions:default": [], - }, - ), + copts = select({ + ":qnx": [], + ":windows": [], + "//conditions:default": ["-pthread"], + }), + defines = select({ + ":has_absl": ["GTEST_HAS_ABSL=1"], + "//conditions:default": [], + }), + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), includes = [ "googlemock", "googlemock/include", @@ -95,32 +118,45 @@ cc_library( "googletest/include", ], linkopts = select({ + ":qnx": ["-lregex"], ":windows": [], - ":windows_msvc": [], - "//conditions:default": [ + ":freebsd": [ + "-lm", "-pthread", ], + ":openbsd": [ + "-lm", + "-pthread", + ], + "//conditions:default": ["-pthread"], + }), + deps = select({ + ":has_absl": [ + "@com_google_absl//absl/container:flat_hash_set", + "@com_google_absl//absl/debugging:failure_signal_handler", + "@com_google_absl//absl/debugging:stacktrace", + "@com_google_absl//absl/debugging:symbolize", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/flags:parse", + "@com_google_absl//absl/flags:reflection", + "@com_google_absl//absl/flags:usage", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:any", + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", + "@com_googlesource_code_re2//:re2", + ], + "//conditions:default": [], }), - deps = select( - { - ":has_absl": [ - "@com_google_absl//absl/debugging:failure_signal_handler", - "@com_google_absl//absl/debugging:stacktrace", - "@com_google_absl//absl/debugging:symbolize", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - ], - "//conditions:default": [], - }, - ), ) cc_library( name = "gtest_main", - srcs = [ - "googlemock/src/gmock_main.cc", - ], + srcs = ["googlemock/src/gmock_main.cc"], + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), deps = [":gtest"], ) @@ -139,14 +175,18 @@ cc_library( "googletest/samples/sample3-inl.h", "googletest/samples/sample4.h", ], + features = select({ + ":windows": ["windows_export_all_symbols"], + "//conditions:default": [], + }), ) cc_test( name = "gtest_samples", size = "small", - #All Samples except: - #sample9 ( main ) - #sample10 (main and takes a command line option and needs to be separate) + # All Samples except: + # sample9 (main) + # sample10 (main and takes a command line option and needs to be separate) srcs = [ "googletest/samples/sample1_unittest.cc", "googletest/samples/sample2_unittest.cc", @@ -157,6 +197,7 @@ cc_test( "googletest/samples/sample7_unittest.cc", "googletest/samples/sample8_unittest.cc", ], + linkstatic = 0, deps = [ "gtest_sample_lib", ":gtest_main", @@ -174,7 +215,5 @@ cc_test( name = "sample10_unittest", size = "small", srcs = ["googletest/samples/sample10_unittest.cc"], - deps = [ - ":gtest", - ], + deps = [":gtest"], ) diff --git a/contrib/googletest/CMakeLists.txt b/contrib/googletest/CMakeLists.txt index d77321165aeb..089ac987fb60 100644 --- a/contrib/googletest/CMakeLists.txt +++ b/contrib/googletest/CMakeLists.txt @@ -1,11 +1,14 @@ -cmake_minimum_required(VERSION 2.8.8) +# Note: CMake support is community-based. The maintainers do not use CMake +# internally. -if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) -endif (POLICY CMP0048) +cmake_minimum_required(VERSION 3.13) project(googletest-distribution) -set(GOOGLETEST_VERSION 1.9.0) +set(GOOGLETEST_VERSION 1.14.0) + +if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX) + set(CMAKE_CXX_EXTENSIONS OFF) +endif() enable_testing() @@ -15,6 +18,7 @@ include(GNUInstallDirs) #Note that googlemock target already builds googletest option(BUILD_GMOCK "Builds the googlemock subproject" ON) option(INSTALL_GTEST "Enable installation of googletest. (Projects embedding googletest may want to turn this OFF.)" ON) +option(GTEST_HAS_ABSL "Use Abseil and RE2. Requires Abseil and RE2 to be separately added to the build." OFF) if(BUILD_GMOCK) add_subdirectory( googlemock ) diff --git a/contrib/googletest/CONTRIBUTING.md b/contrib/googletest/CONTRIBUTING.md index 846dd8abfb1c..8bed14b2666d 100644 --- a/contrib/googletest/CONTRIBUTING.md +++ b/contrib/googletest/CONTRIBUTING.md @@ -2,16 +2,16 @@ ## Contributor License Agreements -We'd love to accept your patches! Before we can take them, we -have to jump a couple of legal hurdles. +We'd love to accept your patches! Before we can take them, we have to jump a +couple of legal hurdles. Please fill out either the individual or corporate Contributor License Agreement (CLA). - * If you are an individual writing original source code and you're sure you +* If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](https://developers.google.com/open-source/cla/individual). - * If you work for a company that wants to allow you to contribute your work, +* If you work for a company that wants to allow you to contribute your work, then you'll need to sign a [corporate CLA](https://developers.google.com/open-source/cla/corporate). @@ -20,141 +20,122 @@ instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests. ## Are you a Googler? -If you are a Googler, you can either create an internal change or work on GitHub directly. +If you are a Googler, please make an attempt to submit an internal contribution +rather than a GitHub Pull Request. If you are not able to submit internally, a +PR is acceptable as an alternative. ## Contributing A Patch -1. Submit an issue describing your proposed change to the - [issue tracker](https://github.com/google/googletest). -1. Please don't mix more than one logical change per submittal, - because it makes the history hard to follow. If you want to make a - change that doesn't have a corresponding issue in the issue - tracker, please create one. -1. Also, coordinate with team members that are listed on the issue in - question. This ensures that work isn't being duplicated and - communicating your plan early also generally leads to better - patches. -1. If your proposed change is accepted, and you haven't already done so, sign a - Contributor License Agreement (see details above). -1. Fork the desired repo, develop and test your code changes. -1. Ensure that your code adheres to the existing style in the sample to which - you are contributing. -1. Ensure that your code has an appropriate set of unit tests which all pass. -1. Submit a pull request. - -## The Google Test and Google Mock Communities ## +1. Submit an issue describing your proposed change to the + [issue tracker](https://github.com/google/googletest/issues). +2. Please don't mix more than one logical change per submittal, because it + makes the history hard to follow. If you want to make a change that doesn't + have a corresponding issue in the issue tracker, please create one. +3. Also, coordinate with team members that are listed on the issue in question. + This ensures that work isn't being duplicated and communicating your plan + early also generally leads to better patches. +4. If your proposed change is accepted, and you haven't already done so, sign a + Contributor License Agreement + ([see details above](#contributor-license-agreements)). +5. Fork the desired repo, develop and test your code changes. +6. Ensure that your code adheres to the existing style in the sample to which + you are contributing. +7. Ensure that your code has an appropriate set of unit tests which all pass. +8. Submit a pull request. + +## The Google Test and Google Mock Communities The Google Test community exists primarily through the -[discussion group](http://groups.google.com/group/googletestframework) -and the GitHub repository. -Likewise, the Google Mock community exists primarily through their own -[discussion group](http://groups.google.com/group/googlemock). -You are definitely encouraged to contribute to the -discussion and you can also help us to keep the effectiveness of the -group high by following and promoting the guidelines listed here. - -### Please Be Friendly ### - -Showing courtesy and respect to others is a vital part of the Google -culture, and we strongly encourage everyone participating in Google -Test development to join us in accepting nothing less. Of course, -being courteous is not the same as failing to constructively disagree -with each other, but it does mean that we should be respectful of each -other when enumerating the 42 technical reasons that a particular *** 162876 LINES SKIPPED *** From nobody Thu Aug 10 02:32:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLrYk4mDYz4ptW9; Thu, 10 Aug 2023 02:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLrYk41w3z3DvM; Thu, 10 Aug 2023 02:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691634762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUadA0gnBMFS/s1ej6rV0f1gf+vcYWQOqiqyzyCU+hk=; b=Sfr15I/LyHEjl2lC1HJvcfolqUPMhjdebMGCIo+pQiFpVt1aPmjgmRZHFVZfYNmvU1P2X9 YhkXMWiY5HaaF2MU8dQv1Ep7dx1fB7Raxhjl7ffyzx6TPTsJW2HN8iry5+p/oL1rPfiZyT 5pQCfeP9ZNVjAJ4AT/4eN35AY1mH8q6PEms4GpFck6k5IuxcUex2Cqb3ob07GZjyrbeajn pXHhTHWi98WydvsLY4F7P7lckYErYGC3sryL/jiRvm59JSVeDPPOWLHEHNRDaFPNLK9HkY 6KTXwyZtsVZuK/sN48/mfQloadDksnWWl2Yh45qRkMJyoBNEgDOceispenWpuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691634762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dUadA0gnBMFS/s1ej6rV0f1gf+vcYWQOqiqyzyCU+hk=; b=ZY6sLwya/t1/6nCCdW+o6nnUMOGSbeGzN2PhDmjlxSYITZDZBl1uLtKD7ljjgOaedsrivw AD0lUD5nkjrvmmN8Q0GDfnquzzGBLgJ0u82Rm5T2fVef7qiK9XjMFwtJsTPh9a+1br6lrL 1CV6feqCBm5NF5Guc0e/OvMiGVGI0dWjdWLQNgjS9q2kdO+ktXe9cikhwJoyl3wZY6x3Gs HLWJjZHOp0BozLqy0tC2R7SdF0OOvbVhmBkZopnvWZQOwP25s+23Zu77W+Dm0Bp5y1WJZ+ qrtjf5doqF/94eiGIWYxETGsgJHl35Bm1rWbAWu/S9ukZLGw3KbmR+xaQ/nzfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691634762; a=rsa-sha256; cv=none; b=VkdMo08CtbwSu4uFF2xIiGUPeCxGu0xdXUsClbQs4YAq5PJsBqQpEcu3h17aY4rlsanu/Q Sg5Lfv/mRxfc3gTD5eAZKjDV2kPp5TfwFiIyL1ovPI8ZVGNkhD6vZ5HLvtSyY2++TRehoO IjQqWRc8hMuooD43lq1bXcquFZybHizCx6uZE59jRSoas5BC/K4zM7D2qc9twmZBWmMImn tRBFcIr9nT6VFaBj5MJnWfMG14DaiaowoFU+UTqQ0yH0yVlvY8ohKceXGdfLgfdoNB50A/ FMhdqxw6bthZAo6fgA3z4Y2t1Yae47mGVWC1lFOZ0gKHpvb3st4trj0rzpXifg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLrYk24fDzgP5; Thu, 10 Aug 2023 02:32:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37A2Wgup040493; Thu, 10 Aug 2023 02:32:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2WgNG040490; Thu, 10 Aug 2023 02:32:42 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:32:42 GMT Message-Id: <202308100232.37A2WgNG040490@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: 811e0a31acaf - main - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=811e0a31acafd6ab21f89bec8ba0fb8c09f258d2 commit 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2 Author: Enji Cooper AuthorDate: 2023-08-08 13:42:07 +0000 Commit: Enji Cooper CommitDate: 2023-08-10 09:32:33 +0000 fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 `INSTANTIATE_TEST_CASE_P` has been replaced with `INSTANTIATE_TEST_SUITE_P`. Replace all uses of the former macro with the latter macro. While here, address the fact that the latter macro doesn't permit some of the constructions that the former macro did, e.g., empty parameters, etc. MFC after: 2 weeks Reviewed by: asomers Differential Revision: https://reviews.freebsd.org/D41398 --- tests/sys/fs/fusefs/bmap.cc | 2 +- tests/sys/fs/fusefs/cache.cc | 2 +- tests/sys/fs/fusefs/dev_fuse_poll.cc | 2 +- tests/sys/fs/fusefs/fallocate.cc | 4 ++-- tests/sys/fs/fusefs/io.cc | 4 ++-- tests/sys/fs/fusefs/last_local_modify.cc | 2 +- tests/sys/fs/fusefs/mount.cc | 6 +++--- tests/sys/fs/fusefs/read.cc | 4 ++-- tests/sys/fs/fusefs/write.cc | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc index 9d97d1c08ca5..3191ac657de9 100644 --- a/tests/sys/fs/fusefs/bmap.cc +++ b/tests/sys/fs/fusefs/bmap.cc @@ -253,6 +253,6 @@ TEST_P(BmapEof, eof) leak(fd); } -INSTANTIATE_TEST_CASE_P(BE, BmapEof, +INSTANTIATE_TEST_SUITE_P(BE, BmapEof, Values(1, 2, 3) ); diff --git a/tests/sys/fs/fusefs/cache.cc b/tests/sys/fs/fusefs/cache.cc index cf9476a0a853..429b54c7ba75 100644 --- a/tests/sys/fs/fusefs/cache.cc +++ b/tests/sys/fs/fusefs/cache.cc @@ -197,7 +197,7 @@ TEST_P(Cache, truncate_by_surprise_invalidates_cache) leak(fd); } -INSTANTIATE_TEST_CASE_P(Cache, Cache, +INSTANTIATE_TEST_SUITE_P(Cache, Cache, Combine( /* Test every combination that: * - does not cache at least one of entries and attrs diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_fuse_poll.cc index de1b9a6b5f3f..4777f9818c60 100644 --- a/tests/sys/fs/fusefs/dev_fuse_poll.cc +++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc @@ -98,7 +98,7 @@ TEST_P(DevFusePoll, destroy) m_mock->unmount(); } -INSTANTIATE_TEST_CASE_P(PM, DevFusePoll, +INSTANTIATE_TEST_SUITE_P(PM, DevFusePoll, ::testing::Values("BLOCKING", "KQ", "POLL", "SELECT")); static void* statter(void* arg) { diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc index d10abfba3807..166f9ca7ff3a 100644 --- a/tests/sys/fs/fusefs/fallocate.cc +++ b/tests/sys/fs/fusefs/fallocate.cc @@ -493,8 +493,8 @@ TEST_P(FspacectlCache, clears_cache) leak(fd); } -INSTANTIATE_TEST_CASE_P(FspacectlCache, FspacectlCache, - Values(Uncached, Writethrough, Writeback), +INSTANTIATE_TEST_SUITE_P(FspacectlCache, FspacectlCache, + Values(Uncached, Writethrough, Writeback) ); /* diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc index d08dea99ff47..fe3237d39c95 100644 --- a/tests/sys/fs/fusefs/io.cc +++ b/tests/sys/fs/fusefs/io.cc @@ -509,14 +509,14 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) close(m_test_fd); } -INSTANTIATE_TEST_CASE_P(Io, Io, +INSTANTIATE_TEST_SUITE_P(Io, Io, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ Values(Uncached, Writethrough, Writeback, WritebackAsync) ) ); -INSTANTIATE_TEST_CASE_P(Io, IoCacheable, +INSTANTIATE_TEST_SUITE_P(Io, IoCacheable, Combine(Bool(), /* async read */ Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ Values(Writethrough, Writeback, WritebackAsync) diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/last_local_modify.cc index dd0d9c740355..537187a6bfb7 100644 --- a/tests/sys/fs/fusefs/last_local_modify.cc +++ b/tests/sys/fs/fusefs/last_local_modify.cc @@ -506,7 +506,7 @@ TEST_P(LastLocalModify, vfs_vget) } -INSTANTIATE_TEST_CASE_P(LLM, LastLocalModify, +INSTANTIATE_TEST_SUITE_P(LLM, LastLocalModify, Values( "VOP_ALLOCATE", "VOP_COPY_FILE_RANGE", diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc index 06ebe7fedebc..db06068e4eb8 100644 --- a/tests/sys/fs/fusefs/mount.cc +++ b/tests/sys/fs/fusefs/mount.cc @@ -192,11 +192,11 @@ TEST_P(UpdateErr, update) EXPECT_TRUE((newflags ^ statbuf.f_flags) & flag); } -INSTANTIATE_TEST_CASE_P(Mount, UpdateOk, +INSTANTIATE_TEST_SUITE_P(Mount, UpdateOk, ::testing::Values("MNT_RDONLY", "MNT_NOEXEC", "MNT_NOSUID", "MNT_NOATIME", "MNT_SUIDDIR") ); -INSTANTIATE_TEST_CASE_P(Mount, UpdateErr, - ::testing::Values( "MNT_USER"); +INSTANTIATE_TEST_SUITE_P(Mount, UpdateErr, + ::testing::Values( "MNT_USER") ); diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc index f1f485d0b736..72e09d355ad3 100644 --- a/tests/sys/fs/fusefs/read.cc +++ b/tests/sys/fs/fusefs/read.cc @@ -1314,7 +1314,7 @@ TEST_P(ReadAhead, readahead) { free(contents); } -INSTANTIATE_TEST_CASE_P(RA, ReadAhead, +INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, Values(tuple(false, 0), tuple(false, 1), tuple(false, 2), @@ -1362,4 +1362,4 @@ TEST_P(TimeGran, atime_during_setattr) leak(fd); } -INSTANTIATE_TEST_CASE_P(TG, TimeGran, Range(0u, 10u)); +INSTANTIATE_TEST_SUITE_P(TG, TimeGran, Range(0u, 10u)); diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc index a217e285a76b..c8cb7d08f474 100644 --- a/tests/sys/fs/fusefs/write.cc +++ b/tests/sys/fs/fusefs/write.cc @@ -616,7 +616,7 @@ TEST_P(WriteRlimitFsize, rlimit_fsize_truncate) leak(fd); } -INSTANTIATE_TEST_CASE_P(W, WriteRlimitFsize, +INSTANTIATE_TEST_SUITE_P(W, WriteRlimitFsize, Values(0, O_DIRECT) ); @@ -724,7 +724,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strategy) } -INSTANTIATE_TEST_CASE_P(W, WriteEofDuringVnopStrategy, +INSTANTIATE_TEST_SUITE_P(W, WriteEofDuringVnopStrategy, Values(1, 2, 3) ); @@ -1546,7 +1546,7 @@ TEST_P(TimeGran, timestamps_during_setattr) leak(fd); } -INSTANTIATE_TEST_CASE_P(RA, TimeGran, Range(0u, 10u)); +INSTANTIATE_TEST_SUITE_P(RA, TimeGran, Range(0u, 10u)); /* * Without direct_io, writes should be committed to cache From nobody Thu Aug 10 02:58:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7S6WGfz4pvvY; Thu, 10 Aug 2023 02:58: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 4RLs7S5bHfz3HqP; Thu, 10 Aug 2023 02:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+9EQpp7U5lgo7UV39yobi+O9E97hxAI06Jf3K7WlYE=; b=wqoryHRcDtEFmTTG15ikHZhQB81NGYP1kjHMOv3N8XRcFR1Gv3VFRSflvaNJre7L+xEFrB /ebDmhlxO3N/zIbiOu4uIN3BQ++XRHQ+z+SE5MblBpPKq+UoJcBScu7qPw2X9DUn6QZE2l ZqUlyZ4YBpJsklxvCIsJafni9f+8aRN+TAeDPI//DS28VPVrZulrefJ5ImrHfw4NkCrW7u gefzg5CtZqXIdqkERbSqHzZ7K6K+wot8hT2YD0T7Gi06ZSpwmmMeQXBIrhKhFri7et7zrZ 47VQDT+QlHsKK39K7zU/FGYRA6jmKS70sh0ANU5/UWP6Dlca0K9t7UO67JUY8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n+9EQpp7U5lgo7UV39yobi+O9E97hxAI06Jf3K7WlYE=; b=BXHL4NwVB8kA4/PZzyjX/6anx8XssIwwo+7pa8txKNuCokxgQDTuprVlc1DJ8uj2fjCWqg +lLUKVjjrklmESd22YrukMtHYXhgqvfX2hjji3s3HUXC5rKCnVh6EJ41CzCil4ndw6tMF1 k4uVlNP2IQt/QwBMLC5fYBrEcN38JzbKhIQJxZdLTc7Ifom6+6tpSyugBxhkozQQ/JCW7K UX/d/lTElVtK6lHGUMR2HJwhFYB1hnUS9tnHIj8pk5s9DZ0vc+29Z6bEcUG31TDdMPVQlM 4ZtGpLymh6wiP+zgUzIgysmprBAsfRazVt+1ZQqvvdT95KJSUw21hP/JgbvA3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636308; a=rsa-sha256; cv=none; b=AeDzxE0gV9EiQ0FMMKwLaw1OH/xpEtuxAa4hljhQ2cAfAYiR7clejWGvRROXKNEMuLkYiW TUbLu4Ac1bZArJq7efL6EDkWLeUqOvTkaseqX2VH+oiYjXB+OGXipc9g1rmUomOvMDdf7v M8lroHhiU0T4NPBb1mQmRhsrN+XFSnigDksBQWCloOeZkMwZenjuVHrsFUqJqq0eIyy6WE BClXpuzh4KXA9c2clbNxui3cAdfxLs6jb7oP41IKPMYYD/0Qo0U7NZggaR6fips1PXqMSJ jp5gd04KiSLitPuoEKP/7UYREF/i7L5bs5ZqXqzCBU9tuVq3mrVGBnH2CRgKbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7S4RN3zgjc; Thu, 10 Aug 2023 02:58: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 37A2wST0074239; Thu, 10 Aug 2023 02:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wSqK074236; Thu, 10 Aug 2023 02:58:28 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:28 GMT Message-Id: <202308100258.37A2wSqK074236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1d488ee57aa1 - stable/13 - Cleanup debugging code in libm List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1d488ee57aa193bb10337972c9ced440017806de Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d488ee57aa193bb10337972c9ced440017806de commit 1d488ee57aa193bb10337972c9ced440017806de Author: Steve Kargl AuthorDate: 2023-07-31 22:32:54 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 Cleanup debugging code in libm PR: 272765 (cherry picked from commit c66a499e037efd268a744e487e7d0c45a4944a9b) --- lib/msun/ld128/s_expl.c | 28 +++++------ lib/msun/ld128/s_logl.c | 24 ++++----- lib/msun/ld80/s_expl.c | 28 +++++------ lib/msun/ld80/s_logl.c | 26 +++++----- lib/msun/src/math_private.h | 115 ++------------------------------------------ 5 files changed, 49 insertions(+), 172 deletions(-) diff --git a/lib/msun/ld128/s_expl.c b/lib/msun/ld128/s_expl.c index 5fc43802b950..0274a8f302db 100644 --- a/lib/msun/ld128/s_expl.c +++ b/lib/msun/ld128/s_expl.c @@ -65,8 +65,6 @@ expl(long double x) int k; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -74,15 +72,15 @@ expl(long double x) if (ix >= BIAS + 13) { /* |x| >= 8192 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf or -NaN */ - RETURNP(-1 / x); - RETURNP(x + x); /* x is +Inf or +NaN */ + RETURNF(-1 / x); + RETURNF(x + x); /* x is +Inf or +NaN */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); if (x < u_threshold) - RETURNP(tiny * tiny); + RETURNF(tiny * tiny); } else if (ix < BIAS - 114) { /* |x| < 0x1p-114 */ - RETURN2P(1, x); /* 1 with inexact iff x != 0 */ + RETURNF(1 + x); /* 1 with inexact iff x != 0 */ } ENTERI(); @@ -210,8 +208,6 @@ expm1l(long double x) int k, n, n2; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -219,11 +215,11 @@ expm1l(long double x) if (ix >= BIAS + 7) { /* |x| >= 128 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf or -NaN */ - RETURNP(-1 / x - 1); - RETURNP(x + x); /* x is +Inf or +NaN */ + RETURNF(-1 / x - 1); + RETURNF(x + x); /* x is +Inf or +NaN */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); /* * expm1l() never underflows, but it must avoid * unrepresentable large negative exponents. We used a @@ -232,7 +228,7 @@ expm1l(long double x) * in the same way as large ones here. */ if (hx & 0x8000) /* x <= -128 */ - RETURN2P(tiny, -1); /* good for x < -114ln2 - eps */ + RETURNF(tiny - 1); /* good for x < -114ln2 - eps */ } ENTERI(); @@ -244,7 +240,7 @@ expm1l(long double x) if (x < T3) { if (ix < BIAS - 113) { /* |x| < 0x1p-113 */ /* x (rounded) with inexact if x != 0: */ - RETURNPI(x == 0 ? x : + RETURNI(x == 0 ? x : (0x1p200 * x + fabsl(x)) * 0x1p-200); } q = x * x2 * C3 + x2 * x2 * (C4 + x * (C5 + x * (C6 + @@ -265,9 +261,9 @@ expm1l(long double x) hx2_hi = x_hi * x_hi / 2; hx2_lo = x_lo * (x + x_hi) / 2; if (ix >= BIAS - 7) - RETURN2PI(hx2_hi + x_hi, hx2_lo + x_lo + q); + RETURNI((hx2_hi + x_hi) + (hx2_lo + x_lo + q)); else - RETURN2PI(x, hx2_lo + q + hx2_hi); + RETURNI(x + (hx2_lo + q + hx2_hi)); } /* Reduce x to (k*ln2 + endpoint[n2] + r1 + r2). */ diff --git a/lib/msun/ld128/s_logl.c b/lib/msun/ld128/s_logl.c index 40a22c0f1a8c..bc538840a760 100644 --- a/lib/msun/ld128/s_logl.c +++ b/lib/msun/ld128/s_logl.c @@ -573,24 +573,23 @@ log1pl(long double x) int i, k; int16_t ax, hx; - DOPRINT_START(&x); EXTRACT_LDBL128_WORDS(hx, lx, llx, x); if (hx < 0x3fff) { /* x < 1, or x neg NaN */ ax = hx & 0x7fff; if (ax >= 0x3fff) { /* x <= -1, or x neg NaN */ if (ax == 0x3fff && (lx | llx) == 0) - RETURNP(-1 / zero); /* log1p(-1) = -Inf */ + RETURNF(-1 / zero); /* log1p(-1) = -Inf */ /* log1p(x < 1, or x NaN) = qNaN: */ - RETURNP((x - x) / (x - x)); + RETURNF((x - x) / (x - x)); } if (ax <= 0x3f8d) { /* |x| < 2**-113 */ if ((int)x == 0) - RETURNP(x); /* x with inexact if x != 0 */ + RETURNF(x); /* x with inexact if x != 0 */ } f_hi = 1; f_lo = x; } else if (hx >= 0x7fff) { /* x +Inf or non-neg NaN */ - RETURNP(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ + RETURNF(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ } else if (hx < 0x40e1) { /* 1 <= x < 2**226 */ f_hi = x; f_lo = 1; @@ -669,7 +668,7 @@ log1pl(long double x) #endif _3sumF(val_hi, val_lo, F_hi(i) + dk * ln2_hi); - RETURN2PI(val_hi, val_lo); + RETURNI(val_hi + val_lo); } #ifdef STRUCT_RETURN @@ -680,7 +679,6 @@ logl(long double x) struct ld r; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); RETURNSPI(&r); } @@ -708,15 +706,13 @@ log10l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln10_hi * hi, - invln10_lo_plus_hi * lo + invln10_lo * hi); + RETURNI(invln10_hi * hi + (invln10_lo_plus_hi * lo + invln10_lo * hi)); } long double @@ -726,15 +722,13 @@ log2l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln2_hi * hi, - invln2_lo_plus_hi * lo + invln2_lo * hi); + RETURNI(invln2_hi * hi + (invln2_lo_plus_hi * lo + invln2_lo * hi)); } #endif /* STRUCT_RETURN */ diff --git a/lib/msun/ld80/s_expl.c b/lib/msun/ld80/s_expl.c index 0571377a3f8d..a41de4d6d1d8 100644 --- a/lib/msun/ld80/s_expl.c +++ b/lib/msun/ld80/s_expl.c @@ -77,8 +77,6 @@ expl(long double x) int k; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -86,15 +84,15 @@ expl(long double x) if (ix >= BIAS + 13) { /* |x| >= 8192 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf, -NaN or unsupported */ - RETURNP(-1 / x); - RETURNP(x + x); /* x is +Inf, +NaN or unsupported */ + RETURNF(-1 / x); + RETURNF(x + x); /* x is +Inf, +NaN or unsupported */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); if (x < u_threshold) - RETURNP(tiny * tiny); + RETURNF(tiny * tiny); } else if (ix < BIAS - 75) { /* |x| < 0x1p-75 (includes pseudos) */ - RETURN2P(1, x); /* 1 with inexact iff x != 0 */ + RETURNF(1 + x); /* 1 with inexact iff x != 0 */ } ENTERI(); @@ -168,8 +166,6 @@ expm1l(long double x) int k, n, n2; uint16_t hx, ix; - DOPRINT_START(&x); - /* Filter out exceptional cases. */ u.e = x; hx = u.xbits.expsign; @@ -177,11 +173,11 @@ expm1l(long double x) if (ix >= BIAS + 6) { /* |x| >= 64 or x is NaN */ if (ix == BIAS + LDBL_MAX_EXP) { if (hx & 0x8000) /* x is -Inf, -NaN or unsupported */ - RETURNP(-1 / x - 1); - RETURNP(x + x); /* x is +Inf, +NaN or unsupported */ + RETURNF(-1 / x - 1); + RETURNF(x + x); /* x is +Inf, +NaN or unsupported */ } if (x > o_threshold) - RETURNP(huge * huge); + RETURNF(huge * huge); /* * expm1l() never underflows, but it must avoid * unrepresentable large negative exponents. We used a @@ -190,7 +186,7 @@ expm1l(long double x) * in the same way as large ones here. */ if (hx & 0x8000) /* x <= -64 */ - RETURN2P(tiny, -1); /* good for x < -65ln2 - eps */ + RETURNF(tiny - 1); /* good for x < -65ln2 - eps */ } ENTERI(); @@ -198,7 +194,7 @@ expm1l(long double x) if (T1 < x && x < T2) { if (ix < BIAS - 74) { /* |x| < 0x1p-74 (includes pseudos) */ /* x (rounded) with inexact if x != 0: */ - RETURNPI(x == 0 ? x : + RETURNI(x == 0 ? x : (0x1p100 * x + fabsl(x)) * 0x1p-100); } @@ -219,9 +215,9 @@ expm1l(long double x) hx2_hi = x_hi * x_hi / 2; hx2_lo = x_lo * (x + x_hi) / 2; if (ix >= BIAS - 7) - RETURN2PI(hx2_hi + x_hi, hx2_lo + x_lo + q); + RETURNI((hx2_hi + x_hi) + (hx2_lo + x_lo + q)); else - RETURN2PI(x, hx2_lo + q + hx2_hi); + RETURNI(x + (hx2_lo + q + hx2_hi)); } /* Reduce x to (k*ln2 + endpoint[n2] + r1 + r2). */ diff --git a/lib/msun/ld80/s_logl.c b/lib/msun/ld80/s_logl.c index dac5bfb9e25e..abe778249549 100644 --- a/lib/msun/ld80/s_logl.c +++ b/lib/msun/ld80/s_logl.c @@ -560,24 +560,23 @@ log1pl(long double x) int i, k; int16_t ax, hx; - DOPRINT_START(&x); EXTRACT_LDBL80_WORDS(hx, lx, x); if (hx < 0x3fff) { /* x < 1, or x neg NaN */ ax = hx & 0x7fff; if (ax >= 0x3fff) { /* x <= -1, or x neg NaN */ if (ax == 0x3fff && lx == 0x8000000000000000ULL) - RETURNP(-1 / zero); /* log1p(-1) = -Inf */ + RETURNF(-1 / zero); /* log1p(-1) = -Inf */ /* log1p(x < 1, or x [pseudo-]NaN) = qNaN: */ - RETURNP((x - x) / (x - x)); + RETURNF((x - x) / (x - x)); } if (ax <= 0x3fbe) { /* |x| < 2**-64 */ if ((int)x == 0) - RETURNP(x); /* x with inexact if x != 0 */ + RETURNF(x); /* x with inexact if x != 0 */ } f_hi = 1; f_lo = x; } else if (hx >= 0x7fff) { /* x +Inf or non-neg NaN */ - RETURNP(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ + RETURNF(x + x); /* log1p(Inf or NaN) = Inf or qNaN */ /* log1p(pseudo-Inf) = qNaN */ /* log1p(pseudo-NaN) = qNaN */ /* log1p(unnormal) = qNaN */ @@ -658,7 +657,7 @@ log1pl(long double x) #endif _3sumF(val_hi, val_lo, F_hi(i) + dk * ln2_hi); - RETURN2PI(val_hi, val_lo); + RETURNI(val_hi + val_lo); } #ifdef STRUCT_RETURN @@ -669,7 +668,6 @@ logl(long double x) struct ld r; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); RETURNSPI(&r); } @@ -690,15 +688,14 @@ log10l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln10_hi * hi, - invln10_lo_plus_hi * lo + invln10_lo * hi); + RETURNI(invln10_hi * hi + + (invln10_lo_plus_hi * lo + invln10_lo * hi)); } long double @@ -708,15 +705,14 @@ log2l(long double x) long double hi, lo; ENTERI(); - DOPRINT_START(&x); k_logl(x, &r); if (!r.lo_set) - RETURNPI(r.hi); + RETURNI(r.hi); _2sumF(r.hi, r.lo); hi = (float)r.hi; lo = r.lo + (r.hi - hi); - RETURN2PI(invln2_hi * hi, - invln2_lo_plus_hi * lo + invln2_lo * hi); + RETURNI(invln2_hi * hi + + (invln2_lo_plus_hi * lo + invln2_lo * hi)); } #endif /* STRUCT_RETURN */ diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 33f790c13a6b..429b9c70b215 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -698,127 +698,22 @@ irintl(long double x) #endif #endif -/* Write a pari script to test things externally. */ -#ifdef DOPRINT -#include - -#ifndef DOPRINT_SWIZZLE -#define DOPRINT_SWIZZLE 0 -#endif - -#ifdef DOPRINT_LD80 - -#define DOPRINT_START(xp) do { \ - uint64_t __lx; \ - uint16_t __hx; \ - \ - /* Hack to give more-problematic args. */ \ - EXTRACT_LDBL80_WORDS(__hx, __lx, *xp); \ - __lx ^= DOPRINT_SWIZZLE; \ - INSERT_LDBL80_WORDS(*xp, __hx, __lx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#elif defined(DOPRINT_D64) - -#define DOPRINT_START(xp) do { \ - uint32_t __hx, __lx; \ - \ - EXTRACT_WORDS(__hx, __lx, *xp); \ - __lx ^= DOPRINT_SWIZZLE; \ - INSERT_WORDS(*xp, __hx, __lx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#elif defined(DOPRINT_F32) - -#define DOPRINT_START(xp) do { \ - uint32_t __hx; \ - \ - GET_FLOAT_WORD(__hx, *xp); \ - __hx ^= DOPRINT_SWIZZLE; \ - SET_FLOAT_WORD(*xp, __hx); \ - printf("x = %.21Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.21Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.21Lg; z = %.21Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#else /* !DOPRINT_LD80 && !DOPRINT_D64 (LD128 only) */ - -#ifndef DOPRINT_SWIZZLE_HIGH -#define DOPRINT_SWIZZLE_HIGH 0 -#endif - -#define DOPRINT_START(xp) do { \ - uint64_t __lx, __llx; \ - uint16_t __hx; \ - \ - EXTRACT_LDBL128_WORDS(__hx, __lx, __llx, *xp); \ - __llx ^= DOPRINT_SWIZZLE; \ - __lx ^= DOPRINT_SWIZZLE_HIGH; \ - INSERT_LDBL128_WORDS(*xp, __hx, __lx, __llx); \ - printf("x = %.36Lg; ", (long double)*xp); \ -} while (0) -#define DOPRINT_END1(v) \ - printf("y = %.36Lg; z = 0; show(x, y, z);\n", (long double)(v)) -#define DOPRINT_END2(hi, lo) \ - printf("y = %.36Lg; z = %.36Lg; show(x, y, z);\n", \ - (long double)(hi), (long double)(lo)) - -#endif /* DOPRINT_LD80 */ - -#else /* !DOPRINT */ -#define DOPRINT_START(xp) -#define DOPRINT_END1(v) -#define DOPRINT_END2(hi, lo) -#endif /* DOPRINT */ - -#define RETURNP(x) do { \ - DOPRINT_END1(x); \ - RETURNF(x); \ -} while (0) -#define RETURNPI(x) do { \ - DOPRINT_END1(x); \ - RETURNI(x); \ -} while (0) -#define RETURN2P(x, y) do { \ - DOPRINT_END2((x), (y)); \ - RETURNF((x) + (y)); \ -} while (0) -#define RETURN2PI(x, y) do { \ - DOPRINT_END2((x), (y)); \ - RETURNI((x) + (y)); \ -} while (0) #ifdef STRUCT_RETURN #define RETURNSP(rp) do { \ if (!(rp)->lo_set) \ - RETURNP((rp)->hi); \ - RETURN2P((rp)->hi, (rp)->lo); \ + RETURNF((rp)->hi); \ + RETURNF((rp)->hi + (rp)->lo); \ } while (0) #define RETURNSPI(rp) do { \ if (!(rp)->lo_set) \ - RETURNPI((rp)->hi); \ - RETURN2PI((rp)->hi, (rp)->lo); \ + RETURNI((rp)->hi); \ + RETURNI((rp)->hi + (rp)->lo); \ } while (0) #endif + #define SUM2P(x, y) ({ \ const __typeof (x) __x = (x); \ const __typeof (y) __y = (y); \ - \ - DOPRINT_END2(__x, __y); \ __x + __y; \ }) From nobody Thu Aug 10 02:58:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7V0W8Gz4pvvc; Thu, 10 Aug 2023 02:58: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 4RLs7T6cxxz3Hl9; Thu, 10 Aug 2023 02:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0r/6Osx9CjbBTJJT/iK6Vs5bLc5/2ZaRFRfXtz2Mjdo=; b=yCWnf0vE9oE+bIKVcbEK8xz/EfQ1SVVZqoAbI2aJp1sChsGU0J7PGyX7KtZhJjlBfxBtyH wbMJO/teO7HaloF/Y6umj53HdUIp+yKiMJaJHzA/LhE89j97uxbUdvZO3cCsIAV9EcSdC6 8dIdWbf5zKdOoifMMb07qnWwhsiLXpR5ZTQMBY1X2iOXunSuirr9O5jRqmnKcFFj6POhfg Xm7mPvQ9UZt3aeJFgLhaFd8pH98R0VpekfkOuunPp9pOQYAPk7jZmygivvrNW/wcGS3lH0 CMBMEeUP/gDffBn67CC51PW0CPpNJi471KA/8yMkipaOKJYLLwAxq3H6tx+1qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0r/6Osx9CjbBTJJT/iK6Vs5bLc5/2ZaRFRfXtz2Mjdo=; b=u6R1uqSmPzt3xgdm97ktVT8dVdC+k3hy8bNeAMnC6PIlBC76X9fDB2j462iqBMlzz0HnNk r22xq2HgDAgr+H4HhWbkpW/VMzU4WLalT4H7CtlvuyxU9MDL4G8YH+0Nlz332Vl+y3hX/I hpsTrtWbpXFV6X6iZnK9qaHJs+akE9ZaFIaBKdD6HaIAUlmdCrlK9WN7fSDqYyw4VM7YMo rcuWwkKmfM6+Dfs2WePsxptYG39YdgJ8njSizx2rKRLSxzOSLXodcrywB3QH63P5S9FtSB odl54vVDRImWSppBmxAJWcoPY43RYenUrDo22T5MDYmYdp960DOmhQhmhR6ViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636309; a=rsa-sha256; cv=none; b=XmQ3jwD+VKTIbYpsVIJ9+Wr4W6SSaAScJMqySFM+KDomV39ywzokCyA5TVyy748UotqtOO TlEcM4Cd9pSIa2ei7f9tecQSKWTb8cYxtLFESR6OeQ2mk0dAiRkhSnd1pAzdES2cFKmXkw 67erpafFhJmXw9N62QR7VrbVReGvTI854+CsTAImmCj2eziYCuQHDggm8WsBDo4QEC/ykf Xglc+snkRur46AU/75kER0xdDTuZf0tkpMzWSsIK+ERE1xiA4huFaIEG/in55NG6qDl9Xd Dxw6RRfjc4E/P42ScxB3AGg2MMmiklb8HrBZtKfyCwgCUsZM0kFWuoDxFNvCxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7T5Q39zgVd; Thu, 10 Aug 2023 02:58: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 37A2wTg5074282; Thu, 10 Aug 2023 02:58:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wThC074279; Thu, 10 Aug 2023 02:58:29 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:29 GMT Message-Id: <202308100258.37A2wThC074279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6fe5d4d8c3c7 - stable/13 - Fixes for bugs in sinpi/cospi/tanpi List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6fe5d4d8c3c7cf3a2a81f38300766a733029c763 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6fe5d4d8c3c7cf3a2a81f38300766a733029c763 commit 6fe5d4d8c3c7cf3a2a81f38300766a733029c763 Author: Steve Kargl AuthorDate: 2023-07-31 22:34:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 Fixes for bugs in sinpi/cospi/tanpi PR: 272742 (cherry picked from commit 2d3b0a687b910c84606e4bc36176945ad5c60406) --- lib/msun/ld128/s_cospil.c | 50 ++++++++++++++++++++---------------------- lib/msun/ld128/s_sinpil.c | 38 ++++++++++++-------------------- lib/msun/ld128/s_tanpil.c | 39 ++++++++++++++++----------------- lib/msun/ld80/s_cospil.c | 22 ++++++------------- lib/msun/ld80/s_sinpil.c | 16 +++----------- lib/msun/ld80/s_tanpil.c | 34 ++++++++++++----------------- lib/msun/src/math_private.h | 53 +++++++++++++++++++++++++++++++++++++++++++++ lib/msun/src/s_cospi.c | 20 +++++------------ lib/msun/src/s_cospif.c | 16 ++++++-------- lib/msun/src/s_sinpi.c | 13 ++--------- lib/msun/src/s_sinpif.c | 10 +++------ lib/msun/src/s_tanpi.c | 41 +++++++++++++++++------------------ lib/msun/src/s_tanpif.c | 24 ++++++++++---------- 13 files changed, 183 insertions(+), 193 deletions(-) diff --git a/lib/msun/ld128/s_cospil.c b/lib/msun/ld128/s_cospil.c index 71acc4485f7b..b21f879c3e84 100644 --- a/lib/msun/ld128/s_cospil.c +++ b/lib/msun/ld128/s_cospil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_cospi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -46,8 +47,7 @@ volatile static const double vzero = 0; long double cospil(long double x) { - long double ax, c, xf; - uint32_t ix; + long double ai, ar, ax, c; ax = fabsl(x); @@ -72,41 +72,37 @@ cospil(long double x) } if (ax < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); - if (ax < 0.5) { - if (ax < 0.25) - c = ax == 0 ? 1 : __kernel_cospil(ax); + if (ar < 0.5) { + if (ar < 0.25) + c = ar == 0 ? 1 : __kernel_cospil(ar); else - c = __kernel_sinpil(0.5 - ax); + c = __kernel_sinpil(0.5 - ar); } else { - if (ax < 0.75) { - if (ax == 0.5) + if (ar < 0.75) { + if (ar == 0.5) return (0); - c = -__kernel_sinpil(ax - 0.5); + c = -__kernel_sinpil(ar - 0.5); } else - c = -__kernel_cospil(1 - ax); + c = -__kernel_cospil(1 - ar); } - - if (xf > 0x1p64) - xf -= 0x1p64; - if (xf > 0x1p32) - xf -= 0x1p32; - ix = (uint32_t)xf; - return (ix & 1 ? -c : c); + return (fmodl(ai, 2.L) == 0 ? c : -c); } if (isinf(x) || isnan(x)) return (vzero / vzero); /* - * |x| >= 0x1p112 is always an even integer, so return 1. + * For |x| >= 0x1p113, it is always an even integer, so return 1. */ - return (1); + if (ax >= 0x1p113) + return (1); + /* + * For 0x1p112 <= |x| < 0x1p113 need to determine if x is an even + * or odd integer to return 1 or -1. + */ + + return (fmodl(ax, 2.L) == 0 ? 1 : -1); } diff --git a/lib/msun/ld128/s_sinpil.c b/lib/msun/ld128/s_sinpil.c index cdfa2bcac3ef..c8c205449557 100644 --- a/lib/msun/ld128/s_sinpil.c +++ b/lib/msun/ld128/s_sinpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_sinpi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -46,8 +47,7 @@ volatile static const double vzero = 0; long double sinpil(long double x) { - long double ax, hi, lo, s, xf, xhi, xlo; - uint32_t ix; + long double ai, ar, ax, hi, lo, s, xhi, xlo; ax = fabsl(x); @@ -78,35 +78,25 @@ sinpil(long double x) } if (ax < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); - if (ax == 0) { + if (ar == 0) { s = 0; } else { - if (ax < 0.5) { - if (ax <= 0.25) - s = __kernel_sinpil(ax); + if (ar < 0.5) { + if (ar <= 0.25) + s = __kernel_sinpil(ar); else - s = __kernel_cospil(0.5 - ax); + s = __kernel_cospil(0.5 - ar); } else { - if (ax < 0.75) - s = __kernel_cospil(ax - 0.5); + if (ar < 0.75) + s = __kernel_cospil(ar - 0.5); else - s = __kernel_sinpil(1 - ax); + s = __kernel_sinpil(1 - ar); } - if (xf > 0x1p64) - xf -= 0x1p64; - if (xf > 0x1p32) - xf -= 0x1p32; - ix = (uint32_t)xf; - if (ix & 1) s = -s; + s = fmodl(ai, 2.L) == 0 ? s : -s; } return (x < 0 ? -s : s); } diff --git a/lib/msun/ld128/s_tanpil.c b/lib/msun/ld128/s_tanpil.c index 90f4aea5c629..2d253bb9f478 100644 --- a/lib/msun/ld128/s_tanpil.c +++ b/lib/msun/ld128/s_tanpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017-2021 Steven G. Kargl + * Copyright (c) 2017-2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,6 +28,7 @@ * See ../src/s_tanpi.c for implementation details. */ +#include "fpmath.h" #include "math.h" #include "math_private.h" @@ -69,8 +70,8 @@ volatile static const double vzero = 0; long double tanpil(long double x) { - long double ax, hi, lo, xf, t; - uint32_t ix; + long double ai, ar, ax, hi, lo, t; + double odd; ax = fabsl(x); @@ -88,27 +89,22 @@ tanpil(long double x) } t = __kernel_tanpil(ax); } else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = -__kernel_tanpil(1 - ax); return (x < 0 ? -t : t); } - if (ix < 0x1p112) { - /* Split x = n + r with 0 <= r < 1. */ - xf = (ax + 0x1p112L) - 0x1p112L; /* Integer part */ - ax -= xf; /* Remainder */ - if (ax < 0) { - ax += 1; - xf -= 1; - } - - if (ax < 0.5) - t = ax == 0 ? 0 : __kernel_tanpil(ax); - else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + if (ax < 0x1p112) { + /* Split ax = ai + ar with 0 <= ar < 1. */ + FFLOORL128(ax, ai, ar); + odd = fmodl(ai, 2.L) == 0 ? 1 : -1; + if (ar < 0.5) + t = ar == 0 ? copysign(0., odd) : __kernel_tanpil(ar); + else if (ar == 0.5) + t = odd / vzero; else - t = -__kernel_tanpil(1 - ax); + t = -__kernel_tanpil(1 - ar); return (x < 0 ? -t : t); } @@ -117,7 +113,10 @@ tanpil(long double x) return (vzero / vzero); /* - * |x| >= 0x1p112 is always an integer, so return +-0. + * For 0x1p112 <= |x| < 0x1p113 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p113, it is always an even integer, so t = 0. */ - return (copysignl(0, x)); + t = fmodl(ax,2.L) == 0 ? 0 : copysign(0., -1.); + return (copysignl(t, x)); } diff --git a/lib/msun/ld80/s_cospil.c b/lib/msun/ld80/s_cospil.c index 199479e9eaf9..69620d2f2f33 100644 --- a/lib/msun/ld80/s_cospil.c +++ b/lib/msun/ld80/s_cospil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -80,18 +80,8 @@ cospil(long double x) RETURNI(c); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); @@ -123,7 +113,9 @@ cospil(long double x) RETURNI(vzero / vzero); /* - * |x| >= 0x1p63 is always an even integer, so return 1. + * For 0x1p63 <= |x| < 0x1p64 need to determine if x is an even + * or odd integer to return t = +1 or -1. + * For |x| >= 0x1p64, it is always an even integer, so t = 1. */ - RETURNI(1); + RETURNI(ix >= 0x403f ? 1 : ((lx & 1) ? -1 : 1)); } diff --git a/lib/msun/ld80/s_sinpil.c b/lib/msun/ld80/s_sinpil.c index 4cefa92352e1..7d9008f9e18f 100644 --- a/lib/msun/ld80/s_sinpil.c +++ b/lib/msun/ld80/s_sinpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -88,18 +88,8 @@ sinpil(long double x) RETURNI((hx & 0x8000) ? -s : s); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); diff --git a/lib/msun/ld80/s_tanpil.c b/lib/msun/ld80/s_tanpil.c index 02451e562025..2d640413af6c 100644 --- a/lib/msun/ld80/s_tanpil.c +++ b/lib/msun/ld80/s_tanpil.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -72,7 +72,7 @@ volatile static const double vzero = 0; long double tanpil(long double x) { - long double ax, hi, lo, t; + long double ax, hi, lo, odd, t; uint64_t lx, m; uint32_t j0; uint16_t hx, ix; @@ -98,31 +98,22 @@ tanpil(long double x) } t = __kernel_tanpil(ax); } else if (ax == 0.5) - RETURNI((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = -__kernel_tanpil(1 - ax); RETURNI((hx & 0x8000) ? -t : t); } - if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ - /* Determine integer part of ax. */ - j0 = ix - 0x3fff + 1; - if (j0 < 32) { - lx = (lx >> 32) << 32; - lx &= ~(((lx << 32)-1) >> j0); - } else { - m = (uint64_t)-1 >> (j0 + 1); - if (lx & m) lx &= ~m; - } - INSERT_LDBL80_WORDS(x, ix, lx); - + if (ix < 0x403e) { /* 1 <= |x| < 0x1p63 */ + FFLOORL80(x, j0, ix, lx); /* Integer part of ax. */ + odd = (uint64_t)x & 1 ? -1 : 1; ax -= x; EXTRACT_LDBL80_WORDS(ix, lx, ax); if (ix < 0x3ffe) /* |x| < 0.5 */ - t = ax == 0 ? 0 : __kernel_tanpil(ax); - else if (ax == 0.5) - RETURNI((ax - ax) / (ax - ax)); + t = ix == 0 ? copysignl(0, odd) : __kernel_tanpil(ax); + else if (ax == 0.5L) + t = odd / vzero; else t = -__kernel_tanpil(1 - ax); RETURNI((hx & 0x8000) ? -t : t); @@ -133,7 +124,10 @@ tanpil(long double x) RETURNI(vzero / vzero); /* - * |x| >= 0x1p63 is always an integer, so return +-0. + * For 0x1p63 <= |x| < 0x1p64 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p64, it is always an even integer, so t = 0. */ - RETURNI(copysignl(0, x)); + t = ix >= 0x403f ? 0 : (copysignl(0, (lx & 1) ? -1 : 1)); + RETURNI((hx & 0x8000) ? -t : t); } diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 429b9c70b215..814a05ebce67 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -688,6 +688,59 @@ irintl(long double x) } #endif +/* + * The following are fast floor macros for 0 <= |x| < 0x1p(N-1), where + * N is the precision of the type of x. These macros are used in the + * half-cycle trignometric functions (e.g., sinpi(x)). + */ +#define FFLOORF(x, j0, ix) do { \ + (j0) = (((ix) >> 23) & 0xff) - 0x7f; \ + (ix) &= ~(0x007fffff >> (j0)); \ + SET_FLOAT_WORD((x), (ix)); \ +} while (0) + +#define FFLOOR(x, j0, ix, lx) do { \ + (j0) = (((ix) >> 20) & 0x7ff) - 0x3ff; \ + if ((j0) < 20) { \ + (ix) &= ~(0x000fffff >> (j0)); \ + (lx) = 0; \ + } else { \ + (lx) &= ~((uint32_t)0xffffffff >> ((j0) - 20)); \ + } \ + INSERT_WORDS((x), (ix), (lx)); \ +} while (0) + +#define FFLOORL80(x, j0, ix, lx) do { \ + j0 = ix - 0x3fff + 1; \ + if ((j0) < 32) { \ + (lx) = ((lx) >> 32) << 32; \ + (lx) &= ~((((lx) << 32)-1) >> (j0)); \ + } else { \ + uint64_t _m; \ + _m = (uint64_t)-1 >> (j0); \ + if ((lx) & _m) (lx) &= ~_m; \ + } \ + INSERT_LDBL80_WORDS((x), (ix), (lx)); \ +} while (0) + +#define FFLOORL128(x, ai, ar) do { \ + union IEEEl2bits u; \ + uint64_t m; \ + int e; \ + u.e = (x); \ + e = u.bits.exp - 16383; \ + if (e < 48) { \ + m = ((1llu << 49) - 1) >> (e + 1); \ + u.bits.manh &= ~m; \ + u.bits.manl = 0; \ + } else { \ + m = (uint64_t)-1 >> (e - 48); \ + u.bits.manl &= ~m; \ + } \ + (ai) = u.e; \ + (ar) = (x) - (ai); \ +} while (0) + #ifdef DEBUG #if defined(__amd64__) || defined(__i386__) #define breakpoint() asm("int $3") diff --git a/lib/msun/src/s_cospi.c b/lib/msun/src/s_cospi.c index 2e2f92733a86..f97570dc8792 100644 --- a/lib/msun/src/s_cospi.c +++ b/lib/msun/src/s_cospi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,20 +104,10 @@ cospi(double x) } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~((uint32_t)0xffffffff >> (j0 - 20)); - } - INSERT_WORDS(x, ix, lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_WORDS(ix, lx, ax); - if (ix < 0x3fe00000) { /* |x| < 0.5 */ if (ix < 0x3fd00000) /* |x| < 0.25 */ c = ix == 0 ? 1 : __kernel_cospi(ax); @@ -143,9 +133,11 @@ cospi(double x) return (vzero / vzero); /* - * |x| >= 0x1p52 is always an even integer, so return 1. + * For 0x1p52 <= |x| < 0x1p53 need to determine if x is an even + * or odd integer to return +1 or -1. + * For |x| >= 0x1p53, it is always an even integer, so return 1. */ - return (1); + return (ix < 0x43400000 ? ((lx & 1) ? -1 : 1) : 1); } #if LDBL_MANT_DIG == 53 diff --git a/lib/msun/src/s_cospif.c b/lib/msun/src/s_cospif.c index 4dd881395baf..44d19f165025 100644 --- a/lib/msun/src/s_cospif.c +++ b/lib/msun/src/s_cospif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -71,12 +71,8 @@ cospif(float x) return (c); } - if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ + FFLOORF(x, j0, ix); /* Integer part of ax. */ ax -= x; GET_FLOAT_WORD(ix, ax); @@ -103,7 +99,9 @@ cospif(float x) return (vzero / vzero); /* - * |x| >= 0x1p23 is always an even integer, so return 1. + * For 0x1p23 <= |x| < 0x1p24 need to determine if x is an even + * or odd integer to return +1 or -1. + * For |x| >= 0x1p24, it is always an even integer, so return 1. */ - return (1); + return (ix < 0x4b800000 ? ((ix & 1) ? -1 : 1) : 1); } diff --git a/lib/msun/src/s_sinpi.c b/lib/msun/src/s_sinpi.c index bc3759e567a3..8b388de863c3 100644 --- a/lib/msun/src/s_sinpi.c +++ b/lib/msun/src/s_sinpi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -118,16 +118,7 @@ sinpi(double x) } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~((uint32_t)0xffffffff >> (j0 - 20)); - } - INSERT_WORDS(x, ix, lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ ax -= x; EXTRACT_WORDS(ix, lx, ax); diff --git a/lib/msun/src/s_sinpif.c b/lib/msun/src/s_sinpif.c index c9f76f8a2358..21082dee7d9c 100644 --- a/lib/msun/src/s_sinpif.c +++ b/lib/msun/src/s_sinpif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,12 +81,8 @@ sinpif(float x) return ((hx & 0x80000000) ? -s : s); } - if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ + FFLOORF(x, j0, ix); /* Integer part of ax. */ ax -= x; GET_FLOAT_WORD(ix, ax); diff --git a/lib/msun/src/s_tanpi.c b/lib/msun/src/s_tanpi.c index f911d56156b3..cd00adbcb86e 100644 --- a/lib/msun/src/s_tanpi.c +++ b/lib/msun/src/s_tanpi.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017, 2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,11 +56,15 @@ * 5. Special cases: * * tanpi(+-0) = +-0 - * tanpi(+-n) = +-0, for positive integers n. + * tanpi(n) = +0 for positive even and negative odd integer n. + * tanpi(n) = -0 for positive odd and negative even integer n. * tanpi(+-n+1/4) = +-1, for positive integers n. - * tanpi(+-n+1/2) = NaN, for positive integers n. - * tanpi(+-inf) = NaN. Raises the "invalid" floating-point exception. - * tanpi(nan) = NaN. Raises the "invalid" floating-point exception. + * tanpi(n+1/2) = +inf and raises the FE_DIVBYZERO exception for + * even integers n. + * tanpi(n+1/2) = -inf and raises the FE_DIVBYZERO exception for + * odd integers n. + * tanpi(+-inf) = NaN and raises the FE_INVALID exception. + * tanpi(nan) = NaN and raises the FE_INVALID exception. */ #include @@ -106,7 +110,7 @@ volatile static const double vzero = 0; double tanpi(double x) { - double ax, hi, lo, t; + double ax, hi, lo, odd, t; uint32_t hx, ix, j0, lx; EXTRACT_WORDS(hx, lx, x); @@ -132,30 +136,22 @@ tanpi(double x) } t = __kernel_tanpi(ax); } else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = - __kernel_tanpi(1 - ax); return ((hx & 0x80000000) ? -t : t); } if (ix < 0x43300000) { /* 1 <= |x| < 0x1p52 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 20) & 0x7ff) - 0x3ff; - if (j0 < 20) { - ix &= ~(0x000fffff >> j0); - lx = 0; - } else { - lx &= ~(((uint32_t)(0xffffffff)) >> (j0 - 20)); - } - INSERT_WORDS(x,ix,lx); - + FFLOOR(x, j0, ix, lx); /* Integer part of ax. */ + odd = (uint64_t)x & 1 ? -1 : 1; ax -= x; EXTRACT_WORDS(ix, lx, ax); if (ix < 0x3fe00000) /* |x| < 0.5 */ - t = ax == 0 ? 0 : __kernel_tanpi(ax); + t = ix == 0 ? copysign(0, odd) : __kernel_tanpi(ax); else if (ax == 0.5) - return ((ax - ax) / (ax - ax)); + t = odd / vzero; else t = - __kernel_tanpi(1 - ax); @@ -167,9 +163,12 @@ tanpi(double x) return (vzero / vzero); /* - * |x| >= 0x1p52 is always an integer, so return +-0. + * For 0x1p52 <= |x| < 0x1p53 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p54, it is always an even integer, so t = 0. */ - return (copysign(0, x)); + t = ix >= 0x43400000 ? 0 : (copysign(0, (lx & 1) ? -1 : 1)); + return ((hx & 0x80000000) ? -t : t); } #if LDBL_MANT_DIG == 53 diff --git a/lib/msun/src/s_tanpif.c b/lib/msun/src/s_tanpif.c index 6d4b627d1cf9..12dd8f838976 100644 --- a/lib/msun/src/s_tanpif.c +++ b/lib/msun/src/s_tanpif.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2017 Steven G. Kargl + * Copyright (c) 2017,2023 Steven G. Kargl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -58,7 +58,7 @@ volatile static const float vzero = 0; float tanpif(float x) { - float ax, hi, lo, t; + float ax, hi, lo, odd, t; uint32_t hx, ix, j0; GET_FLOAT_WORD(hx, x); @@ -79,25 +79,22 @@ tanpif(float x) } t = __kernel_tanpif(ax); } else if (ix == 0x3f000000) - return ((ax - ax) / (ax - ax)); + t = 1 / vzero; else t = - __kernel_tanpif(1 - ax); return ((hx & 0x80000000) ? -t : t); } if (ix < 0x4b000000) { /* 1 <= |x| < 0x1p23 */ - /* Determine integer part of ax. */ - j0 = ((ix >> 23) & 0xff) - 0x7f; - ix &= ~(0x007fffff >> j0); - SET_FLOAT_WORD(x, ix); - + FFLOORF(x, j0, ix); /* Integer part of ax. */ + odd = (uint32_t)x & 1 ? -1 : 1; ax -= x; GET_FLOAT_WORD(ix, ax); if (ix < 0x3f000000) /* |x| < 0.5 */ - t = ix == 0 ? 0 : __kernel_tanpif(ax); + t = ix == 0 ? copysignf(0, odd) : __kernel_tanpif(ax); else if (ix == 0x3f000000) - return ((ax - ax) / (ax - ax)); + t = odd / vzero; else t = - __kernel_tanpif(1 - ax); return ((hx & 0x80000000) ? -t : t); @@ -108,7 +105,10 @@ tanpif(float x) return (vzero / vzero); /* - * |x| >= 0x1p23 is always an integer, so return +-0. + * For 0x1p23 <= |x| < 0x1p24 need to determine if x is an even + * or odd integer to set t = +0 or -0. + * For |x| >= 0x1p24, it is always an even integer, so t = 0. */ - return (copysignf(0, x)); + t = ix >= 0x4b800000 ? 0 : (copysignf(0, (ix & 1) ? -1 : 1)); + return ((hx & 0x80000000) ? -t : t); } From nobody Thu Aug 10 02:58:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7W21Bsz4pvsZ; Thu, 10 Aug 2023 02:58: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 4RLs7W0YMXz3J2P; Thu, 10 Aug 2023 02:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gT0VRHDzh65//d3ESifFa6kDf3uot0DllfVdOC2I3V0=; b=raAfXcCxJl7BSVIjyiIpixd0sTRtm8dz+BXCxlKa/7UMqb3PIox4l6jKJhGvkgafK2a9MP gFYSYtgqqPDJyDmhAPT+UUnlJCOwuRC70/U4TiwCW1hk/oOj4K/hkMWpGYGkRy4WGhK2+3 rGs3QErv38LesHyzzEVsjndA0ThK31W7LvhTGW784esp0YrOxNn0QGJt3B+9LtwPw69k8c tLG+x9vWJim1fMkeYZANcJoGWoOiDwMuOBuRJwTw9sjmpMoDlVSDN2p/I5Tkgv0aTvuouM C35bfEij/KfHhcuu8LMhCGw94YyY0pZNW79YI2Arex/wECKhAZeVkpJbJftKXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gT0VRHDzh65//d3ESifFa6kDf3uot0DllfVdOC2I3V0=; b=Zc/2P9uW2RX7t/1zFewn1h851z1gDWpc2R0ICo7yrZKyf1AJulSN5qwoORCLLscG6KyKmv Gv0IWggmL0nlSNQ876O43GkWH2PggLyBcq6xHJ6HAxI1vDiCQs7YhznsioZfPDlkIEBH1z xN09VTyipecbWDL2lK/OLnyYH1az46+fIHcCOMw5lyCxEPou/ho15P/cct3SLEA9KjqAs6 lwN5XdUBissvZH6RLMhw5ZJ7dLMUwr5l9OcEytRQYpKyoY72qGRrNouG1zY+N0TeNpLDtA Luabs6kB6RPtdKwgpn2SSc6mrnAHgvmDCu5sENw9KiI8e88s+UWFynAoC85JrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636311; a=rsa-sha256; cv=none; b=BEax1SRVnyvi/5vfod/JM4rLOS7d2N5rNcudXYga7YUfTKBteG4dSM7J+qeJjvR9WDE16d eebEi5SBWNAstInSzRvgZVjZoXB4YHBGZ5wJXjDRBsEy3oV79R5dxw2TaP5cVm+g+O27kG 12t8PhwmzOb6TOOVXSAAbEhg+4rBXFyou8kd2d8yYbHxwVwWBayxHFdmvE1a6aGxm1pqSt bLa9ZcYF1EB4/VUBjrTy7hKwl8+HGFFR5eLibIkSSNUtF+7/Lnex7NgyZM4IdgP2fIbgDo Es4pVA+jimEc2pYglh8csotGOIlssmFmu8vPSlGOuGxqHOBbgC8etTTG5Rj/7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7V6SK8zgx8; Thu, 10 Aug 2023 02:58: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 37A2wUls074333; Thu, 10 Aug 2023 02:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wU11074330; Thu, 10 Aug 2023 02:58:30 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:30 GMT Message-Id: <202308100258.37A2wU11074330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6c20cf96ac0e - stable/13 - libibverbs: remove nonexistent symbols from the linker map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6c20cf96ac0e101a7e5b845fd02509fd26231de4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6c20cf96ac0e101a7e5b845fd02509fd26231de4 commit 6c20cf96ac0e101a7e5b845fd02509fd26231de4 Author: Konstantin Belousov AuthorDate: 2023-08-01 22:56:40 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 libibverbs: remove nonexistent symbols from the linker map (cherry picked from commit dd0f2d02c683c6ee885dda8ed323a1586c409967) --- contrib/ofed/libibverbs/libibverbs.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/ofed/libibverbs/libibverbs.map b/contrib/ofed/libibverbs/libibverbs.map index 540124110e11..b49c09a06ce3 100644 --- a/contrib/ofed/libibverbs/libibverbs.map +++ b/contrib/ofed/libibverbs/libibverbs.map @@ -10,7 +10,6 @@ IBVERBS_1.0 { ibv_get_async_event; ibv_ack_async_event; ibv_query_device; - ibv_query_device_ex; ibv_query_port; ibv_query_gid; ibv_query_pkey; @@ -65,7 +64,6 @@ IBVERBS_1.1 { ibv_fork_init; ibv_dontfork_range; ibv_dofork_range; - ibv_register_driver; ibv_node_type_str; ibv_port_state_str; @@ -136,7 +134,6 @@ IBVERBS_PRIVATE_14 { ibv_cmd_rereg_mr; ibv_cmd_resize_cq; ibv_query_gid_type; - ibv_register_driver; verbs_register_driver; verbs_init_cq; }; From nobody Thu Aug 10 02:58:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7X69PNz4pvcL; Thu, 10 Aug 2023 02:58: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 4RLs7X1XHtz3HrC; Thu, 10 Aug 2023 02:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+Mq09lisS/Oy/nYqPJRwqtrnKWmq140+dUt1mZvzhY=; b=e2tLC0AYGE6xXP1eOh/hQ+UUsWtZdZhZCrsKgf6h6ZvL1uKwam5I63cF3/fd/Kr8u+FMLD hP1qPak/tSQf8Qt5BImm+EzPlu22VfTjHfaCJYupvXv4wMZkUDZSpbmZlL1OUX21LyR2Tx QqyUqb/PaXX0lmW/AHmXiK2NHvZakKXZKSfTI0Vt27yiShedtXY4Q/xH8AB9werHz0P37d ojRt+9gQF2KRGeJgbFU4CxS/my0rXwZp/n5jyTUypgJiX8JY1r+1KtEvXFM+soFZbLmV3A ZXLH+9tdN7azfdgWmxVyq71HvYD6XNxBCROZqXPF6KB0gs03nMDdArWZ5sGjzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V+Mq09lisS/Oy/nYqPJRwqtrnKWmq140+dUt1mZvzhY=; b=RnrQwP+hHGnFLLbknQEJC3bhCyYW5UI/tcZuyOueRJQyq19psmKR2wZK6x3sL5gTLgdB/K 9ggr26UB6w1gOKTymBDIK5Ri8MCSrgGUgD70H5ViLjxqx7MsQpLvx+WaWu3N5OBESTbO4B kWnCNo2ekyBZNQc5Ay14fupssZu2bYBQ2LHc+rojF4xMYqTVdMGNvceP7h4MEELIjDkNGr JpT1oW5R9KsX3aOpffgTeY3yhBRWpCRzVgiaHhvvGm6JlEhLQPa3I8aOIupcHfHx3E0gLV 8Unpx/ZdXKAgNTsCHz7K4GEUOaeEGkljr9HX7a0bWceK8y3kbZWQuEWzRNNmeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636312; a=rsa-sha256; cv=none; b=Wi9H1gay8ui1sTtnNn64mmavTCMBA0b1Csm60gMqtdYlds+BJEjq3J6VeXsSysuW+qHeBL xH46j5ujQzsPA8UdUx4cXzo7M7UQmX/ufV1uyKUIJux2l7ON5EVCse03ZqTSZRqLZqGM1E VmR+gvI9x5gLY9aQtGPxu6rOP1kIa/gksqHO212KING7OSAzKhcVU1Lw9M17XWxsjLju7C 2tSRl3iQ+iWCC0ek+rSbG/buPvUwmkplwFHuPGh3gsNmv0GkOGTreq2v2HUenl1nA/owvy QIthTqqVr+Q0z9BvjU+x2mblHIP568PLLHKMB+w3OfI8P5UBOmyEyj3gBdoM/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7X0NWfzgmR; Thu, 10 Aug 2023 02:58: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 37A2wVW4074384; Thu, 10 Aug 2023 02:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wVop074381; Thu, 10 Aug 2023 02:58:31 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:31 GMT Message-Id: <202308100258.37A2wVop074381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7bf2125dc1a5 - stable/13 - librdmacm: remove rsocket symbols from the map file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bf2125dc1a5fc52abe1c859107ac68701464323 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7bf2125dc1a5fc52abe1c859107ac68701464323 commit 7bf2125dc1a5fc52abe1c859107ac68701464323 Author: Konstantin Belousov AuthorDate: 2023-08-03 07:54:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 librdmacm: remove rsocket symbols from the map file (cherry picked from commit 9a7eba89f972e0dac0f53d0d442328248eb949ec) --- contrib/ofed/librdmacm/librdmacm.map | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/contrib/ofed/librdmacm/librdmacm.map b/contrib/ofed/librdmacm/librdmacm.map index 1c8d74350265..e2eebbe576b4 100644 --- a/contrib/ofed/librdmacm/librdmacm.map +++ b/contrib/ofed/librdmacm/librdmacm.map @@ -36,33 +36,6 @@ RDMACM_1.0 { rdma_destroy_ep; rdma_create_srq; rdma_destroy_srq; - rsocket; - rbind; - rlisten; - raccept; - rconnect; - rshutdown; - rclose; - rrecv; - rrecvfrom; - rrecvmsg; - rsend; - rsendto; - rsendmsg; - rread; - rreadv; - rwrite; - rwritev; - rpoll; - rselect; - rgetpeername; - rgetsockname; - rsetsockopt; - rgetsockopt; - rfcntl; - riomap; - riounmap; - riowrite; rdma_create_srq_ex; rdma_create_qp_ex; local: *; From nobody Thu Aug 10 02:58:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7Y3cZcz4pw5h; Thu, 10 Aug 2023 02:58: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 4RLs7Y1zvcz3J0b; Thu, 10 Aug 2023 02:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RSfvc527al0e6s5RBFTb1Dlj+HJOk9cDjlwGGkO36tI=; b=DA/aMCgxm9MmHrLNjcuNVJ4JoOXBIzgDHJc7Oj8oL1lZvMGDZg2IjeIk3jgFgY7M62tR+/ BTQpyJw7E7o4lR4bXd9k0J0iPdL6Yx0ExZpL4v9JLe37uXOrvb3oFnT/n8Syc0RzyFyDmW iLUmKxGCKfvz7pXrNYPGz52aMzzvGU9OXo4XRHSXsnqBpC4/7qJm7ByNj5HbIe/+37Ar5H bXd1WDBYjRZ7MNg3oEEMn+59MBQWbgA7N5FelK8IoG7RHgUyO78WKHS0JA9Pi8rqJasDIV tWA0HpJQYtiMLN4lg8H1bV91OM8R98i9rLAJl+JOctbEtLdxX+bsHWujqhxnFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RSfvc527al0e6s5RBFTb1Dlj+HJOk9cDjlwGGkO36tI=; b=JzBOEUgROQAJLMGi2LN1wmaAx9I88nEGzwfRLIgsQnGA9oBw4DbLDnzr3WMUliHAxQzzV7 XMroMFA2JpVkex/v9p1HdmgdWA2AU/PsyCoD6+J/xYGKCOxolu3p5eVy3Jd7QSL4OcIU68 l81YkII498XW8G4x4rXzLCmqbLSs0RAhduxRtLa4G7AwM8cMt4wNAr4TNBzveSz/ZkHQkf Qh9qgR1U4RTKMIr1Sw9VdEBQLdrwjDURDoIs5N9aeQGyP+YGaIZJYli6bxWn7o8JgwJQge wUmuVIcGVgMP9HHNrdW+9j0F1SnrJJ1eLI45XpASVxp4xVOT8wWMzVC5VBl14A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636313; a=rsa-sha256; cv=none; b=DweC3ER8QrxenOKeBQkhsUk3K5s9qysLKDuyAqHqnls/8+j069wyifGXH2SnrUjTYOFSKf 2qcQyEfRU4bLFtog1GYhb27m6XHyqv9OulrOIu4WUyAQci32ZVkUqfT9jrux5Kp0DoTcTT kLmIBPrd/d47gk0a6ROTdAvoZdTN8RHTR+jVqWrF7BccJ8YCgdm/nnIdwrpccUv5zUoh7g wNbWrxgG/9r31nJMue+ewjDByoGpPkGh7/BceKYwqd7ALbkCWN4GtHcJ4F7kAXVSYBi5C5 FQk7Zw0/PIenH3/UNAUnrNLisOm4wo/aboDdtTw4mLVDeE0W9pyt85DlJvIM6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7Y14H9zg43; Thu, 10 Aug 2023 02:58: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 37A2wXF7074438; Thu, 10 Aug 2023 02:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wXjK074435; Thu, 10 Aug 2023 02:58:33 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:33 GMT Message-Id: <202308100258.37A2wXjK074435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 42b25e115a79 - stable/13 - librmdacm: rdma_get_local_addr and rdma_get_peer_addr are not exported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 42b25e115a797bfc69b3c07401d9ede5aea8b08a Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=42b25e115a797bfc69b3c07401d9ede5aea8b08a commit 42b25e115a797bfc69b3c07401d9ede5aea8b08a Author: Konstantin Belousov AuthorDate: 2023-08-03 08:08:32 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 librmdacm: rdma_get_local_addr and rdma_get_peer_addr are not exported (cherry picked from commit e5cf232b3f2484601b2a30f71dcbe9861e22370e) --- contrib/ofed/librdmacm/librdmacm.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/librdmacm/librdmacm.map b/contrib/ofed/librdmacm/librdmacm.map index e2eebbe576b4..2d826e03238c 100644 --- a/contrib/ofed/librdmacm/librdmacm.map +++ b/contrib/ofed/librdmacm/librdmacm.map @@ -26,8 +26,6 @@ RDMACM_1.0 { rdma_free_devices; rdma_event_str; rdma_set_option; - rdma_get_local_addr; - rdma_get_peer_addr; rdma_migrate_id; rdma_getaddrinfo; rdma_freeaddrinfo; From nobody Thu Aug 10 02:58:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7Z6wF4z4pvss; Thu, 10 Aug 2023 02:58: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 4RLs7Z31FPz3J2r; Thu, 10 Aug 2023 02:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMZ42OwJZltTXBApJ35R1hbPltmf5yqKZkmdamBWEbE=; b=c/osbKjcLX2bibnEFRlB4mHQHMO5gmk98MOTf3KGq8oTOddP6b6aAQq2ctouFL4/fE8JnK oTpZ7iiM+oms7zKBYzIlUncF1V4LSj0bCF2B+lBiYTrVKspPFIL8PCResLqT25DovDSfMr 0pAgVdTefUGkBT/GH36cOdKlpDZEMh2rwMQqxOHxsLBH8jv7UE/LVVXVXOmhC7ApaHd42X IfXf2EicXFBNDnwlevBiygyptUGkE3neGZcaCzU7bNWnecZMpf6M6jdsiif72F8lzkb4Hz 0TJVwITOD0SCPZV3J9OSIFZ/VXnm1GELCIguOBrBKE9gHc0EEyFZHd4PsG3wjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TMZ42OwJZltTXBApJ35R1hbPltmf5yqKZkmdamBWEbE=; b=R14hLLnRLBppyV+yJiscEzsPOecjGRnUWltLOEcQ30jYbeAe2v+6oVy8MkX6g+o0TIRDmt TrrOlf7uS8FaAqp/7XNL0dZNrcMbk7cEpmUkl98MIdJXCbSdQJzXn9M3mibWFKbVqaoBdB bEHUnxWmFDOSlxCLKldMMP1oGIEStydd/5vQaePsoArpK23K6gcB04ED7ofu7EsqWhRcHt YTMVQ513vm9KTrUAQKuCq1yB9qAw6id7bcc7QGHYwvVF3Km00qPo19LdYwx8wgS9lCWd58 i0bO8kanjx1mgzlfq1p+MJMny30b8fnOmkJcg4rbI7SeJhuYwqR8Dvh6GrwE7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636314; a=rsa-sha256; cv=none; b=mnVvXpxijPm4OnH/2BVuzk5/PRh/SgFIggFAwhp4AmQRYEcwhwaH4KQ/SjN6MEBoFWQv2Y bAvsMrezwsJ1YifPESmQEt/of+P5p8uaqGqHqxWRs7nS1ZMJPDdMy6u9HgULtREsaGTExS EBHUSnzy0oIOaIJZb0v6Elv5BK5KHfqmtdJ5BHYSSzQqmqXj052YTKhkYVrJ0LqmPR5svv 6v6o+Rg0IS7O58Bw8oxTcKNa92b35fLApoyTsoruBlB3ZbZvlGxt4wuPKEqGxxrbbjKxIi uX5jFS9owY3Onvd+e2XGRnEKB/8oAkw2IEcA4tvI4qB+NOqfMBDpjYIBLBZJIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7Z26pQzgRP; Thu, 10 Aug 2023 02:58: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 37A2wYlb074493; Thu, 10 Aug 2023 02:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wYno074490; Thu, 10 Aug 2023 02:58:34 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:34 GMT Message-Id: <202308100258.37A2wYno074490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8b2e264d6e5c - stable/13 - opensm libosmcomp: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b2e264d6e5c101b01b8dc320b84c5d4f2cf6dfc Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8b2e264d6e5c101b01b8dc320b84c5d4f2cf6dfc commit 8b2e264d6e5c101b01b8dc320b84c5d4f2cf6dfc Author: Konstantin Belousov AuthorDate: 2023-08-03 08:29:31 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 opensm libosmcomp: remove non-existent symbols from the version map (cherry picked from commit 67c5de2dcacc7642f4648f9ec25eb10dd7387de1) --- contrib/ofed/opensm/complib/libosmcomp.map | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/ofed/opensm/complib/libosmcomp.map b/contrib/ofed/opensm/complib/libosmcomp.map index 52410ccccf08..eaa5a1742a5d 100644 --- a/contrib/ofed/opensm/complib/libosmcomp.map +++ b/contrib/ofed/opensm/complib/libosmcomp.map @@ -112,7 +112,6 @@ OSMCOMP_2.3 { cl_thread_stall; cl_proc_count; cl_is_current_thread; - cl_thread_pool_construct; cl_thread_pool_init; cl_thread_pool_destroy; cl_thread_pool_signal; @@ -126,7 +125,6 @@ OSMCOMP_2.3 { cl_timer_trim; cl_get_time_stamp; cl_get_time_stamp_sec; - cl_vector_copy_general; cl_vector_copy16; cl_vector_copy32; cl_vector_copy64; @@ -142,7 +140,6 @@ OSMCOMP_2.3 { cl_vector_find_from_start; cl_vector_find_from_end; cl_atomic_spinlock; - cl_atomic_dec; ib_error_str; ib_async_event_str; ib_wc_status_str; From nobody Thu Aug 10 02:58:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7c2D81z4pvvq; Thu, 10 Aug 2023 02:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLs7b3xphz3J4r; Thu, 10 Aug 2023 02:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03/nqzEzM/aKHD2VIG8uzWw/amBT6+5UTpNrFo8lXjw=; b=CMF99B9I0WC2dbxpqxnwX3KiEWwnmKpjJ8T4+rFb4S7Bp/in1MhBiXyMKLJvaz0OncB+nj 5lU1YXroBITz3l0e5/b/bQ7oVIXWBJWXycPyd26lTkz5gsyRyq/rNveqWjsVb3MWB3ARHs qpTPfyaz8tMOQswt463uicRvDJU12QhmiFeX7JIzs/GfUN3nWW5p76r3OCfEVMIp0v49dM EAenxw6iJqkhVI3r4tXND6MAKm7m5Uu/sV0IvTBloTIfYkyDmq4BpXV+SHhh2QOKszhLZo TU0JT8kzPGDQQEKRY75JUo047n68JZzS8BBuNrGxC3YwS8gYvsYcjkGgTSD0wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=03/nqzEzM/aKHD2VIG8uzWw/amBT6+5UTpNrFo8lXjw=; b=xif7NM8LIW4TXHuZsyTkNmPOVabiiXsCBzltO0KgvvjszrDj0QWkv81/mGcheRb58xVm1T 4UO4f+N7fHut8GqXLHfOOCP+0LXabeGhWECuvRmGck2MOmcJOyM4CfJOEUdm/+byrF6PYE F41MO0cQErW+EX5/SUfAaO0XJZhICo1QNdXgjoH4UI/cx8B3GePx8040YXKv+ASY/LlD3C wR8KAkHTmnPi1QHSky+RwMhss0MJp40obsMaZ1A9Ka+FB09w2SfY9dipMaJi7LjmR0/cvx Pjvtnqam8UMjpi7vEjrfkdO+SwXEnnrMGQ7hz+Kv/m9Kk2ekawYz73Zua1RQMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636315; a=rsa-sha256; cv=none; b=R30lqz1tLQKEj3BU1wdGH+297+4ZKiRxr36XoaUKuzqzcU4cF6yUODfY5Uu1te11OtDV43 4M0OXhS3IxeJIkgrLOA5tkbB9trZyFGHoD2OH/Hf3N/JW6CxaSQt9XOxuMZVOoBJEF4TqG lt4nCm/nEspC+NxHKiya2sNBakvQY3d65mtyrVIqcArqWYHERnG82tEK/qOZCDOo/JuiAF cIo97hrBJ5L7a6xMjaHOHDfH9Ezq6g0jDKb51c6FLZ60XnSZBa6So2qt3dSe6Ph8H2lPhv fcpXFyT3/T/joaAgIoHptSwjlc9HwCQTg7QH5Nhev4l/0M/7xn6GXZcZDmqCUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7b33y0zgVf; Thu, 10 Aug 2023 02:58: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 37A2wZA5074549; Thu, 10 Aug 2023 02:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wZfY074546; Thu, 10 Aug 2023 02:58:35 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:35 GMT Message-Id: <202308100258.37A2wZfY074546@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ac0199a0c53d - stable/13 - opensm libvendor: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ac0199a0c53d5a93401f03b14619745fb3dcc2d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac0199a0c53d5a93401f03b14619745fb3dcc2d6 commit ac0199a0c53d5a93401f03b14619745fb3dcc2d6 Author: Konstantin Belousov AuthorDate: 2023-08-03 08:44:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 opensm libvendor: remove non-existent symbols from the version map (cherry picked from commit 6fdf714d5d18f5d6d3f2ae3889a788a3ebead5cc) --- contrib/ofed/opensm/libvendor/libosmvendor.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/opensm/libvendor/libosmvendor.map b/contrib/ofed/opensm/libvendor/libosmvendor.map index 17416b35e9fb..2656b42cef1c 100644 --- a/contrib/ofed/opensm/libvendor/libosmvendor.map +++ b/contrib/ofed/opensm/libvendor/libosmvendor.map @@ -1,6 +1,5 @@ OSMVENDOR_2.0 { global: - umad_receiver; osm_vendor_init; osm_vendor_new; osm_vendor_delete; @@ -15,6 +14,5 @@ OSMVENDOR_2.0 { osm_vendor_set_debug; osmv_bind_sa; osmv_query_sa; - osm_vendor_get_guid_ca_and_port; local: *; }; From nobody Thu Aug 10 02:58:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7d4zHQz4pvvv; Thu, 10 Aug 2023 02:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLs7c5BdCz3Hxk; Thu, 10 Aug 2023 02:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dCr/T2ljNwHxzlCyy0R2HNbphPYJQArxJK7YMD74EA=; b=xEm7tPl/7WLAssLzTyfFhhQruz3YTHo1HVyk13gX9aweAqEBoZVNrr+LUmJjcHuM9c6I0o XZEp5f5dEkUwDfZEG34rm94xryCQPfV92OFE29sUKvGw2wc2yh4NcW8g1giB5P/Itrpseo lmOchlOPcRvz9FH+ztPgQUSlNlHzj7DtVhBn0oDdnjr0G2TEtkOjRUpvqnfmIk0bnqjz9/ fa/CQPRwTJEFb6P3pSWvsbNQ8XizSUi3/yOYhafFQFyAYAE9ZHZVJ+9VlNaZD5sOrH0lFw a1tA/sHY9Kti9Oqmq45a9ORzPkhOYGqvbGTW4pYaFXPr0S0iSzVJ9AyDBJzkHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/dCr/T2ljNwHxzlCyy0R2HNbphPYJQArxJK7YMD74EA=; b=hB8sFREtchnPf6FjyaLQQb9sY/4LH3J3SRapo46X3UhQ57I+wTaFzjDELy54R+c/dl0mD0 a8RRCZ1b5UEYH3v2QbF5Ia82ABZ9wWNoa8FUnYnxTnFl4PYPrcEZeBfs4M9VQtsVaJ54di fX2E7WakKbkRv8PLr0aMzsy1IoQfVRhXfcT8ex7KPTShZ63tEisN9zQduRUq3CBsrcjmo2 vz06pibvdWyBSuxh3goGGHzyvM31hzXmPvXLc4tAe0hrIUGAtTZNGQsJGDf34N7Ak0puBH MoDUiM30sY/YX2wf4MpRRbbvKaCe3gXkJIFNmfblKg6AB0+OvqP/Oj+eZvRjcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636316; a=rsa-sha256; cv=none; b=dKupHRyUxMT1g0EplJzEieTWKiY4b3evFm6hg+c28HzgERPeeAJ+MHEqFa4/d4ee1//Qyl xRJJHSt19PKT8XBcydxV9ufXMeFDUHrJo+AHsWY/YAYKKwrnUe/JQ+knSbepX6rMlw1t0r c3t9UHh3MXmhjp/sb660n0Tsy3tBm0CqkMsYvnrmXUUTFz07C8TjBpJtsm1wDOf2v/9aZU LrsrOvPZLrv0O05oQPueNURpEhV1gQlTUqhlgwwWBYWX/727Ta2RntBYOXXJ02d4dSK1+k 4H4lXqTFa5Srl+SS70/7IMdjroHX9Kfrh/ZI+8lql2OMj+ce63KA1TsiRldDYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7c46YyzgVg; Thu, 10 Aug 2023 02:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37A2wamt074606; Thu, 10 Aug 2023 02:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2waZZ074603; Thu, 10 Aug 2023 02:58:36 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:36 GMT Message-Id: <202308100258.37A2waZZ074603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 286943c3747f - stable/13 - opensm libopensm: remove non-existent symbols from the version map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 286943c3747faa4cf8408d1e640bf22ab1bc815d Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=286943c3747faa4cf8408d1e640bf22ab1bc815d commit 286943c3747faa4cf8408d1e640bf22ab1bc815d Author: Konstantin Belousov AuthorDate: 2023-08-03 08:52:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 opensm libopensm: remove non-existent symbols from the version map (cherry picked from commit 21d6c29f344d587a99314f9cd960cc008cb3dec4) --- contrib/ofed/opensm/opensm/libopensm.map | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/ofed/opensm/opensm/libopensm.map b/contrib/ofed/opensm/opensm/libopensm.map index 087e69ad464a..128f4716db7c 100644 --- a/contrib/ofed/opensm/opensm/libopensm.map +++ b/contrib/ofed/opensm/opensm/libopensm.map @@ -71,7 +71,6 @@ OPENSM_1.5 { osm_dump_pkey_block; osm_dump_pkey_block_v2; osm_log_raw; - osm_get_sm_state_str; osm_get_sm_signal_str; osm_get_disp_msg_str; osm_get_port_state_str_fixed_width; @@ -91,7 +90,6 @@ OPENSM_1.5 { osm_dump_mlnx_ext_port_info_v2; osm_log_v2; osm_log_msg_box_v2; - osm_log_is_active_v2; osm_get_log_per_module; osm_set_log_per_module; osm_reset_log_per_module; From nobody Thu Aug 10 02:58:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLs7f5LcWz4pw5r; Thu, 10 Aug 2023 02:58: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 4RLs7d61Pmz3Hvd; Thu, 10 Aug 2023 02:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+f7nkp+o2rperOtat2I9RURAK2xOqA77r5Rv7FnkYUI=; b=ysLGOW8rebhfQbve60AzBgFsw3FV2M1oeLpmfZig0kDfGa9WGdtBN+9mCufXZ59ytcLuhh eTEKm2TIbMWNlf3J9UXFCmbfYWP9cv6CD5Wye2H27r9O/VGUwHBHUUt+HNUYFiJqzqe2cD WNND6ldO6hoyFHMS/bHVZ9MxUyqoZyruDiEH8f+MZF6KE5fJRD5mZoCeuUuExcnGcGhoNe 0qcvc1lXo8x80WG0Iqnyrh59MPT5vPIygqnyEHNmjL5Yj5wdB5igMEI0xjpNdDVJol0wwR zN6TYv77xXkWvpacehlqWmMTgIJ3V3QsxFtSMKI5pqiWm5ID0/uT0p20JVuVfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691636317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+f7nkp+o2rperOtat2I9RURAK2xOqA77r5Rv7FnkYUI=; b=MuqL8HuTuli254IEvzi87nDrvO+U+imfKOpHQ/pqedsWIs3hcEYPzBNDQGloM2/afJHqiv TY/tvXY+IfML1qRTakeZbcN6n5acIpviN/co3CXVvi23yfB2M3nAEkkeQQDu7vmtfrA58Z 9u8BimBeF/9ntGyoiH5ALoiMcLgmMpyoWZvaSk+4jVowkmbTmtmoYD6p2QCJ+/CW2rM9zm ZIsC2EcwPfr6XNnDV51cY/Qw8+B3FByiDYG2a81OBHTIO/F2CvRpmQZlZ/YBBLkQ8PGi4h +GyCOFggRPMicaheznfyA1yjGa1P1Xb9G46poUYl+RBCiLtcOftOoyKpM39vjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691636317; a=rsa-sha256; cv=none; b=FLnVv/FXJr6kiigRweuMKzMSOvqEOLxs5hLFD1TBPFVcMq8pH5dYJUT97vzlFaGCK73PFO pbUbezFHo0INiOTBYEUCwcVG5FdOO2JD/mAUlDp/7k4YopXwWRHibHiNVwyDZgbLAK5S4s TEzk+JBaiisCdsbd/n0f6GzBZ+lhNVOymF8mDkPoSq05zumcZde70jOls/TYGBk8T9Jni2 ztkp1Ecg/T4KdXy43Q8p4EkH4eVaGlCvrEkxBItAH9D+tWrsx0kKti2ZRnQgfERmg164t/ mxOl4+FdggwPGL4ThE9lTgLQMNL+4SOC8P2WzC7mVClggIRJ6CfzBoP7KtZ28g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLs7d57ThzgVh; Thu, 10 Aug 2023 02:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37A2wbUV074654; Thu, 10 Aug 2023 02:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A2wbLA074651; Thu, 10 Aug 2023 02:58:37 GMT (envelope-from git) Date: Thu, 10 Aug 2023 02:58:37 GMT Message-Id: <202308100258.37A2wbLA074651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 21a943407e99 - stable/13 - udf: reject invalid block sizes from lvd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21a943407e9992a219a5fe572ee27fea9f5d2c69 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=21a943407e9992a219a5fe572ee27fea9f5d2c69 commit 21a943407e9992a219a5fe572ee27fea9f5d2c69 Author: Konstantin Belousov AuthorDate: 2023-08-04 22:47:09 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 02:57:29 +0000 udf: reject invalid block sizes from lvd PR: 272893 (cherry picked from commit 9e6941a2c7a393aefe6a123952c6eacbc23098a6) --- sys/fs/udf/udf_vfsops.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index 3f6f481dfd6b..65b2ff5b2699 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -413,6 +413,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) lvd = (struct logvol_desc *)bp->b_data; if (!udf_checktag(&lvd->tag, TAGID_LOGVOL)) { udfmp->bsize = le32toh(lvd->lb_size); + if (udfmp->bsize < 0 || udfmp->bsize > maxbcachebuf) { + printf("lvd block size %d\n", udfmp->bsize); + error = EINVAL; + goto bail; + } udfmp->bmask = udfmp->bsize - 1; udfmp->bshift = ffs(udfmp->bsize) - 1; fsd_part = le16toh(lvd->_lvd_use.fsd_loc.loc.part_num); From nobody Thu Aug 10 04:17:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLtvC4kKgz4q2Bp; Thu, 10 Aug 2023 04: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 4RLtvC4CVpz3TvW; Thu, 10 Aug 2023 04: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=1691641079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8jPW2LOVOAQYqlRTvG6y12cjw+m+lW7i6g+wQLHYK8=; b=vGdPx4TlT6Az/Ch/4j4klOl7kt+akmSY2DDC7Hg85FaqcQ3Y2/3z3dNmkekfz2U208riVe fN4Jlo0Y2JNEU8mgo+sEh+3AAnbu8eb1wnNQcVD4ibg/v7vSLA6nROMqZnWaFgodO23AL7 tss8RWhi8atZ23Hj3vQYYyeWjWKv8QuNhE/o/bcjoqck2vJ9maEvisrXp+iJdvoM2M+3vn WguC361QotPv3KzsOJTkbGAv6xuEA+WAUJGuYUP2pBwL3SKtJ1Qx4SV+XYpWkq15LUgUvz 0HK1KiP3BPbQr95tG6xX6EBAPskvLAm1Q6tpDB6vdNHmjfs24mGnMbDQtOt0+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691641079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8jPW2LOVOAQYqlRTvG6y12cjw+m+lW7i6g+wQLHYK8=; b=xA7a6ORDfq5KQcQ+iV2TSTBmoDg0KSeraqpej3goxj2hFYS1scOHXuyg0dQJUv74wEfVcV QW/Lt6e+QipJbA0RVpI9wY7l3XAvqFLy0A9PUrgu+Vz4Y4F/wMwejprFCSWMHTgV+PkstJ 4TlkLNCS2jEqW7vByVYF7eNalqL1jBmq8ZAYv1/5jlAoRBiEa+EFjBQbULZ8SGewO7UFE3 I5hc/4uC+hW6L6cbWVxfVhRZOiMIO8AKo68xqkBvM3e9eRfT7MdiddGaHgDf855OrRuy7V Sc5tz/Tmq/8AaJvSpcSXHMDnXSaGBRtca8vx/9bDV//wTObPVF9SrHZJ0LO70g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691641079; a=rsa-sha256; cv=none; b=t1BtcRermeXQSckAGkoaLglo0v/qf9Lq41pTZKnVFE+fbW1yqzPmf1BtWljDJJCNCGJ2eq 5DSRV98B4HQVitgrAj6H0xWmZNCKp6nqsbVe6MqBF2MYyFO+oQGK1m01uDGfORlfbsz+WR Xr1HUIhvnkYuEy/oCBXrdZZdNhoczaNf7SIBjJrnNlOLNuFCVnVSnQo31HTufn49NjgMNq ktADJik2R7wciccPFkx/EtzIqXMJa0Kpuz/Zy6NQm7LxRAGvRyk33/CwzHuRtCXw+77kOT kkTlEtsEJPYWSuRooBqyUjtAXxwG/3464c30QfBVqSQqzrlk+YoZS0A5doU86w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLtvC3GlMzjhr; Thu, 10 Aug 2023 04: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 37A4Hx6x009641; Thu, 10 Aug 2023 04: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 37A4Hx6c009638; Thu, 10 Aug 2023 04:17:59 GMT (envelope-from git) Date: Thu, 10 Aug 2023 04:17:59 GMT Message-Id: <202308100417.37A4Hx6c009638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b9dd766aa8e6 - stable/13 - arm64-iommu: Fix a typo in a kernel message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b9dd766aa8e6ede5c46aaf307ccacbc7454d4049 Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b9dd766aa8e6ede5c46aaf307ccacbc7454d4049 commit b9dd766aa8e6ede5c46aaf307ccacbc7454d4049 Author: Gordon Bergling AuthorDate: 2023-08-04 11:52:36 +0000 Commit: Gordon Bergling CommitDate: 2023-08-10 04:17:43 +0000 arm64-iommu: Fix a typo in a kernel message - s/endianess/endianness/ (cherry picked from commit f0ab805200fc304e4255fc68f9fb8d5400de84ce) --- sys/arm64/iommu/smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index e3b7a14e705f..edb126184751 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -1316,7 +1316,7 @@ smmu_check_features(struct smmu_softc *sc) switch (reg & IDR0_TTENDIAN_M) { case IDR0_TTENDIAN_MIXED: if (bootverbose) - device_printf(sc->dev, "Mixed endianess supported.\n"); + device_printf(sc->dev, "Mixed endianness supported.\n"); sc->features |= SMMU_FEATURE_TT_LE; sc->features |= SMMU_FEATURE_TT_BE; break; From nobody Thu Aug 10 05:20:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLwJ02dNZz4q6LT; Thu, 10 Aug 2023 05:21:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLwHz66P9z3bG3; Thu, 10 Aug 2023 05:21:03 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 37A5KtQq086656 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 10 Aug 2023 08:20:59 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 37A5KtQq086656 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 37A5KtOP086655; Thu, 10 Aug 2023 08:20:55 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 10 Aug 2023 08:20:55 +0300 From: Konstantin Belousov To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cbf845052f1c - main - msi: report error for attempt to use APIC ID > 255 Message-ID: References: <202308091817.379IHCL9010484@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202308091817.379IHCL9010484@gitrepo.freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RLwHz66P9z3bG3 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:6939, ipnet:2001:470::/32, country:US] On Wed, Aug 09, 2023 at 06:17:12PM +0000, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=cbf845052f1c2862a64e66dbaf38e887a7592474 > > commit cbf845052f1c2862a64e66dbaf38e887a7592474 > Author: Ed Maste > AuthorDate: 2023-08-08 23:42:09 +0000 > Commit: Ed Maste > CommitDate: 2023-08-09 17:52:43 +0000 > > msi: report error for attempt to use APIC ID > 255 > > The MSI/MSI-X address includes 8 bits to encode the Destination ID. > Previously IDs over 255 overlapped with the fixed portion of the > address, resulting in an invalid value (and a nonfunctional interrupt). > > Instead, print an error message and return EINVAL. The interrupt will > still not work, but the user will have a clue as to why. > > PR: 273022 > Reviewed by: jhb > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D41395 > --- > sys/x86/x86/msi.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c > index f85d4a5161e5..de8f42c0fa68 100644 > --- a/sys/x86/x86/msi.c > +++ b/sys/x86/x86/msi.c > @@ -620,6 +620,11 @@ msi_map(int irq, uint64_t *addr, uint32_t *data) > mtx_unlock(&msi_lock); > error = EOPNOTSUPP; > #endif > + if (error == EOPNOTSUPP && msi->msi_cpu > 0xff) { I suspect 0xff is also invalid destination apic id. For the Pentium 4 and Intel Xeon processors, the xAPIC specification extends the local APIC ID field to 8 bits. These can be used to identify up to 255 processors in the system. > + printf("%s: unsupported destination APIC ID %u\n", __func__, > + msi->msi_cpu); > + error = EINVAL; > + } > if (error == EOPNOTSUPP) { > *addr = INTEL_ADDR(msi); > *data = INTEL_DATA(msi); From nobody Thu Aug 10 06:01:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLxC70PHHz4q95N; Thu, 10 Aug 2023 06:01: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 4RLxC66zcwz4DcZ; Thu, 10 Aug 2023 06:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691647315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oBOQl8h3yA3qUapmUuL5DQGx73ASOOiWjLLxbRYCu4=; b=jLofYavEdDhUtiLPCVEshVz8Igy2jnS+tfDGEPabJWZq3TSQnXOF8cURzJlqvARYGu+dVp KtoqCngJTOCjv3PjlUci2dooIfj0eqhGr02VikC8A4IiI+IlRBFPdwSLzzNWyXvimIo4cz ihDokh95nr5DHkecklP9X0YWItAqeOXGVatNgikrADHg0eIAifSbr+8yQiZrjevfid5/LH YC+gX/994Ub/cidpkiz9mwqNRlmeKR2scrbUC0TGZH/Jfw6CAgj1mjZNkMrpYB4tnD0jPp C5XqPBcGZ1Ua3+7vrq0nuMdWyOCQo35ooE1HeGRKSQF2wlJyLNNAfsi2kyBcaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691647315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0oBOQl8h3yA3qUapmUuL5DQGx73ASOOiWjLLxbRYCu4=; b=r1WAdOjM1JG5XDBN1QJ5aF4gJXerRqbtC6UqSAwRKvhCzvsapXlAwrkPSz6bmEdsiQF8T7 LT+Il1y+jMAwiXfa8JOhHzpPrmlZI2TD6jPNhuydN6nkzJxZ0Dn+dIxZGaUrGwV3ISEz3B je6C3qbHTne+quFPR7GhJwYwSh4XaiwgNcHmuNhpzhVzhN89CF8hsLSV15bwHzMs6RSm2e 7e2Xoa2pBqI+jIh77Y7LxGAKI5mxYdTwyPzf/wRUIvnZ2gZM/i77Bx4BBjvAx2n3u8lTk/ skURWWf1EOh2rjVrggs9eQZpNShT37LYbr6tOmhvGicrZjLEygniKLXlJaAjwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691647315; a=rsa-sha256; cv=none; b=uiHXJsiBGQfq81/Aj13WDmfDUlX6PdDrDzs22xSjhgTwaJGv39c0XjW82n3duYFWxnoBl6 QChXJg81tUyP1zhTzR0+4dl4QKqXOg3V+ljqBMFJ2XTpZColnC9dDoIqQSZBbBCu+U/cf2 ySKq1lskVW9PLRnO+mD815ezrnZ0U33bbZCHEi7HBgHV2+g+SOp9Urj5+X7qAA1YDEVeNT wq3V7EudLwXbknrdLuZQZJiyMEj67sSeeqsyBKU/g7BIu1IHgcJD2QKbZxjSXUYMphewcT JakAHiU15aPJ0w86BQPnZkQV7RnTAcXr3cNWwCZJFDMTDHT7tCi9yIOS8gKZCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLxC662s1zmFj; Thu, 10 Aug 2023 06:01: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 37A61s2i090108; Thu, 10 Aug 2023 06:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A61sET090105; Thu, 10 Aug 2023 06:01:54 GMT (envelope-from git) Date: Thu, 10 Aug 2023 06:01:54 GMT Message-Id: <202308100601.37A61sET090105@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: 9da33e8d1073 - main - Update comment describing struct vm_map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9da33e8d10736c255bf63d408837c6942bd28e04 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9da33e8d10736c255bf63d408837c6942bd28e04 commit 9da33e8d10736c255bf63d408837c6942bd28e04 Author: Konstantin Belousov AuthorDate: 2023-08-10 05:01:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-10 06:01:26 +0000 Update comment describing struct vm_map There is no list connecting all entries any more, and correspondingly no order on the list entries. Reviewed by: dougm Sponsored by: The FreeBSD Foundation MFC after: 3 days Differential revision: https://reviews.freebsd.org/D41405 --- sys/vm/vm_map.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index b974f52e51ed..82320196b98b 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -183,12 +183,11 @@ vm_map_entry_system_wired_count(vm_map_entry_t entry) /* * A map is a set of map entries. These map entries are - * organized as a threaded binary search tree. Both structures - * are ordered based upon the start and end addresses contained + * organized as a threaded binary search tree. The tree is + * ordered based upon the start and end addresses contained * within each map entry. The largest gap between an entry in a * subtree and one of its neighbors is saved in the max_free - * field, and that field is updated when the tree is - * restructured. + * field, and that field is updated when the tree is restructured. * * Sleator and Tarjan's top-down splay algorithm is employed to * control height imbalance in the binary search tree. From nobody Thu Aug 10 07:22:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLyzl5F9wz4qFkj; Thu, 10 Aug 2023 07:22: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 4RLyzl4qMCz4LvC; Thu, 10 Aug 2023 07:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQXHcZO15cHS0Aed6r1c3fSXNOe+1+/X63fGmCnhQCQ=; b=W1V9vTWoqY7bY+8xpVKcoxL5Ui3L5JnHtXMHZSLKNaU8EeNOiH+cvqjO5EIIAROB1FYOFm Twk3nFAPffZHD/83MUQrsrUUoEC9IRJDsVB7mJjHKW9i+BA6k9lf/6RwgONp33S21Nxlil tWSKXESowspBWeYjKGzbZckQTv2m0oPfms/M/zRaUbXdd21xXNZvbzmdrjyUPtVFgbFONO wDE+FI6ndIVwt68iaVn5oMW2Kr99zuJMyHfJXJzNcCN08CpwbnvAiWsLVL2AKjn2LSj0h3 IEu2cq8aO4Sf6g/RyKF+VJ/w0AamSaTke5iNPeSccBgOtXjrDSbytKs43+UMbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tQXHcZO15cHS0Aed6r1c3fSXNOe+1+/X63fGmCnhQCQ=; b=GnJXedNNCFjsEGcFJvm2lOn1qfll7oSJi8SXn6Y4naCKonW++Er3m60Ut/qW8m8H3gXa1H nl6YQDn57WffEMBSn2pKhJN8whbCB7hDj+nhwI1oyEB1vh39WEZTo2t3sl7tgNKlw9mJFT F8ih4VNFB6TxyekeQUVlZO7iHj05j/ajBjrgPn7iZKjTaJQnB/fnNIJCIGC1uYmZn6JUr2 4IH5khqWXYF1S4KDxJE33YyZ0q/F/+uXSonklheU9+X3vLcEtBmSdNiI40WOyn7muN3b9t +WetWPClJ5ul0u/+wxVteX1EVGdRn6FfGpzB+4YJPhIrRFE3g20eFTbE2iQ0Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652131; a=rsa-sha256; cv=none; b=NI56RbjWPzQ0mYvFeKdlkeBuPfQVVmOOtqOt/5Tl+bytkheBGVBg3seD212jbwXPZjUCnj QAAs+e5YVurXruiVhcMko7VnHJYkMcMZfU0O8FkJyYe8zRvnoNp0B3K/TGY8cSyqYV4Mh3 bPLFlY2k8dRo55QLiTAzvuIKHSR1j6mu+nd+AU3EooUK9Gdzd2LIdEWWPOKJhSj0YsDuuS wc8lyab8g56+WbRSIX+V+oxSXygwJjHf2kMaKx0RypjqUmaiM2xueAiQCwE3sZL9PsUiWX teOQ2k8pD7bltr90r3SYqLnbRtLshigXKfKos7t9SdC79e1ECPXDQJQk/vSdrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLyzl3vvkznhp; Thu, 10 Aug 2023 07:22: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 37A7MBl2023217; Thu, 10 Aug 2023 07:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7MBTe023214; Thu, 10 Aug 2023 07:22:11 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:22:11 GMT Message-Id: <202308100722.37A7MBTe023214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b07fed8180a6 - main - arm: xilinx: gpio: Make the driver more generic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b07fed8180a6b97f44c7d900d17b94fa3f1974cf Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b07fed8180a6b97f44c7d900d17b94fa3f1974cf commit b07fed8180a6b97f44c7d900d17b94fa3f1974cf Author: Emmanuel Vadot AuthorDate: 2022-09-29 08:05:19 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-10 07:21:55 +0000 arm: xilinx: gpio: Make the driver more generic All other Zynq SoCs have the same GPIO controller, the only difference is the number of banks/pins so make this driver more generic to add other SoCs more easily. No functional changes intended. Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 2 weeks --- sys/arm/xilinx/zy7_gpio.c | 120 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 93 insertions(+), 27 deletions(-) diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c index 9e9cf2b7f86a..d487fc8e79d1 100644 --- a/sys/arm/xilinx/zy7_gpio.c +++ b/sys/arm/xilinx/zy7_gpio.c @@ -70,16 +70,30 @@ __FBSDID("$FreeBSD$"); #include "gpio_if.h" -#define NUMBANKS 4 -#define MAXPIN (32*NUMBANKS) - -#define MIO_PIN 0 /* pins 0-53 go to MIO */ -#define NUM_MIO_PINS 54 -#define EMIO_PIN 64 /* pins 64-127 go to PL */ -#define NUM_EMIO_PINS 64 - -#define VALID_PIN(u) (((u) >= MIO_PIN && (u) < MIO_PIN + NUM_MIO_PINS) || \ - ((u) >= EMIO_PIN && (u) < EMIO_PIN + NUM_EMIO_PINS)) +#define ZYNQ_MAX_BANK 4 + +/* Zynq 7000 */ +#define ZYNQ_BANK0_PIN_MIN 0 +#define ZYNQ_BANK0_NPIN 32 +#define ZYNQ_BANK1_PIN_MIN 32 +#define ZYNQ_BANK1_NPIN 22 +#define ZYNQ_BANK2_PIN_MIN 64 +#define ZYNQ_BANK2_NPIN 32 +#define ZYNQ_BANK3_PIN_MIN 96 +#define ZYNQ_BANK3_NPIN 32 +#define ZYNQ_PIN_MIO_MIN 0 +#define ZYNQ_PIN_MIO_MAX 54 +#define ZYNQ_PIN_EMIO_MIN 64 +#define ZYNQ_PIN_EMIO_MAX 118 + +#define ZYNQ_BANK_NPIN(bank) (ZYNQ_BANK##bank##_NPIN) +#define ZYNQ_BANK_PIN_MIN(bank) (ZYNQ_BANK##bank##_PIN_MIN) +#define ZYNQ_BANK_PIN_MAX(bank) (ZYNQ_BANK##bank##_PIN_MIN + ZYNQ_BANK##bank##_NPIN - 1) + +#define ZYNQ_PIN_IS_MIO(pin) (pin >= ZYNQ_PIN_MIO_MIN && \ + pin <= ZYNQ_PIN_MIO_MAX) +#define ZYNQ_PIN_IS_EMIO(pin) (pin >= ZYNQ_PIN_EMIO_MIN && \ + pin <= ZYNQ_PIN_EMIO_MAX) #define ZGPIO_LOCK(sc) mtx_lock(&(sc)->sc_mtx) #define ZGPIO_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) @@ -88,11 +102,39 @@ __FBSDID("$FreeBSD$"); "gpio", MTX_DEF) #define ZGPIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +struct zynq_gpio_conf { + char *name; + uint32_t nbanks; + uint32_t maxpin; + uint32_t bank_min[ZYNQ_MAX_BANK]; + uint32_t bank_max[ZYNQ_MAX_BANK]; +}; + struct zy7_gpio_softc { - device_t dev; - device_t busdev; - struct mtx sc_mtx; - struct resource *mem_res; /* Memory resource */ + device_t dev; + device_t busdev; + struct mtx sc_mtx; + struct resource *mem_res; /* Memory resource */ + struct zynq_gpio_conf *conf; +}; + +static struct zynq_gpio_conf z7_gpio_conf = { + .name = "Zynq-7000 GPIO Controller", + .nbanks = ZYNQ_MAX_BANK, + .maxpin = ZYNQ_PIN_EMIO_MAX, + .bank_min[0] = ZYNQ_BANK_PIN_MIN(0), + .bank_max[0] = ZYNQ_BANK_PIN_MAX(0), + .bank_min[1] = ZYNQ_BANK_PIN_MIN(1), + .bank_max[1] = ZYNQ_BANK_PIN_MAX(1), + .bank_min[2] = ZYNQ_BANK_PIN_MIN(2), + .bank_max[2] = ZYNQ_BANK_PIN_MAX(2), + .bank_min[3] = ZYNQ_BANK_PIN_MIN(3), + .bank_max[3] = ZYNQ_BANK_PIN_MAX(3), +}; + +static struct ofw_compat_data compat_data[] = { + {"xlnx,zy7_gpio", (uintptr_t)&z7_gpio_conf}, + {NULL, 0}, }; #define WR4(sc, off, val) bus_write_4((sc)->mem_res, (off), (val)) @@ -128,17 +170,37 @@ zy7_gpio_get_bus(device_t dev) static int zy7_gpio_pin_max(device_t dev, int *maxpin) { + struct zy7_gpio_softc *sc; - *maxpin = MAXPIN; + sc = device_get_softc(dev); + *maxpin = sc->conf->maxpin; return (0); } +static inline bool +zy7_pin_valid(device_t dev, uint32_t pin) +{ + struct zy7_gpio_softc *sc; + int i; + bool found = false; + + sc = device_get_softc(dev); + for (i = 0; i < sc->conf->nbanks; i++) { + if (pin >= sc->conf->bank_min[i] && pin <= sc->conf->bank_max[i]) { + found = true; + break; + } + } + + return (found); +} + /* Get a specific pin's capabilities. */ static int zy7_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) { - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); *caps = (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | GPIO_PIN_TRISTATE); @@ -151,14 +213,14 @@ static int zy7_gpio_pin_getname(device_t dev, uint32_t pin, char *name) { - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); - if (pin < NUM_MIO_PINS) { + if (ZYNQ_PIN_IS_MIO(pin)) { snprintf(name, GPIOMAXNAME, "MIO_%d", pin); name[GPIOMAXNAME - 1] = '\0'; } else { - snprintf(name, GPIOMAXNAME, "EMIO_%d", pin - EMIO_PIN); + snprintf(name, GPIOMAXNAME, "EMIO_%d", pin - ZYNQ_PIN_EMIO_MIN); name[GPIOMAXNAME - 1] = '\0'; } @@ -171,7 +233,7 @@ zy7_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) { struct zy7_gpio_softc *sc = device_get_softc(dev); - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); ZGPIO_LOCK(sc); @@ -197,7 +259,7 @@ zy7_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) { struct zy7_gpio_softc *sc = device_get_softc(dev); - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); ZGPIO_LOCK(sc); @@ -234,7 +296,7 @@ zy7_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) { struct zy7_gpio_softc *sc = device_get_softc(dev); - if (!VALID_PIN(pin) || value > 1) + if (!zy7_pin_valid(dev, pin) || value > 1) return (EINVAL); /* Fancy register tricks allow atomic set or reset. */ @@ -256,7 +318,7 @@ zy7_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *value) { struct zy7_gpio_softc *sc = device_get_softc(dev); - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); *value = (RD4(sc, ZY7_GPIO_DATA_RO(pin >> 5)) >> (pin & 31)) & 1; @@ -270,7 +332,7 @@ zy7_gpio_pin_toggle(device_t dev, uint32_t pin) { struct zy7_gpio_softc *sc = device_get_softc(dev); - if (!VALID_PIN(pin)) + if (!zy7_pin_valid(dev, pin)) return (EINVAL); ZGPIO_LOCK(sc); @@ -286,14 +348,16 @@ zy7_gpio_pin_toggle(device_t dev, uint32_t pin) static int zy7_gpio_probe(device_t dev) { + struct zynq_gpio_conf *conf; if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "xlnx,zy7_gpio")) + conf = (struct zynq_gpio_conf *)ofw_bus_search_compatible(dev, compat_data)->ocd_data; + if (conf == 0) return (ENXIO); - device_set_desc(dev, "Zynq-7000 GPIO driver"); + device_set_desc(dev, conf->name); return (0); } @@ -306,6 +370,7 @@ zy7_gpio_attach(device_t dev) int rid; sc->dev = dev; + sc->conf = (struct zynq_gpio_conf *)ofw_bus_search_compatible(dev, compat_data)->ocd_data; ZGPIO_LOCK_INIT(sc); @@ -372,4 +437,5 @@ static driver_t zy7_gpio_driver = { sizeof(struct zy7_gpio_softc), }; -DRIVER_MODULE(zy7_gpio, simplebus, zy7_gpio_driver, NULL, NULL); +EARLY_DRIVER_MODULE(zy7_gpio, simplebus, zy7_gpio_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_LATE); From nobody Thu Aug 10 07:22:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLyzm6KVNz4TjVy; Thu, 10 Aug 2023 07:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLyzm5qVDz4M4k; Thu, 10 Aug 2023 07:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zf9OZtm5iM4Qej/8QpeT9Zf7/vKhzk4owK5nwBi5SSM=; b=ktmqXdU//tWxei+6HqQ+BE/Q2dWVtl50RrOrcomgDD9xLYCxrJ5RsYAWAgYf2pY6oksww5 C3i0i5/T1M6Juu3IRqj1Z0XPbQxtJ+oKJqUngvn+rEHVrn5af+te1g8OqOsu4mK4CrTA2X fTUA+YYCCYd2dyZYeEUB/NHwWgQQV/Vuzh8dxvZxlWViJclkTj36avcvs4iv90+7pvZQP5 HLTJfIBKSkDCsjiF5h6sNBDgn97NUbdvT6RcCM+PRGMmJavY6zC4WdlWxwsIrgrVU9IMbG uJ8bRIAebLmiph3J7IdUlIYYQHX7mVIdApipMPEQ87EL01at0HWLqKanSyg2Mg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zf9OZtm5iM4Qej/8QpeT9Zf7/vKhzk4owK5nwBi5SSM=; b=vvL5LGyLAeGc5vnnQNpRGpnIHKfydxFiG21ksNORlHFj/lRyLt74JuZvMHG8OSa4ynms10 sC7/UU6SQm8KdCKZsugjYPoCvyRSPPrifnAD05UQDB08Nff1F7LsvmASZXpMppZ/LrLufD Q0XigSjCuTPU4J9A8a1QsbakHAJk7oli/19PJl77tEgvL7wFw07G5WJicgqVZbbBuOjUPZ vW4ESoyU9kBsufcOhrwN5UV8Uhw7eHHRuwZlqJvsI/2Iyrj0+3ythHUh3JSoM59CuDl8UA b2Rvoe0Dx3CNZK2DyUx9v96U8Kz1ONF/LNUjN8rfeAXJy7FKlrPBjdlgQ5Ea5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652132; a=rsa-sha256; cv=none; b=QyzKaMc/W/uLT2+2yzQMp5F7aKu15hwm/ckpx2JoOm+GohMA1NV/jCPK/u3UYVrxfccX+b 9due2MxsHDpc2wE5aAIgpjdpAYtFEbV+JbIWIBEFvE14kaVhNsN/UoDwpmFpxNxmjD/X7z y/Ls9x5xBBmzIRSeVAvLghDGUr1vDU6WRY5bjMTwPs0g9yD183TDMwUbapdpQIovCJeyya uOt2h+AOsGSzSlp8UI58q4yGsGmIZDDU6gZqvgWGzXLeZ7axNrvcjwKmGRgFb+44Bf2OJB S7qjcE8Zh4nU/AJqZL60LP5MdGr45gK/kYyf7rFmfa07G5Ad51mTy3MZBHHylQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLyzm4nTpznhq; Thu, 10 Aug 2023 07:22:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37A7MCUm023555; Thu, 10 Aug 2023 07:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7MCLY023540; Thu, 10 Aug 2023 07:22:12 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:22:12 GMT Message-Id: <202308100722.37A7MCLY023540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: c15106da820b - main - arm64: xilinx: gpio: Add support for ZynqMP SoC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c15106da820bd2e042fa8bc7cfba56ae69b371d6 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c15106da820bd2e042fa8bc7cfba56ae69b371d6 commit c15106da820bd2e042fa8bc7cfba56ae69b371d6 Author: Emmanuel Vadot AuthorDate: 2022-09-29 08:41:24 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-10 07:21:55 +0000 arm64: xilinx: gpio: Add support for ZynqMP SoC Add support for the gpio controller found in the ZynqMP SoC. The registers are the same as the Zynq 7000, just the number of banks/pins per banks differs. Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 2 weeks --- sys/arm/xilinx/zy7_gpio.c | 140 +++++++++++++++++++++++++++++++++------------- sys/conf/files.arm64 | 1 + 2 files changed, 102 insertions(+), 39 deletions(-) diff --git a/sys/arm/xilinx/zy7_gpio.c b/sys/arm/xilinx/zy7_gpio.c index d487fc8e79d1..3dea34dc47fd 100644 --- a/sys/arm/xilinx/zy7_gpio.c +++ b/sys/arm/xilinx/zy7_gpio.c @@ -70,30 +70,49 @@ __FBSDID("$FreeBSD$"); #include "gpio_if.h" -#define ZYNQ_MAX_BANK 4 +#define ZYNQ7_MAX_BANK 4 +#define ZYNQMP_MAX_BANK 6 /* Zynq 7000 */ -#define ZYNQ_BANK0_PIN_MIN 0 -#define ZYNQ_BANK0_NPIN 32 -#define ZYNQ_BANK1_PIN_MIN 32 -#define ZYNQ_BANK1_NPIN 22 -#define ZYNQ_BANK2_PIN_MIN 64 -#define ZYNQ_BANK2_NPIN 32 -#define ZYNQ_BANK3_PIN_MIN 96 -#define ZYNQ_BANK3_NPIN 32 -#define ZYNQ_PIN_MIO_MIN 0 -#define ZYNQ_PIN_MIO_MAX 54 -#define ZYNQ_PIN_EMIO_MIN 64 -#define ZYNQ_PIN_EMIO_MAX 118 - -#define ZYNQ_BANK_NPIN(bank) (ZYNQ_BANK##bank##_NPIN) -#define ZYNQ_BANK_PIN_MIN(bank) (ZYNQ_BANK##bank##_PIN_MIN) -#define ZYNQ_BANK_PIN_MAX(bank) (ZYNQ_BANK##bank##_PIN_MIN + ZYNQ_BANK##bank##_NPIN - 1) - -#define ZYNQ_PIN_IS_MIO(pin) (pin >= ZYNQ_PIN_MIO_MIN && \ - pin <= ZYNQ_PIN_MIO_MAX) -#define ZYNQ_PIN_IS_EMIO(pin) (pin >= ZYNQ_PIN_EMIO_MIN && \ - pin <= ZYNQ_PIN_EMIO_MAX) +#define ZYNQ7_BANK0_PIN_MIN 0 +#define ZYNQ7_BANK0_NPIN 32 +#define ZYNQ7_BANK1_PIN_MIN 32 +#define ZYNQ7_BANK1_NPIN 22 +#define ZYNQ7_BANK2_PIN_MIN 64 +#define ZYNQ7_BANK2_NPIN 32 +#define ZYNQ7_BANK3_PIN_MIN 96 +#define ZYNQ7_BANK3_NPIN 32 +#define ZYNQ7_PIN_MIO_MIN 0 +#define ZYNQ7_PIN_MIO_MAX 54 +#define ZYNQ7_PIN_EMIO_MIN 64 +#define ZYNQ7_PIN_EMIO_MAX 118 + +/* ZynqMP */ +#define ZYNQMP_BANK0_PIN_MIN 0 +#define ZYNQMP_BANK0_NPIN 26 +#define ZYNQMP_BANK1_PIN_MIN 26 +#define ZYNQMP_BANK1_NPIN 26 +#define ZYNQMP_BANK2_PIN_MIN 52 +#define ZYNQMP_BANK2_NPIN 26 +#define ZYNQMP_BANK3_PIN_MIN 78 +#define ZYNQMP_BANK3_NPIN 32 +#define ZYNQMP_BANK4_PIN_MIN 110 +#define ZYNQMP_BANK4_NPIN 32 +#define ZYNQMP_BANK5_PIN_MIN 142 +#define ZYNQMP_BANK5_NPIN 32 +#define ZYNQMP_PIN_MIO_MIN 0 +#define ZYNQMP_PIN_MIO_MAX 77 +#define ZYNQMP_PIN_EMIO_MIN 78 +#define ZYNQMP_PIN_EMIO_MAX 174 + +#define ZYNQ_BANK_NPIN(type, bank) (ZYNQ##type##_BANK##bank##_NPIN) +#define ZYNQ_BANK_PIN_MIN(type, bank) (ZYNQ##type##_BANK##bank##_PIN_MIN) +#define ZYNQ_BANK_PIN_MAX(type, bank) (ZYNQ##type##_BANK##bank##_PIN_MIN + ZYNQ##type##_BANK##bank##_NPIN - 1) + +#define ZYNQ_PIN_IS_MIO(type, pin) (pin >= ZYNQ##type##_PIN_MIO_MIN && \ + pin <= ZYNQ##type##_PIN_MIO_MAX) +#define ZYNQ_PIN_IS_EMIO(type, pin) (pin >= ZYNQ##type##_PIN_EMIO_MIN && \ + pin <= ZYNQ##type##_PIN_EMIO_MAX) #define ZGPIO_LOCK(sc) mtx_lock(&(sc)->sc_mtx) #define ZGPIO_UNLOCK(sc) mtx_unlock(&(sc)->sc_mtx) @@ -102,12 +121,18 @@ __FBSDID("$FreeBSD$"); "gpio", MTX_DEF) #define ZGPIO_LOCK_DESTROY(_sc) mtx_destroy(&_sc->sc_mtx); +enum zynq_gpio_type { + ZYNQ_7000 = 0, + ZYNQMP, +}; + struct zynq_gpio_conf { - char *name; - uint32_t nbanks; - uint32_t maxpin; - uint32_t bank_min[ZYNQ_MAX_BANK]; - uint32_t bank_max[ZYNQ_MAX_BANK]; + char *name; + enum zynq_gpio_type type; + uint32_t nbanks; + uint32_t maxpin; + uint32_t bank_min[ZYNQMP_MAX_BANK]; + uint32_t bank_max[ZYNQMP_MAX_BANK]; }; struct zy7_gpio_softc { @@ -120,20 +145,41 @@ struct zy7_gpio_softc { static struct zynq_gpio_conf z7_gpio_conf = { .name = "Zynq-7000 GPIO Controller", - .nbanks = ZYNQ_MAX_BANK, - .maxpin = ZYNQ_PIN_EMIO_MAX, - .bank_min[0] = ZYNQ_BANK_PIN_MIN(0), - .bank_max[0] = ZYNQ_BANK_PIN_MAX(0), - .bank_min[1] = ZYNQ_BANK_PIN_MIN(1), - .bank_max[1] = ZYNQ_BANK_PIN_MAX(1), - .bank_min[2] = ZYNQ_BANK_PIN_MIN(2), - .bank_max[2] = ZYNQ_BANK_PIN_MAX(2), - .bank_min[3] = ZYNQ_BANK_PIN_MIN(3), - .bank_max[3] = ZYNQ_BANK_PIN_MAX(3), + .type = ZYNQ_7000, + .nbanks = ZYNQ7_MAX_BANK, + .maxpin = ZYNQ7_PIN_EMIO_MAX, + .bank_min[0] = ZYNQ_BANK_PIN_MIN(7, 0), + .bank_max[0] = ZYNQ_BANK_PIN_MAX(7, 0), + .bank_min[1] = ZYNQ_BANK_PIN_MIN(7, 1), + .bank_max[1] = ZYNQ_BANK_PIN_MAX(7, 1), + .bank_min[2] = ZYNQ_BANK_PIN_MIN(7, 2), + .bank_max[2] = ZYNQ_BANK_PIN_MAX(7, 2), + .bank_min[3] = ZYNQ_BANK_PIN_MIN(7, 3), + .bank_max[3] = ZYNQ_BANK_PIN_MAX(7, 3), +}; + +static struct zynq_gpio_conf zynqmp_gpio_conf = { + .name = "ZynqMP GPIO Controller", + .type = ZYNQMP, + .nbanks = ZYNQMP_MAX_BANK, + .maxpin = ZYNQMP_PIN_EMIO_MAX, + .bank_min[0] = ZYNQ_BANK_PIN_MIN(MP, 0), + .bank_max[0] = ZYNQ_BANK_PIN_MAX(MP, 0), + .bank_min[1] = ZYNQ_BANK_PIN_MIN(MP, 1), + .bank_max[1] = ZYNQ_BANK_PIN_MAX(MP, 1), + .bank_min[2] = ZYNQ_BANK_PIN_MIN(MP, 2), + .bank_max[2] = ZYNQ_BANK_PIN_MAX(MP, 2), + .bank_min[3] = ZYNQ_BANK_PIN_MIN(MP, 3), + .bank_max[3] = ZYNQ_BANK_PIN_MAX(MP, 3), + .bank_min[4] = ZYNQ_BANK_PIN_MIN(MP, 4), + .bank_max[4] = ZYNQ_BANK_PIN_MAX(MP, 4), + .bank_min[5] = ZYNQ_BANK_PIN_MIN(MP, 5), + .bank_max[5] = ZYNQ_BANK_PIN_MAX(MP, 5), }; static struct ofw_compat_data compat_data[] = { {"xlnx,zy7_gpio", (uintptr_t)&z7_gpio_conf}, + {"xlnx,zynqmp-gpio-1.0", (uintptr_t)&zynqmp_gpio_conf}, {NULL, 0}, }; @@ -212,15 +258,31 @@ zy7_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) static int zy7_gpio_pin_getname(device_t dev, uint32_t pin, char *name) { + struct zy7_gpio_softc *sc; + uint32_t emio_min; + bool is_mio; + sc = device_get_softc(dev); if (!zy7_pin_valid(dev, pin)) return (EINVAL); - if (ZYNQ_PIN_IS_MIO(pin)) { + switch (sc->conf->type) { + case ZYNQ_7000: + is_mio = ZYNQ_PIN_IS_MIO(7, pin); + emio_min = ZYNQ7_PIN_EMIO_MIN; + break; + case ZYNQMP: + is_mio = ZYNQ_PIN_IS_MIO(MP, pin); + emio_min = ZYNQMP_PIN_EMIO_MIN; + break; + default: + return (EINVAL); + } + if (is_mio) { snprintf(name, GPIOMAXNAME, "MIO_%d", pin); name[GPIOMAXNAME - 1] = '\0'; } else { - snprintf(name, GPIOMAXNAME, "EMIO_%d", pin - ZYNQ_PIN_EMIO_MIN); + snprintf(name, GPIOMAXNAME, "EMIO_%d", pin - emio_min); name[GPIOMAXNAME - 1] = '\0'; } diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 7eb0c0d04367..31c296d49d86 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -692,3 +692,4 @@ arm64/rockchip/clk/rk3568_pmucru.c optional fdt soc_rockchip_rk3568 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq fdt +arm/xilinx/zy7_gpio.c optional gpio soc_xilinx_zynq fdt From nobody Thu Aug 10 07:22:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLyzp2cB4z4qFfZ; Thu, 10 Aug 2023 07:22: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 4RLyzn6rvHz4M0Z; Thu, 10 Aug 2023 07:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZxL+gUyeMMJtTCBwNmUI+SUmV4iU7DlvQ0VFOPfTjg=; b=O084CLsoIIcLyJt8sALttP5Kpb7mZUepIe1NHWX2Bhtsew1UlDwItxnwD0uR/ps3/Mb9Rw 1AL1cuOXpNGfyEmQPsMvMoVmLE32Icbo4+DwSGeBVV0/JH9EpFsdpVPNuWHYkT1Iiv3wVg fdr4E7xzM7e3qafsLjKhFLlUDaHWF21hKQke9g/Ivar4qTP2hvQHyaxD/87b7twiee7Dym 6ja6tA/fitD7Yhsm0EAVJRKlYb6LShwxakhKm9mWVpklC7tGTsLa8Dvdaso/xEuumu9cH0 HgN42kzpNy4EALoXCHabgZZvZCzLbo+7YF8xZOjuewlA2Ok334s1kcUk0+BL2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZxL+gUyeMMJtTCBwNmUI+SUmV4iU7DlvQ0VFOPfTjg=; b=YBSjhZjavv/JfuTiNFm8Lfo44X/Dj0RLjBTMxjzdWkXENPudqO/Q/AP+orDRvA52T1KRpA dYFo6bgA00rPsBT5e/L6DJCaDzjswWcg1II36S0K4peZc6jCbHevnWGZ7mtkY68Js5cvE8 /H67MbcRitw0lY9nA5tKe9JTMvUJBvpGFr++opb89cXqiPJO9TFk2aW7dlie0gkMFLpUg7 6yy0UCqNlK00nP+/sTd8zsCmdPRmc3A7yYmWGmj7iQl8z9131NpBHVCWIx47hJE6HLfv7/ KfbMj14ej3amuw+xP6hsTQ0+eyIEQCqGJdgs2UDew1wHaxc4Dx53b7ipDSoOJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652134; a=rsa-sha256; cv=none; b=Gl4E1Cc2ZaGwHdKFWw3sCmDZRqTNXjlU+xtdkrNs89Zby3/GmzeU/jXt06sIpv8u/Ac5xQ CCRX+aamJj35EMjWoXZhZFqWybKCi//Z97S35bGtw1DiVKrXdATTGX1HJx1Zn2myE50lp5 uJl0KO2UR3IZwrVVzb7UChsaWvSR4yVP6e3lYa2mTJKWXO6Y7fkPA+oEYparqMTo6CELLT eO0bRmEi7HZoId52tg44JoB8C7tXkV0SsCe2bYeG131JlcJgxuuUAPjr4efucE1Urecd6C ojEQKk60CIqEMU5w7dJk+jNdVquFj5Jk38NXlA8X4gNYcWC3Fb81Ixdml7XOcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLyzn5pQlzpCY; Thu, 10 Aug 2023 07:22: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 37A7MDae024213; Thu, 10 Aug 2023 07:22:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7MDHB024210; Thu, 10 Aug 2023 07:22:13 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:22:13 GMT Message-Id: <202308100722.37A7MDHB024210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: b426119a45d0 - main - sdhci: xilinx: Add compatible and quirks for ZynqMP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b426119a45d09a44ebb5645e026cc61e810244e8 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=b426119a45d09a44ebb5645e026cc61e810244e8 commit b426119a45d09a44ebb5645e026cc61e810244e8 Author: Emmanuel Vadot AuthorDate: 2022-09-29 08:49:05 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-10 07:21:55 +0000 sdhci: xilinx: Add compatible and quirks for ZynqMP Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 2 weeks --- sys/dev/sdhci/sdhci_fdt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index 09338602d2fb..c6319d49ca65 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$"); #define SDHCI_FDT_QUALCOMM 4 #define SDHCI_FDT_RK3399 5 #define SDHCI_FDT_RK3568 6 +#define SDHCI_FDT_XLNX_ZMP 7 #define RK3399_GRF_EMMCCORE_CON0 0xf000 #define RK3399_CORECFG_BASECLKFREQ 0xff00 @@ -124,6 +125,7 @@ static struct ofw_compat_data compat_data[] = { { "rockchip,rk3399-sdhci-5.1", SDHCI_FDT_RK3399 }, { "xlnx,zy7_sdhci", SDHCI_FDT_XLNX_ZY7 }, { "rockchip,rk3568-dwcmshc", SDHCI_FDT_RK3568 }, + { "xlnx,zynqmp-8.9a", SDHCI_FDT_XLNX_ZMP }, { NULL, 0 } }; @@ -532,6 +534,9 @@ sdhci_fdt_probe(device_t dev) case SDHCI_FDT_RK3568: device_set_desc(dev, "Rockchip RK3568 fdt SDHCI controller"); break; + case SDHCI_FDT_XLNX_ZMP: + device_set_desc(dev, "ZynqMP generic fdt SDHCI controller"); + break; default: return (ENXIO); } From nobody Thu Aug 10 07:22:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLyzq14bNz4Tjbb; Thu, 10 Aug 2023 07:22: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 4RLyzq0ZXFz4LxF; Thu, 10 Aug 2023 07:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mBgLhvLhBa5E3wJGef4hhE2PyzYHiOt23UfDwJbQlS0=; b=mtY7PItJuGctiQNO4DqXBbxk2r0lk8R3kfjaohKfNtzRaPeVS1/O/wDfnIKgODfs283yxq Cy4CrdFBTZiU5hMUy14yk+MfZrGaLnnJINaviYB/pVDhO6vcVH2GtctnXRvt+qEKJTFW8z m2A0PTHK83bhTP7t9jR/b1L3TZ1TplEwpBP//HAm21MFSclrou2/wqLqcFNqKpXMWYCKUB HNqRWQEYZXObZo5aGfaafUM4vKJ+d5mOVaI4E7PfdvVnR1Lo7ewS6DV9Is+UAKt8ydEmtK jBdQhIBSFIjjURmntS0thdtDcDaG9Nu4l2w9blpJm4r9QGb1OSNiU+6htq08NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mBgLhvLhBa5E3wJGef4hhE2PyzYHiOt23UfDwJbQlS0=; b=g2DY7rJDhjWpcjAelllpDlo3yyUfA4fxlpDGrE9wZE9NALCVa2IZKWHWm1ZsAGs2n58eVs 2omJi5AWBY9rf0tT6QE6/qViVdFNuxGcZsu5vM9MwTvSxHFdOu1rT6Mnc6mUY8v2fQFQE+ snB2y/TkG/A1Mlb0P18WBPL/LEkZSQlx5+r+mls9UX4psCJPh6vb2/6Wjx0em4WHPAlwBG ppm4sfkhk6Y4M3J5dkLis5Mvm5Gv07LgiJPQ8Ya4Pp6aboUYcC4OQlpr25jnZL3XyS83BS /3SRYFJ6hbldh7iB6dapLZMQwZ+0DSu6+8tm9p7qH7KO3/1JwrJWrWE82a0gYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652135; a=rsa-sha256; cv=none; b=W3R5XWu42sVNPn0ZtmdK6OHIodd1wqP9HLdB036FJNgjbj0ljUoaQAsJHfyi2lonF94mjo Q2GdCsyCs3knNcbaKcw4RuYE/nUIv9koUHXMkDzEwKz8IR62EQDzRCPZb5fV7d8s4uv7yU Wl/gxuRJiGAEC7/zS3P1YQBnIn1jSAVDcDPwTkQs2yD0KRlW2GHRmjNJJ5FWf/zSViy3P1 bjrqRp0PVByxj/tnkz7Sfkb+VVyHOv6sRTamll8momqaHs+APdpk4cXsq5Z+bQ3ieKSaOY 56qmmQ1b2sr/6SHOLvEAJT70lrkSx9af74RUXFhBvnd0GYB0bYdvL8S9Fcp66g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLyzp6pF1zpCZ; Thu, 10 Aug 2023 07:22: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 37A7MEWK024259; Thu, 10 Aug 2023 07:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7MEGQ024256; Thu, 10 Aug 2023 07:22:14 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:22:14 GMT Message-Id: <202308100722.37A7MEGQ024256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: e758ed2dd535 - main - sdhci: Add support for disable-wp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 commit e758ed2dd5350b432cf10b6c2c3cbf4c3d570b03 Author: Emmanuel Vadot AuthorDate: 2022-09-29 11:58:08 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-10 07:21:55 +0000 sdhci: Add support for disable-wp Some platform needs it when the WP pin is broken. Sponsored by: Beckhoff Automation GmbH & Co. KG MFC after: 2 weeks --- sys/dev/sdhci/sdhci_fdt.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/dev/sdhci/sdhci_fdt.c b/sys/dev/sdhci/sdhci_fdt.c index c6319d49ca65..1890ab3ae6a6 100644 --- a/sys/dev/sdhci/sdhci_fdt.c +++ b/sys/dev/sdhci/sdhci_fdt.c @@ -143,6 +143,7 @@ struct sdhci_fdt_softc { struct resource *mem_res[MAX_SLOTS]; /* Memory resource */ bool wp_inverted; /* WP pin is inverted */ + bool wp_disabled; /* WP pin is not supported */ bool no_18v; /* No 1.8V support */ clk_t clk_xin; /* xin24m fixed clock */ @@ -433,6 +434,8 @@ sdhci_fdt_get_ro(device_t bus, device_t dev) { struct sdhci_fdt_softc *sc = device_get_softc(bus); + if (sc->wp_disabled) + return (false); return (sdhci_generic_get_ro(bus, dev) ^ sc->wp_inverted); } @@ -554,6 +557,8 @@ sdhci_fdt_probe(device_t dev) sc->no_18v = true; if (OF_hasprop(node, "wp-inverted")) sc->wp_inverted = true; + if (OF_hasprop(node, "disable-wp")) + sc->wp_disabled = true; return (0); } From nobody Thu Aug 10 07:23:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLz1l6fRJz4TjdR; Thu, 10 Aug 2023 07:23: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 4RLz1l62j9z4NhD; Thu, 10 Aug 2023 07:23:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ygRZvonj0SQHE29nKJBTNjHq0ck6/0KZ+krT5y64lQo=; b=Nn0xSGHjrJdQ7RkdjY3/EI+TC3GzhCP4NvCc8SV2u3Ztj5KTiod8RkhUbQbvlrdwnsh/U8 SUKGO9h4odOQ1WrBIUr5HVOoiFnsvwGDgaPqYR/jYAk/26FOmOLfC7POFTDSe1u15g0Rdf i3u5Ov8JQ4PMsg0z6QHpXNMvjsxP+tKhm1OUU8vUHQ61Iyw/sbHvnv4u/8lkWYoTonfD0d HR37VD+eHvDfACUZDn0Lv2JygHMHpUIms1NSMh12IbSPr/8ZcX2pkOY4ChUPfqAbG4KWgX y/L0w6OqlzRYzIP512p/I8hc3OVSHkNEEkHb+RDId9fZcw2cYSzIGv+5zql9tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ygRZvonj0SQHE29nKJBTNjHq0ck6/0KZ+krT5y64lQo=; b=uGd4MQsu+hlGvTAqsM6AmQ4w//GG6JnnPBiC6S9mz5mvLv85TOsXGkHuyOCYHe3sOeckpJ xjOSMfCzwIgWczkhMz62RVljd5hOjwrlxixcslE6gPPCA/R+b70N6i1tP8ZY4K5H83uioc N8kH9hlt97hdLZOroru8mba6y9v+Qqh3etCGW1BrJNOb9MujzNR0RLnMkbVWvKMIvoaR7I knEq5ydf7Rj2d1i79QABV1r5HRW2WcfLer4+u6viTqk4DwDd7t01rR1WCv3bDXrMWqzP4/ chsOxCUSpPvbDtT6tf6Xi1GemF3WaGWCCDpVqRVPp2Dmz+gqusZ2FIUeqScpvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652235; a=rsa-sha256; cv=none; b=URLdErCfhn/jN+5Xaei5S6IROd40hYXuhyTzF2DeSi998VSuBEYJe7kfMuKfd+Q0ybJ116 SfsH/7AHxb/57s7kq+roSKKtXyB7DB/m2Xy89X1mpUPkr8dF2X7L1STCvbqLT2n9ZXtWzL nNviEmqysJEeHOSDBNl5mG+8GfbD6f/zS8I0VrTWhH67qXwQxbGQBGxfY/tMdE5eteS8sc +FzGkbrIDZ8CGaGE/7drFlLwF1m73UM9CPLfZHSwUoy0ZYnHYq7rAiU0HLYmJpKUULP+Ym jXefW+vb3DxtaplSWKWRZ2tzPBsIzDvg9ZcOPO9dfvh1ztEPoJMzD7Xy4aN0fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLz1l5543znrF; Thu, 10 Aug 2023 07:23: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 37A7NtC8025543; Thu, 10 Aug 2023 07:23:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7NtWp025540; Thu, 10 Aug 2023 07:23:55 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:23:55 GMT Message-Id: <202308100723.37A7NtWp025540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 28dc1aa73392 - main - bhyve: add emulation for CRB register of TPM devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28dc1aa733923fbccc81281b8f2d9a6a2d96d4f9 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=28dc1aa733923fbccc81281b8f2d9a6a2d96d4f9 commit 28dc1aa733923fbccc81281b8f2d9a6a2d96d4f9 Author: Corvin Köhne AuthorDate: 2022-08-29 10:10:44 +0000 Commit: Corvin Köhne CommitDate: 2023-08-10 07:23:33 +0000 bhyve: add emulation for CRB register of TPM devices Trap accesses to the CRB MMIO range and emulate them properly. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40459 --- usr.sbin/bhyve/tpm_device.c | 3 +- usr.sbin/bhyve/tpm_intf.h | 4 +- usr.sbin/bhyve/tpm_intf_crb.c | 185 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 189 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 3ff480d5e6bb..421d10dafb75 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -141,7 +141,8 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, } if (dev->intf->init) { - error = dev->intf->init(&dev->intf_sc, dev->emul, dev->emul_sc); + error = dev->intf->init(&dev->intf_sc, dev->emul, dev->emul_sc, + dev->acpi_dev); if (error) goto err_out; } diff --git a/usr.sbin/bhyve/tpm_intf.h b/usr.sbin/bhyve/tpm_intf.h index b1523270d7e7..8f50297138d9 100644 --- a/usr.sbin/bhyve/tpm_intf.h +++ b/usr.sbin/bhyve/tpm_intf.h @@ -9,6 +9,7 @@ #include +#include "acpi_device.h" #include "config.h" #include "tpm_device.h" #include "tpm_emul.h" @@ -31,7 +32,8 @@ struct tpm_intf { const char *name; - int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc); + int (*init)(void **sc, struct tpm_emul *emul, void *emul_sc, + struct acpi_device *acpi_dev); void (*deinit)(void *sc); int (*build_acpi_table)(void *sc, struct vmctx *vm_ctx); }; diff --git a/usr.sbin/bhyve/tpm_intf_crb.c b/usr.sbin/bhyve/tpm_intf_crb.c index c4bfaa19958d..6aeafe7f0ec1 100644 --- a/usr.sbin/bhyve/tpm_intf_crb.c +++ b/usr.sbin/bhyve/tpm_intf_crb.c @@ -253,7 +253,173 @@ tpm_crb_thread(void *const arg) } static int -tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc) +tpm_crb_mmiocpy(void *const dst, void *const src, const int size) +{ + if (!(size == 1 || size == 2 || size == 4 || size == 8)) + return (EINVAL); + memcpy(dst, src, size); + + return (0); +} + +static int +tpm_crb_mem_handler(struct vcpu *vcpu __unused, const int dir, + const uint64_t addr, const int size, uint64_t *const val, void *const arg1, + const long arg2 __unused) +{ + struct tpm_crb *crb; + uint8_t *ptr; + uint64_t off, shift; + int error = 0; + + if ((addr & (size - 1)) != 0) { + warnx("%s: unaligned %s access @ %16lx [size = %x]", __func__, + (dir == MEM_F_READ) ? "read" : "write", addr, size); + return (EINVAL); + } + + crb = arg1; + + off = addr - TPM_CRB_ADDRESS; + if (off > TPM_CRB_REGS_SIZE || off + size >= TPM_CRB_REGS_SIZE) { + return (EINVAL); + } + + shift = 8 * (off & 3); + ptr = (uint8_t *)&crb->regs + off; + + if (dir == MEM_F_READ) { + error = tpm_crb_mmiocpy(val, ptr, size); + if (error) + goto err_out; + } else { + switch (off & ~0x3) { + case offsetof(struct tpm_crb_regs, loc_ctrl): { + union tpm_crb_reg_loc_ctrl loc_ctrl; + + if ((size_t)size > sizeof(loc_ctrl)) + goto err_out; + + *val = *val << shift; + tpm_crb_mmiocpy(&loc_ctrl, val, size); + + if (loc_ctrl.relinquish) { + crb->regs.loc_sts.granted = false; + crb->regs.loc_state.loc_assigned = false; + } else if (loc_ctrl.request_access) { + crb->regs.loc_sts.granted = true; + crb->regs.loc_state.loc_assigned = true; + } + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_req): { + union tpm_crb_reg_ctrl_req req; + + if ((size_t)size > sizeof(req)) + goto err_out; + + *val = *val << shift; + tpm_crb_mmiocpy(&req, val, size); + + if (req.cmd_ready && !req.go_idle) { + crb->regs.ctrl_sts.tpm_idle = false; + } else if (!req.cmd_ready && req.go_idle) { + crb->regs.ctrl_sts.tpm_idle = true; + } + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_cancel): { + /* TODO: cancel the tpm command */ + warnx( + "%s: cancelling a TPM command is not implemented yet", + __func__); + + break; + } + case offsetof(struct tpm_crb_regs, ctrl_start): { + union tpm_crb_reg_ctrl_start start; + + if ((size_t)size > sizeof(start)) + goto err_out; + + *val = *val << shift; + + pthread_mutex_lock(&crb->mutex); + tpm_crb_mmiocpy(&start, val, size); + + if (!start.start || crb->regs.ctrl_start.start) + break; + + crb->regs.ctrl_start.start = true; + + pthread_cond_signal(&crb->cond); + pthread_mutex_unlock(&crb->mutex); + + break; + } + case offsetof(struct tpm_crb_regs, cmd_size): + case offsetof(struct tpm_crb_regs, cmd_addr_lo): + case offsetof(struct tpm_crb_regs, cmd_addr_hi): + case offsetof(struct tpm_crb_regs, rsp_size): + case offsetof(struct tpm_crb_regs, + rsp_addr) ... offsetof(struct tpm_crb_regs, rsp_addr) + + 4: + case offsetof(struct tpm_crb_regs, + data_buffer) ... offsetof(struct tpm_crb_regs, data_buffer) + + TPM_CRB_DATA_BUFFER_SIZE / 4: + /* + * Those fields are used to execute a TPM command. The + * crb_thread will access them. For that reason, we have + * to acquire the crb mutex in order to write them. + */ + pthread_mutex_lock(&crb->mutex); + error = tpm_crb_mmiocpy(ptr, val, size); + pthread_mutex_unlock(&crb->mutex); + if (error) + goto err_out; + break; + default: + /* + * The other fields are either readonly or we do not + * support writing them. + */ + error = EINVAL; + goto err_out; + } + } + + return (0); + +err_out: + warnx("%s: invalid %s @ %16lx [size = %d]", __func__, + dir == MEM_F_READ ? "read" : "write", addr, size); + + return (error); +} + +static int +tpm_crb_modify_mmio_registration(const bool registration, void *const arg1) +{ + struct mem_range crb_mmio = { + .name = "crb-mmio", + .base = TPM_CRB_ADDRESS, + .size = TPM_CRB_LOCALITIES_MAX * TPM_CRB_CONTROL_AREA_SIZE, + .flags = MEM_F_RW, + .arg1 = arg1, + .handler = tpm_crb_mem_handler, + }; + + if (registration) + return (register_mem(&crb_mmio)); + else + return (unregister_mem(&crb_mmio)); +} + +static int +tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc, + struct acpi_device *acpi_dev) { struct tpm_crb *crb = NULL; int error; @@ -304,6 +470,19 @@ tpm_crb_init(void **sc, struct tpm_emul *emul, void *emul_sc) goto err_out; } + error = acpi_device_add_res_fixed_memory32(acpi_dev, false, + TPM_CRB_ADDRESS, TPM_CRB_CONTROL_AREA_SIZE); + if (error) { + warnx("%s: failed to add acpi resources\n", __func__); + goto err_out; + } + + error = tpm_crb_modify_mmio_registration(true, crb); + if (error) { + warnx("%s: failed to register crb mmio", __func__); + goto err_out; + } + error = pthread_mutex_init(&crb->mutex, NULL); if (error) { warnc(error, "%s: failed to init mutex", __func__); @@ -338,6 +517,7 @@ static void tpm_crb_deinit(void *sc) { struct tpm_crb *crb; + int error; if (sc == NULL) { return; @@ -352,6 +532,9 @@ tpm_crb_deinit(void *sc) pthread_cond_destroy(&crb->cond); pthread_mutex_destroy(&crb->mutex); + error = tpm_crb_modify_mmio_registration(false, NULL); + assert(error == 0); + free(crb); } From nobody Thu Aug 10 07:23:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLz1n0Sgyz4qFlT; Thu, 10 Aug 2023 07:23: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 4RLz1m6lw5z4NkV; Thu, 10 Aug 2023 07:23:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K+ycz7oubavgZCDCBewcIHB4FJ9ZWJhSyfeRPK1leUU=; b=d0gews4j4S2N6MmB0NBAcWXODsLyapMkPJ7FkEAB34I+d4hvTLKAnNpIYYAamELT2vx9mw RCnDVS8HpMmf9X5qawCYqv1T+TkxOzVgY0rh5ajaABKv7X3O5VrcBWTQfTEiGhsnyECZH3 D9BlNwCi2gB8cT3yaMundDzPK02RbdroF6DfsZBprG2Ms6zdiMH4zr0Z2IVR2YOYDIW80/ u26qhkWsd+CvCoXMVbBhrLng7CzAxgiTAbHc/G9SAKBWf0Ob9JDtuHLY9KTHCV+j88LKwy aahIuTXti5Y06fGXIC7mPBuIG35vbIN27pJhafrVKSYDKPqM4DeJ3wga1gagJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691652237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K+ycz7oubavgZCDCBewcIHB4FJ9ZWJhSyfeRPK1leUU=; b=Br0BDZ7OFczKCXim+ee6c1zpFVzstYz1nG/pFNPWS9asPWFzlygJvHPlRLyf4YZC582gEV gIUk1n31flE8btO2TD38hwWAwsjRHTnpQBIFnYDMF748fyZvsZwV50ATqF/w3/ranGNAt2 OoVRKURy3ySPUCWxuZ5DPMYWawc8vZWG+8DLWgsdklmx/dkmthQ1PUUtAd23GjXO5rDXH/ /ArjG127mrDKi3u5cnv0iW5UWONrJL88imuLhYR5HzBC7x+EKCBIZrRuhG9FDFrQ88VVT5 lhUIN6Ycj6LQiXFa4X7e3Y4m7t5k+WyAqEx6rEp87Seow7XLHmztCGY2P+BCjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691652237; a=rsa-sha256; cv=none; b=OX7rHiFhgv8WPLVcydDxYYvUiAmmrJITwJktTb23wiudsGmm+naHMZKhBqJMikCmwUUTXm HVcE5+7dZp8L9BD1SFnrXqodkMR5sXxeDrn5q/QRM3dcvwKIkr3PSg7H0K8ZO3VEiznDbT 3KZks0F2TuqiEUfFGUXNzQVedj1w6PqM54Ys92Igj81aLiwLm+4TkvZzD71K6WOJ4tdaTF 8bSKIpDxm17cg1V/7NNHYLlVFRzaCAGLOVrTDLjqsQT9dVho1G/zSTe015hVrk6FJfnWQt csjYPTFhWLph5SZtStjyYeRtjihUiLgTRgLnlLQ7rV8nGFds6Nw7V2D5aQ0kzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLz1m5rNmzpCs; Thu, 10 Aug 2023 07:23: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 37A7NuKT025594; Thu, 10 Aug 2023 07:23:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A7NuTx025591; Thu, 10 Aug 2023 07:23:56 GMT (envelope-from git) Date: Thu, 10 Aug 2023 07:23:56 GMT Message-Id: <202308100723.37A7NuTx025591@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 29200a8133c0 - main - bhyve: emulate TPM passthru by accessing /dev/tpmX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29200a8133c0963c17508035b63f5ca43db174c8 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=29200a8133c0963c17508035b63f5ca43db174c8 commit 29200a8133c0963c17508035b63f5ca43db174c8 Author: Corvin Köhne AuthorDate: 2022-08-29 10:10:45 +0000 Commit: Corvin Köhne CommitDate: 2023-08-10 07:23:42 +0000 bhyve: emulate TPM passthru by accessing /dev/tpmX To send commands to the TPM device, bhyve can use the host TPM driver by reading and writing from /dev/tpmX. Using this approach, only the host TPM driver has to detect and interact with the physical TPM interface. This simplifies bhyve's code much. As the host TPM driver has to interact with the TPM regardless of bhyve making use of it or not, makes it a good approach. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40460 --- usr.sbin/bhyve/tpm_emul_passthru.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/usr.sbin/bhyve/tpm_emul_passthru.c b/usr.sbin/bhyve/tpm_emul_passthru.c index 9d706dee7120..084d31d5fa9f 100644 --- a/usr.sbin/bhyve/tpm_emul_passthru.c +++ b/usr.sbin/bhyve/tpm_emul_passthru.c @@ -22,6 +22,12 @@ struct tpm_passthru { int fd; }; +struct tpm_resp_hdr { + uint16_t tag; + uint32_t len; + uint32_t errcode; +} __packed; + static int tpm_passthru_init(void **sc, nvlist_t *nvl) { @@ -46,6 +52,37 @@ tpm_passthru_init(void **sc, nvlist_t *nvl) return (0); } +static int +tpm_passthru_execute_cmd(void *sc, void *cmd, uint32_t cmd_size, void *rsp, + uint32_t rsp_size) +{ + struct tpm_passthru *tpm; + ssize_t len; + + if (rsp_size < (ssize_t)sizeof(struct tpm_resp_hdr)) { + warn("%s: rsp_size of %u is too small", __func__, rsp_size); + return (EINVAL); + } + + tpm = sc; + + len = write(tpm->fd, cmd, cmd_size); + if (len != cmd_size) { + warn("%s: cmd write failed (bytes written: %zd / %d)", __func__, + len, cmd_size); + return (EFAULT); + } + + len = read(tpm->fd, rsp, rsp_size); + if (len < (ssize_t)sizeof(struct tpm_resp_hdr)) { + warn("%s: rsp read failed (bytes read: %zd / %d)", __func__, + len, rsp_size); + return (EFAULT); + } + + return (0); +} + static void tpm_passthru_deinit(void *sc) { @@ -65,5 +102,6 @@ static const struct tpm_emul tpm_emul_passthru = { .name = "passthru", .init = tpm_passthru_init, .deinit = tpm_passthru_deinit, + .execute_cmd = tpm_passthru_execute_cmd, }; TPM_EMUL_SET(tpm_emul_passthru); From nobody Thu Aug 10 08:35:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM0c34lFPz4TnY6; Thu, 10 Aug 2023 08:35: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 4RM0c34F4Kz4VG1; Thu, 10 Aug 2023 08:35:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxGAU0Qnwd+XPvtCS5n361QEN9zJZYU6BPHj31BhKl0=; b=ssP0cs05sgOSFZ9TqCmLH+LBktwS8f4X7lchZsqAhnLTs3NgUGIVtlzX27ZHmNeLm2BNoC dmBYL+NAGe7MvIYO0AU7wOdvA/ftfB9JG5kDdqgJEkcDO6WzajtGvzAG84TPM+bJNWkIBH gI0qF1/GlzwPCLPYWQohlwXEQ8KyFaBxmo9TBXN+9USt1AmNKOfAsEX945KHrs++MEeIat QzvnZ2+3QNHB0ptixou6v2b662vZpbF5KCWdk1751AkH3UyLCErl3RPUrod5r8g87r+fFh iOC8fmtMCUuNdlNPnrQxk9tXZ1//mvcTp/bF2jcFkdQc51fC/rs0EnpovTSIig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cxGAU0Qnwd+XPvtCS5n361QEN9zJZYU6BPHj31BhKl0=; b=Zf+CH+DBdLdX81yqqn28I42UxYhYzKx3vAFe7FMnxUubiRb3tzSWIG+3iHQEKGjjnHVjSS CnucL095Nm9AEXdLSGn43Rm8VHgDj8XY7+B/KWcfr3khgQQnbF8DjMZVb43Ub35ambG1G6 DIR4bjvNjH04r9Y7r9J3YWNULwyNzrPQYUkkmTdp1q5hisZ/UQYoKJc6F0PRSwEi4DPIEq 0qgcrCbhrosuOSD0pVjc+hdg8HmPAfC95KAi6ezg+gSvbCmyKsoJfqJ9ynWDKnE6ZuIqvK gaov/p3u/mlCyBv/klWR40F2H9WHAaTPD2tB+ezB+eS93AFA5mhUkateyIeesQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691656515; a=rsa-sha256; cv=none; b=yRCeJOQ7iPeM29ZiVFYQi8g3wLFsF4iuYSC7uMsCfhI6JByVggliBXw4oVyNK9IkrWmGQd ZP9GsSMn3SIi282Hg7T8BvjFdFvRSIgFwTt9CKkqzbWkapP61fCHsTIx1ZkW+es1sWk92l 0Acq+rZ3tn4uGVXWnTesMkDu4U8mtZBdvrENyCR8IaEaN62tPXtI8JLFLSq95UTcoDPdQq AZwf4GYrSG5JhHiLvBmIbyl+BVCkc2exdyK4/OI8f6sZSk8EvzVm5blqur7zYJOTofDvJF eqR9TV0zvaYu4Xzf4pvUFZNJzCYuqFOPE6n4Kc9gDdGKOjpHQ6xp6IkHGMhMOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM0c33HBpzqky; Thu, 10 Aug 2023 08:35: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 37A8ZFpa042545; Thu, 10 Aug 2023 08:35:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A8ZFgc042543; Thu, 10 Aug 2023 08:35:15 GMT (envelope-from git) Date: Thu, 10 Aug 2023 08:35:15 GMT Message-Id: <202308100835.37A8ZFgc042543@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: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd25b0f740f8c846562fd66e7380437eb898c875 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 commit cd25b0f740f8c846562fd66e7380437eb898c875 Author: Martin Matuska AuthorDate: 2023-08-10 07:55:42 +0000 Commit: Martin Matuska CommitDate: 2023-08-10 07:56:53 +0000 zfs: cherry-pick fix from openzfs Vendor PR: #15080 ZIL: Fix config lock deadlock Obtained from: OpenZFS OpenZFS commit: 2cb992a99ccadb78d97049b40bd442eb4fdc549d Note: full vendor imports will continue when stable/14 has been branched --- sys/contrib/openzfs/module/zfs/zil.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/zil.c b/sys/contrib/openzfs/module/zfs/zil.c index 00d66a2481d7..af7137faaccf 100644 --- a/sys/contrib/openzfs/module/zfs/zil.c +++ b/sys/contrib/openzfs/module/zfs/zil.c @@ -151,6 +151,7 @@ static kmem_cache_t *zil_lwb_cache; static kmem_cache_t *zil_zcw_cache; static void zil_lwb_commit(zilog_t *zilog, lwb_t *lwb, itx_t *itx); +static void zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb); static itx_t *zil_itx_clone(itx_t *oitx); static int @@ -1768,7 +1769,7 @@ static uint_t zil_maxblocksize = SPA_OLD_MAXBLOCKSIZE; * Has to be called under zl_issuer_lock to chain more lwbs. */ static lwb_t * -zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) +zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb, list_t *ilwbs) { lwb_t *nlwb = NULL; zil_chain_t *zilc; @@ -1870,6 +1871,27 @@ zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) dmu_tx_commit(tx); + /* + * We need to acquire the config lock for the lwb to issue it later. + * However, if we already have a queue of closed parent lwbs already + * holding the config lock (but not yet issued), we can't block here + * waiting on the lock or we will deadlock. In that case we must + * first issue to parent IOs before waiting on the lock. + */ + if (ilwbs && !list_is_empty(ilwbs)) { + if (!spa_config_tryenter(spa, SCL_STATE, lwb, RW_READER)) { + lwb_t *tlwb; + while ((tlwb = list_remove_head(ilwbs)) != NULL) + zil_lwb_write_issue(zilog, tlwb); + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); + } + } else { + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); + } + + if (ilwbs) + list_insert_tail(ilwbs, lwb); + /* * If there was an allocation failure then nlwb will be null which * forces a txg_wait_synced(). @@ -1933,7 +1955,7 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb) ZIL_STAT_INCR(zilog, zil_itx_metaslab_normal_alloc, BP_GET_LSIZE(&lwb->lwb_blk)); } - spa_config_enter(zilog->zl_spa, SCL_STATE, lwb, RW_READER); + ASSERT(spa_config_held(zilog->zl_spa, SCL_STATE, RW_READER)); zil_lwb_add_block(lwb, &lwb->lwb_blk); lwb->lwb_issued_timestamp = gethrtime(); zio_nowait(lwb->lwb_root_zio); @@ -2037,8 +2059,7 @@ cont: lwb_sp < zil_max_waste_space(zilog) && (dlen % max_log_data == 0 || lwb_sp < reclen + dlen % max_log_data))) { - list_insert_tail(ilwbs, lwb); - lwb = zil_lwb_write_close(zilog, lwb); + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); if (lwb == NULL) return (NULL); zil_lwb_write_open(zilog, lwb); @@ -2937,8 +2958,7 @@ zil_process_commit_list(zilog_t *zilog, zil_commit_waiter_t *zcw, list_t *ilwbs) zfs_commit_timeout_pct / 100; if (sleep < zil_min_commit_timeout || lwb->lwb_sz - lwb->lwb_nused < lwb->lwb_sz / 8) { - list_insert_tail(ilwbs, lwb); - lwb = zil_lwb_write_close(zilog, lwb); + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); zilog->zl_cur_used = 0; if (lwb == NULL) { while ((lwb = list_remove_head(ilwbs)) @@ -3096,7 +3116,7 @@ zil_commit_waiter_timeout(zilog_t *zilog, zil_commit_waiter_t *zcw) * since we've reached the commit waiter's timeout and it still * hasn't been issued. */ - lwb_t *nlwb = zil_lwb_write_close(zilog, lwb); + lwb_t *nlwb = zil_lwb_write_close(zilog, lwb, NULL); ASSERT3S(lwb->lwb_state, !=, LWB_STATE_OPENED); From nobody Thu Aug 10 08:35:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM0c45Qrsz4TpCZ; Thu, 10 Aug 2023 08:35: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 4RM0c44yyxz4VGc; Thu, 10 Aug 2023 08:35:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5XwZ8e57WX32ASQGtEoFTSsvUwmDoCZI02fbdqYT2E=; b=m7OTKX2O2CZmgt82a0wq1G0ylehQNCsQPfwWCi1NUebFC0q76PvUx7znsZgnyA4Ll0FITN LKGfGTC0TBcgpCUJkEHCHpQzDpC3DxgWqe8OToeXoHYBXUhhC57MYuEeMD/Dj1KkJDMtdR EPNVWTaDRmy0SF7ciwgR4AgSzB296CAfjNlpNksU+nenRmJMZ/H+TzghgjIxp4neHLRJA6 JgoVjl8bMjKpCe1UgRKU/kwyEWwiZM1Kp9YPLAVzi+J0CrQUNxH9FTJp8c6DP/UhWvtbfq yLdrnsrpoe32P8YLaWWGS6bcgq2pkbi/SfFDiqWiCsAlHprfTfw1pA1M/10g3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691656516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u5XwZ8e57WX32ASQGtEoFTSsvUwmDoCZI02fbdqYT2E=; b=hdkbzub0QvB6hB1UM5cAd0U8qlzVHXiQx/pFeORWdPTSezZSxXKXc9zTS9b3C4SAs/9X3+ 0GOvlfkVUkofWI0ACeviU2vQW6D0osWntbuxFTSfLsgWS0ldtvSj4EYUJEIKE+/ElZlUFh 6TLrR8k0MWBlPCTlBYuxgMIpMRmrSN2KErMFflD1dn1Cd76cyRldgGcfnbhsvVJ8N+dTiy d3FOGcMubOuuEZ1xYqgUu604eiyS3eXETQ8BgFPxhwV82kpPCkXGr/gUkBSNDrQGu4f/Lu ptbz9B0evUBn+wdAob+9XiDP6X1xzT1tgs/QWrupx1pk7cfFRns55aukkfXsMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691656516; a=rsa-sha256; cv=none; b=q0ObttriCHYLoTCwTg4O1F8LXf0u/PjcNsKJNVEYUZqMELZiGxkBG3EECxwn94MRYBlTPc Ql5qGgaLZ9tYDQGEJzGzWHrAM/U7kZC3VDMsjI3ymsz+7FYNTrJhLeX4wu7n3VYI85uvfV TtWH0pfZ/0DKNEy6DJSQUnfklFVnta+t2GZ8prSSDZ9PCpLU7gsBqga/VUoYXzFj2AmyD7 bIEh7SuYU48FrYWRYL9Ktl7koE9L9bsG08QuDb/+2NkmGRy1ZgwVSsxC468t7KVMwhp87f uQ44pHwGywiPDsKkQmrGLKorbMfk5PAU4MK2wseON6k1Q7pWwQIv4IGF2fmERA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM0c441snzqj6; Thu, 10 Aug 2023 08:35: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 37A8ZGoX042591; Thu, 10 Aug 2023 08:35:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A8ZGqx042588; Thu, 10 Aug 2023 08:35:16 GMT (envelope-from git) Date: Thu, 10 Aug 2023 08:35:16 GMT Message-Id: <202308100835.37A8ZGqx042588@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: 28d2e3b5dedf - main - zfs: cherry-pick fix from openzfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28d2e3b5dedf24938e5ec0806084941510621f13 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=28d2e3b5dedf24938e5ec0806084941510621f13 commit 28d2e3b5dedf24938e5ec0806084941510621f13 Author: Martin Matuska AuthorDate: 2023-08-10 07:59:39 +0000 Commit: Martin Matuska CommitDate: 2023-08-10 08:11:52 +0000 zfs: cherry-pick fix from openzfs Vendor PR: #15103 Remove zl_issuer_lock from zil_suspend() Obtained from: OpenZFS OpenZFS commit: 2848de11e516a2ef2e6baa574a60d77a6fb47023 Note: full vendor imports will continue when stable/14 has been branched --- sys/contrib/openzfs/module/zfs/zil.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/zil.c b/sys/contrib/openzfs/module/zfs/zil.c index af7137faaccf..be5b9edf6ede 100644 --- a/sys/contrib/openzfs/module/zfs/zil.c +++ b/sys/contrib/openzfs/module/zfs/zil.c @@ -3941,13 +3941,11 @@ zil_suspend(const char *osname, void **cookiep) return (error); zilog = dmu_objset_zil(os); - mutex_enter(&zilog->zl_issuer_lock); mutex_enter(&zilog->zl_lock); zh = zilog->zl_header; if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); - mutex_exit(&zilog->zl_issuer_lock); dmu_objset_rele(os, suspend_tag); return (SET_ERROR(EBUSY)); } @@ -3961,7 +3959,6 @@ zil_suspend(const char *osname, void **cookiep) if (cookiep == NULL && !zilog->zl_suspending && (zilog->zl_suspend > 0 || BP_IS_HOLE(&zh->zh_log))) { mutex_exit(&zilog->zl_lock); - mutex_exit(&zilog->zl_issuer_lock); dmu_objset_rele(os, suspend_tag); return (0); } @@ -3970,7 +3967,6 @@ zil_suspend(const char *osname, void **cookiep) dsl_pool_rele(dmu_objset_pool(os), suspend_tag); zilog->zl_suspend++; - mutex_exit(&zilog->zl_issuer_lock); if (zilog->zl_suspend > 1) { /* From nobody Thu Aug 10 13:38:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM7LT65cGz4mHYp; Thu, 10 Aug 2023 13:38: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 4RM7LT5ZTVz3R7j; Thu, 10 Aug 2023 13:38:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691674737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cHfThhFq/yjuqcbkCAXzWH5PR7p0ukl43u9vYaBqc8=; b=Yzvf8gBHqJwrlcSk937Q80BRZFR4LE1SEGZTXZF6N5RXLIpozaiuy2IE4PtX4U/myzm519 NQbtPzlIAaFco2uzqMy2xsTlH+1tQoSJRnwp/FgULtQZftRrtvG+rdSM2Jrqf3KgW4OOH9 kYyAZgH09JZhYVU2W/Hp51cjxI3lEbuucEfIQLrgdeq/YwYNu3JednUrNY8Jk9Ej6XKD4X 80WlTz110eE09GMtQbc3mCwjaaL8BxPz9yCmCu7vDioZuIF6fR+fI9ao/1ZnwLtJp7MyRb 8dcKR+hYTKZOOoP+SJbWCm46lhgUfZaxxUBpTMyU2AoYRvCoUoSak1+pRH5kTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691674737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cHfThhFq/yjuqcbkCAXzWH5PR7p0ukl43u9vYaBqc8=; b=fKJKtGkjGeRAmy0nu1YbhnA/ihcY2a84KTe8d++g9iGj2f9opsqP7pws3+vis8JM+P27mb olljiRLr3e9ub/WfQCpIsfPFOADtIzmnNTwBdZrybVtRbfUYxHiLpAP8hgyVlBp2x7RLIr wdRUse7bjU+1N4h1Jn1ou62lZxEY4wcHylDVpy9R7uG/EUgLPKxAeYuOaclwbdjqFDyd+H o4GJwn3cfNxO1ZwXq/Xg5KZnaufwsqGl976TEyn+AeA7fci7eRDUbQhcZ8Z5oCIHY9Vj/I tWV7r7BIHTg2Qr7L0a1Rs3mZ1bD3CQiu69AMohBeDcxUrPhbG1Tzlsd1lIYm7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691674737; a=rsa-sha256; cv=none; b=OIM4znLz6BpzpvYIV2gkAakVfuUKs6CI4L64mtloCwALCTkH72d4pEOHxcg9jmd11CydpB Z8RD/3s9LyAarPxv5VHsMLN0/XPA/n2Aahl7qmeeYwToldIxWiyr2m3WndgWJ+DQsQFIdd DHvtMC9X9uvp/PH+gZoa0Y0n2eytSDMRu9uOaIJgaGNbyoiOR06rds/KvrXAYCC+eR/0FO jJJ5BMucMeW/lTUmPhncT0chi882+stPUemaw+WX+faqQdjuk7jCnbF1PBY0ezugma+7K0 b114heSup+0qPW3vLkka4HTYEmBEdUkgUZk5aTh4uT/8eaFJ//9tskAemmKihw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM7LT3xBXz10D2; Thu, 10 Aug 2023 13:38: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 37ADcvcB042746; Thu, 10 Aug 2023 13:38:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ADcvYw042743; Thu, 10 Aug 2023 13:38:57 GMT (envelope-from git) Date: Thu, 10 Aug 2023 13:38:57 GMT Message-Id: <202308101338.37ADcvYw042743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8ae81fa9c4bc - stable/13 - inet.3: remove mention of VAX endianness List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ae81fa9c4bc162bf505b80ef6e389d4e87ef6ec Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ae81fa9c4bc162bf505b80ef6e389d4e87ef6ec commit 8ae81fa9c4bc162bf505b80ef6e389d4e87ef6ec Author: Ed Maste AuthorDate: 2023-08-01 17:20:12 +0000 Commit: Ed Maste CommitDate: 2023-08-10 13:38:36 +0000 inet.3: remove mention of VAX endianness Machine endianness is not very important in understanding the inet* functions; the endianness of the VAX is especially so. PR: 272728 Sponsored by: The FreeBSD Foundation (cherry picked from commit 89c762c815dae64a39221956070af549b11ceb80) --- lib/libc/net/inet.3 | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/lib/libc/net/inet.3 b/lib/libc/net/inet.3 index cb44394d0a0c..7a5d888a4951 100644 --- a/lib/libc/net/inet.3 +++ b/lib/libc/net/inet.3 @@ -191,17 +191,6 @@ a When four parts are specified, each is interpreted as a byte of data and assigned, from left to right, to the four bytes of an Internet address. -Note -that when an Internet address is viewed as a 32-bit -integer quantity on the -.Tn VAX -the bytes referred to -above appear as -.Dq Li d.c.b.a . -That is, -.Tn VAX -bytes are -ordered from right to left. .Pp When a three part address is specified, the last part is interpreted as a 16-bit quantity and placed From nobody Thu Aug 10 13:44:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM7T61sxCz4mHk4; Thu, 10 Aug 2023 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RM7T61KdCz3Ryw; Thu, 10 Aug 2023 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691675082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pwbaa2ghVvJtwC3hkrfEHgiEdBjz5gy76MdZ58BnxqM=; b=ZkBSIljszfoA1Zez3nwm1I6n0uaoc7xtLIz0Z4W1+EdGaNmA6q9/XmzWCXdwN20BvC7DGe K0sEDSV6mEBWTKTHd7em3rH1c+sifptPTEKuP+CyFZqdPA+D0hU3SS+MP74JgSatHTxcYd iwYwyayDICbkFxVDIaJ5BO4uJTl519t9Gk5Gt1BRyM682wKji2r118JLGz0mdA/vs/tUNx 550OPKLQ/7d4ZtqILclJ6L3izqGkLf1VfDVB0YF85V01auPlfcOtgBXSRnlizz8QlHJ/uZ 7kyk2FVhLUmSjGWt0reIknnJa0VchZjIU9L/FvKLgh2ukDZy0wnulwuQX8WqsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691675082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pwbaa2ghVvJtwC3hkrfEHgiEdBjz5gy76MdZ58BnxqM=; b=kOnsnF5OWb5b8PxZJO5ht/pnVqUa9T7i3CWoQURSlBaSO6YkW8xr4+rKWblhgGV/sXGazw +an3vi//Qht2MR5zlvq3bAGrCsvfP0X3ntHqFwtqSLwqS5a9QDjE++VEDmZvq6w3ybqLc9 z3kCXqmmfG1NSVnawln0eS31n8bBBct16Ye8HJ3EXIQgCS4xtGGTJQQhoMxwjScfzc/QKh SY5pDZVyMHd5YA5lqVioDoEzYkiJn9wonIvQYnScKmTV3qZnA1oeEV3nVr9oF844xarzF/ Ual8kgpG8lzy2JHZ7ELEE9HEnPKm0nlPL5aAwmRZlkp6Rgm5f6d5ivi5/Ll22A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691675082; a=rsa-sha256; cv=none; b=pvyem+8ZWnPK0Fa1egBXW7OPYVkTpsVaHJJoEQrF82LyDkKVR7EErsHuXzOG2gwTmLimcS g0DsQ1NcUjT3T3OoBhr0msIlOFKIP6sbvlQxLReq0pFNS35hmsboZKxID1jcCfM+QXzUdC UpkYwZoosYACBhCK3lfkIVGfRhl89OodOfSkGQAe5/0p3TF7KTgCW0Quy+16V6d6yMb507 Mjy+OTDlKgNh5Xt4zotfI3xHRs0f9r5SzpKx6gHWheT0T0nFj2JJTiptX/1YoN2Pec3eXC lcbj9R2/fzl9NSoCjzqHnX8qk2Vv5RgluQx7eYYMp1lAf4rPkHfvzAacobyp2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM7T60J3czyrj; Thu, 10 Aug 2023 13:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ADifvo058634; Thu, 10 Aug 2023 13:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ADif9B058632; Thu, 10 Aug 2023 13:44:41 GMT (envelope-from git) Date: Thu, 10 Aug 2023 13:44:41 GMT Message-Id: <202308101344.37ADif9B058632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 73fa89e041ff - main - ix: Fix accessing wrong register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73fa89e041ffc3093178cb2bcc47a6adb7da7f42 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=73fa89e041ffc3093178cb2bcc47a6adb7da7f42 commit 73fa89e041ffc3093178cb2bcc47a6adb7da7f42 Author: Piotr Pietruszewski AuthorDate: 2023-08-10 13:43:21 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-10 13:43:21 +0000 ix: Fix accessing wrong register Use IXGBE_GRC_BY_MAC(hw) macro instead of IXGBE_GRC as IXGBE_GRC's address is different on Denverton platform. This patch is part of change made in NetBSD kernel by Masanobu Saitoh, NetBSD maintainer. Differential Revision: https://reviews.freebsd.org/D19175 Approved by: erj --- sys/dev/ixgbe/if_ix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index c2a911773f4b..e76bed13e607 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -2855,8 +2855,8 @@ ixgbe_setup_low_power_mode(if_ctx_t ctx) if (hw->device_id == IXGBE_DEV_ID_X550EM_X_10G_T && hw->phy.ops.enter_lplu) { /* Turn off support for APM wakeup. (Using ACPI instead) */ - IXGBE_WRITE_REG(hw, IXGBE_GRC, - IXGBE_READ_REG(hw, IXGBE_GRC) & ~(u32)2); + IXGBE_WRITE_REG(hw, IXGBE_GRC_BY_MAC(hw), + IXGBE_READ_REG(hw, IXGBE_GRC_BY_MAC(hw)) & ~(u32)2); /* * Clear Wake Up Status register to prevent any previous wakeup From nobody Thu Aug 10 14:23:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM8LJ6Q1Fz4mLKY; Thu, 10 Aug 2023 14:23:52 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc2a.google.com (mail-oo1-xc2a.google.com [IPv6:2607:f8b0:4864:20::c2a]) (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 4RM8LJ4hdPz3XBb; Thu, 10 Aug 2023 14:23:52 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc2a.google.com with SMTP id 006d021491bc7-56c85b723cfso778138eaf.3; Thu, 10 Aug 2023 07:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691677431; x=1692282231; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pXgdnZkAuyGoW4BeojKBcvs04Kgw/BKvL3EVOBybvJM=; b=S/bRIWzVnwag2Mapm2uCTcj9V1seQw/NetUDuyDFnFddX2y2qExZTv533Xe+5dm85d NR+5OqzAm/jIFQZPK1+KdpcVN1sBYvFeju1glU8BV6St6v0xXQct8keOksQTs7EGvr5G N8Y37RY5+RMuBhdKj5iuCdRm2gRDPCh5h/J+EeXAY/GT4Z35ayo3zMo65PE7wXOJgKVF ShVqsE9XDzGBDM+NwxQRy++r9e6137y4zZ3uQiFsPqlIwcNRP3fc/cLYbsztwStpV857 FDfQxDv+gPV/saZYIhG1uV6BkNOfUirWE+Tn4fou3asHJPHUDYnBDf6BMnSHes2UL+vB I+Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691677431; x=1692282231; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pXgdnZkAuyGoW4BeojKBcvs04Kgw/BKvL3EVOBybvJM=; b=Eu/LUBiW2fpK2mcNtlI5BsWQ0unAMm+AlZjseGuQywiJt9T6XQm6xuBKFaR02ubZ3Y kW2t4Lwrm60bBJHD96gAcFHG7KusXVz6J97hWeQ6h56WL0TisOGOYNfKz/knwuJRiFVL i2Sb9IL4LDI6Xw5vxi+HIOEeWKXQYkt1rOdzi6sMhIr8+bYNjgR0fuqpa5rNXd81qrzc vTevy4uLwcC1Sb/Wiw8RmIVRGtF3phowFrpM9rqzC5LJp3Kx1JRQWo51cV6hGrotAaFe 2qQxgN2wf3hQy+nyrp3j1gLGybalS+hb3GuTKz2o08JAof00HOAKTZM8cTR0zav1TE1q dYog== X-Gm-Message-State: AOJu0YzbHNVPz1T/7iGFTlVMb29LFfYoUTPMeID2D1yehgltoasIXz3t f01RTD3jxqcp0bjRFQcyqMScElYcZJ7aujvhNDDguB/8bVo= X-Google-Smtp-Source: AGHT+IHcjwnU5s1jGjGH7QLgE68Fo5hIouq2fREKcSeoe55jIDL+2RUq9vnJlshFJBuqIi73RNHt8aGrl1nO8nzA4uQ= X-Received: by 2002:a4a:2a4c:0:b0:56c:7120:8363 with SMTP id x12-20020a4a2a4c000000b0056c71208363mr2114462oox.5.1691677431045; Thu, 10 Aug 2023 07:23:51 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:129a:0:b0:4f0:1250:dd51 with HTTP; Thu, 10 Aug 2023 07:23:50 -0700 (PDT) In-Reply-To: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> References: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 10 Aug 2023 16:23:50 +0200 Message-ID: Subject: Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4RM8LJ4hdPz3XBb 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] On 8/10/23, Martin Matuska wrote: > The branch main has been updated by mm: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 > > commit cd25b0f740f8c846562fd66e7380437eb898c875 > Author: Martin Matuska > AuthorDate: 2023-08-10 07:55:42 +0000 > Commit: Martin Matuska > CommitDate: 2023-08-10 07:56:53 +0000 > > zfs: cherry-pick fix from openzfs > > Vendor PR: > #15080 ZIL: Fix config lock deadlock > > Obtained from: OpenZFS > OpenZFS commit: 2cb992a99ccadb78d97049b40bd442eb4fdc549d > > Note: full vendor imports will continue when stable/14 has been > branched First a stylistic issue: Can you please use upstream one-liner, maybe prefixed with zfs:. For this commit it would be: zfs: ZIL: Fix config lock deadlock. then copy their commit message For example see https://cgit.freebsd.org/src/commit/?id=d09a955a605d03471c5ab7bd17b8a6186fdc148c A not stylistic issue is the delay between upstream fixes and them getting merged into FreeBSD. For example the commit at hand is over 2 weeks old and I presume this merge got only prompted by des@ running a zfs-related deadlock. We really should be getting timely updates without local people running into them. > --- > sys/contrib/openzfs/module/zfs/zil.c | 34 > +++++++++++++++++++++++++++------- > 1 file changed, 27 insertions(+), 7 deletions(-) > > diff --git a/sys/contrib/openzfs/module/zfs/zil.c > b/sys/contrib/openzfs/module/zfs/zil.c > index 00d66a2481d7..af7137faaccf 100644 > --- a/sys/contrib/openzfs/module/zfs/zil.c > +++ b/sys/contrib/openzfs/module/zfs/zil.c > @@ -151,6 +151,7 @@ static kmem_cache_t *zil_lwb_cache; > static kmem_cache_t *zil_zcw_cache; > > static void zil_lwb_commit(zilog_t *zilog, lwb_t *lwb, itx_t *itx); > +static void zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb); > static itx_t *zil_itx_clone(itx_t *oitx); > > static int > @@ -1768,7 +1769,7 @@ static uint_t zil_maxblocksize = > SPA_OLD_MAXBLOCKSIZE; > * Has to be called under zl_issuer_lock to chain more lwbs. > */ > static lwb_t * > -zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) > +zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb, list_t *ilwbs) > { > lwb_t *nlwb = NULL; > zil_chain_t *zilc; > @@ -1870,6 +1871,27 @@ zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) > > dmu_tx_commit(tx); > > + /* > + * We need to acquire the config lock for the lwb to issue it later. > + * However, if we already have a queue of closed parent lwbs already > + * holding the config lock (but not yet issued), we can't block here > + * waiting on the lock or we will deadlock. In that case we must > + * first issue to parent IOs before waiting on the lock. > + */ > + if (ilwbs && !list_is_empty(ilwbs)) { > + if (!spa_config_tryenter(spa, SCL_STATE, lwb, RW_READER)) { > + lwb_t *tlwb; > + while ((tlwb = list_remove_head(ilwbs)) != NULL) > + zil_lwb_write_issue(zilog, tlwb); > + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); > + } > + } else { > + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); > + } > + > + if (ilwbs) > + list_insert_tail(ilwbs, lwb); > + > /* > * If there was an allocation failure then nlwb will be null which > * forces a txg_wait_synced(). > @@ -1933,7 +1955,7 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb) > ZIL_STAT_INCR(zilog, zil_itx_metaslab_normal_alloc, > BP_GET_LSIZE(&lwb->lwb_blk)); > } > - spa_config_enter(zilog->zl_spa, SCL_STATE, lwb, RW_READER); > + ASSERT(spa_config_held(zilog->zl_spa, SCL_STATE, RW_READER)); > zil_lwb_add_block(lwb, &lwb->lwb_blk); > lwb->lwb_issued_timestamp = gethrtime(); > zio_nowait(lwb->lwb_root_zio); > @@ -2037,8 +2059,7 @@ cont: > lwb_sp < zil_max_waste_space(zilog) && > (dlen % max_log_data == 0 || > lwb_sp < reclen + dlen % max_log_data))) { > - list_insert_tail(ilwbs, lwb); > - lwb = zil_lwb_write_close(zilog, lwb); > + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); > if (lwb == NULL) > return (NULL); > zil_lwb_write_open(zilog, lwb); > @@ -2937,8 +2958,7 @@ zil_process_commit_list(zilog_t *zilog, > zil_commit_waiter_t *zcw, list_t *ilwbs) > zfs_commit_timeout_pct / 100; > if (sleep < zil_min_commit_timeout || > lwb->lwb_sz - lwb->lwb_nused < lwb->lwb_sz / 8) { > - list_insert_tail(ilwbs, lwb); > - lwb = zil_lwb_write_close(zilog, lwb); > + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); > zilog->zl_cur_used = 0; > if (lwb == NULL) { > while ((lwb = list_remove_head(ilwbs)) > @@ -3096,7 +3116,7 @@ zil_commit_waiter_timeout(zilog_t *zilog, > zil_commit_waiter_t *zcw) > * since we've reached the commit waiter's timeout and it still > * hasn't been issued. > */ > - lwb_t *nlwb = zil_lwb_write_close(zilog, lwb); > + lwb_t *nlwb = zil_lwb_write_close(zilog, lwb, NULL); > > ASSERT3S(lwb->lwb_state, !=, LWB_STATE_OPENED); > > -- Mateusz Guzik From nobody Thu Aug 10 14:43:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM8mx4DrZz4mMpx; Thu, 10 Aug 2023 14:43: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 4RM8mx3Vm0z3b4S; Thu, 10 Aug 2023 14:43:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cG10hjpFQu8dYRiMpk2IWaB2WGb2cdzTCQ2DBc6Nf6M=; b=VgxH6fgeM2qAjTCTlTGAHIpRSQfPz+O7FQOHyUaUaEN+i+SNMi87dXQ3uWy23six07bzgw /R59qjFDzxbM2nKXhOWdrzcYuIg3MUp1i+9NnHGw0wwLs5MpWZj1dEnZsPuL3NuRkU2tSw tV2rCVwSpYi747O7PLEKSS4iJJ1FzcB8viV+Ri0AwePRMY2MbcVEcpxqZ9Z90Z0nd7h+RF 1xbSWzmC9MXkkIL8J6b5bPzfPrYYuxAabsA5PgMl2chbOTyK5rsiKlM2M42qTPzAZNN5QF JOTjeDz7dVhb3dX9p+34P+nJqos1A/3C2S9qEhgPp2xNAz6sesoEoZ1/PRvNCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691678609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cG10hjpFQu8dYRiMpk2IWaB2WGb2cdzTCQ2DBc6Nf6M=; b=l5GBP8l2uJC1pRPk8xlWMe16JrEE6tb+gkREn9DqXAv0Ksm5Ifr8woCpE9R1rwxF8tAzqN lKxb5C34/xgU3DQyJx13c7QJN5690wn3HMcctjSwF5AB3Sr8NSGwjGVvde1h+y6E3ElYrc cLq4fWsRe99erGqwHZf0F/j9eSnuxsJ/tjWvAazdujFXQJzKTml24WrkRcY5HuwCsKTd21 UyUUdeRZ+ugJ3DWTnOHt+813gc4Q3bHrYKi6s7vps1S+tEDCV6ADJ00uM7lHCFjbDJ5oHv KdTgvLum+LErXDLazhPpgvnHEcZLCC8JYZKGVVkJ3vy/leWyDIqgF9xT4FSTFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691678609; a=rsa-sha256; cv=none; b=QNRLReL4gtX2Sg/jJkQuOAdorKBOo09//M3CXnpOf3hahGJsBpmS5WVX4zy49hdzEVF40a GvAMESUM8VonyMJocW1U8lLkva052TdR612q97jhYlZjUCRFTPosvKCWoTFiF7zGN+a1d9 etdGAQVhnAAnzXnalgOJl3Q5lKgOJENZwfwtFJLCmoxwQ5h2Ir+YQIyDNkb1LDfOw4l6aE TW0tAZM1jmt6FQkwEA6566NQIMN1K9e79wzb6JOGm8QCzYurYOEEm1Ufg1YMUrlgeLvrIe chjfmeXUId7KZJO96ajb3AfwCM1ZBHTplHl6Fa5MWsqI4rkH/ctuEHnoXbWPnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM8mx2Z1Mz11vd; Thu, 10 Aug 2023 14:43: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 37AEhTfX059161; Thu, 10 Aug 2023 14:43:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AEhTeF059158; Thu, 10 Aug 2023 14:43:29 GMT (envelope-from git) Date: Thu, 10 Aug 2023 14:43:29 GMT Message-Id: <202308101443.37AEhTeF059158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 0eb8cd1de268 - main - igc: sync srrctl buffer sizing with e1000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 commit 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52 Author: Kevin Bowling AuthorDate: 2023-08-10 14:41:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-10 14:43:16 +0000 igc: sync srrctl buffer sizing with e1000 Approved by: grehan MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D31493 --- sys/dev/igc/if_igc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 1ede99eee4ae..70f1aa2d2239 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1985,6 +1985,7 @@ igc_initialize_transmit_unit(if_ctx_t ctx) * Enable receive unit. * **********************************************************************/ +#define BSIZEPKT_ROUNDUP ((1< ETHERMTU) { - /* Set maximum packet len */ - if (adapter->rx_mbuf_sz <= 4096) { - srrctl |= 4096 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_4096 | IGC_RCTL_BSEX; - } else if (adapter->rx_mbuf_sz > 4096) { - srrctl |= 8192 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_8192 | IGC_RCTL_BSEX; - } psize = scctx->isc_max_frame_size; /* are we on a vlan? */ if (if_vlantrunkinuse(ifp)) psize += VLAN_TAG_SIZE; IGC_WRITE_REG(&adapter->hw, IGC_RLPML, psize); - } else { - srrctl |= 2048 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_2048; } + /* Set maximum packet buffer len */ + srrctl |= (adapter->rx_mbuf_sz + BSIZEPKT_ROUNDUP) >> + IGC_SRRCTL_BSIZEPKT_SHIFT; + /* srrctl above overrides this but set the register to a sane value */ + rctl |= IGC_RCTL_SZ_2048; + /* * If TX flow control is disabled and there's >1 queue defined, * enable DROP. From nobody Thu Aug 10 14:48:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM8vD1S05z4mN99; Thu, 10 Aug 2023 14:48:56 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) (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 4RM8vC4TNRz3bs4; Thu, 10 Aug 2023 14:48:55 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc2e.google.com with SMTP id 006d021491bc7-56c85b723cfso798129eaf.3; Thu, 10 Aug 2023 07:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691678934; x=1692283734; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ue8+nsP/S3Y+JUipdmD3iJYLKFBXWj31ouW/UsYvgkY=; b=fPPo7zcmbkoIxOZ2xpqBaNsQHU8i3XWajM+RxasvxJ+FKUNLlZyG2e8AUfZMDM1EzL CoVjmYAy6anEiNuCK1vGZoZLObZkQNulaZSXXsfCHfKC6t9j7FHatD0BY4BoIqTGFmts oUdArt0uLQEcBhCmTcQGDtXdK3dM8Mr0Xt/RXSyl8pgnxqVdsBdu4HRy9exlBP8/tuuG RKLYR+dz7f5B8dCYFVKnFKx48hA5tIVMQTU0N8x6mH5Pd8vdnWgDDxPldCc8Bh8Rse8t /UPEku9dVI/yBIxgKmIkQcBlcnCa6gPQ+MCOrXU2FulVk+VYO7BtT/XwTXTZ7SB+Bvgj XCHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691678934; x=1692283734; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ue8+nsP/S3Y+JUipdmD3iJYLKFBXWj31ouW/UsYvgkY=; b=Dma1XEkiIubENCx1BwNk2hnCCtbvdIl1EjDAYgypWRZ5PzLnUMub4HDCcld42KiBN0 c+GVhcw/LaVAQ73Hpq1EO6P53/4claM53CojwbNe0UqBQh2nzwAOeZwnapoe9fWBrWFI cDDbtzmJ4/1dAYAto0znrGPQiElFWowJ9A1zFy4bvmpBE96ZBmfGE3j4xzLjdlWPTnnD 4eYGNgQjkfV/7rqsMnFkEhoYYjKvnOgwDttOydBT5denO743l7S5CK5qZ+g1iOSBDmG4 c/Fa0qRoji9mE1YSrhDznzKQr4ncH5GMOohS6zl7Alp7zU3eK+EYr+pHv0CZZaqQiX1Q +2Tg== X-Gm-Message-State: AOJu0YzI8pamFfkEvmwid+tOOhIjr8WIGnptRMWeEUChoK/jnCc67m50 mmr7W8AObBJj/q2INxq074NQeABMYL761IIC0+KT00SZ9wM= X-Google-Smtp-Source: AGHT+IEM8UnSOi9HoS8K/8EETjq5n9aRhECEvjC1Yi+ogCyKQVsQZef8dzr5Ciq4oh3qCs+f3GOxn0X/T3Yfgn9aSI8= X-Received: by 2002:a4a:315a:0:b0:56c:e747:4609 with SMTP id v26-20020a4a315a000000b0056ce7474609mr2284841oog.7.1691678934213; Thu, 10 Aug 2023 07:48:54 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:129a:0:b0:4f0:1250:dd51 with HTTP; Thu, 10 Aug 2023 07:48:53 -0700 (PDT) In-Reply-To: <202308091605.379G59u4094318@gitrepo.freebsd.org> References: <202308091605.379G59u4094318@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 10 Aug 2023 16:48:53 +0200 Message-ID: Subject: Re: git: 077ef5b445f1 - main - ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL To: Marius Strobl Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4RM8vC4TNRz3bs4 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] On 8/9/23, Marius Strobl wrote: > The branch main has been updated by marius: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=077ef5b445f10f41723b63ab9c24a9809c61afb8 > > commit 077ef5b445f10f41723b63ab9c24a9809c61afb8 > Author: Marius Strobl > AuthorDate: 2023-08-07 19:16:11 +0000 > Commit: Marius Strobl > CommitDate: 2023-08-09 15:44:46 +0000 > > ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL > > All of these are obsoleted by the general removal of MIPS support. > > Actually, corresponding to the removed AH_SUPPORT_x, there is more > superfluous support sprinkled across the HAL source. However, that > code is left in place for now in order to ease a sync to NetBSD. > A coworker claims this driver is unofficially supported on one of the arm64 appliances, as in it is not mips-only. Can this be reverted? > Reviewed by: emaste (w/ man page fix) > Approved by: adrian > Differential Revision: https://reviews.freebsd.org/D41355 > --- > share/man/man4/ath_hal.4 | 5 +- > sys/conf/files | 10 - > sys/conf/options | 11 - > .../dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h | 13 - > sys/dev/ath/ah_osdep_ar5416.c | 3 - > sys/dev/ath/ath_hal/ar9001/ar9130.ini | 669 > --------------------- > sys/dev/ath/ath_hal/ar9001/ar9130_attach.c | 324 ---------- > sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c | 20 - > sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h | 24 - > sys/dev/ath/ath_hal/ar9001/ar9130_phy.c | 49 -- > sys/dev/ath/ath_hal/ar9001/ar9130_phy.h | 27 - > sys/dev/ath/ath_hal/ar9001/ar9130reg.h | 29 - > sys/modules/ath_hal_ar5416/Makefile | 9 - > 13 files changed, 2 insertions(+), 1191 deletions(-) > > diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4 > index 940809a9c3c9..daf787d412a9 100644 > --- a/share/man/man4/ath_hal.4 > +++ b/share/man/man4/ath_hal.4 > @@ -28,7 +28,7 @@ > .\" > .\" $FreeBSD$ > .\"/ > -.Dd January 25, 2019 > +.Dd August 7, 2023 > .Dt ATH_HAL 4 > .Os > .Sh NAME > @@ -50,7 +50,6 @@ or > .\".Cd "device ath_ar5312" > .\".Cd "device ath_rf2136" > .\".Cd "device ath_rf2137" > -.Cd "device ath_ar9130" > .Cd "device ath_ar9160" > .Cd "device ath_ar9280" > .Cd "device ath_ar9285" > @@ -59,7 +58,7 @@ or > .Sh DESCRIPTION > The hal provides hardware support for wireless network adapters based on > the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425, > -AR5413, AR5416, AR5418, AR5424, AR9130, AR9160, AR9220, AR9280, AR9285, > +AR5413, AR5416, AR5418, AR5424, AR9160, AR9220, AR9280, AR9285, > AR9287, AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565 > chips (and companion RF/baseband parts). > This code is part of the > diff --git a/sys/conf/files b/sys/conf/files > index 5d75f819a5f5..80384fe1f5b1 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -1132,16 +1132,6 @@ dev/ath/ath_hal/ar5416/ar5416_xmit.c \ > optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | \ > ath_ar9287 \ > compile-with "${ATH_C} -I$S/dev/ath/ath_hal" > -# ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130 > -# > -# Since this is an embedded MAC SoC, there's no need to compile it into > the > -# default HAL. > -dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \ > - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" > -dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \ > - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" > -dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \ > - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" > # ar9160 (depends on ar5416) > dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \ > compile-with "${ATH_C} -I$S/dev/ath/ath_hal" > diff --git a/sys/conf/options b/sys/conf/options > index c06060f4bea0..9e8db5632ec4 100644 > --- a/sys/conf/options > +++ b/sys/conf/options > @@ -820,17 +820,6 @@ ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h > ATH_DEBUG_ALQ opt_ath.h > ATH_KTR_INTR_DEBUG opt_ath.h > > -# options for the Atheros hal > -# XXX For now, this breaks non-AR9130 chipsets, so only use it > -# XXX when actually targeting AR9130. > -AH_SUPPORT_AR9130 opt_ah.h > - > -# This is required for AR933x SoC support > -AH_SUPPORT_AR9330 opt_ah.h > -AH_SUPPORT_AR9340 opt_ah.h > -AH_SUPPORT_QCA9530 opt_ah.h > -AH_SUPPORT_QCA9550 opt_ah.h > - > AH_DEBUG opt_ah.h > AH_ASSERT opt_ah.h > AH_DEBUG_ALQ opt_ah.h > diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h > b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h > index 71a3388b04f3..229bb0ba56c5 100644 > --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h > +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h > @@ -51,19 +51,6 @@ > #define AH_SUPPORT_POSEIDON 1 > #define AH_SUPPORT_AR9300 1 > > -/* These are the embedded boards */ > -#ifdef AH_SUPPORT_AR9330 > -#define AH_SUPPORT_HORNET 1 > -#endif /* AH_SUPPORT_AR9330 */ > -#ifdef AH_SUPPORT_AR9340 > -#define AH_SUPPORT_WASP 1 > -#endif /* AH_SUPPORT_AR9340 */ > -#ifdef AH_SUPPORT_QCA9550 > -#define AH_SUPPORT_SCORPION 1 > -#endif /* AH_SUPPORT_QCA9550 */ > -#ifdef AH_SUPPORT_QCA9530 > -#define AH_SUPPORT_HONEYBEE 1 > -#endif /* AH_SUPPORT_QCA9530 */ > #define FIX_NOISE_FLOOR 1 > > /* XXX this needs to be removed! No atomics in the HAL! */ > diff --git a/sys/dev/ath/ah_osdep_ar5416.c b/sys/dev/ath/ah_osdep_ar5416.c > index 058027b44c8f..be9e709d6449 100644 > --- a/sys/dev/ath/ah_osdep_ar5416.c > +++ b/sys/dev/ath/ah_osdep_ar5416.c > @@ -41,7 +41,6 @@ > #include > > extern struct ath_hal_chip AR5416_chip; > -extern struct ath_hal_chip AR9130_chip; > extern struct ath_hal_chip AR9160_chip; > extern struct ath_hal_chip AR9280_chip; > extern struct ath_hal_chip AR9285_chip; > @@ -60,7 +59,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int type, > void *data __unused) > switch (type) { > case MOD_LOAD: > ath_hal_add_chip(&AR5416_chip); > - ath_hal_add_chip(&AR9130_chip); > ath_hal_add_chip(&AR9160_chip); > ath_hal_add_chip(&AR9280_chip); > ath_hal_add_chip(&AR9285_chip); > @@ -74,7 +72,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int type, > void *data __unused) > > case MOD_UNLOAD: > ath_hal_remove_chip(&AR5416_chip); > - ath_hal_remove_chip(&AR9130_chip); > ath_hal_remove_chip(&AR9160_chip); > ath_hal_remove_chip(&AR9280_chip); > ath_hal_remove_chip(&AR9285_chip); > diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130.ini > b/sys/dev/ath/ath_hal/ar9001/ar9130.ini > deleted file mode 100644 > index 0bd9f8e0a879..000000000000 > --- a/sys/dev/ath/ath_hal/ar9001/ar9130.ini > +++ /dev/null > @@ -1,669 +0,0 @@ > -/* > - * Copyright (c) 2010 Atheros Communications Inc. > - * > - * Permission to use, copy, modify, and/or distribute this software for > any > - * purpose with or without fee is hereby granted, provided that the above > - * copyright notice and this permission notice appear in all copies. > - * > - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL > WARRANTIES > - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF > - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR > - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN > - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > - * > - * $FreeBSD$ > - */ > - > -static const uint32_t ar5416Modes_9100[][6] = { > - { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, > 0x000001e0 }, > - { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, > 0x000001e0 }, > - { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, > 0x00001180 }, > - { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, > 0x00014008 }, > - { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, > 0x06e006e0 }, > - { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, > 0x098813cf }, > - { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, > 0x08f04810 }, > - { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, > 0x0000320a }, > - { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, > 0x00000303 }, > - { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, > 0x02020200 }, > - { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, > 0x00000e0e }, > - { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, > 0x0a020001 }, > - { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, > 0x00000e0e }, > - { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, > 0x00000007 }, > - { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, > 0x037216a0 }, > - { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, > 0x00197a68 }, > - { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, > 0x00197a68 }, > - { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, > 0x00197a68 }, > - { 0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, > 0x6c48b0e2 }, > - { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, > 0x7ec82d2e }, > - { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, > 0x31395d5e }, > - { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, > 0x00048d18 }, > - { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, > 0x0001ce00 }, > - { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, > 0x409a40d0 }, > - { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, > 0x050cb081 }, > - { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, > 0x000007d0 }, > - { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, > 0x00000016 }, > - { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, > 0xd00a8a0d }, > - { 0x00009940, 0x00750604, 0x00754604, 0xfff81204, 0xfff81204, > 0xfff81204 }, > - { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, > 0xdfb81020 }, > - { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, > 0xe250a51e }, > - { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, > 0x3388ffff }, > - { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, > 0x0001bfc0 }, > - { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, > 0x0001bfc0 }, > - { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, > 0x0001bfc0 }, > - { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, > 0x00001120 }, > - { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, > 0x001a0c00 }, > - { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, > 0x038919be }, > - { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, > 0x06336f77 }, > - { 0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, > 0x6af65329 }, > - { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, > 0x08f186c8 }, > - { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, > 0x00046384 }, > - { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > 0x00000000 }, > - { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > 0x00000000 }, > - { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, > 0x00000880 }, > - { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, > 0xd03e4788 }, > - { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, > 0x002ac120 }, > - { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, > 0x002ac120 }, > - { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, > 0x002ac120 }, > - { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, > 0x1883800a }, > - { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, > 0x00000000 }, > - { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, > 0x0a1a7caa }, > - { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, > 0x18010000 }, > - { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, > 0x2e032402 }, > - { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, > 0x4a0a3c06 }, > - { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, > 0x621a540b }, > - { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, > 0x764f6c1b }, > - { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, > 0x845b7a5a }, > - { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, > 0x950f8ccf }, > - { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, > 0xa5cf9b4f }, > - { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, > 0xbddfaf1f }, > - { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, > 0xd1ffc93f }, > - { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, > 0x00000000 }, > - { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > 0x00000000 }, > - { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > 0x00000000 }, > - { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, > 0x00000000 }, > -}; > - > -static const uint32_t ar5416Common_9100[][2] = { > - /* Addr allmodes */ > - { 0x0000000c, 0x00000000 }, > - { 0x00000030, 0x00020015 }, > - { 0x00000034, 0x00000005 }, > - { 0x00000040, 0x00000000 }, > - { 0x00000044, 0x00000008 }, > - { 0x00000048, 0x00000008 }, > - { 0x0000004c, 0x00000010 }, > - { 0x00000050, 0x00000000 }, > - { 0x00000054, 0x0000001f }, > - { 0x00000800, 0x00000000 }, > - { 0x00000804, 0x00000000 }, > - { 0x00000808, 0x00000000 }, > - { 0x0000080c, 0x00000000 }, > - { 0x00000810, 0x00000000 }, > - { 0x00000814, 0x00000000 }, > - { 0x00000818, 0x00000000 }, > - { 0x0000081c, 0x00000000 }, > - { 0x00000820, 0x00000000 }, > - { 0x00000824, 0x00000000 }, > - { 0x00001040, 0x002ffc0f }, > - { 0x00001044, 0x002ffc0f }, > - { 0x00001048, 0x002ffc0f }, > - { 0x0000104c, 0x002ffc0f }, > - { 0x00001050, 0x002ffc0f }, > - { 0x00001054, 0x002ffc0f }, > - { 0x00001058, 0x002ffc0f }, > - { 0x0000105c, 0x002ffc0f }, > - { 0x00001060, 0x002ffc0f }, > - { 0x00001064, 0x002ffc0f }, > - { 0x00001230, 0x00000000 }, > - { 0x00001270, 0x00000000 }, > - { 0x00001038, 0x00000000 }, > - { 0x00001078, 0x00000000 }, > - { 0x000010b8, 0x00000000 }, > - { 0x000010f8, 0x00000000 }, > - { 0x00001138, 0x00000000 }, > - { 0x00001178, 0x00000000 }, > - { 0x000011b8, 0x00000000 }, > - { 0x000011f8, 0x00000000 }, > - { 0x00001238, 0x00000000 }, > - { 0x00001278, 0x00000000 }, > - { 0x000012b8, 0x00000000 }, > - { 0x000012f8, 0x00000000 }, > - { 0x00001338, 0x00000000 }, > - { 0x00001378, 0x00000000 }, > - { 0x000013b8, 0x00000000 }, > - { 0x000013f8, 0x00000000 }, > - { 0x00001438, 0x00000000 }, > - { 0x00001478, 0x00000000 }, > - { 0x000014b8, 0x00000000 }, > - { 0x000014f8, 0x00000000 }, > - { 0x00001538, 0x00000000 }, > - { 0x00001578, 0x00000000 }, > - { 0x000015b8, 0x00000000 }, > - { 0x000015f8, 0x00000000 }, > - { 0x00001638, 0x00000000 }, > - { 0x00001678, 0x00000000 }, > - { 0x000016b8, 0x00000000 }, > - { 0x000016f8, 0x00000000 }, > - { 0x00001738, 0x00000000 }, > - { 0x00001778, 0x00000000 }, > - { 0x000017b8, 0x00000000 }, > - { 0x000017f8, 0x00000000 }, > - { 0x0000103c, 0x00000000 }, > - { 0x0000107c, 0x00000000 }, > - { 0x000010bc, 0x00000000 }, > - { 0x000010fc, 0x00000000 }, > - { 0x0000113c, 0x00000000 }, > - { 0x0000117c, 0x00000000 }, > - { 0x000011bc, 0x00000000 }, > - { 0x000011fc, 0x00000000 }, > - { 0x0000123c, 0x00000000 }, > - { 0x0000127c, 0x00000000 }, > - { 0x000012bc, 0x00000000 }, > - { 0x000012fc, 0x00000000 }, > - { 0x0000133c, 0x00000000 }, > - { 0x0000137c, 0x00000000 }, > - { 0x000013bc, 0x00000000 }, > - { 0x000013fc, 0x00000000 }, > - { 0x0000143c, 0x00000000 }, > - { 0x0000147c, 0x00000000 }, > - { 0x00020010, 0x00000003 }, > - { 0x00020038, 0x000004c2 }, > - { 0x00008004, 0x00000000 }, > - { 0x00008008, 0x00000000 }, > - { 0x0000800c, 0x00000000 }, > - { 0x00008018, 0x00000700 }, > - { 0x00008020, 0x00000000 }, > - { 0x00008038, 0x00000000 }, > - { 0x0000803c, 0x00000000 }, > - { 0x00008048, 0x40000000 }, > - { 0x00008054, 0x00004000 }, > - { 0x00008058, 0x00000000 }, > - { 0x0000805c, 0x000fc78f }, > - { 0x00008060, 0x0000000f }, > - { 0x00008064, 0x00000000 }, > - { 0x000080c0, 0x2a82301a }, > - { 0x000080c4, 0x05dc01e0 }, > - { 0x000080c8, 0x1f402710 }, > - { 0x000080cc, 0x01f40000 }, > - { 0x000080d0, 0x00001e00 }, > - { 0x000080d4, 0x00000000 }, > - { 0x000080d8, 0x00400000 }, > - { 0x000080e0, 0xffffffff }, > - { 0x000080e4, 0x0000ffff }, > - { 0x000080e8, 0x003f3f3f }, > - { 0x000080ec, 0x00000000 }, > - { 0x000080f0, 0x00000000 }, > - { 0x000080f4, 0x00000000 }, > - { 0x000080f8, 0x00000000 }, > - { 0x000080fc, 0x00020000 }, > - { 0x00008100, 0x00020000 }, > - { 0x00008104, 0x00000001 }, > - { 0x00008108, 0x00000052 }, > - { 0x0000810c, 0x00000000 }, > - { 0x00008110, 0x00000168 }, > - { 0x00008118, 0x000100aa }, > - { 0x0000811c, 0x00003210 }, > - { 0x00008120, 0x08f04800 }, > - { 0x00008124, 0x00000000 }, > - { 0x00008128, 0x00000000 }, > - { 0x0000812c, 0x00000000 }, > - { 0x00008130, 0x00000000 }, > - { 0x00008134, 0x00000000 }, > - { 0x00008138, 0x00000000 }, > - { 0x0000813c, 0x00000000 }, > - { 0x00008144, 0x00000000 }, > - { 0x00008168, 0x00000000 }, > - { 0x0000816c, 0x00000000 }, > - { 0x00008170, 0x32143320 }, > - { 0x00008174, 0xfaa4fa50 }, > - { 0x00008178, 0x00000100 }, > - { 0x0000817c, 0x00000000 }, > - { 0x000081c4, 0x00000000 }, > - { 0x000081d0, 0x00003210 }, > - { 0x000081ec, 0x00000000 }, > - { 0x000081f0, 0x00000000 }, > - { 0x000081f4, 0x00000000 }, > - { 0x000081f8, 0x00000000 }, > - { 0x000081fc, 0x00000000 }, > - { 0x00008200, 0x00000000 }, > - { 0x00008204, 0x00000000 }, > - { 0x00008208, 0x00000000 }, > - { 0x0000820c, 0x00000000 }, > - { 0x00008210, 0x00000000 }, > - { 0x00008214, 0x00000000 }, > - { 0x00008218, 0x00000000 }, > - { 0x0000821c, 0x00000000 }, > - { 0x00008220, 0x00000000 }, > - { 0x00008224, 0x00000000 }, > - { 0x00008228, 0x00000000 }, > - { 0x0000822c, 0x00000000 }, > - { 0x00008230, 0x00000000 }, > - { 0x00008234, 0x00000000 }, > - { 0x00008238, 0x00000000 }, > - { 0x0000823c, 0x00000000 }, > - { 0x00008240, 0x00100000 }, > - { 0x00008244, 0x0010f400 }, > - { 0x00008248, 0x00000100 }, > - { 0x0000824c, 0x0001e800 }, > - { 0x00008250, 0x00000000 }, > - { 0x00008254, 0x00000000 }, > - { 0x00008258, 0x00000000 }, > - { 0x0000825c, 0x400000ff }, > - { 0x00008260, 0x00080922 }, > - { 0x00008270, 0x00000000 }, > - { 0x00008274, 0x40000000 }, > - { 0x00008278, 0x003e4180 }, > - { 0x0000827c, 0x00000000 }, > - { 0x00008284, 0x0000002c }, > - { 0x00008288, 0x0000002c }, > - { 0x0000828c, 0x00000000 }, > - { 0x00008294, 0x00000000 }, > - { 0x00008298, 0x00000000 }, > - { 0x00008300, 0x00000000 }, > - { 0x00008304, 0x00000000 }, > - { 0x00008308, 0x00000000 }, > - { 0x0000830c, 0x00000000 }, > - { 0x00008310, 0x00000000 }, > - { 0x00008314, 0x00000000 }, > - { 0x00008318, 0x00000000 }, > - { 0x00008328, 0x00000000 }, > - { 0x0000832c, 0x00000007 }, > - { 0x00008330, 0x00000302 }, > - { 0x00008334, 0x00000e00 }, > - { 0x00008338, 0x00000000 }, > - { 0x0000833c, 0x00000000 }, > - { 0x00008340, 0x000107ff }, > - { 0x00009808, 0x00000000 }, > - { 0x0000980c, 0xad848e19 }, > - { 0x00009810, 0x7d14e000 }, > - { 0x00009814, 0x9c0a9f6b }, > - { 0x0000981c, 0x00000000 }, > - { 0x0000982c, 0x0000a000 }, > - { 0x00009830, 0x00000000 }, > - { 0x0000983c, 0x00200400 }, > - { 0x00009840, 0x206a01ae }, > - { 0x0000984c, 0x1284233c }, > - { 0x00009854, 0x00000859 }, > - { 0x00009900, 0x00000000 }, > - { 0x00009904, 0x00000000 }, > - { 0x00009908, 0x00000000 }, > - { 0x0000990c, 0x00000000 }, > - { 0x0000991c, 0x10000fff }, > - { 0x00009920, 0x05100000 }, > - { 0x0000a920, 0x05100000 }, > - { 0x0000b920, 0x05100000 }, > - { 0x00009928, 0x00000001 }, > - { 0x0000992c, 0x00000004 }, > - { 0x00009934, 0x1e1f2022 }, > - { 0x00009938, 0x0a0b0c0d }, > - { 0x0000993c, 0x00000000 }, > - { 0x00009948, 0x9280b212 }, > - { 0x0000994c, 0x00020028 }, > - { 0x0000c95c, 0x004b6a8e }, > - { 0x0000c968, 0x000003ce }, > - { 0x00009970, 0x190fb515 }, > - { 0x00009974, 0x00000000 }, > - { 0x00009978, 0x00000001 }, > - { 0x0000997c, 0x00000000 }, > - { 0x00009980, 0x00000000 }, > - { 0x00009984, 0x00000000 }, > - { 0x00009988, 0x00000000 }, > - { 0x0000998c, 0x00000000 }, > - { 0x00009990, 0x00000000 }, > - { 0x00009994, 0x00000000 }, > - { 0x00009998, 0x00000000 }, > - { 0x0000999c, 0x00000000 }, > - { 0x000099a0, 0x00000000 }, > - { 0x000099a4, 0x00000001 }, > - { 0x000099a8, 0x201fff00 }, > - { 0x000099ac, 0x006f0000 }, > - { 0x000099b0, 0x03051000 }, > - { 0x000099dc, 0x00000000 }, > - { 0x000099e0, 0x00000200 }, > - { 0x000099e4, 0xaaaaaaaa }, > - { 0x000099e8, 0x3c466478 }, > - { 0x000099ec, 0x0cc80caa }, > - { 0x000099fc, 0x00001042 }, > - { 0x00009b00, 0x00000000 }, > - { 0x00009b04, 0x00000001 }, > - { 0x00009b08, 0x00000002 }, > - { 0x00009b0c, 0x00000003 }, > - { 0x00009b10, 0x00000004 }, > - { 0x00009b14, 0x00000005 }, > - { 0x00009b18, 0x00000008 }, > - { 0x00009b1c, 0x00000009 }, > - { 0x00009b20, 0x0000000a }, > - { 0x00009b24, 0x0000000b }, > - { 0x00009b28, 0x0000000c }, > - { 0x00009b2c, 0x0000000d }, > - { 0x00009b30, 0x00000010 }, > - { 0x00009b34, 0x00000011 }, > - { 0x00009b38, 0x00000012 }, > - { 0x00009b3c, 0x00000013 }, > - { 0x00009b40, 0x00000014 }, > - { 0x00009b44, 0x00000015 }, > - { 0x00009b48, 0x00000018 }, > - { 0x00009b4c, 0x00000019 }, > - { 0x00009b50, 0x0000001a }, > - { 0x00009b54, 0x0000001b }, > - { 0x00009b58, 0x0000001c }, > - { 0x00009b5c, 0x0000001d }, > - { 0x00009b60, 0x00000020 }, > - { 0x00009b64, 0x00000021 }, > - { 0x00009b68, 0x00000022 }, > - { 0x00009b6c, 0x00000023 }, > - { 0x00009b70, 0x00000024 }, > - { 0x00009b74, 0x00000025 }, > - { 0x00009b78, 0x00000028 }, > - { 0x00009b7c, 0x00000029 }, > - { 0x00009b80, 0x0000002a }, > - { 0x00009b84, 0x0000002b }, > - { 0x00009b88, 0x0000002c }, > - { 0x00009b8c, 0x0000002d }, > - { 0x00009b90, 0x00000030 }, > - { 0x00009b94, 0x00000031 }, > - { 0x00009b98, 0x00000032 }, > - { 0x00009b9c, 0x00000033 }, > - { 0x00009ba0, 0x00000034 }, > - { 0x00009ba4, 0x00000035 }, > - { 0x00009ba8, 0x00000035 }, > - { 0x00009bac, 0x00000035 }, > - { 0x00009bb0, 0x00000035 }, > - { 0x00009bb4, 0x00000035 }, > - { 0x00009bb8, 0x00000035 }, > - { 0x00009bbc, 0x00000035 }, > - { 0x00009bc0, 0x00000035 }, > - { 0x00009bc4, 0x00000035 }, > - { 0x00009bc8, 0x00000035 }, > - { 0x00009bcc, 0x00000035 }, > - { 0x00009bd0, 0x00000035 }, > - { 0x00009bd4, 0x00000035 }, > - { 0x00009bd8, 0x00000035 }, > - { 0x00009bdc, 0x00000035 }, > - { 0x00009be0, 0x00000035 }, > - { 0x00009be4, 0x00000035 }, > - { 0x00009be8, 0x00000035 }, > - { 0x00009bec, 0x00000035 }, > - { 0x00009bf0, 0x00000035 }, > - { 0x00009bf4, 0x00000035 }, > - { 0x00009bf8, 0x00000010 }, > - { 0x00009bfc, 0x0000001a }, > - { 0x0000a210, 0x40806333 }, > - { 0x0000a214, 0x00106c10 }, > - { 0x0000a218, 0x009c4060 }, > - { 0x0000a220, 0x018830c6 }, > - { 0x0000a224, 0x00000400 }, > - { 0x0000a228, 0x001a0bb5 }, > - { 0x0000a22c, 0x00000000 }, > - { 0x0000a234, 0x20202020 }, > - { 0x0000a238, 0x20202020 }, > - { 0x0000a23c, 0x13c889af }, > - { 0x0000a240, 0x38490a20 }, > - { 0x0000a244, 0x00007bb6 }, > - { 0x0000a248, 0x0fff3ffc }, > - { 0x0000a24c, 0x00000001 }, > - { 0x0000a250, 0x0000e000 }, > - { 0x0000a254, 0x00000000 }, > - { 0x0000a258, 0x0cc75380 }, > - { 0x0000a25c, 0x0f0f0f01 }, > - { 0x0000a260, 0xdfa91f01 }, > - { 0x0000a268, 0x00000001 }, > - { 0x0000a26c, 0x0ebae9c6 }, > - { 0x0000b26c, 0x0ebae9c6 }, > - { 0x0000c26c, 0x0ebae9c6 }, > - { 0x0000d270, 0x00820820 }, > - { 0x0000a278, 0x1ce739ce }, > - { 0x0000a27c, 0x050701ce }, > - { 0x0000a338, 0x00000000 }, > - { 0x0000a33c, 0x00000000 }, > - { 0x0000a340, 0x00000000 }, > - { 0x0000a344, 0x00000000 }, > - { 0x0000a348, 0x3fffffff }, > - { 0x0000a34c, 0x3fffffff }, > - { 0x0000a350, 0x3fffffff }, > - { 0x0000a354, 0x0003ffff }, > - { 0x0000a358, 0x79a8aa33 }, > - { 0x0000d35c, 0x07ffffef }, > - { 0x0000d360, 0x0fffffe7 }, > - { 0x0000d364, 0x17ffffe5 }, > - { 0x0000d368, 0x1fffffe4 }, > - { 0x0000d36c, 0x37ffffe3 }, > - { 0x0000d370, 0x3fffffe3 }, > - { 0x0000d374, 0x57ffffe3 }, > - { 0x0000d378, 0x5fffffe2 }, > - { 0x0000d37c, 0x7fffffe2 }, > - { 0x0000d380, 0x7f3c7bba }, > - { 0x0000d384, 0xf3307ff0 }, > - { 0x0000a388, 0x0c000000 }, > - { 0x0000a38c, 0x20202020 }, > - { 0x0000a390, 0x20202020 }, > - { 0x0000a394, 0x1ce739ce }, > - { 0x0000a398, 0x000001ce }, > - { 0x0000a39c, 0x00000001 }, > - { 0x0000a3a0, 0x00000000 }, > - { 0x0000a3a4, 0x00000000 }, > - { 0x0000a3a8, 0x00000000 }, > - { 0x0000a3ac, 0x00000000 }, > - { 0x0000a3b0, 0x00000000 }, > - { 0x0000a3b4, 0x00000000 }, > - { 0x0000a3b8, 0x00000000 }, > - { 0x0000a3bc, 0x00000000 }, > - { 0x0000a3c0, 0x00000000 }, > - { 0x0000a3c4, 0x00000000 }, > - { 0x0000a3c8, 0x00000246 }, > - { 0x0000a3cc, 0x20202020 }, > - { 0x0000a3d0, 0x20202020 }, > - { 0x0000a3d4, 0x20202020 }, > - { 0x0000a3dc, 0x1ce739ce }, > - { 0x0000a3e0, 0x000001ce }, > -}; > - > -static const uint32_t ar5416Bank0_9100[][2] = { > - /* Addr allmodes */ > - { 0x000098b0, 0x1e5795e5 }, > - { 0x000098e0, 0x02008020 }, > -}; > - > -static const uint32_t ar5416BB_RfGain_9100[][3] = { > - /* Addr 5G_HT20 5G_HT40 */ > - { 0x00009a00, 0x00000000, 0x00000000 }, > - { 0x00009a04, 0x00000040, 0x00000040 }, > - { 0x00009a08, 0x00000080, 0x00000080 }, > - { 0x00009a0c, 0x000001a1, 0x00000141 }, > - { 0x00009a10, 0x000001e1, 0x00000181 }, > - { 0x00009a14, 0x00000021, 0x000001c1 }, > - { 0x00009a18, 0x00000061, 0x00000001 }, > - { 0x00009a1c, 0x00000168, 0x00000041 }, > - { 0x00009a20, 0x000001a8, 0x000001a8 }, > - { 0x00009a24, 0x000001e8, 0x000001e8 }, > - { 0x00009a28, 0x00000028, 0x00000028 }, > - { 0x00009a2c, 0x00000068, 0x00000068 }, > - { 0x00009a30, 0x00000189, 0x000000a8 }, > - { 0x00009a34, 0x000001c9, 0x00000169 }, > - { 0x00009a38, 0x00000009, 0x000001a9 }, > - { 0x00009a3c, 0x00000049, 0x000001e9 }, > - { 0x00009a40, 0x00000089, 0x00000029 }, > - { 0x00009a44, 0x00000170, 0x00000069 }, > - { 0x00009a48, 0x000001b0, 0x00000190 }, > - { 0x00009a4c, 0x000001f0, 0x000001d0 }, > - { 0x00009a50, 0x00000030, 0x00000010 }, > - { 0x00009a54, 0x00000070, 0x00000050 }, > - { 0x00009a58, 0x00000191, 0x00000090 }, > - { 0x00009a5c, 0x000001d1, 0x00000151 }, > - { 0x00009a60, 0x00000011, 0x00000191 }, > - { 0x00009a64, 0x00000051, 0x000001d1 }, > - { 0x00009a68, 0x00000091, 0x00000011 }, > - { 0x00009a6c, 0x000001b8, 0x00000051 }, > - { 0x00009a70, 0x000001f8, 0x00000198 }, > - { 0x00009a74, 0x00000038, 0x000001d8 }, > - { 0x00009a78, 0x00000078, 0x00000018 }, > - { 0x00009a7c, 0x00000199, 0x00000058 }, > - { 0x00009a80, 0x000001d9, 0x00000098 }, > - { 0x00009a84, 0x00000019, 0x00000159 }, > - { 0x00009a88, 0x00000059, 0x00000199 }, > - { 0x00009a8c, 0x00000099, 0x000001d9 }, > - { 0x00009a90, 0x000000d9, 0x00000019 }, > - { 0x00009a94, 0x000000f9, 0x00000059 }, > - { 0x00009a98, 0x000000f9, 0x00000099 }, > - { 0x00009a9c, 0x000000f9, 0x000000d9 }, > - { 0x00009aa0, 0x000000f9, 0x000000f9 }, > - { 0x00009aa4, 0x000000f9, 0x000000f9 }, > - { 0x00009aa8, 0x000000f9, 0x000000f9 }, > - { 0x00009aac, 0x000000f9, 0x000000f9 }, > - { 0x00009ab0, 0x000000f9, 0x000000f9 }, > - { 0x00009ab4, 0x000000f9, 0x000000f9 }, > - { 0x00009ab8, 0x000000f9, 0x000000f9 }, > - { 0x00009abc, 0x000000f9, 0x000000f9 }, > - { 0x00009ac0, 0x000000f9, 0x000000f9 }, > - { 0x00009ac4, 0x000000f9, 0x000000f9 }, > - { 0x00009ac8, 0x000000f9, 0x000000f9 }, > - { 0x00009acc, 0x000000f9, 0x000000f9 }, > - { 0x00009ad0, 0x000000f9, 0x000000f9 }, > - { 0x00009ad4, 0x000000f9, 0x000000f9 }, > - { 0x00009ad8, 0x000000f9, 0x000000f9 }, > - { 0x00009adc, 0x000000f9, 0x000000f9 }, > - { 0x00009ae0, 0x000000f9, 0x000000f9 }, > - { 0x00009ae4, 0x000000f9, 0x000000f9 }, > - { 0x00009ae8, 0x000000f9, 0x000000f9 }, > - { 0x00009aec, 0x000000f9, 0x000000f9 }, > - { 0x00009af0, 0x000000f9, 0x000000f9 }, > - { 0x00009af4, 0x000000f9, 0x000000f9 }, > - { 0x00009af8, 0x000000f9, 0x000000f9 }, > - { 0x00009afc, 0x000000f9, 0x000000f9 }, > -}; > - > -static const uint32_t ar5416Bank1_9100[][2] = { > - /* Addr allmodes */ > - { 0x000098b0, 0x02108421 }, > - { 0x000098ec, 0x00000008 }, > -}; > - > -static const uint32_t ar5416Bank2_9100[][2] = { > - /* Addr allmodes */ > - { 0x000098b0, 0x0e73ff17 }, > - { 0x000098e0, 0x00000420 }, > -}; > - > -static const uint32_t ar5416Bank3_9100[][3] = { > - /* Addr 5G_HT20 5G_HT40 */ > - { 0x000098f0, 0x01400018, 0x01c00018 }, > -}; > - > -static const uint32_t ar5416Bank6_9100[][3] = { > - /* Addr 5G_HT20 5G_HT40 */ > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00e00000, 0x00e00000 }, > - { 0x0000989c, 0x005e0000, 0x005e0000 }, > - { 0x0000989c, 0x00120000, 0x00120000 }, > - { 0x0000989c, 0x00620000, 0x00620000 }, > - { 0x0000989c, 0x00020000, 0x00020000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x005f0000, 0x005f0000 }, > - { 0x0000989c, 0x00870000, 0x00870000 }, > - { 0x0000989c, 0x00f90000, 0x00f90000 }, > - { 0x0000989c, 0x007b0000, 0x007b0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00f50000, 0x00f50000 }, > - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, > - { 0x0000989c, 0x00110000, 0x00110000 }, > - { 0x0000989c, 0x006100a8, 0x006100a8 }, > - { 0x0000989c, 0x004210a2, 0x004210a2 }, > - { 0x0000989c, 0x0014000f, 0x0014000f }, > - { 0x0000989c, 0x00c40002, 0x00c40002 }, > - { 0x0000989c, 0x003000f2, 0x003000f2 }, > - { 0x0000989c, 0x00440016, 0x00440016 }, > - { 0x0000989c, 0x00410040, 0x00410040 }, > - { 0x0000989c, 0x000180d6, 0x000180d6 }, > - { 0x0000989c, 0x0000c0aa, 0x0000c0aa }, > - { 0x0000989c, 0x000000b1, 0x000000b1 }, > - { 0x0000989c, 0x00002000, 0x00002000 }, > - { 0x0000989c, 0x000000d4, 0x000000d4 }, > - { 0x000098d0, 0x0000000f, 0x0010000f }, > -}; > - > -static const uint32_t ar5416Bank6TPC_9100[][3] = { > - /* Addr 5G_HT20 5G_HT40 */ > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00000000, 0x00000000 }, > - { 0x0000989c, 0x00e00000, 0x00e00000 }, > - { 0x0000989c, 0x005e0000, 0x005e0000 }, > - { 0x0000989c, 0x00120000, 0x00120000 }, > - { 0x0000989c, 0x00620000, 0x00620000 }, > - { 0x0000989c, 0x00020000, 0x00020000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x40ff0000, 0x40ff0000 }, > - { 0x0000989c, 0x005f0000, 0x005f0000 }, > - { 0x0000989c, 0x00870000, 0x00870000 }, > - { 0x0000989c, 0x00f90000, 0x00f90000 }, > - { 0x0000989c, 0x007b0000, 0x007b0000 }, > - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, > - { 0x0000989c, 0x00f50000, 0x00f50000 }, > - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, > - { 0x0000989c, 0x00110000, 0x00110000 }, > - { 0x0000989c, 0x006100a8, 0x006100a8 }, > - { 0x0000989c, 0x00423022, 0x00423022 }, > - { 0x0000989c, 0x2014008f, 0x2014008f }, > - { 0x0000989c, 0x00c40002, 0x00c40002 }, > - { 0x0000989c, 0x003000f2, 0x003000f2 }, > - { 0x0000989c, 0x00440016, 0x00440016 }, > - { 0x0000989c, 0x00410040, 0x00410040 }, > - { 0x0000989c, 0x0001805e, 0x0001805e }, > - { 0x0000989c, 0x0000c0ab, 0x0000c0ab }, > - { 0x0000989c, 0x000000e1, 0x000000e1 }, > - { 0x0000989c, 0x00007080, 0x00007080 }, > - { 0x0000989c, 0x000000d4, 0x000000d4 }, > - { 0x000098d0, 0x0000000f, 0x0010000f }, > -}; > - > -static const uint32_t ar5416Bank7_9100[][2] = { > - /* Addr allmodes */ > - { 0x0000989c, 0x00000500 }, > - { 0x0000989c, 0x00000800 }, > - { 0x000098cc, 0x0000000e }, > -}; > - > -static const uint32_t ar5416Addac_9100[][2] = { > - /* Addr allmodes */ > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000010 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x000000c0 }, > - { 0x0000989c, 0x00000015 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x0000989c, 0x00000000 }, > - { 0x000098cc, 0x00000000 }, > -}; > diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c > b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c > deleted file mode 100644 > index 70277cc6ca2a..000000000000 > --- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c > +++ /dev/null > @@ -1,324 +0,0 @@ > -/*- > - * SPDX-License-Identifier: ISC > - * > - * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd > - * Copyright (c) 2008 Sam Leffler, Errno Consulting > - * Copyright (c) 2008 Atheros Communications, Inc. > - * > - * Permission to use, copy, modify, and/or distribute this software for > any > - * purpose with or without fee is hereby granted, provided that the above > - * copyright notice and this permission notice appear in all copies. > - * > - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL > WARRANTIES > - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF > - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR > - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES > - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN > - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF > - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. > - * > - * $FreeBSD$ > - */ > -#include "opt_ah.h" > - > -#include "ah.h" > -#include "ah_internal.h" > -#include "ah_devid.h" > - > -#include "ar5416/ar5416.h" > -#include "ar5416/ar5416reg.h" > -#include "ar5416/ar5416phy.h" > - > -#include "ar9001/ar9130reg.h" > -#include "ar9001/ar9130_phy.h" > -#include "ar9001/ar9130_eeprom.h" > - > -#include "ar9001/ar9130.ini" > - > -static const HAL_PERCAL_DATA ar9130_iq_cal = { /* multi sample */ > - .calName = "IQ", .calType = IQ_MISMATCH_CAL, > - .calNumSamples = MAX_CAL_SAMPLES, > - .calCountMax = PER_MIN_LOG_COUNT, > - .calCollect = ar5416IQCalCollect, > - .calPostProc = ar5416IQCalibration > -}; > -static const HAL_PERCAL_DATA ar9130_adc_gain_cal = { /* multi sample */ > - .calName = "ADC Gain", .calType = ADC_GAIN_CAL, > - .calNumSamples = MAX_CAL_SAMPLES, > - .calCountMax = PER_MIN_LOG_COUNT, > - .calCollect = ar5416AdcGainCalCollect, > - .calPostProc = ar5416AdcGainCalibration > -}; > -static const HAL_PERCAL_DATA ar9130_adc_dc_cal = { /* multi sample */ > - .calName = "ADC DC", .calType = ADC_DC_CAL, > - .calNumSamples = MAX_CAL_SAMPLES, > - .calCountMax = PER_MIN_LOG_COUNT, > - .calCollect = ar5416AdcDcCalCollect, > - .calPostProc = ar5416AdcDcCalibration > -}; > -static const HAL_PERCAL_DATA ar9130_adc_init_dc_cal = { > - .calName = "ADC Init DC", .calType = ADC_DC_INIT_CAL, > - .calNumSamples = MIN_CAL_SAMPLES, > - .calCountMax = INIT_LOG_COUNT, > - .calCollect = ar5416AdcDcCalCollect, > - .calPostProc = ar5416AdcDcCalibration > -}; > - > -static HAL_BOOL ar9130FillCapabilityInfo(struct ath_hal *ah); > - > -/* > - * Attach for an AR9130 part. > - */ > -static struct ath_hal * > -ar9130Attach(uint16_t devid, HAL_SOFTC sc, > - HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata, > - HAL_OPS_CONFIG *ah_config, > - HAL_STATUS *status) > -{ > - struct ath_hal_5416 *ahp5416; > - struct ath_hal_5212 *ahp; > - struct ath_hal *ah; > - uint32_t val; > - HAL_STATUS ecode; > - HAL_BOOL rfStatus; > - > - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", > - __func__, sc, (void*) st, (void*) sh); > - > - /* NB: memory is returned zero'd */ > - ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416)); > - if (ahp5416 == AH_NULL) { > - HALDEBUG(AH_NULL, HAL_DEBUG_ANY, > - "%s: cannot allocate memory for state block\n", __func__); > - *status = HAL_ENOMEM; > - return AH_NULL; > - } > - ar5416InitState(ahp5416, devid, sc, st, sh, status); > - ahp = &ahp5416->ah_5212; > - ah = &ahp->ah_priv.h; > - > - /* XXX override with 9100 specific state */ > - AH5416(ah)->ah_initPLL = ar9130InitPLL; > - /* XXX should force chainmasks to 0x7, as per ath9k calibration bugs */ > - > - /* override 5416 methods for our needs */ > - > - AH5416(ah)->ah_cal.iqCalData.calData = &ar9130_iq_cal; > - AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9130_adc_gain_cal; > - AH5416(ah)->ah_cal.adcDcCalData.calData = &ar9130_adc_dc_cal; > - AH5416(ah)->ah_cal.adcDcCalInitData.calData = &ar9130_adc_init_dc_cal; > - AH5416(ah)->ah_cal.suppCals = ADC_GAIN_CAL | ADC_DC_CAL | > IQ_MISMATCH_CAL; > - > - /* > - * This was hard-set because the initial ath9k port of this > - * code kept their runtime conditional register #defines. > - * AR_SREV and the RTC registers have shifted for Howl; > - * they detected this and changed the values at runtime. > - * The current port doesn't yet do this; it may do at a > - * later stage, so this is set early so any routines which > - * manipulate the registers have ah_macVersion set to base > - * the above decision upon. > - */ > - AH_PRIVATE((ah))->ah_macVersion = AR_XSREV_VERSION_HOWL; > - > - /* > - * Use the "local" EEPROM data given to us by the higher layers. > - * This is a private copy out of system flash. > - * By this stage the SoC SPI flash may have disabled the memory- > - * mapping and rely purely on port-based SPI IO. > - */ > - AH_PRIVATE((ah))->ah_eepromRead = ath_hal_EepromDataRead; > - AH_PRIVATE((ah))->ah_eepromWrite = NULL; > - ah->ah_eepromdata = eepromdata; > - > - if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) { > - /* reset chip */ > - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n", > - __func__); > - ecode = HAL_EIO; > - goto bad; > - } > - > - if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) { > - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't wakeup chip\n", > *** 380 LINES SKIPPED *** > -- Mateusz Guzik From nobody Thu Aug 10 14:52:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM8z53Wctz4mN8V; Thu, 10 Aug 2023 14:52:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RM8z516Y2z3cLr; Thu, 10 Aug 2023 14:52:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTP id U1zeqst256NwhU71MqH7b3; Thu, 10 Aug 2023 14:52:16 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id U71Kqhk6B3fOSU71LqpJEs; Thu, 10 Aug 2023 14:52:16 +0000 X-Authority-Analysis: v=2.4 cv=J8G5USrS c=1 sm=1 tr=0 ts=64d4f9a0 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=SsIBFIezZzvieMDQM80A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 88F3C9C9; Thu, 10 Aug 2023 07:52:14 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 7FD4A197; Thu, 10 Aug 2023 07:52:14 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Enji Cooper cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 811e0a31acaf - main - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 In-reply-to: <202308100232.37A2WgNG040490@gitrepo.freebsd.org> References: <202308100232.37A2WgNG040490@gitrepo.freebsd.org> Comments: In-reply-to Enji Cooper message dated "Thu, 10 Aug 2023 02:32:42 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 10 Aug 2023 07:52:14 -0700 Message-Id: <20230810145214.7FD4A197@slippy.cwsent.com> X-CMAE-Envelope: MS4xfJthVj21vbpooKboUlOWLWGOWmisF8ickQ5L/Qh6Pgc9a9a2nXoDspQg1y+Elcs7tHinz2lfuefmEuvk2h9zHvp79p4nrTGYXr2/nRl+myvJC0pKBvp9 5oq/RYhtJm8vzHVngfN/lDgmW31tvH82x5/bz86hbqAtQ3IdeJB0f5rUgyHFaflw0EG+XbAb/0GczHm1fNE8/phyzruQJ99sF9ri1Np3XBS5EUcuoi+UyxUs 5K6Mj9eSwtX7Aay5O4mO881HZP7yDlrTa0chi13ATpF1ldQ2lRYFzhag43pQ782q7HHOjwGTgT1sNrC0fbAWAr6+m1+x3eADjOFT7D2ZYZY= X-Rspamd-Queue-Id: 4RM8z516Y2z3cLr X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202308100232.37A2WgNG040490@gitrepo.freebsd.org>, Enji Cooper write s: > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=811e0a31acafd6ab21f89bec8ba0fb8c > 09f258d2 > > commit 811e0a31acafd6ab21f89bec8ba0fb8c09f258d2 > Author: Enji Cooper > AuthorDate: 2023-08-08 13:42:07 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 +0000 > > fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 > > `INSTANTIATE_TEST_CASE_P` has been replaced with `INSTANTIATE_TEST_SUITE_ > P`. > Replace all uses of the former macro with the latter macro. > > While here, address the fact that the latter macro doesn't permit some > of the constructions that the former macro did, e.g., empty parameters, > etc. > > MFC after: 2 weeks > Reviewed by: asomers > Differential Revision: https://reviews.freebsd.org/D41398 > --- > tests/sys/fs/fusefs/bmap.cc | 2 +- > tests/sys/fs/fusefs/cache.cc | 2 +- > tests/sys/fs/fusefs/dev_fuse_poll.cc | 2 +- > tests/sys/fs/fusefs/fallocate.cc | 4 ++-- > tests/sys/fs/fusefs/io.cc | 4 ++-- > tests/sys/fs/fusefs/last_local_modify.cc | 2 +- > tests/sys/fs/fusefs/mount.cc | 6 +++--- > tests/sys/fs/fusefs/read.cc | 4 ++-- > tests/sys/fs/fusefs/write.cc | 6 +++--- > 9 files changed, 16 insertions(+), 16 deletions(-) > > diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc > index 9d97d1c08ca5..3191ac657de9 100644 > --- a/tests/sys/fs/fusefs/bmap.cc > +++ b/tests/sys/fs/fusefs/bmap.cc > @@ -253,6 +253,6 @@ TEST_P(BmapEof, eof) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(BE, BmapEof, > +INSTANTIATE_TEST_SUITE_P(BE, BmapEof, > Values(1, 2, 3) > ); > diff --git a/tests/sys/fs/fusefs/cache.cc b/tests/sys/fs/fusefs/cache.cc > index cf9476a0a853..429b54c7ba75 100644 > --- a/tests/sys/fs/fusefs/cache.cc > +++ b/tests/sys/fs/fusefs/cache.cc > @@ -197,7 +197,7 @@ TEST_P(Cache, truncate_by_surprise_invalidates_cache) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(Cache, Cache, > +INSTANTIATE_TEST_SUITE_P(Cache, Cache, > Combine( > /* Test every combination that: > * - does not cache at least one of entries and attrs > diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_f > use_poll.cc > index de1b9a6b5f3f..4777f9818c60 100644 > --- a/tests/sys/fs/fusefs/dev_fuse_poll.cc > +++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc > @@ -98,7 +98,7 @@ TEST_P(DevFusePoll, destroy) > m_mock->unmount(); > } > > -INSTANTIATE_TEST_CASE_P(PM, DevFusePoll, > +INSTANTIATE_TEST_SUITE_P(PM, DevFusePoll, > ::testing::Values("BLOCKING", "KQ", "POLL", "SELECT")); > > static void* statter(void* arg) { > diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate > .cc > index d10abfba3807..166f9ca7ff3a 100644 > --- a/tests/sys/fs/fusefs/fallocate.cc > +++ b/tests/sys/fs/fusefs/fallocate.cc > @@ -493,8 +493,8 @@ TEST_P(FspacectlCache, clears_cache) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(FspacectlCache, FspacectlCache, > - Values(Uncached, Writethrough, Writeback), > +INSTANTIATE_TEST_SUITE_P(FspacectlCache, FspacectlCache, > + Values(Uncached, Writethrough, Writeback) > ); > > /* > diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc > index d08dea99ff47..fe3237d39c95 100644 > --- a/tests/sys/fs/fusefs/io.cc > +++ b/tests/sys/fs/fusefs/io.cc > @@ -509,14 +509,14 @@ TEST_P(Io, resize_a_valid_buffer_while_extending) > close(m_test_fd); > } > > -INSTANTIATE_TEST_CASE_P(Io, Io, > +INSTANTIATE_TEST_SUITE_P(Io, Io, > Combine(Bool(), /* async read */ > Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ > Values(Uncached, Writethrough, Writeback, WritebackAsync) > ) > ); > > -INSTANTIATE_TEST_CASE_P(Io, IoCacheable, > +INSTANTIATE_TEST_SUITE_P(Io, IoCacheable, > Combine(Bool(), /* async read */ > Values(0x1000, 0x10000, 0x20000), /* m_maxwrite */ > Values(Writethrough, Writeback, WritebackAsync) > diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/l > ast_local_modify.cc > index dd0d9c740355..537187a6bfb7 100644 > --- a/tests/sys/fs/fusefs/last_local_modify.cc > +++ b/tests/sys/fs/fusefs/last_local_modify.cc > @@ -506,7 +506,7 @@ TEST_P(LastLocalModify, vfs_vget) > } > > > -INSTANTIATE_TEST_CASE_P(LLM, LastLocalModify, > +INSTANTIATE_TEST_SUITE_P(LLM, LastLocalModify, > Values( > "VOP_ALLOCATE", > "VOP_COPY_FILE_RANGE", > diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc > index 06ebe7fedebc..db06068e4eb8 100644 > --- a/tests/sys/fs/fusefs/mount.cc > +++ b/tests/sys/fs/fusefs/mount.cc > @@ -192,11 +192,11 @@ TEST_P(UpdateErr, update) > EXPECT_TRUE((newflags ^ statbuf.f_flags) & flag); > } > > -INSTANTIATE_TEST_CASE_P(Mount, UpdateOk, > +INSTANTIATE_TEST_SUITE_P(Mount, UpdateOk, > ::testing::Values("MNT_RDONLY", "MNT_NOEXEC", "MNT_NOSUID", "MN > T_NOATIME", > "MNT_SUIDDIR") > ); > > -INSTANTIATE_TEST_CASE_P(Mount, UpdateErr, > - ::testing::Values( "MNT_USER"); > +INSTANTIATE_TEST_SUITE_P(Mount, UpdateErr, > + ::testing::Values( "MNT_USER") > ); > diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc > index f1f485d0b736..72e09d355ad3 100644 > --- a/tests/sys/fs/fusefs/read.cc > +++ b/tests/sys/fs/fusefs/read.cc > @@ -1314,7 +1314,7 @@ TEST_P(ReadAhead, readahead) { > free(contents); > } > > -INSTANTIATE_TEST_CASE_P(RA, ReadAhead, > +INSTANTIATE_TEST_SUITE_P(RA, ReadAhead, > Values(tuple(false, 0), > tuple(false, 1), > tuple(false, 2), > @@ -1362,4 +1362,4 @@ TEST_P(TimeGran, atime_during_setattr) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(TG, TimeGran, Range(0u, 10u)); > +INSTANTIATE_TEST_SUITE_P(TG, TimeGran, Range(0u, 10u)); > diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc > index a217e285a76b..c8cb7d08f474 100644 > --- a/tests/sys/fs/fusefs/write.cc > +++ b/tests/sys/fs/fusefs/write.cc > @@ -616,7 +616,7 @@ TEST_P(WriteRlimitFsize, rlimit_fsize_truncate) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(W, WriteRlimitFsize, > +INSTANTIATE_TEST_SUITE_P(W, WriteRlimitFsize, > Values(0, O_DIRECT) > ); > > @@ -724,7 +724,7 @@ TEST_P(WriteEofDuringVnopStrategy, eof_during_vop_strateg > y) > > } > > -INSTANTIATE_TEST_CASE_P(W, WriteEofDuringVnopStrategy, > +INSTANTIATE_TEST_SUITE_P(W, WriteEofDuringVnopStrategy, > Values(1, 2, 3) > ); > > @@ -1546,7 +1546,7 @@ TEST_P(TimeGran, timestamps_during_setattr) > leak(fd); > } > > -INSTANTIATE_TEST_CASE_P(RA, TimeGran, Range(0u, 10u)); > +INSTANTIATE_TEST_SUITE_P(RA, TimeGran, Range(0u, 10u)); > > /* > * Without direct_io, writes should be committed to cache > Probably precipitated by the local revert of 28f6c2f29280 due to its build failure, this causes the following build failure. -- bmap --- /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:26: error: unknown type name 'BE' INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:37: error: parameter type 'BmapEof' is an abstract class INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ /opt/src/git-src/tests/sys/name 'Values' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:257:9: error: expected ')' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:257:8: note: to match this '(' Values(1, 2, 3) ^ /opt/src/git-src/tests/sys/fs/fusefs/bmap.cc:256:1: error: a type specifier is required for all declarations INSTANTIATE_TEST_SUITE_P(BE, BmapEof, ^ -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Thu Aug 10 14:52:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM8zV1FYLz4mNVh; Thu, 10 Aug 2023 14:52:38 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc33.google.com (mail-oo1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) (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 4RM8zT3sx3z3d1c; Thu, 10 Aug 2023 14:52:37 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=c10k738m; spf=pass (mx1.freebsd.org: domain of mjguzik@gmail.com designates 2607:f8b0:4864:20::c33 as permitted sender) smtp.mailfrom=mjguzik@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-56d6dfa8b52so811921eaf.3; Thu, 10 Aug 2023 07:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691679156; x=1692283956; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=UwnAKBUcVnOYJgQVRMPbPqWrK28F66XwiWwmveS/OAQ=; b=c10k738mrU4Ieo9yUrBEuEPzFh89RLbdJrYPzn1UCMhw420DfhowamvcpcOcIpylY7 n2zk1KPY8LDpPh+9kaBhQgSVMlQ3H5wPmD5TOlTrB50PG2oWCwFviFD6SKz3cf3zzc80 TV5hvdnKNz5J9wSDk3W0Wa/NoGNbvCDYSpP5MYG0/CSE9XlVTsD7QLiQ4kYlYdnUxBOa C6b5CRzIvAbXZO6Sk84AXed0tZA3EkYTah9tn9ztZA/GNhLD5Mx4deOpk67taYRicuxV K5BR991/99KD+EwaP66/54o42D2xtay3GvZEVaWuPAtZQcbngLiNHI1C3hpZ/Q8jzVvo 2WIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691679156; x=1692283956; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UwnAKBUcVnOYJgQVRMPbPqWrK28F66XwiWwmveS/OAQ=; b=lPEOMUxUGnaXFRgD9GFwKGPIZDGrC1maVerh9lN/aLdzIYirvAtt0TAx7gSBy0qIh3 +JOJCGDYTvjqucF8hx0FDJnUmssRSop6PtDG0J+yNuCfbygykhy4ATP/nkIBSnhbazmn orv3Xqac0rBIJo4tkI9kIPWqBimqYPtEdBOPbtFitXMsInJ1HHjI5XD0OzDvtEklmge8 5LvRKJFgAJ7KHYdyZY408XYnB+Y+l2Q8IGFKdDDn4VL3atgicav1ByY2994/NLwubVBK YyYqtA3oKJmXqFaZPPBNzVMdksU9FXdhRvsGV3OXOxWmuNUYtm+c3oLtHVJKS/SK2jDc OW3A== X-Gm-Message-State: AOJu0Yz8tPsDp56eKQ36RNUqidFioUoQc89qqsr3VIigTlRN/tzj/Cg/ C3HNVs5fZo0eQo0Pbhobjh8cu6vWnPdkuENV+V8rygF14cw= X-Google-Smtp-Source: AGHT+IHksZszWcRbtIZ10opxHqeQeOFLSh48C1Q6Udl7FBpxoAcjXPC0eTNHoGOJrd21aqKqjh6QpC3+oLBDIy2q5cY= X-Received: by 2002:a4a:2b1a:0:b0:56d:55b7:e99c with SMTP id i26-20020a4a2b1a000000b0056d55b7e99cmr2157097ooa.1.1691679155876; Thu, 10 Aug 2023 07:52:35 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:129a:0:b0:4f0:1250:dd51 with HTTP; Thu, 10 Aug 2023 07:52:35 -0700 (PDT) In-Reply-To: References: <202308091605.379G59u4094318@gitrepo.freebsd.org> From: Mateusz Guzik Date: Thu, 10 Aug 2023 16:52:35 +0200 Message-ID: Subject: Re: git: 077ef5b445f1 - main - ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL To: Marius Strobl Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::c33:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RM8zT3sx3z3d1c On 8/10/23, Mateusz Guzik wrote: > On 8/9/23, Marius Strobl wrote: >> The branch main has been updated by marius: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=077ef5b445f10f41723b63ab9c24a9809c61afb8 >> >> commit 077ef5b445f10f41723b63ab9c24a9809c61afb8 >> Author: Marius Strobl >> AuthorDate: 2023-08-07 19:16:11 +0000 >> Commit: Marius Strobl >> CommitDate: 2023-08-09 15:44:46 +0000 >> >> ath(4): Remove MIPS SoC build glue and AR9130 from FreeBSD HAL >> >> All of these are obsoleted by the general removal of MIPS support. >> >> Actually, corresponding to the removed AH_SUPPORT_x, there is more >> superfluous support sprinkled across the HAL source. However, that >> code is left in place for now in order to ease a sync to NetBSD. >> > > A coworker claims this driver is unofficially supported on one of the > arm64 appliances, as in it is not mips-only. > > Can this be reverted? > Ops, that's the wrong commit. the right commit does state pci support is expected to still work, so we are good here. Sorry for the noise, please ignore. > >> Reviewed by: emaste (w/ man page fix) >> Approved by: adrian >> Differential Revision: https://reviews.freebsd.org/D41355 >> --- >> share/man/man4/ath_hal.4 | 5 +- >> sys/conf/files | 10 - >> sys/conf/options | 11 - >> .../dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h | 13 - >> sys/dev/ath/ah_osdep_ar5416.c | 3 - >> sys/dev/ath/ath_hal/ar9001/ar9130.ini | 669 >> --------------------- >> sys/dev/ath/ath_hal/ar9001/ar9130_attach.c | 324 ---------- >> sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.c | 20 - >> sys/dev/ath/ath_hal/ar9001/ar9130_eeprom.h | 24 - >> sys/dev/ath/ath_hal/ar9001/ar9130_phy.c | 49 -- >> sys/dev/ath/ath_hal/ar9001/ar9130_phy.h | 27 - >> sys/dev/ath/ath_hal/ar9001/ar9130reg.h | 29 - >> sys/modules/ath_hal_ar5416/Makefile | 9 - >> 13 files changed, 2 insertions(+), 1191 deletions(-) >> >> diff --git a/share/man/man4/ath_hal.4 b/share/man/man4/ath_hal.4 >> index 940809a9c3c9..daf787d412a9 100644 >> --- a/share/man/man4/ath_hal.4 >> +++ b/share/man/man4/ath_hal.4 >> @@ -28,7 +28,7 @@ >> .\" >> .\" $FreeBSD$ >> .\"/ >> -.Dd January 25, 2019 >> +.Dd August 7, 2023 >> .Dt ATH_HAL 4 >> .Os >> .Sh NAME >> @@ -50,7 +50,6 @@ or >> .\".Cd "device ath_ar5312" >> .\".Cd "device ath_rf2136" >> .\".Cd "device ath_rf2137" >> -.Cd "device ath_ar9130" >> .Cd "device ath_ar9160" >> .Cd "device ath_ar9280" >> .Cd "device ath_ar9285" >> @@ -59,7 +58,7 @@ or >> .Sh DESCRIPTION >> The hal provides hardware support for wireless network adapters based on >> the Atheros AR5210, AR5211, AR5212, AR5213, AR2413, AR2417, AR2425, >> -AR5413, AR5416, AR5418, AR5424, AR9130, AR9160, AR9220, AR9280, AR9285, >> +AR5413, AR5416, AR5418, AR5424, AR9160, AR9220, AR9280, AR9285, >> AR9287, AR9380, AR9390, AR9580, AR9590, AR9562 and QCA9565 >> chips (and companion RF/baseband parts). >> This code is part of the >> diff --git a/sys/conf/files b/sys/conf/files >> index 5d75f819a5f5..80384fe1f5b1 100644 >> --- a/sys/conf/files >> +++ b/sys/conf/files >> @@ -1132,16 +1132,6 @@ dev/ath/ath_hal/ar5416/ar5416_xmit.c \ >> optional ath_hal | ath_ar5416 | ath_ar9160 | ath_ar9280 | ath_ar9285 | >> \ >> ath_ar9287 \ >> compile-with "${ATH_C} -I$S/dev/ath/ath_hal" >> -# ar9130 (depends upon ar5416) - also requires AH_SUPPORT_AR9130 >> -# >> -# Since this is an embedded MAC SoC, there's no need to compile it into >> the >> -# default HAL. >> -dev/ath/ath_hal/ar9001/ar9130_attach.c optional ath_ar9130 \ >> - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" >> -dev/ath/ath_hal/ar9001/ar9130_phy.c optional ath_ar9130 \ >> - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" >> -dev/ath/ath_hal/ar9001/ar9130_eeprom.c optional ath_ar9130 \ >> - compile-with "${ATH_C} -I$S/dev/ath/ath_hal" >> # ar9160 (depends on ar5416) >> dev/ath/ath_hal/ar9001/ar9160_attach.c optional ath_hal | ath_ar9160 \ >> compile-with "${ATH_C} -I$S/dev/ath/ath_hal" >> diff --git a/sys/conf/options b/sys/conf/options >> index c06060f4bea0..9e8db5632ec4 100644 >> --- a/sys/conf/options >> +++ b/sys/conf/options >> @@ -820,17 +820,6 @@ ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h >> ATH_DEBUG_ALQ opt_ath.h >> ATH_KTR_INTR_DEBUG opt_ath.h >> >> -# options for the Atheros hal >> -# XXX For now, this breaks non-AR9130 chipsets, so only use it >> -# XXX when actually targeting AR9130. >> -AH_SUPPORT_AR9130 opt_ah.h >> - >> -# This is required for AR933x SoC support >> -AH_SUPPORT_AR9330 opt_ah.h >> -AH_SUPPORT_AR9340 opt_ah.h >> -AH_SUPPORT_QCA9530 opt_ah.h >> -AH_SUPPORT_QCA9550 opt_ah.h >> - >> AH_DEBUG opt_ah.h >> AH_ASSERT opt_ah.h >> AH_DEBUG_ALQ opt_ah.h >> diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h >> b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h >> index 71a3388b04f3..229bb0ba56c5 100644 >> --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h >> +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h >> @@ -51,19 +51,6 @@ >> #define AH_SUPPORT_POSEIDON 1 >> #define AH_SUPPORT_AR9300 1 >> >> -/* These are the embedded boards */ >> -#ifdef AH_SUPPORT_AR9330 >> -#define AH_SUPPORT_HORNET 1 >> -#endif /* AH_SUPPORT_AR9330 */ >> -#ifdef AH_SUPPORT_AR9340 >> -#define AH_SUPPORT_WASP 1 >> -#endif /* AH_SUPPORT_AR9340 */ >> -#ifdef AH_SUPPORT_QCA9550 >> -#define AH_SUPPORT_SCORPION 1 >> -#endif /* AH_SUPPORT_QCA9550 */ >> -#ifdef AH_SUPPORT_QCA9530 >> -#define AH_SUPPORT_HONEYBEE 1 >> -#endif /* AH_SUPPORT_QCA9530 */ >> #define FIX_NOISE_FLOOR 1 >> >> /* XXX this needs to be removed! No atomics in the HAL! */ >> diff --git a/sys/dev/ath/ah_osdep_ar5416.c >> b/sys/dev/ath/ah_osdep_ar5416.c >> index 058027b44c8f..be9e709d6449 100644 >> --- a/sys/dev/ath/ah_osdep_ar5416.c >> +++ b/sys/dev/ath/ah_osdep_ar5416.c >> @@ -41,7 +41,6 @@ >> #include >> >> extern struct ath_hal_chip AR5416_chip; >> -extern struct ath_hal_chip AR9130_chip; >> extern struct ath_hal_chip AR9160_chip; >> extern struct ath_hal_chip AR9280_chip; >> extern struct ath_hal_chip AR9285_chip; >> @@ -60,7 +59,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int >> type, >> void *data __unused) >> switch (type) { >> case MOD_LOAD: >> ath_hal_add_chip(&AR5416_chip); >> - ath_hal_add_chip(&AR9130_chip); >> ath_hal_add_chip(&AR9160_chip); >> ath_hal_add_chip(&AR9280_chip); >> ath_hal_add_chip(&AR9285_chip); >> @@ -74,7 +72,6 @@ ath_hal_ar5416_modevent(module_t mod __unused, int >> type, >> void *data __unused) >> >> case MOD_UNLOAD: >> ath_hal_remove_chip(&AR5416_chip); >> - ath_hal_remove_chip(&AR9130_chip); >> ath_hal_remove_chip(&AR9160_chip); >> ath_hal_remove_chip(&AR9280_chip); >> ath_hal_remove_chip(&AR9285_chip); >> diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130.ini >> b/sys/dev/ath/ath_hal/ar9001/ar9130.ini >> deleted file mode 100644 >> index 0bd9f8e0a879..000000000000 >> --- a/sys/dev/ath/ath_hal/ar9001/ar9130.ini >> +++ /dev/null >> @@ -1,669 +0,0 @@ >> -/* >> - * Copyright (c) 2010 Atheros Communications Inc. >> - * >> - * Permission to use, copy, modify, and/or distribute this software for >> any >> - * purpose with or without fee is hereby granted, provided that the >> above >> - * copyright notice and this permission notice appear in all copies. >> - * >> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL >> WARRANTIES >> - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF >> - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE >> FOR >> - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY >> DAMAGES >> - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN >> - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT >> OF >> - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. >> - * >> - * $FreeBSD$ >> - */ >> - >> -static const uint32_t ar5416Modes_9100[][6] = { >> - { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, >> 0x000001e0 }, >> - { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, >> 0x000001e0 }, >> - { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, >> 0x00001180 }, >> - { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, >> 0x00014008 }, >> - { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, >> 0x06e006e0 }, >> - { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, >> 0x098813cf }, >> - { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, >> 0x08f04810 }, >> - { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, >> 0x0000320a }, >> - { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, >> 0x00000303 }, >> - { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, >> 0x02020200 }, >> - { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, >> 0x00000e0e }, >> - { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, >> 0x0a020001 }, >> - { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, >> 0x00000e0e }, >> - { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, >> 0x00000007 }, >> - { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, >> 0x037216a0 }, >> - { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, >> 0x00197a68 }, >> - { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, >> 0x00197a68 }, >> - { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, >> 0x00197a68 }, >> - { 0x00009850, 0x6c48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6c48b0e2, >> 0x6c48b0e2 }, >> - { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, >> 0x7ec82d2e }, >> - { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, >> 0x31395d5e }, >> - { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, >> 0x00048d18 }, >> - { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, >> 0x0001ce00 }, >> - { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, >> 0x409a40d0 }, >> - { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, >> 0x050cb081 }, >> - { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, >> 0x000007d0 }, >> - { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, >> 0x00000016 }, >> - { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, >> 0xd00a8a0d }, >> - { 0x00009940, 0x00750604, 0x00754604, 0xfff81204, 0xfff81204, >> 0xfff81204 }, >> - { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, >> 0xdfb81020 }, >> - { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, >> 0xe250a51e }, >> - { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, >> 0x3388ffff }, >> - { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, >> 0x0001bfc0 }, >> - { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, >> 0x0001bfc0 }, >> - { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, >> 0x0001bfc0 }, >> - { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, >> 0x00001120 }, >> - { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, >> 0x001a0c00 }, >> - { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, >> 0x038919be }, >> - { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, >> 0x06336f77 }, >> - { 0x000099c8, 0x6af65329, 0x6af65329, 0x6af65329, 0x6af65329, >> 0x6af65329 }, >> - { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, >> 0x08f186c8 }, >> - { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, >> 0x00046384 }, >> - { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, >> 0x00000000 }, >> - { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, >> 0x00000000 }, >> - { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, >> 0x00000880 }, >> - { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, >> 0xd03e4788 }, >> - { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, >> 0x002ac120 }, >> - { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, >> 0x002ac120 }, >> - { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, >> 0x002ac120 }, >> - { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, >> 0x1883800a }, >> - { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, >> 0x00000000 }, >> - { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, >> 0x0a1a7caa }, >> - { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, >> 0x18010000 }, >> - { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, >> 0x2e032402 }, >> - { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, >> 0x4a0a3c06 }, >> - { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, >> 0x621a540b }, >> - { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, >> 0x764f6c1b }, >> - { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, >> 0x845b7a5a }, >> - { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, >> 0x950f8ccf }, >> - { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, >> 0xa5cf9b4f }, >> - { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, >> 0xbddfaf1f }, >> - { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, >> 0xd1ffc93f }, >> - { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, >> 0x00000000 }, >> - { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, >> 0x00000000 }, >> - { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, >> 0x00000000 }, >> - { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, >> 0x00000000 }, >> -}; >> - >> -static const uint32_t ar5416Common_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x0000000c, 0x00000000 }, >> - { 0x00000030, 0x00020015 }, >> - { 0x00000034, 0x00000005 }, >> - { 0x00000040, 0x00000000 }, >> - { 0x00000044, 0x00000008 }, >> - { 0x00000048, 0x00000008 }, >> - { 0x0000004c, 0x00000010 }, >> - { 0x00000050, 0x00000000 }, >> - { 0x00000054, 0x0000001f }, >> - { 0x00000800, 0x00000000 }, >> - { 0x00000804, 0x00000000 }, >> - { 0x00000808, 0x00000000 }, >> - { 0x0000080c, 0x00000000 }, >> - { 0x00000810, 0x00000000 }, >> - { 0x00000814, 0x00000000 }, >> - { 0x00000818, 0x00000000 }, >> - { 0x0000081c, 0x00000000 }, >> - { 0x00000820, 0x00000000 }, >> - { 0x00000824, 0x00000000 }, >> - { 0x00001040, 0x002ffc0f }, >> - { 0x00001044, 0x002ffc0f }, >> - { 0x00001048, 0x002ffc0f }, >> - { 0x0000104c, 0x002ffc0f }, >> - { 0x00001050, 0x002ffc0f }, >> - { 0x00001054, 0x002ffc0f }, >> - { 0x00001058, 0x002ffc0f }, >> - { 0x0000105c, 0x002ffc0f }, >> - { 0x00001060, 0x002ffc0f }, >> - { 0x00001064, 0x002ffc0f }, >> - { 0x00001230, 0x00000000 }, >> - { 0x00001270, 0x00000000 }, >> - { 0x00001038, 0x00000000 }, >> - { 0x00001078, 0x00000000 }, >> - { 0x000010b8, 0x00000000 }, >> - { 0x000010f8, 0x00000000 }, >> - { 0x00001138, 0x00000000 }, >> - { 0x00001178, 0x00000000 }, >> - { 0x000011b8, 0x00000000 }, >> - { 0x000011f8, 0x00000000 }, >> - { 0x00001238, 0x00000000 }, >> - { 0x00001278, 0x00000000 }, >> - { 0x000012b8, 0x00000000 }, >> - { 0x000012f8, 0x00000000 }, >> - { 0x00001338, 0x00000000 }, >> - { 0x00001378, 0x00000000 }, >> - { 0x000013b8, 0x00000000 }, >> - { 0x000013f8, 0x00000000 }, >> - { 0x00001438, 0x00000000 }, >> - { 0x00001478, 0x00000000 }, >> - { 0x000014b8, 0x00000000 }, >> - { 0x000014f8, 0x00000000 }, >> - { 0x00001538, 0x00000000 }, >> - { 0x00001578, 0x00000000 }, >> - { 0x000015b8, 0x00000000 }, >> - { 0x000015f8, 0x00000000 }, >> - { 0x00001638, 0x00000000 }, >> - { 0x00001678, 0x00000000 }, >> - { 0x000016b8, 0x00000000 }, >> - { 0x000016f8, 0x00000000 }, >> - { 0x00001738, 0x00000000 }, >> - { 0x00001778, 0x00000000 }, >> - { 0x000017b8, 0x00000000 }, >> - { 0x000017f8, 0x00000000 }, >> - { 0x0000103c, 0x00000000 }, >> - { 0x0000107c, 0x00000000 }, >> - { 0x000010bc, 0x00000000 }, >> - { 0x000010fc, 0x00000000 }, >> - { 0x0000113c, 0x00000000 }, >> - { 0x0000117c, 0x00000000 }, >> - { 0x000011bc, 0x00000000 }, >> - { 0x000011fc, 0x00000000 }, >> - { 0x0000123c, 0x00000000 }, >> - { 0x0000127c, 0x00000000 }, >> - { 0x000012bc, 0x00000000 }, >> - { 0x000012fc, 0x00000000 }, >> - { 0x0000133c, 0x00000000 }, >> - { 0x0000137c, 0x00000000 }, >> - { 0x000013bc, 0x00000000 }, >> - { 0x000013fc, 0x00000000 }, >> - { 0x0000143c, 0x00000000 }, >> - { 0x0000147c, 0x00000000 }, >> - { 0x00020010, 0x00000003 }, >> - { 0x00020038, 0x000004c2 }, >> - { 0x00008004, 0x00000000 }, >> - { 0x00008008, 0x00000000 }, >> - { 0x0000800c, 0x00000000 }, >> - { 0x00008018, 0x00000700 }, >> - { 0x00008020, 0x00000000 }, >> - { 0x00008038, 0x00000000 }, >> - { 0x0000803c, 0x00000000 }, >> - { 0x00008048, 0x40000000 }, >> - { 0x00008054, 0x00004000 }, >> - { 0x00008058, 0x00000000 }, >> - { 0x0000805c, 0x000fc78f }, >> - { 0x00008060, 0x0000000f }, >> - { 0x00008064, 0x00000000 }, >> - { 0x000080c0, 0x2a82301a }, >> - { 0x000080c4, 0x05dc01e0 }, >> - { 0x000080c8, 0x1f402710 }, >> - { 0x000080cc, 0x01f40000 }, >> - { 0x000080d0, 0x00001e00 }, >> - { 0x000080d4, 0x00000000 }, >> - { 0x000080d8, 0x00400000 }, >> - { 0x000080e0, 0xffffffff }, >> - { 0x000080e4, 0x0000ffff }, >> - { 0x000080e8, 0x003f3f3f }, >> - { 0x000080ec, 0x00000000 }, >> - { 0x000080f0, 0x00000000 }, >> - { 0x000080f4, 0x00000000 }, >> - { 0x000080f8, 0x00000000 }, >> - { 0x000080fc, 0x00020000 }, >> - { 0x00008100, 0x00020000 }, >> - { 0x00008104, 0x00000001 }, >> - { 0x00008108, 0x00000052 }, >> - { 0x0000810c, 0x00000000 }, >> - { 0x00008110, 0x00000168 }, >> - { 0x00008118, 0x000100aa }, >> - { 0x0000811c, 0x00003210 }, >> - { 0x00008120, 0x08f04800 }, >> - { 0x00008124, 0x00000000 }, >> - { 0x00008128, 0x00000000 }, >> - { 0x0000812c, 0x00000000 }, >> - { 0x00008130, 0x00000000 }, >> - { 0x00008134, 0x00000000 }, >> - { 0x00008138, 0x00000000 }, >> - { 0x0000813c, 0x00000000 }, >> - { 0x00008144, 0x00000000 }, >> - { 0x00008168, 0x00000000 }, >> - { 0x0000816c, 0x00000000 }, >> - { 0x00008170, 0x32143320 }, >> - { 0x00008174, 0xfaa4fa50 }, >> - { 0x00008178, 0x00000100 }, >> - { 0x0000817c, 0x00000000 }, >> - { 0x000081c4, 0x00000000 }, >> - { 0x000081d0, 0x00003210 }, >> - { 0x000081ec, 0x00000000 }, >> - { 0x000081f0, 0x00000000 }, >> - { 0x000081f4, 0x00000000 }, >> - { 0x000081f8, 0x00000000 }, >> - { 0x000081fc, 0x00000000 }, >> - { 0x00008200, 0x00000000 }, >> - { 0x00008204, 0x00000000 }, >> - { 0x00008208, 0x00000000 }, >> - { 0x0000820c, 0x00000000 }, >> - { 0x00008210, 0x00000000 }, >> - { 0x00008214, 0x00000000 }, >> - { 0x00008218, 0x00000000 }, >> - { 0x0000821c, 0x00000000 }, >> - { 0x00008220, 0x00000000 }, >> - { 0x00008224, 0x00000000 }, >> - { 0x00008228, 0x00000000 }, >> - { 0x0000822c, 0x00000000 }, >> - { 0x00008230, 0x00000000 }, >> - { 0x00008234, 0x00000000 }, >> - { 0x00008238, 0x00000000 }, >> - { 0x0000823c, 0x00000000 }, >> - { 0x00008240, 0x00100000 }, >> - { 0x00008244, 0x0010f400 }, >> - { 0x00008248, 0x00000100 }, >> - { 0x0000824c, 0x0001e800 }, >> - { 0x00008250, 0x00000000 }, >> - { 0x00008254, 0x00000000 }, >> - { 0x00008258, 0x00000000 }, >> - { 0x0000825c, 0x400000ff }, >> - { 0x00008260, 0x00080922 }, >> - { 0x00008270, 0x00000000 }, >> - { 0x00008274, 0x40000000 }, >> - { 0x00008278, 0x003e4180 }, >> - { 0x0000827c, 0x00000000 }, >> - { 0x00008284, 0x0000002c }, >> - { 0x00008288, 0x0000002c }, >> - { 0x0000828c, 0x00000000 }, >> - { 0x00008294, 0x00000000 }, >> - { 0x00008298, 0x00000000 }, >> - { 0x00008300, 0x00000000 }, >> - { 0x00008304, 0x00000000 }, >> - { 0x00008308, 0x00000000 }, >> - { 0x0000830c, 0x00000000 }, >> - { 0x00008310, 0x00000000 }, >> - { 0x00008314, 0x00000000 }, >> - { 0x00008318, 0x00000000 }, >> - { 0x00008328, 0x00000000 }, >> - { 0x0000832c, 0x00000007 }, >> - { 0x00008330, 0x00000302 }, >> - { 0x00008334, 0x00000e00 }, >> - { 0x00008338, 0x00000000 }, >> - { 0x0000833c, 0x00000000 }, >> - { 0x00008340, 0x000107ff }, >> - { 0x00009808, 0x00000000 }, >> - { 0x0000980c, 0xad848e19 }, >> - { 0x00009810, 0x7d14e000 }, >> - { 0x00009814, 0x9c0a9f6b }, >> - { 0x0000981c, 0x00000000 }, >> - { 0x0000982c, 0x0000a000 }, >> - { 0x00009830, 0x00000000 }, >> - { 0x0000983c, 0x00200400 }, >> - { 0x00009840, 0x206a01ae }, >> - { 0x0000984c, 0x1284233c }, >> - { 0x00009854, 0x00000859 }, >> - { 0x00009900, 0x00000000 }, >> - { 0x00009904, 0x00000000 }, >> - { 0x00009908, 0x00000000 }, >> - { 0x0000990c, 0x00000000 }, >> - { 0x0000991c, 0x10000fff }, >> - { 0x00009920, 0x05100000 }, >> - { 0x0000a920, 0x05100000 }, >> - { 0x0000b920, 0x05100000 }, >> - { 0x00009928, 0x00000001 }, >> - { 0x0000992c, 0x00000004 }, >> - { 0x00009934, 0x1e1f2022 }, >> - { 0x00009938, 0x0a0b0c0d }, >> - { 0x0000993c, 0x00000000 }, >> - { 0x00009948, 0x9280b212 }, >> - { 0x0000994c, 0x00020028 }, >> - { 0x0000c95c, 0x004b6a8e }, >> - { 0x0000c968, 0x000003ce }, >> - { 0x00009970, 0x190fb515 }, >> - { 0x00009974, 0x00000000 }, >> - { 0x00009978, 0x00000001 }, >> - { 0x0000997c, 0x00000000 }, >> - { 0x00009980, 0x00000000 }, >> - { 0x00009984, 0x00000000 }, >> - { 0x00009988, 0x00000000 }, >> - { 0x0000998c, 0x00000000 }, >> - { 0x00009990, 0x00000000 }, >> - { 0x00009994, 0x00000000 }, >> - { 0x00009998, 0x00000000 }, >> - { 0x0000999c, 0x00000000 }, >> - { 0x000099a0, 0x00000000 }, >> - { 0x000099a4, 0x00000001 }, >> - { 0x000099a8, 0x201fff00 }, >> - { 0x000099ac, 0x006f0000 }, >> - { 0x000099b0, 0x03051000 }, >> - { 0x000099dc, 0x00000000 }, >> - { 0x000099e0, 0x00000200 }, >> - { 0x000099e4, 0xaaaaaaaa }, >> - { 0x000099e8, 0x3c466478 }, >> - { 0x000099ec, 0x0cc80caa }, >> - { 0x000099fc, 0x00001042 }, >> - { 0x00009b00, 0x00000000 }, >> - { 0x00009b04, 0x00000001 }, >> - { 0x00009b08, 0x00000002 }, >> - { 0x00009b0c, 0x00000003 }, >> - { 0x00009b10, 0x00000004 }, >> - { 0x00009b14, 0x00000005 }, >> - { 0x00009b18, 0x00000008 }, >> - { 0x00009b1c, 0x00000009 }, >> - { 0x00009b20, 0x0000000a }, >> - { 0x00009b24, 0x0000000b }, >> - { 0x00009b28, 0x0000000c }, >> - { 0x00009b2c, 0x0000000d }, >> - { 0x00009b30, 0x00000010 }, >> - { 0x00009b34, 0x00000011 }, >> - { 0x00009b38, 0x00000012 }, >> - { 0x00009b3c, 0x00000013 }, >> - { 0x00009b40, 0x00000014 }, >> - { 0x00009b44, 0x00000015 }, >> - { 0x00009b48, 0x00000018 }, >> - { 0x00009b4c, 0x00000019 }, >> - { 0x00009b50, 0x0000001a }, >> - { 0x00009b54, 0x0000001b }, >> - { 0x00009b58, 0x0000001c }, >> - { 0x00009b5c, 0x0000001d }, >> - { 0x00009b60, 0x00000020 }, >> - { 0x00009b64, 0x00000021 }, >> - { 0x00009b68, 0x00000022 }, >> - { 0x00009b6c, 0x00000023 }, >> - { 0x00009b70, 0x00000024 }, >> - { 0x00009b74, 0x00000025 }, >> - { 0x00009b78, 0x00000028 }, >> - { 0x00009b7c, 0x00000029 }, >> - { 0x00009b80, 0x0000002a }, >> - { 0x00009b84, 0x0000002b }, >> - { 0x00009b88, 0x0000002c }, >> - { 0x00009b8c, 0x0000002d }, >> - { 0x00009b90, 0x00000030 }, >> - { 0x00009b94, 0x00000031 }, >> - { 0x00009b98, 0x00000032 }, >> - { 0x00009b9c, 0x00000033 }, >> - { 0x00009ba0, 0x00000034 }, >> - { 0x00009ba4, 0x00000035 }, >> - { 0x00009ba8, 0x00000035 }, >> - { 0x00009bac, 0x00000035 }, >> - { 0x00009bb0, 0x00000035 }, >> - { 0x00009bb4, 0x00000035 }, >> - { 0x00009bb8, 0x00000035 }, >> - { 0x00009bbc, 0x00000035 }, >> - { 0x00009bc0, 0x00000035 }, >> - { 0x00009bc4, 0x00000035 }, >> - { 0x00009bc8, 0x00000035 }, >> - { 0x00009bcc, 0x00000035 }, >> - { 0x00009bd0, 0x00000035 }, >> - { 0x00009bd4, 0x00000035 }, >> - { 0x00009bd8, 0x00000035 }, >> - { 0x00009bdc, 0x00000035 }, >> - { 0x00009be0, 0x00000035 }, >> - { 0x00009be4, 0x00000035 }, >> - { 0x00009be8, 0x00000035 }, >> - { 0x00009bec, 0x00000035 }, >> - { 0x00009bf0, 0x00000035 }, >> - { 0x00009bf4, 0x00000035 }, >> - { 0x00009bf8, 0x00000010 }, >> - { 0x00009bfc, 0x0000001a }, >> - { 0x0000a210, 0x40806333 }, >> - { 0x0000a214, 0x00106c10 }, >> - { 0x0000a218, 0x009c4060 }, >> - { 0x0000a220, 0x018830c6 }, >> - { 0x0000a224, 0x00000400 }, >> - { 0x0000a228, 0x001a0bb5 }, >> - { 0x0000a22c, 0x00000000 }, >> - { 0x0000a234, 0x20202020 }, >> - { 0x0000a238, 0x20202020 }, >> - { 0x0000a23c, 0x13c889af }, >> - { 0x0000a240, 0x38490a20 }, >> - { 0x0000a244, 0x00007bb6 }, >> - { 0x0000a248, 0x0fff3ffc }, >> - { 0x0000a24c, 0x00000001 }, >> - { 0x0000a250, 0x0000e000 }, >> - { 0x0000a254, 0x00000000 }, >> - { 0x0000a258, 0x0cc75380 }, >> - { 0x0000a25c, 0x0f0f0f01 }, >> - { 0x0000a260, 0xdfa91f01 }, >> - { 0x0000a268, 0x00000001 }, >> - { 0x0000a26c, 0x0ebae9c6 }, >> - { 0x0000b26c, 0x0ebae9c6 }, >> - { 0x0000c26c, 0x0ebae9c6 }, >> - { 0x0000d270, 0x00820820 }, >> - { 0x0000a278, 0x1ce739ce }, >> - { 0x0000a27c, 0x050701ce }, >> - { 0x0000a338, 0x00000000 }, >> - { 0x0000a33c, 0x00000000 }, >> - { 0x0000a340, 0x00000000 }, >> - { 0x0000a344, 0x00000000 }, >> - { 0x0000a348, 0x3fffffff }, >> - { 0x0000a34c, 0x3fffffff }, >> - { 0x0000a350, 0x3fffffff }, >> - { 0x0000a354, 0x0003ffff }, >> - { 0x0000a358, 0x79a8aa33 }, >> - { 0x0000d35c, 0x07ffffef }, >> - { 0x0000d360, 0x0fffffe7 }, >> - { 0x0000d364, 0x17ffffe5 }, >> - { 0x0000d368, 0x1fffffe4 }, >> - { 0x0000d36c, 0x37ffffe3 }, >> - { 0x0000d370, 0x3fffffe3 }, >> - { 0x0000d374, 0x57ffffe3 }, >> - { 0x0000d378, 0x5fffffe2 }, >> - { 0x0000d37c, 0x7fffffe2 }, >> - { 0x0000d380, 0x7f3c7bba }, >> - { 0x0000d384, 0xf3307ff0 }, >> - { 0x0000a388, 0x0c000000 }, >> - { 0x0000a38c, 0x20202020 }, >> - { 0x0000a390, 0x20202020 }, >> - { 0x0000a394, 0x1ce739ce }, >> - { 0x0000a398, 0x000001ce }, >> - { 0x0000a39c, 0x00000001 }, >> - { 0x0000a3a0, 0x00000000 }, >> - { 0x0000a3a4, 0x00000000 }, >> - { 0x0000a3a8, 0x00000000 }, >> - { 0x0000a3ac, 0x00000000 }, >> - { 0x0000a3b0, 0x00000000 }, >> - { 0x0000a3b4, 0x00000000 }, >> - { 0x0000a3b8, 0x00000000 }, >> - { 0x0000a3bc, 0x00000000 }, >> - { 0x0000a3c0, 0x00000000 }, >> - { 0x0000a3c4, 0x00000000 }, >> - { 0x0000a3c8, 0x00000246 }, >> - { 0x0000a3cc, 0x20202020 }, >> - { 0x0000a3d0, 0x20202020 }, >> - { 0x0000a3d4, 0x20202020 }, >> - { 0x0000a3dc, 0x1ce739ce }, >> - { 0x0000a3e0, 0x000001ce }, >> -}; >> - >> -static const uint32_t ar5416Bank0_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x000098b0, 0x1e5795e5 }, >> - { 0x000098e0, 0x02008020 }, >> -}; >> - >> -static const uint32_t ar5416BB_RfGain_9100[][3] = { >> - /* Addr 5G_HT20 5G_HT40 */ >> - { 0x00009a00, 0x00000000, 0x00000000 }, >> - { 0x00009a04, 0x00000040, 0x00000040 }, >> - { 0x00009a08, 0x00000080, 0x00000080 }, >> - { 0x00009a0c, 0x000001a1, 0x00000141 }, >> - { 0x00009a10, 0x000001e1, 0x00000181 }, >> - { 0x00009a14, 0x00000021, 0x000001c1 }, >> - { 0x00009a18, 0x00000061, 0x00000001 }, >> - { 0x00009a1c, 0x00000168, 0x00000041 }, >> - { 0x00009a20, 0x000001a8, 0x000001a8 }, >> - { 0x00009a24, 0x000001e8, 0x000001e8 }, >> - { 0x00009a28, 0x00000028, 0x00000028 }, >> - { 0x00009a2c, 0x00000068, 0x00000068 }, >> - { 0x00009a30, 0x00000189, 0x000000a8 }, >> - { 0x00009a34, 0x000001c9, 0x00000169 }, >> - { 0x00009a38, 0x00000009, 0x000001a9 }, >> - { 0x00009a3c, 0x00000049, 0x000001e9 }, >> - { 0x00009a40, 0x00000089, 0x00000029 }, >> - { 0x00009a44, 0x00000170, 0x00000069 }, >> - { 0x00009a48, 0x000001b0, 0x00000190 }, >> - { 0x00009a4c, 0x000001f0, 0x000001d0 }, >> - { 0x00009a50, 0x00000030, 0x00000010 }, >> - { 0x00009a54, 0x00000070, 0x00000050 }, >> - { 0x00009a58, 0x00000191, 0x00000090 }, >> - { 0x00009a5c, 0x000001d1, 0x00000151 }, >> - { 0x00009a60, 0x00000011, 0x00000191 }, >> - { 0x00009a64, 0x00000051, 0x000001d1 }, >> - { 0x00009a68, 0x00000091, 0x00000011 }, >> - { 0x00009a6c, 0x000001b8, 0x00000051 }, >> - { 0x00009a70, 0x000001f8, 0x00000198 }, >> - { 0x00009a74, 0x00000038, 0x000001d8 }, >> - { 0x00009a78, 0x00000078, 0x00000018 }, >> - { 0x00009a7c, 0x00000199, 0x00000058 }, >> - { 0x00009a80, 0x000001d9, 0x00000098 }, >> - { 0x00009a84, 0x00000019, 0x00000159 }, >> - { 0x00009a88, 0x00000059, 0x00000199 }, >> - { 0x00009a8c, 0x00000099, 0x000001d9 }, >> - { 0x00009a90, 0x000000d9, 0x00000019 }, >> - { 0x00009a94, 0x000000f9, 0x00000059 }, >> - { 0x00009a98, 0x000000f9, 0x00000099 }, >> - { 0x00009a9c, 0x000000f9, 0x000000d9 }, >> - { 0x00009aa0, 0x000000f9, 0x000000f9 }, >> - { 0x00009aa4, 0x000000f9, 0x000000f9 }, >> - { 0x00009aa8, 0x000000f9, 0x000000f9 }, >> - { 0x00009aac, 0x000000f9, 0x000000f9 }, >> - { 0x00009ab0, 0x000000f9, 0x000000f9 }, >> - { 0x00009ab4, 0x000000f9, 0x000000f9 }, >> - { 0x00009ab8, 0x000000f9, 0x000000f9 }, >> - { 0x00009abc, 0x000000f9, 0x000000f9 }, >> - { 0x00009ac0, 0x000000f9, 0x000000f9 }, >> - { 0x00009ac4, 0x000000f9, 0x000000f9 }, >> - { 0x00009ac8, 0x000000f9, 0x000000f9 }, >> - { 0x00009acc, 0x000000f9, 0x000000f9 }, >> - { 0x00009ad0, 0x000000f9, 0x000000f9 }, >> - { 0x00009ad4, 0x000000f9, 0x000000f9 }, >> - { 0x00009ad8, 0x000000f9, 0x000000f9 }, >> - { 0x00009adc, 0x000000f9, 0x000000f9 }, >> - { 0x00009ae0, 0x000000f9, 0x000000f9 }, >> - { 0x00009ae4, 0x000000f9, 0x000000f9 }, >> - { 0x00009ae8, 0x000000f9, 0x000000f9 }, >> - { 0x00009aec, 0x000000f9, 0x000000f9 }, >> - { 0x00009af0, 0x000000f9, 0x000000f9 }, >> - { 0x00009af4, 0x000000f9, 0x000000f9 }, >> - { 0x00009af8, 0x000000f9, 0x000000f9 }, >> - { 0x00009afc, 0x000000f9, 0x000000f9 }, >> -}; >> - >> -static const uint32_t ar5416Bank1_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x000098b0, 0x02108421 }, >> - { 0x000098ec, 0x00000008 }, >> -}; >> - >> -static const uint32_t ar5416Bank2_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x000098b0, 0x0e73ff17 }, >> - { 0x000098e0, 0x00000420 }, >> -}; >> - >> -static const uint32_t ar5416Bank3_9100[][3] = { >> - /* Addr 5G_HT20 5G_HT40 */ >> - { 0x000098f0, 0x01400018, 0x01c00018 }, >> -}; >> - >> -static const uint32_t ar5416Bank6_9100[][3] = { >> - /* Addr 5G_HT20 5G_HT40 */ >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00e00000, 0x00e00000 }, >> - { 0x0000989c, 0x005e0000, 0x005e0000 }, >> - { 0x0000989c, 0x00120000, 0x00120000 }, >> - { 0x0000989c, 0x00620000, 0x00620000 }, >> - { 0x0000989c, 0x00020000, 0x00020000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x005f0000, 0x005f0000 }, >> - { 0x0000989c, 0x00870000, 0x00870000 }, >> - { 0x0000989c, 0x00f90000, 0x00f90000 }, >> - { 0x0000989c, 0x007b0000, 0x007b0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00f50000, 0x00f50000 }, >> - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, >> - { 0x0000989c, 0x00110000, 0x00110000 }, >> - { 0x0000989c, 0x006100a8, 0x006100a8 }, >> - { 0x0000989c, 0x004210a2, 0x004210a2 }, >> - { 0x0000989c, 0x0014000f, 0x0014000f }, >> - { 0x0000989c, 0x00c40002, 0x00c40002 }, >> - { 0x0000989c, 0x003000f2, 0x003000f2 }, >> - { 0x0000989c, 0x00440016, 0x00440016 }, >> - { 0x0000989c, 0x00410040, 0x00410040 }, >> - { 0x0000989c, 0x000180d6, 0x000180d6 }, >> - { 0x0000989c, 0x0000c0aa, 0x0000c0aa }, >> - { 0x0000989c, 0x000000b1, 0x000000b1 }, >> - { 0x0000989c, 0x00002000, 0x00002000 }, >> - { 0x0000989c, 0x000000d4, 0x000000d4 }, >> - { 0x000098d0, 0x0000000f, 0x0010000f }, >> -}; >> - >> -static const uint32_t ar5416Bank6TPC_9100[][3] = { >> - /* Addr 5G_HT20 5G_HT40 */ >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00000000, 0x00000000 }, >> - { 0x0000989c, 0x00e00000, 0x00e00000 }, >> - { 0x0000989c, 0x005e0000, 0x005e0000 }, >> - { 0x0000989c, 0x00120000, 0x00120000 }, >> - { 0x0000989c, 0x00620000, 0x00620000 }, >> - { 0x0000989c, 0x00020000, 0x00020000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x40ff0000, 0x40ff0000 }, >> - { 0x0000989c, 0x005f0000, 0x005f0000 }, >> - { 0x0000989c, 0x00870000, 0x00870000 }, >> - { 0x0000989c, 0x00f90000, 0x00f90000 }, >> - { 0x0000989c, 0x007b0000, 0x007b0000 }, >> - { 0x0000989c, 0x00ff0000, 0x00ff0000 }, >> - { 0x0000989c, 0x00f50000, 0x00f50000 }, >> - { 0x0000989c, 0x00dc0000, 0x00dc0000 }, >> - { 0x0000989c, 0x00110000, 0x00110000 }, >> - { 0x0000989c, 0x006100a8, 0x006100a8 }, >> - { 0x0000989c, 0x00423022, 0x00423022 }, >> - { 0x0000989c, 0x2014008f, 0x2014008f }, >> - { 0x0000989c, 0x00c40002, 0x00c40002 }, >> - { 0x0000989c, 0x003000f2, 0x003000f2 }, >> - { 0x0000989c, 0x00440016, 0x00440016 }, >> - { 0x0000989c, 0x00410040, 0x00410040 }, >> - { 0x0000989c, 0x0001805e, 0x0001805e }, >> - { 0x0000989c, 0x0000c0ab, 0x0000c0ab }, >> - { 0x0000989c, 0x000000e1, 0x000000e1 }, >> - { 0x0000989c, 0x00007080, 0x00007080 }, >> - { 0x0000989c, 0x000000d4, 0x000000d4 }, >> - { 0x000098d0, 0x0000000f, 0x0010000f }, >> -}; >> - >> -static const uint32_t ar5416Bank7_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x0000989c, 0x00000500 }, >> - { 0x0000989c, 0x00000800 }, >> - { 0x000098cc, 0x0000000e }, >> -}; >> - >> -static const uint32_t ar5416Addac_9100[][2] = { >> - /* Addr allmodes */ >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000010 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x000000c0 }, >> - { 0x0000989c, 0x00000015 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x0000989c, 0x00000000 }, >> - { 0x000098cc, 0x00000000 }, >> -}; >> diff --git a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c >> b/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c >> deleted file mode 100644 >> index 70277cc6ca2a..000000000000 >> --- a/sys/dev/ath/ath_hal/ar9001/ar9130_attach.c >> +++ /dev/null >> @@ -1,324 +0,0 @@ >> -/*- >> - * SPDX-License-Identifier: ISC >> - * >> - * Copyright (c) 2011 Adrian Chadd, Xenion Pty Ltd >> - * Copyright (c) 2008 Sam Leffler, Errno Consulting >> - * Copyright (c) 2008 Atheros Communications, Inc. >> - * >> - * Permission to use, copy, modify, and/or distribute this software for >> any >> - * purpose with or without fee is hereby granted, provided that the >> above >> - * copyright notice and this permission notice appear in all copies. >> - * >> - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL >> WARRANTIES >> - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF >> - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE >> FOR >> - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY >> DAMAGES >> - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN >> - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT >> OF >> - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. >> - * >> - * $FreeBSD$ >> - */ >> -#include "opt_ah.h" >> - >> -#include "ah.h" >> -#include "ah_internal.h" >> -#include "ah_devid.h" >> - >> -#include "ar5416/ar5416.h" >> -#include "ar5416/ar5416reg.h" >> -#include "ar5416/ar5416phy.h" >> - >> -#include "ar9001/ar9130reg.h" >> -#include "ar9001/ar9130_phy.h" >> -#include "ar9001/ar9130_eeprom.h" >> - >> -#include "ar9001/ar9130.ini" >> - >> -static const HAL_PERCAL_DATA ar9130_iq_cal = { /* multi sample */ >> - .calName = "IQ", .calType = IQ_MISMATCH_CAL, >> - .calNumSamples = MAX_CAL_SAMPLES, >> - .calCountMax = PER_MIN_LOG_COUNT, >> - .calCollect = ar5416IQCalCollect, >> - .calPostProc = ar5416IQCalibration >> -}; >> -static const HAL_PERCAL_DATA ar9130_adc_gain_cal = { /* multi sample */ >> - .calName = "ADC Gain", .calType = ADC_GAIN_CAL, >> - .calNumSamples = MAX_CAL_SAMPLES, >> - .calCountMax = PER_MIN_LOG_COUNT, >> - .calCollect = ar5416AdcGainCalCollect, >> - .calPostProc = ar5416AdcGainCalibration >> -}; >> -static const HAL_PERCAL_DATA ar9130_adc_dc_cal = { /* multi sample */ >> - .calName = "ADC DC", .calType = ADC_DC_CAL, >> - .calNumSamples = MAX_CAL_SAMPLES, >> - .calCountMax = PER_MIN_LOG_COUNT, >> - .calCollect = ar5416AdcDcCalCollect, >> - .calPostProc = ar5416AdcDcCalibration >> -}; >> -static const HAL_PERCAL_DATA ar9130_adc_init_dc_cal = { >> - .calName = "ADC Init DC", .calType = ADC_DC_INIT_CAL, >> - .calNumSamples = MIN_CAL_SAMPLES, >> - .calCountMax = INIT_LOG_COUNT, >> - .calCollect = ar5416AdcDcCalCollect, >> - .calPostProc = ar5416AdcDcCalibration >> -}; >> - >> -static HAL_BOOL ar9130FillCapabilityInfo(struct ath_hal *ah); >> - >> -/* >> - * Attach for an AR9130 part. >> - */ >> -static struct ath_hal * >> -ar9130Attach(uint16_t devid, HAL_SOFTC sc, >> - HAL_BUS_TAG st, HAL_BUS_HANDLE sh, uint16_t *eepromdata, >> - HAL_OPS_CONFIG *ah_config, >> - HAL_STATUS *status) >> -{ >> - struct ath_hal_5416 *ahp5416; >> - struct ath_hal_5212 *ahp; >> - struct ath_hal *ah; >> - uint32_t val; >> - HAL_STATUS ecode; >> - HAL_BOOL rfStatus; >> - >> - HALDEBUG(AH_NULL, HAL_DEBUG_ATTACH, "%s: sc %p st %p sh %p\n", >> - __func__, sc, (void*) st, (void*) sh); >> - >> - /* NB: memory is returned zero'd */ >> - ahp5416 = ath_hal_malloc(sizeof (struct ath_hal_5416)); >> - if (ahp5416 == AH_NULL) { >> - HALDEBUG(AH_NULL, HAL_DEBUG_ANY, >> - "%s: cannot allocate memory for state block\n", __func__); >> - *status = HAL_ENOMEM; >> - return AH_NULL; >> - } >> - ar5416InitState(ahp5416, devid, sc, st, sh, status); >> - ahp = &ahp5416->ah_5212; >> - ah = &ahp->ah_priv.h; >> - >> - /* XXX override with 9100 specific state */ >> - AH5416(ah)->ah_initPLL = ar9130InitPLL; >> - /* XXX should force chainmasks to 0x7, as per ath9k calibration bugs */ >> - >> - /* override 5416 methods for our needs */ >> - >> - AH5416(ah)->ah_cal.iqCalData.calData = &ar9130_iq_cal; >> - AH5416(ah)->ah_cal.adcGainCalData.calData = &ar9130_adc_gain_cal; >> - AH5416(ah)->ah_cal.adcDcCalData.calData = &ar9130_adc_dc_cal; >> - AH5416(ah)->ah_cal.adcDcCalInitData.calData = &ar9130_adc_init_dc_cal; >> - AH5416(ah)->ah_cal.suppCals = ADC_GAIN_CAL | ADC_DC_CAL | >> IQ_MISMATCH_CAL; >> - >> - /* >> - * This was hard-set because the initial ath9k port of this >> - * code kept their runtime conditional register #defines. >> - * AR_SREV and the RTC registers have shifted for Howl; >> - * they detected this and changed the values at runtime. >> - * The current port doesn't yet do this; it may do at a >> - * later stage, so this is set early so any routines which >> - * manipulate the registers have ah_macVersion set to base >> - * the above decision upon. >> - */ >> - AH_PRIVATE((ah))->ah_macVersion = AR_XSREV_VERSION_HOWL; >> - >> - /* >> - * Use the "local" EEPROM data given to us by the higher layers. >> - * This is a private copy out of system flash. >> - * By this stage the SoC SPI flash may have disabled the memory- >> - * mapping and rely purely on port-based SPI IO. >> - */ >> - AH_PRIVATE((ah))->ah_eepromRead = ath_hal_EepromDataRead; >> - AH_PRIVATE((ah))->ah_eepromWrite = NULL; >> - ah->ah_eepromdata = eepromdata; >> - >> - if (!ar5416SetResetReg(ah, HAL_RESET_POWER_ON)) { >> - /* reset chip */ >> - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't reset chip\n", >> - __func__); >> - ecode = HAL_EIO; >> - goto bad; >> - } >> - >> - if (!ar5416SetPowerMode(ah, HAL_PM_AWAKE, AH_TRUE)) { >> - HALDEBUG(ah, HAL_DEBUG_ANY, "%s: couldn't wakeup chip\n", >> *** 380 LINES SKIPPED *** >> > > > -- > Mateusz Guzik > -- Mateusz Guzik From nobody Thu Aug 10 14:58:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM96J6kXPz4mNb5; Thu, 10 Aug 2023 14:58: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 4RM96J6CNSz3dpL; Thu, 10 Aug 2023 14:58:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691679512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nwpm/emmKT/iH9f41morHuzAnfzGWhDAupZgHcqRwvU=; b=uDgfeJrt1iaSZkkdqG8PZTugQZaIr7AQEBUn9f5b4voDds6ssa5AYcfTOBTR89mLCC+RAA G4zLMkyISAMOq6e7lZul0YEqguBm5pUEFMf0a8PudFasvQLxvsdDZ3fXOrp10tf3xUd+/F WTIfkzSigPkEyIhKFLPu+btGiKOwg0zeaQEthlkIjAE7dfs/H5xY8iEEn5KVTiKyTs7uFY 4aPnS9YeSeZZQrGbwQjjntZhdjIKd2UFX6Mz7e1E3r73loCuBcD17Yg6c54ZyA5WEHNEgQ 79VtClqtIboXPEgs14UxjczGVb0vA7UfHA6qSHGLac2UwjEWdOiOKoJY7fUt2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691679512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nwpm/emmKT/iH9f41morHuzAnfzGWhDAupZgHcqRwvU=; b=pLuOo1PKlZ3rHrwieDDEHBAxPcDLG/s1afUw9s5orNyML4PVKTgBv9HZowjlYcPXZL0mVI nY7lgQDXd3QsvzHa9SYPt5zmf53NBI/mvXCup9V4ZJlw2GuSq3eRnx93W9onn4O+IrcoUW 7wCAPfd8DXZ3++9LmWJxOOW6WcAYAdBkyMXtzFp9bXf8aG2Us4R0fHMDM070bNss+9wOql meDuR+An1i9++69DKdz5sywwkUfbLlUSfy5nNi06kFaPn5ycT+w0x+YJz4OwBjiFoOzP9g LVIiNg8bc/rpp1j3XZZpqo/Gk2pGa5LAXps5NbHfKUon/k6xbkY3/ZcyKap/UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691679512; a=rsa-sha256; cv=none; b=ltNdnhduwKUE2g0ITK/PfYQCGUg1iyiJL2yDtpRpjNq2dYpATL9iOkGH+GmbiOEeHD9tQV 3c5MUH8t9ouKM4/V8/7G9kQbG0N0Zg4GgopDDUQmEkkTtVsEKOMhym3tBuhj9dMFM+jwxj P25pb/H4GAAB/1hUDh2VCtPcDyAmjRMHHuFTD5kMZRgmcTJyeTiGiJc256FmdMXkhoHACg ys8xMNSeerhyV054ZdDTcOWvC5Upmy8s/1Znsc3x8HjUFXO81ea6Dv+Q3Gm6aKtB1qEC4K 23TGn3YSkBR3OCKQMKeqCCcV+qxUQC3a/wsLcbbKgfpyBIVecxwSiYUbpXaNEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM96J5J8dz11d1; Thu, 10 Aug 2023 14:58: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 37AEwW7f076489; Thu, 10 Aug 2023 14:58:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AEwWeL076486; Thu, 10 Aug 2023 14:58:32 GMT (envelope-from git) Date: Thu, 10 Aug 2023 14:58:32 GMT Message-Id: <202308101458.37AEwWeL076486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Poul-Henning Kamp Subject: git: 4ff782c06a56 - main - tcopy: Pick up max blocksize from sysctl kern.maxphys List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: phk X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ff782c06a56281b113df6dbf48bb397ddcb020a Auto-Submitted: auto-generated The branch main has been updated by phk: URL: https://cgit.FreeBSD.org/src/commit/?id=4ff782c06a56281b113df6dbf48bb397ddcb020a commit 4ff782c06a56281b113df6dbf48bb397ddcb020a Author: Poul-Henning Kamp AuthorDate: 2023-08-10 14:56:53 +0000 Commit: Poul-Henning Kamp CommitDate: 2023-08-10 14:58:18 +0000 tcopy: Pick up max blocksize from sysctl kern.maxphys --- usr.bin/tcopy/tcopy.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index 24dcc969a9af..ef0da430002e 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -52,6 +52,7 @@ static const char sccsid[] = "@(#)tcopy.c 8.2 (Berkeley) 4/17/94"; #include #include #include +#include #include #include #include @@ -82,6 +83,11 @@ main(int argc, char *argv[]) int ch, needeof; char *buff; const char *inf; + unsigned long maxphys = 0; + size_t l_maxphys = sizeof maxphys; + + if (!sysctlbyname("kern.maxphys", &maxphys, &l_maxphys, NULL, 0)) + maxblk = maxphys; msg = stdout; guesslen = 1; From nobody Thu Aug 10 14:59:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RM97M1rBzz4mNgl; Thu, 10 Aug 2023 14:59: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 4RM97L68MMz3dyj; Thu, 10 Aug 2023 14:59:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691679566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhYa3PL5x8NxgnwGshINe9XuqRuR3H4fV8dYrjQD3+0=; b=Cc0/sX59s2Hns5X+BcVrB0ojrKgv2M9wd4VIWAceG2dMLVc9jDbfngkRWVQ5vS605Fl2Rz jm+RaofVGle/1V2DLxRELNcLpZ9Q8/R4aN+QXs906okfp8TqM0AihsOjKoX92BfwyCJa4r HA1XBs9naRrTXN7/68O/qKXfLEZiyYGh7dkuiAQrb099LB80yEB4IgVSjF2CA8z4orO0Ny s3Ybhar5a5d5SLxNBsXG8yKC8q/Zgut3DRnEoNOza+M7M4eV6lrKaCUPSKI3oFgO/3N9kW 5maV7DS/zoTyUtFc+d9mL2FwIFI4LW0V4WTU7OwmeMgyfbGoWnbSaCbBqYD6TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691679566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhYa3PL5x8NxgnwGshINe9XuqRuR3H4fV8dYrjQD3+0=; b=CHPddOEmhsRYdM6twpxpRZeLjAJi0vcQ1lOgUm97sTvqRBjBKIzTfqTUdvSEdCHy7or+TY bL4pkZby5c0imXThnAH87Pn3cnEK2gy9druJOL0paemVVPsi9OnhzjvAj65WfNkfBIAdTU sCInUrDaX5bQG6ZOsFaaf5s2/PaNzvkOLqEwCiJnjdXze/yP5KVn5hPUq/2hGtRGPhycjZ FpblwUzEiLkuGxZKSPS4VagkN+FejQljnZeDm+Sn8gZcwORre0ybK47PprLaMkOcyqVxfb NDEIDje5KwjNdWQnYpTN1D4MAvZOQAsm1kbiwyHnK8mPwlzTzaIsh/fztpdL/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691679566; a=rsa-sha256; cv=none; b=N5BJG7j8GK2G7qyVV+iSSbWycEMgKT2U0S0zienl0avWDtgxK7RcH4YwSy+O0v//qzi8Wy rQuGfVlRqB0OEU2IMLs+AZvjd4R5yoYTEskjK7WENImGd+g/krrmYT1wegcV3GW1JdJTNk NhGCxGlLCacUySRLjf1Hrk7rrcjDeLQ+vJ3b/yJYSpqGSTvYi0wUMSOnQ5djimCdRWsf7L TLnwjMGihkZH7ysUvLITNTTSLWUeD+cfc0BMVXatquUfCucjZGs8t0dyGs0jp4iZRbDcPS H4bh3sGGoH5VAr2YdTXipNXe6YJlJlfq7LuYRt3hbSL2OQDkuIJlELK83Wvy+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RM97L5DYwz11lp; Thu, 10 Aug 2023 14:59: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 37AExQ6h076765; Thu, 10 Aug 2023 14:59:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AExQ5k076762; Thu, 10 Aug 2023 14:59:26 GMT (envelope-from git) Date: Thu, 10 Aug 2023 14:59:26 GMT Message-Id: <202308101459.37AExQ5k076762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: ec54a3142354 - main - ixl.4: update link to intel-nvmupdate ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec54a31423544586061c444aa129ccda966e83f0 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=ec54a31423544586061c444aa129ccda966e83f0 commit ec54a31423544586061c444aa129ccda966e83f0 Author: Alan Somers AuthorDate: 2023-08-02 00:04:12 +0000 Commit: Alan Somers CommitDate: 2023-08-10 14:59:19 +0000 ixl.4: update link to intel-nvmupdate ports MFC after: 2 weeks Sponsored by: Axcient Reviewed by: pkubaj Differential Revision: https://reviews.freebsd.org/D41288 --- share/man/man4/ixl.4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ixl.4 b/share/man/man4/ixl.4 index 320971a74f52..3beb5498f515 100644 --- a/share/man/man4/ixl.4 +++ b/share/man/man4/ixl.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 19, 2021 +.Dd August 1, 2023 .Dt IXL 4 .Os .Sh NAME @@ -105,7 +105,10 @@ package. .It To update the firmware on an adapter, use the Intel Non-Volatile Memory (NVM) Update Utility; installed by the -.Em sysutils/intel-nvmupdate +.Em sysutils/intel-nvmupdate-10g , +.Em sysutils/intel-nvmupdate-40g , +or +.Em sysutils/intel-nvmupdate-100g , package. .It Drivers are provided by Intel outside of the From nobody Thu Aug 10 15:55:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMBN032trz4mShF; Thu, 10 Aug 2023 15:55:28 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMBN00KWjz4Ggp; Thu, 10 Aug 2023 15:55:28 +0000 (UTC) (envelope-from mm@FreeBSD.org) Authentication-Results: mx1.freebsd.org; none Received: from sslproxy03.your-server.de ([88.198.220.132]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qU80N-0005Xc-PR; Thu, 10 Aug 2023 17:55:19 +0200 Received: from [88.207.13.9] (helo=[192.168.1.68]) by sslproxy03.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qU80N-000S47-CD; Thu, 10 Aug 2023 17:55:19 +0200 Message-ID: <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> Date: Thu, 10 Aug 2023 17:55:17 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs Content-Language: en-US To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> From: Martin Matuska In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.8/26996/Thu Aug 10 09:33:34 2023) X-Rspamd-Queue-Id: 4RMBN00KWjz4Ggp 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:24940, ipnet:213.133.96.0/19, country:DE] Hi Mateusz, I am very sorry but we have to wait with full merges until 14-stable is branched. After branching: main will continue to receive updates from OpenZFS master branch stable/14 will be updated from OpenZFS zfs-2.2-release branch Until then everything we can do is cherry-pick commits that fix serious issues everything else will make the merge management unnecessarily complicated. Cheers, mm On 10. 8. 2023 16:23, Mateusz Guzik wrote: > On 8/10/23, Martin Matuska wrote: >> The branch main has been updated by mm: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 >> >> commit cd25b0f740f8c846562fd66e7380437eb898c875 >> Author: Martin Matuska >> AuthorDate: 2023-08-10 07:55:42 +0000 >> Commit: Martin Matuska >> CommitDate: 2023-08-10 07:56:53 +0000 >> >> zfs: cherry-pick fix from openzfs >> >> Vendor PR: >> #15080 ZIL: Fix config lock deadlock >> >> Obtained from: OpenZFS >> OpenZFS commit: 2cb992a99ccadb78d97049b40bd442eb4fdc549d >> >> Note: full vendor imports will continue when stable/14 has been >> branched > First a stylistic issue: > Can you please use upstream one-liner, maybe prefixed with zfs:. For > this commit it would be: > zfs: ZIL: Fix config lock deadlock. > > then copy their commit message > > For example see > https://cgit.freebsd.org/src/commit/?id=d09a955a605d03471c5ab7bd17b8a6186fdc148c > > A not stylistic issue is the delay between upstream fixes and them > getting merged into FreeBSD. For example the commit at hand is over 2 > weeks old and I presume this merge got only prompted by des@ running a > zfs-related deadlock. > > We really should be getting timely updates without local people > running into them. > >> --- >> sys/contrib/openzfs/module/zfs/zil.c | 34 >> +++++++++++++++++++++++++++------- >> 1 file changed, 27 insertions(+), 7 deletions(-) >> >> diff --git a/sys/contrib/openzfs/module/zfs/zil.c >> b/sys/contrib/openzfs/module/zfs/zil.c >> index 00d66a2481d7..af7137faaccf 100644 >> --- a/sys/contrib/openzfs/module/zfs/zil.c >> +++ b/sys/contrib/openzfs/module/zfs/zil.c >> @@ -151,6 +151,7 @@ static kmem_cache_t *zil_lwb_cache; >> static kmem_cache_t *zil_zcw_cache; >> >> static void zil_lwb_commit(zilog_t *zilog, lwb_t *lwb, itx_t *itx); >> +static void zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb); >> static itx_t *zil_itx_clone(itx_t *oitx); >> >> static int >> @@ -1768,7 +1769,7 @@ static uint_t zil_maxblocksize = >> SPA_OLD_MAXBLOCKSIZE; >> * Has to be called under zl_issuer_lock to chain more lwbs. >> */ >> static lwb_t * >> -zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) >> +zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb, list_t *ilwbs) >> { >> lwb_t *nlwb = NULL; >> zil_chain_t *zilc; >> @@ -1870,6 +1871,27 @@ zil_lwb_write_close(zilog_t *zilog, lwb_t *lwb) >> >> dmu_tx_commit(tx); >> >> + /* >> + * We need to acquire the config lock for the lwb to issue it later. >> + * However, if we already have a queue of closed parent lwbs already >> + * holding the config lock (but not yet issued), we can't block here >> + * waiting on the lock or we will deadlock. In that case we must >> + * first issue to parent IOs before waiting on the lock. >> + */ >> + if (ilwbs && !list_is_empty(ilwbs)) { >> + if (!spa_config_tryenter(spa, SCL_STATE, lwb, RW_READER)) { >> + lwb_t *tlwb; >> + while ((tlwb = list_remove_head(ilwbs)) != NULL) >> + zil_lwb_write_issue(zilog, tlwb); >> + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); >> + } >> + } else { >> + spa_config_enter(spa, SCL_STATE, lwb, RW_READER); >> + } >> + >> + if (ilwbs) >> + list_insert_tail(ilwbs, lwb); >> + >> /* >> * If there was an allocation failure then nlwb will be null which >> * forces a txg_wait_synced(). >> @@ -1933,7 +1955,7 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb) >> ZIL_STAT_INCR(zilog, zil_itx_metaslab_normal_alloc, >> BP_GET_LSIZE(&lwb->lwb_blk)); >> } >> - spa_config_enter(zilog->zl_spa, SCL_STATE, lwb, RW_READER); >> + ASSERT(spa_config_held(zilog->zl_spa, SCL_STATE, RW_READER)); >> zil_lwb_add_block(lwb, &lwb->lwb_blk); >> lwb->lwb_issued_timestamp = gethrtime(); >> zio_nowait(lwb->lwb_root_zio); >> @@ -2037,8 +2059,7 @@ cont: >> lwb_sp < zil_max_waste_space(zilog) && >> (dlen % max_log_data == 0 || >> lwb_sp < reclen + dlen % max_log_data))) { >> - list_insert_tail(ilwbs, lwb); >> - lwb = zil_lwb_write_close(zilog, lwb); >> + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); >> if (lwb == NULL) >> return (NULL); >> zil_lwb_write_open(zilog, lwb); >> @@ -2937,8 +2958,7 @@ zil_process_commit_list(zilog_t *zilog, >> zil_commit_waiter_t *zcw, list_t *ilwbs) >> zfs_commit_timeout_pct / 100; >> if (sleep < zil_min_commit_timeout || >> lwb->lwb_sz - lwb->lwb_nused < lwb->lwb_sz / 8) { >> - list_insert_tail(ilwbs, lwb); >> - lwb = zil_lwb_write_close(zilog, lwb); >> + lwb = zil_lwb_write_close(zilog, lwb, ilwbs); >> zilog->zl_cur_used = 0; >> if (lwb == NULL) { >> while ((lwb = list_remove_head(ilwbs)) >> @@ -3096,7 +3116,7 @@ zil_commit_waiter_timeout(zilog_t *zilog, >> zil_commit_waiter_t *zcw) >> * since we've reached the commit waiter's timeout and it still >> * hasn't been issued. >> */ >> - lwb_t *nlwb = zil_lwb_write_close(zilog, lwb); >> + lwb_t *nlwb = zil_lwb_write_close(zilog, lwb, NULL); >> >> ASSERT3S(lwb->lwb_state, !=, LWB_STATE_OPENED); >> >> > From nobody Thu Aug 10 16:08:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMBg35VyYz4mTVC; Thu, 10 Aug 2023 16:08: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 4RMBg34mnJz4HJW; Thu, 10 Aug 2023 16:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691683711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pQytkXX2BMrEvlpoeb/REY8EFbFnPuUa3IeKSZZ0JM=; b=uIYXIi+erdNkJ5N2Dvc8GwTjzWohP8oDkhjCvjGH4Zc/kaytK99CY6vJbZztkDEsvUlE7N BpGbIpjkDv/k9LHCxIDDr7KtsYk+W6ND96i8DJdn7iQZ7s6VgwGoF2nWClWwU6rI85/ttu Bfptuy4yGgQgI/DRXrCu2HsbvU9yj/NTMwSeSMK+5tedWPizHAo/cBWDrFCYIQZV1FidKP yqwv7B+dQvEErfK5ce4Lz+e3zMLGUjFIDunNRxvnlXKiiNdwWgiqdQWuKXea7R5Su/E/aS DktbacupKMAg0NDPMQ7a7T4kAgPMAF/GsFB+SUkNTZKDEPX77s17PgVy5MvzNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691683711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8pQytkXX2BMrEvlpoeb/REY8EFbFnPuUa3IeKSZZ0JM=; b=nWU+tcgJ1XKJJgALckHy1B0OcLBxcYEt8n01TqLwfI5siBr4pHcA6U90VCok9vqzcleYye xYuRUF+sY4FMl8Fehkpf1vMBi0DMM9a6SAHB0TEEsinb353MNB+NfA9yinGorxyNmq8f6c 2C3keFgFOz/XcGSumCC9PBZunGfKGYny30DCcWBMRkHr0EJMdXQuVuXa90YVA9jhJh1/5u HoY6XApPC8gvYZMebP1QLr4LdTRlCMhIMuITYnL3g/o0hwrYdNmmYOA3r8a1S7osHBr2ji OBcmMDSxclHT3CVgoUoINEl0MmAWIc1apDf9i9QIZkYllC3C7YM8nKn65teiJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691683711; a=rsa-sha256; cv=none; b=JAEGpHX3/Y5Uxirx/dAYcAf1D7UZ889+xEb8iG7r57MklF1602O5CYmUYynYhcKic4fffj 0EoqukE3fsS7lwlnE5CDlxCqPkuNu2CXnMG5rndhw6tSNdSrQDtbvsteuXNlFFpomUreZA duqrot35AURlLAzDdDEf/lbT/evhnzwrLUVdYjnTp03yNCEHv+9Bz/a6n7N2PYq/tS++yU oDAbtaCY6wjo8cuK5Kby3Ok2SNg+48u0VqbbmL1YNWInYOZedzYkE79LMonQpdR6rxuSki fyv/DCrACR1EYXWtTFqFhKtO1ebQBe4Lewz8ZKV6rWp5t7qNOQA46+FNnHH3Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMBg33rhZz13lH; Thu, 10 Aug 2023 16:08: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 37AG8VN0093676; Thu, 10 Aug 2023 16:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AG8R0I093671; Thu, 10 Aug 2023 16:08:27 GMT (envelope-from git) Date: Thu, 10 Aug 2023 16:08:27 GMT Message-Id: <202308101608.37AG8R0I093671@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: aa7957345732 - main - OpenSSL: update to 3.0.10 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa7957345732816fb0ba8308798d2f79f45597f9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aa7957345732816fb0ba8308798d2f79f45597f9 commit aa7957345732816fb0ba8308798d2f79f45597f9 Merge: ec54a3142354 cf2fc1b0f5ce Author: Pierre Pronchery AuthorDate: 2023-08-10 16:07:32 +0000 Commit: Ed Maste CommitDate: 2023-08-10 16:07:32 +0000 OpenSSL: update to 3.0.10 OpenSSL 3.0.10 addresses: - CVE-2023-3817 - CVE-2023-3446 - CVE-2023-2975 (Note that the vendor branch commit incorrectly referenced 3.0.9.) Relnotes: Yes Pull request: https://github.com/freebsd/freebsd-src/pull/808 Sponsored by: The FreeBSD Foundation crypto/openssl/CHANGES.md | 66 ++++++++++++++- crypto/openssl/Configure | 5 +- crypto/openssl/INSTALL.md | 18 ++-- crypto/openssl/NEWS.md | 9 ++ crypto/openssl/README-FIPS.md | 96 ++++++++++++++++++++-- crypto/openssl/VERSION.dat | 4 +- crypto/openssl/apps/ca.c | 52 ++++++++---- crypto/openssl/apps/cmp.c | 5 +- crypto/openssl/apps/cms.c | 25 +++--- crypto/openssl/apps/lib/apps.c | 10 ++- crypto/openssl/apps/pkeyutl.c | 4 +- crypto/openssl/apps/req.c | 10 ++- crypto/openssl/apps/s_client.c | 4 +- crypto/openssl/apps/speed.c | 30 ++++++- crypto/openssl/crypto/LPdir_unix.c | 4 +- crypto/openssl/crypto/asn1/asn_mime.c | 8 +- crypto/openssl/crypto/bn/bn_recp.c | 4 +- crypto/openssl/crypto/cms/cms_env.c | 6 +- crypto/openssl/crypto/cms/cms_lib.c | 4 + crypto/openssl/crypto/cms/cms_rsa.c | 13 ++- crypto/openssl/crypto/conf/conf_mod.c | 10 ++- crypto/openssl/crypto/conf/conf_sap.c | 4 +- crypto/openssl/crypto/core_namemap.c | 5 +- crypto/openssl/crypto/dh/dh_check.c | 18 +++- crypto/openssl/crypto/err/openssl.txt | 1 + crypto/openssl/crypto/evp/ctrl_params_translate.c | 11 ++- crypto/openssl/crypto/evp/p5_crpt2.c | 3 + crypto/openssl/crypto/evp/p_lib.c | 1 + crypto/openssl/crypto/http/http_lib.c | 8 ++ crypto/openssl/crypto/params.c | 40 ++++++--- crypto/openssl/crypto/pkcs12/p12_mutl.c | 7 +- crypto/openssl/crypto/rand/rand_lib.c | 8 +- crypto/openssl/crypto/rc4/build.info | 7 +- crypto/openssl/crypto/rsa/rsa_ameth.c | 34 +++++++- crypto/openssl/crypto/rsa/rsa_pmeth.c | 6 +- crypto/openssl/crypto/sha/asm/keccak1600-avx2.pl | 3 +- crypto/openssl/crypto/sha/asm/keccak1600-avx512.pl | 3 +- .../openssl/crypto/sha/asm/keccak1600-avx512vl.pl | 3 +- crypto/openssl/crypto/store/store_result.c | 6 +- crypto/openssl/crypto/x509/by_dir.c | 3 +- crypto/openssl/crypto/x509/v3_ist.c | 41 ++++----- crypto/openssl/crypto/x509/v3_purp.c | 8 +- crypto/openssl/crypto/x509/x509_att.c | 7 +- crypto/openssl/crypto/x509/x509_cmp.c | 10 +-- crypto/openssl/crypto/x509/x509_err.c | 4 +- crypto/openssl/crypto/x509/x509_vpm.c | 12 ++- crypto/openssl/doc/man1/openssl-dhparam.pod.in | 4 +- crypto/openssl/doc/man1/openssl-genpkey.pod.in | 6 +- crypto/openssl/doc/man1/openssl-genrsa.pod.in | 9 +- crypto/openssl/doc/man1/openssl-kdf.pod.in | 41 +++++++-- crypto/openssl/doc/man1/openssl-rsautl.pod.in | 4 +- crypto/openssl/doc/man1/openssl-s_client.pod.in | 4 +- .../doc/man1/openssl-verification-options.pod | 4 +- crypto/openssl/doc/man1/openssl-x509.pod.in | 4 +- crypto/openssl/doc/man3/ASN1_aux_cb.pod | 6 +- crypto/openssl/doc/man3/ASN1_item_sign.pod | 6 +- crypto/openssl/doc/man3/ASYNC_WAIT_CTX_new.pod | 4 +- crypto/openssl/doc/man3/BIO_s_core.pod | 4 +- crypto/openssl/doc/man3/BN_rand.pod | 4 +- crypto/openssl/doc/man3/CONF_modules_load_file.pod | 4 +- crypto/openssl/doc/man3/DH_get0_pqg.pod | 4 +- crypto/openssl/doc/man3/EVP_EncryptInit.pod | 12 +-- crypto/openssl/doc/man3/EVP_KDF.pod | 13 ++- crypto/openssl/doc/man3/EVP_KEYMGMT.pod | 4 +- crypto/openssl/doc/man3/EVP_PKEY2PKCS8.pod | 4 +- crypto/openssl/doc/man3/EVP_PKEY_decapsulate.pod | 20 +++-- crypto/openssl/doc/man3/EVP_PKEY_derive.pod | 4 +- crypto/openssl/doc/man3/EVP_PKEY_encapsulate.pod | 28 ++++--- .../doc/man3/EVP_PKEY_get_default_digest_nid.pod | 6 +- .../openssl/doc/man3/EVP_PKEY_gettable_params.pod | 4 +- crypto/openssl/doc/man3/EVP_PKEY_new.pod | 4 +- crypto/openssl/doc/man3/EVP_PKEY_todata.pod | 4 +- crypto/openssl/doc/man3/EVP_chacha20.pod | 7 +- crypto/openssl/doc/man3/OCSP_resp_find_status.pod | 4 +- crypto/openssl/doc/man3/OCSP_sendreq_new.pod | 4 +- crypto/openssl/doc/man3/OSSL_CMP_CTX_new.pod | 2 +- crypto/openssl/doc/man3/OSSL_CMP_log_open.pod | 4 +- crypto/openssl/doc/man3/OSSL_DECODER.pod | 4 +- .../doc/man3/OSSL_DECODER_CTX_new_for_pkey.pod | 4 +- crypto/openssl/doc/man3/OSSL_ENCODER.pod | 4 +- crypto/openssl/doc/man3/OSSL_ENCODER_CTX.pod | 6 +- .../doc/man3/OSSL_ESS_check_signing_certs.pod | 4 +- crypto/openssl/doc/man3/OSSL_HTTP_REQ_CTX.pod | 4 +- crypto/openssl/doc/man3/OSSL_HTTP_parse_url.pod | 4 +- crypto/openssl/doc/man3/OSSL_PARAM.pod | 2 +- crypto/openssl/doc/man3/OSSL_PARAM_int.pod | 6 +- crypto/openssl/doc/man3/OSSL_PROVIDER.pod | 6 +- crypto/openssl/doc/man3/OSSL_SELF_TEST_new.pod | 4 +- crypto/openssl/doc/man3/OSSL_STORE_LOADER.pod | 4 +- crypto/openssl/doc/man3/OSSL_trace_set_channel.pod | 2 +- crypto/openssl/doc/man3/PKCS12_decrypt_skey.pod | 4 +- crypto/openssl/doc/man3/PKCS12_gen_mac.pod | 4 +- crypto/openssl/doc/man3/RAND_bytes.pod | 4 +- crypto/openssl/doc/man3/RSA_get0_key.pod | 4 +- crypto/openssl/doc/man3/SSL_CTX_new.pod | 4 +- .../doc/man3/SSL_CTX_set_tmp_dh_callback.pod | 6 +- crypto/openssl/doc/man3/SSL_get_verify_result.pod | 9 +- crypto/openssl/doc/man3/X509_STORE_CTX_new.pod | 4 +- .../doc/man3/X509_VERIFY_PARAM_set_flags.pod | 2 +- crypto/openssl/doc/man3/X509_add_cert.pod | 4 +- crypto/openssl/doc/man3/X509_digest.pod | 6 +- crypto/openssl/doc/man3/X509_dup.pod | 4 +- crypto/openssl/doc/man5/config.pod | 2 +- crypto/openssl/doc/man7/EVP_PKEY-EC.pod | 6 +- crypto/openssl/doc/man7/EVP_PKEY-RSA.pod | 2 +- crypto/openssl/doc/man7/OSSL_PROVIDER-FIPS.pod | 16 +++- crypto/openssl/doc/man7/crypto.pod | 2 +- crypto/openssl/doc/man7/fips_module.pod | 23 +++++- crypto/openssl/doc/man7/life_cycle-pkey.pod | 6 +- crypto/openssl/doc/man7/migration_guide.pod | 8 +- crypto/openssl/doc/man7/openssl-glossary.pod | 8 +- crypto/openssl/doc/man7/provider-kdf.pod | 4 +- crypto/openssl/doc/man7/provider-object.pod | 4 +- crypto/openssl/engines/e_loader_attic.c | 6 +- crypto/openssl/include/crypto/x509err.h | 2 +- crypto/openssl/include/openssl/dh.h | 8 +- crypto/openssl/include/openssl/x509err.h | 3 +- crypto/openssl/providers/common/securitycheck.c | 24 ++++-- crypto/openssl/providers/fips-sources.checksums | 18 ++-- crypto/openssl/providers/fips.checksum | 2 +- crypto/openssl/providers/fips/self_test.c | 52 ++++-------- .../implementations/ciphers/cipher_aes_siv.c | 20 +++-- .../implementations/ciphers/cipher_rc4_hmac_md5.h | 2 +- .../implementations/storemgmt/file_store.c | 8 +- crypto/openssl/ssl/statem/extensions.c | 8 +- crypto/openssl/ssl/statem/statem_lib.c | 4 +- crypto/openssl/ssl/t1_lib.c | 25 +++++- secure/lib/libcrypto/Makefile.asm | 6 +- secure/lib/libcrypto/Makefile.inc | 4 +- secure/lib/libcrypto/man/man3/ADMISSIONS.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_EXTERN_FUNCS.3 | 2 +- .../libcrypto/man/man3/ASN1_INTEGER_get_int64.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_INTEGER_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_ITEM_lookup.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_OBJECT_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_TABLE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_length.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_STRING_new.3 | 2 +- .../lib/libcrypto/man/man3/ASN1_STRING_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TIME_set.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_TYPE_get.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_aux_cb.3 | 8 +- .../lib/libcrypto/man/man3/ASN1_generate_nconf.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_d2i_bio.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_new.3 | 2 +- secure/lib/libcrypto/man/man3/ASN1_item_sign.3 | 8 +- secure/lib/libcrypto/man/man3/ASYNC_WAIT_CTX_new.3 | 6 +- secure/lib/libcrypto/man/man3/ASYNC_start_job.3 | 2 +- secure/lib/libcrypto/man/man3/BF_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDR.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ADDRINFO.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_ctrl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_base64.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_buffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_cipher.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_md.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_prefix.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_readbuffer.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_f_ssl.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_find_type.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_get_data.3 | 2 +- .../lib/libcrypto/man/man3/BIO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_new_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_parse_hostserv.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_printf.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_push.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_read.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_accept.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_bio.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_connect.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_core.3 | 6 +- secure/lib/libcrypto/man/man3/BIO_s_datagram.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_fd.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_file.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_mem.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_null.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_s_socket.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_should_retry.3 | 2 +- secure/lib/libcrypto/man/man3/BIO_socket_wait.3 | 2 +- secure/lib/libcrypto/man/man3/BN_BLINDING_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_CTX_start.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add.3 | 2 +- secure/lib/libcrypto/man/man3/BN_add_word.3 | 2 +- secure/lib/libcrypto/man/man3/BN_bn2bin.3 | 2 +- secure/lib/libcrypto/man/man3/BN_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/BN_copy.3 | 2 +- secure/lib/libcrypto/man/man3/BN_generate_prime.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_exp_mont.3 | 2 +- secure/lib/libcrypto/man/man3/BN_mod_inverse.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_montgomery.3 | 2 +- .../lib/libcrypto/man/man3/BN_mod_mul_reciprocal.3 | 2 +- secure/lib/libcrypto/man/man3/BN_new.3 | 2 +- secure/lib/libcrypto/man/man3/BN_num_bytes.3 | 2 +- secure/lib/libcrypto/man/man3/BN_rand.3 | 6 +- secure/lib/libcrypto/man/man3/BN_security_bits.3 | 2 +- secure/lib/libcrypto/man/man3/BN_set_bit.3 | 2 +- secure/lib/libcrypto/man/man3/BN_swap.3 | 2 +- secure/lib/libcrypto/man/man3/BN_zero.3 | 2 +- secure/lib/libcrypto/man/man3/BUF_MEM_new.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_decrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EncryptedData_encrypt.3 | 2 +- .../libcrypto/man/man3/CMS_EnvelopedData_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add0_cert.3 | 2 +- .../libcrypto/man/man3/CMS_add1_recipient_cert.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_add1_signer.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_compress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_data_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_digest_create.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_final.3 | 2 +- .../libcrypto/man/man3/CMS_get0_RecipientInfos.3 | 2 +- .../lib/libcrypto/man/man3/CMS_get0_SignerInfos.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_get0_type.3 | 2 +- .../libcrypto/man/man3/CMS_get1_ReceiptRequest.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_sign_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_uncompress.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify.3 | 2 +- secure/lib/libcrypto/man/man3/CMS_verify_receipt.3 | 2 +- secure/lib/libcrypto/man/man3/CONF_modules_free.3 | 2 +- .../libcrypto/man/man3/CONF_modules_load_file.3 | 6 +- .../libcrypto/man/man3/CRYPTO_THREAD_run_once.3 | 2 +- .../libcrypto/man/man3/CRYPTO_get_ex_new_index.3 | 2 +- secure/lib/libcrypto/man/man3/CRYPTO_memcmp.3 | 2 +- .../man/man3/CTLOG_STORE_get0_log_by_id.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_STORE_new.3 | 2 +- secure/lib/libcrypto/man/man3/CTLOG_new.3 | 2 +- .../libcrypto/man/man3/CT_POLICY_EVAL_CTX_new.3 | 2 +- secure/lib/libcrypto/man/man3/DEFINE_STACK_OF.3 | 2 +- secure/lib/libcrypto/man/man3/DES_random_key.3 | 2 +- secure/lib/libcrypto/man/man3/DH_generate_key.3 | 2 +- .../libcrypto/man/man3/DH_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DH_get0_pqg.3 | 6 +- secure/lib/libcrypto/man/man3/DH_get_1024_160.3 | 2 +- secure/lib/libcrypto/man/man3/DH_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new.3 | 2 +- secure/lib/libcrypto/man/man3/DH_new_by_nid.3 | 2 +- secure/lib/libcrypto/man/man3/DH_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DH_size.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_do_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_dup_DH.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_generate_key.3 | 2 +- .../libcrypto/man/man3/DSA_generate_parameters.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_get0_pqg.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_new.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_sign.3 | 2 +- secure/lib/libcrypto/man/man3/DSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_get_data_mtu.3 | 2 +- secure/lib/libcrypto/man/man3/DTLS_set_timer_cb.3 | 2 +- secure/lib/libcrypto/man/man3/DTLSv1_listen.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_SIG_new.3 | 2 +- secure/lib/libcrypto/man/man3/ECDSA_sign.3 | 2 +- .../lib/libcrypto/man/man3/ECPKParameters_print.3 | 2 +- .../lib/libcrypto/man/man3/EC_GFp_simple_method.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_copy.3 | 2 +- secure/lib/libcrypto/man/man3/EC_GROUP_new.3 | 2 +- .../lib/libcrypto/man/man3/EC_KEY_get_enc_flags.3 | 2 +- secure/lib/libcrypto/man/man3/EC_KEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_add.3 | 2 +- secure/lib/libcrypto/man/man3/EC_POINT_new.3 | 2 +- secure/lib/libcrypto/man/man3/ENGINE_add.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_GET_LIB.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_clear_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_error_string.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_get_error.3 | 2 +- .../libcrypto/man/man3/ERR_load_crypto_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_load_strings.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_new.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_print_errors.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_put_error.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_remove_state.3 | 2 +- secure/lib/libcrypto/man/man3/ERR_set_mark.3 | 2 +- .../lib/libcrypto/man/man3/EVP_ASYM_CIPHER_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_BytesToKey.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_cipher_data.3 | 2 +- .../man/man3/EVP_CIPHER_CTX_get_original_iv.3 | 2 +- .../lib/libcrypto/man/man3/EVP_CIPHER_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_DigestSignInit.3 | 2 +- .../lib/libcrypto/man/man3/EVP_DigestVerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncodeInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_EncryptInit.3 | 14 ++-- secure/lib/libcrypto/man/man3/EVP_KDF.3 | 15 +++- secure/lib/libcrypto/man/man3/EVP_KEM_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYEXCH_free.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_KEYMGMT.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_MAC.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_MD_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_OpenInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PBE_CipherInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY2PKCS8.3 | 6 +- .../lib/libcrypto/man/man3/EVP_PKEY_ASN1_METHOD.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_ctrl.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_libctx.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_get0_pkey.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_CTX_new.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set1_pbe_pass.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_hkdf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_params.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_CTX_set_scrypt_N.3 | 2 +- .../man/man3/EVP_PKEY_CTX_set_tls1_prf_md.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_asn1_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_check.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_copy_parameters.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_decapsulate.3 | 22 ++--- secure/lib/libcrypto/man/man3/EVP_PKEY_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_derive.3 | 6 +- .../man/man3/EVP_PKEY_digestsign_supports_digest.3 | 2 +- .../lib/libcrypto/man/man3/EVP_PKEY_encapsulate.3 | 30 ++++--- secure/lib/libcrypto/man/man3/EVP_PKEY_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_fromdata.3 | 2 +- .../man/man3/EVP_PKEY_get_default_digest_nid.3 | 8 +- .../libcrypto/man/man3/EVP_PKEY_get_field_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_get_group_name.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_get_size.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_gettable_params.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_PKEY_is_a.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_keygen.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_meth_get_count.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_new.3 | 6 +- .../libcrypto/man/man3/EVP_PKEY_print_private.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set1_RSA.3 | 2 +- .../man/man3/EVP_PKEY_set1_encoded_public_key.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_set_type.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_settable_params.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_sign.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_PKEY_todata.3 | 6 +- secure/lib/libcrypto/man/man3/EVP_PKEY_verify.3 | 2 +- .../libcrypto/man/man3/EVP_PKEY_verify_recover.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_RAND.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SIGNATURE.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SealInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_SignInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_VerifyInit.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aes_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_aria_128_gcm.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_bf_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_blake2b512.3 | 2 +- .../lib/libcrypto/man/man3/EVP_camellia_128_ecb.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_cast5_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_chacha20.3 | 9 +- secure/lib/libcrypto/man/man3/EVP_des_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_desx_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_idea_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md4.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_md5.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_mdc2.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc2_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_rc4.3 | 2 +- .../lib/libcrypto/man/man3/EVP_rc5_32_12_16_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_ripemd160.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_seed_cbc.3 | 2 +- .../man/man3/EVP_set_default_properties.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha1.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sha3_224.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm3.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_sm4_cbc.3 | 2 +- secure/lib/libcrypto/man/man3/EVP_whirlpool.3 | 2 +- secure/lib/libcrypto/man/man3/HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/MD5.3 | 2 +- secure/lib/libcrypto/man/man3/MDC2_Init.3 | 2 +- secure/lib/libcrypto/man/man3/NCONF_new_ex.3 | 2 +- secure/lib/libcrypto/man/man3/OBJ_nid2obj.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_REQUEST_new.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_cert_to_id.3 | 2 +- .../libcrypto/man/man3/OCSP_request_add1_nonce.3 | 2 +- .../lib/libcrypto/man/man3/OCSP_resp_find_status.3 | 6 +- .../lib/libcrypto/man/man3/OCSP_response_status.3 | 2 +- secure/lib/libcrypto/man/man3/OCSP_sendreq_new.3 | 6 +- secure/lib/libcrypto/man/man3/OPENSSL_Applink.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_FILE.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_LH_COMPFUNC.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_LH_stats.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_config.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_fork_prepare.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_gmtime.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_hexchar2int.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_ia32cap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_init_crypto.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_init_ssl.3 | 2 +- .../libcrypto/man/man3/OPENSSL_instrument_bus.3 | 2 +- .../man/man3/OPENSSL_load_builtin_modules.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_s390xcap.3 | 2 +- .../lib/libcrypto/man/man3/OPENSSL_secure_malloc.3 | 2 +- secure/lib/libcrypto/man/man3/OPENSSL_strcasecmp.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ALGORITHM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CALLBACK.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_CTX_new.3 | 4 +- .../man/man3/OSSL_CMP_HDR_get0_transactionID.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_ITAV_set0.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_get0_header.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_MSG_http_perform.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_SRV_CTX_new.3 | 2 +- .../libcrypto/man/man3/OSSL_CMP_STATUSINFO_new.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CMP_exec_certreq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CMP_log_open.3 | 6 +- .../lib/libcrypto/man/man3/OSSL_CMP_validate_msg.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_CORE_MAKE_FUNC.3 | 2 +- .../libcrypto/man/man3/OSSL_CRMF_MSG_get0_tmpl.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set0_validity.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3 | 2 +- .../man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_CRMF_pbmp_new.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DECODER.3 | 6 +- secure/lib/libcrypto/man/man3/OSSL_DECODER_CTX.3 | 2 +- .../man/man3/OSSL_DECODER_CTX_new_for_pkey.3 | 6 +- .../lib/libcrypto/man/man3/OSSL_DECODER_from_bio.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_DISPATCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER.3 | 6 +- secure/lib/libcrypto/man/man3/OSSL_ENCODER_CTX.3 | 8 +- .../man/man3/OSSL_ENCODER_CTX_new_for_pkey.3 | 2 +- .../lib/libcrypto/man/man3/OSSL_ENCODER_to_bio.3 | 2 +- .../man/man3/OSSL_ESS_check_signing_certs.3 | 6 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_REQ_CTX.3 | 6 +- .../lib/libcrypto/man/man3/OSSL_HTTP_parse_url.3 | 6 +- secure/lib/libcrypto/man/man3/OSSL_HTTP_transfer.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_ITEM.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_LIB_CTX.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM.3 | 4 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_BLD.3 | 2 +- .../man/man3/OSSL_PARAM_allocate_from_text.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_dup.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_PARAM_int.3 | 8 +- secure/lib/libcrypto/man/man3/OSSL_PROVIDER.3 | 8 +- secure/lib/libcrypto/man/man3/OSSL_SELF_TEST_new.3 | 6 +- .../man/man3/OSSL_SELF_TEST_set_callback.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_INFO.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_LOADER.3 | 6 +- secure/lib/libcrypto/man/man3/OSSL_STORE_SEARCH.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_attach.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_expect.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_STORE_open.3 | 2 +- secure/lib/libcrypto/man/man3/OSSL_trace_enabled.3 | 2 +- .../man/man3/OSSL_trace_get_category_num.3 | 2 +- .../libcrypto/man/man3/OSSL_trace_set_channel.3 | 4 +- .../man/man3/OpenSSL_add_all_algorithms.3 | 2 +- secure/lib/libcrypto/man/man3/OpenSSL_version.3 | 2 +- .../libcrypto/man/man3/PEM_X509_INFO_read_bio_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_bytes_read_bio.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_CMS.3 | 2 +- .../libcrypto/man/man3/PEM_read_bio_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/PEM_read_bio_ex.3 | 2 +- .../libcrypto/man/man3/PEM_write_bio_CMS_stream.3 | 2 +- .../man/man3/PEM_write_bio_PKCS7_stream.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_PBE_keyivgen.3 | 2 +- .../man/man3/PKCS12_SAFEBAG_create_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get0_attrs.3 | 2 +- .../libcrypto/man/man3/PKCS12_SAFEBAG_get1_cert.3 | 2 +- .../libcrypto/man/man3/PKCS12_add1_attr_by_NID.3 | 2 +- .../libcrypto/man/man3/PKCS12_add_CSPName_asc.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_cert.3 | 2 +- .../man/man3/PKCS12_add_friendlyname_asc.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_add_localkeyid.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_add_safe.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_create.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_decrypt_skey.3 | 6 +- secure/lib/libcrypto/man/man3/PKCS12_gen_mac.3 | 6 +- .../libcrypto/man/man3/PKCS12_get_friendlyname.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_init.3 | 2 +- .../libcrypto/man/man3/PKCS12_item_decrypt_d2i.3 | 2 +- .../libcrypto/man/man3/PKCS12_key_gen_utf8_ex.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_newpass.3 | 2 +- .../lib/libcrypto/man/man3/PKCS12_pack_p7encdata.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS12_parse.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBE_keyivgen.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS5_PBKDF2_HMAC.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_decrypt.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_encrypt.3 | 2 +- .../libcrypto/man/man3/PKCS7_get_octet_string.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_sign.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_sign_add_signer.3 | 2 +- .../lib/libcrypto/man/man3/PKCS7_type_is_other.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS7_verify.3 | 2 +- secure/lib/libcrypto/man/man3/PKCS8_encrypt.3 | 2 +- .../lib/libcrypto/man/man3/PKCS8_pkey_add1_attr.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_add.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_bytes.3 | 6 +- secure/lib/libcrypto/man/man3/RAND_cleanup.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_egd.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_get0_primary.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_load_file.3 | 2 +- secure/lib/libcrypto/man/man3/RAND_set_DRBG_type.3 | 2 +- .../lib/libcrypto/man/man3/RAND_set_rand_method.3 | 2 +- secure/lib/libcrypto/man/man3/RC4_set_key.3 | 2 +- secure/lib/libcrypto/man/man3/RIPEMD160_Init.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_blinding_on.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_check_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_generate_key.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_get0_key.3 | 6 +- secure/lib/libcrypto/man/man3/RSA_meth_new.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_new.3 | 2 +- .../man/man3/RSA_padding_add_PKCS1_type_1.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_print.3 | 2 +- .../lib/libcrypto/man/man3/RSA_private_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_public_encrypt.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_set_method.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_sign.3 | 2 +- .../man/man3/RSA_sign_ASN1_OCTET_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/RSA_size.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_new.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_print.3 | 2 +- secure/lib/libcrypto/man/man3/SCT_validate.3 | 2 +- secure/lib/libcrypto/man/man3/SHA256_Init.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_read_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_ASN1.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_CMS.3 | 2 +- secure/lib/libcrypto/man/man3/SMIME_write_PKCS7.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_Calc_B.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_VBASE_new.3 | 2 +- .../lib/libcrypto/man/man3/SRP_create_verifier.3 | 2 +- secure/lib/libcrypto/man/man3/SRP_user_pwd_new.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CIPHER_get_name.3 | 2 +- .../man/man3/SSL_COMP_add_compression_method.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_CTX_new.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set1_prefix.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_flags.3 | 2 +- .../libcrypto/man/man3/SSL_CONF_CTX_set_ssl_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CONF_cmd_argv.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_add1_chain_cert.3 | 2 +- .../man/man3/SSL_CTX_add_extra_chain_cert.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_add_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_config.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_ctrl.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_dane_enable.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_flush_sessions.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_get0_param.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_get_verify_mode.3 | 2 +- .../man/man3/SSL_CTX_has_client_custom_ext.3 | 2 +- .../man/man3/SSL_CTX_load_verify_locations.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_new.3 | 6 +- .../lib/libcrypto/man/man3/SSL_CTX_sess_number.3 | 2 +- .../man/man3/SSL_CTX_sess_set_cache_size.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_sess_set_get_cb.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_sessions.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set0_CA_list.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_curves.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set1_sigalgs.3 | 2 +- .../man/man3/SSL_CTX_set1_verify_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_alpn_select_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_cert_cb.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cert_store.3 | 2 +- .../man/man3/SSL_CTX_set_cert_verify_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_cipher_list.3 | 2 +- .../man/man3/SSL_CTX_set_client_cert_cb.3 | 2 +- .../man/man3/SSL_CTX_set_client_hello_cb.3 | 2 +- .../man/man3/SSL_CTX_set_ct_validation_callback.3 | 2 +- .../man/man3/SSL_CTX_set_ctlog_list_file.3 | 2 +- .../man/man3/SSL_CTX_set_default_passwd_cb.3 | 2 +- .../man/man3/SSL_CTX_set_generate_session_id.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_info_callback.3 | 2 +- .../man/man3/SSL_CTX_set_keylog_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_max_cert_list.3 | 2 +- .../man/man3/SSL_CTX_set_min_proto_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_mode.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_msg_callback.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_num_tickets.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_options.3 | 2 +- .../man/man3/SSL_CTX_set_psk_client_callback.3 | 2 +- .../man/man3/SSL_CTX_set_quiet_shutdown.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_read_ahead.3 | 2 +- .../man/man3/SSL_CTX_set_record_padding_callback.3 | 2 +- .../man/man3/SSL_CTX_set_security_level.3 | 2 +- .../man/man3/SSL_CTX_set_session_cache_mode.3 | 2 +- .../man/man3/SSL_CTX_set_session_id_context.3 | 2 +- .../man/man3/SSL_CTX_set_session_ticket_cb.3 | 2 +- .../man/man3/SSL_CTX_set_split_send_fragment.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_srp_password.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_set_ssl_version.3 | 2 +- .../SSL_CTX_set_stateless_cookie_generate_cb.3 | 2 +- .../lib/libcrypto/man/man3/SSL_CTX_set_timeout.3 | 2 +- .../man3/SSL_CTX_set_tlsext_servername_callback.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_status_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3 | 2 +- .../man/man3/SSL_CTX_set_tlsext_use_srtp.3 | 2 +- .../man/man3/SSL_CTX_set_tmp_dh_callback.3 | 8 +- .../lib/libcrypto/man/man3/SSL_CTX_set_tmp_ecdh.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_CTX_set_verify.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_certificate.3 | 2 +- .../man/man3/SSL_CTX_use_psk_identity_hint.3 | 2 +- .../libcrypto/man/man3/SSL_CTX_use_serverinfo.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_free.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_get0_hostname.3 | 2 +- .../man/man3/SSL_SESSION_get0_id_context.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get0_peer.3 | 2 +- .../man/man3/SSL_SESSION_get_compress_id.3 | 2 +- .../man/man3/SSL_SESSION_get_protocol_version.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_get_time.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_has_ticket.3 | 2 +- .../libcrypto/man/man3/SSL_SESSION_is_resumable.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_SESSION_print.3 | 2 +- .../lib/libcrypto/man/man3/SSL_SESSION_set1_id.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_accept.3 | 2 +- .../lib/libcrypto/man/man3/SSL_alert_type_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_alloc_buffers.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_check_chain.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_clear.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_connect.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_do_handshake.3 | 2 +- .../man/man3/SSL_export_keying_material.3 | 2 +- .../libcrypto/man/man3/SSL_extension_supported.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_free.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get0_peer_scts.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_SSL_CTX.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_all_async_fds.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_certificate.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_ciphers.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_client_random.3 | 2 +- .../libcrypto/man/man3/SSL_get_current_cipher.3 | 2 +- .../libcrypto/man/man3/SSL_get_default_timeout.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_error.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_extms_support.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_fd.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_cert_chain.3 | 2 +- .../libcrypto/man/man3/SSL_get_peer_certificate.3 | 2 +- .../man/man3/SSL_get_peer_signature_nid.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_peer_tmp_key.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_psk_identity.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_rbio.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_get_session.3 | 2 +- .../libcrypto/man/man3/SSL_get_shared_sigalgs.3 | 2 +- .../lib/libcrypto/man/man3/SSL_get_verify_result.3 | 11 ++- secure/lib/libcrypto/man/man3/SSL_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_group_to_name.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_in_init.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_key_update.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_library_init.3 | 2 +- .../libcrypto/man/man3/SSL_load_client_CA_file.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_new.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_pending.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_read.3 | 2 +- .../lib/libcrypto/man/man3/SSL_read_early_data.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_rstate_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_session_reused.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set1_host.3 | 2 +- .../libcrypto/man/man3/SSL_set_async_callback.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_bio.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_connect_state.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_fd.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_retry_verify.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_session.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_set_shutdown.3 | 2 +- .../lib/libcrypto/man/man3/SSL_set_verify_result.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_shutdown.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_state_string.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_want.3 | 2 +- secure/lib/libcrypto/man/man3/SSL_write.3 | 2 +- secure/lib/libcrypto/man/man3/TS_RESP_CTX_new.3 | 2 +- .../libcrypto/man/man3/TS_VERIFY_CTX_set_certs.3 | 2 +- secure/lib/libcrypto/man/man3/UI_STRING.3 | 2 +- secure/lib/libcrypto/man/man3/UI_UTIL_read_pw.3 | 2 +- secure/lib/libcrypto/man/man3/UI_create_method.3 | 2 +- secure/lib/libcrypto/man/man3/UI_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_get_d2i.3 | 2 +- secure/lib/libcrypto/man/man3/X509V3_set_ctx.3 | 2 +- secure/lib/libcrypto/man/man3/X509_ALGOR_dup.3 | 2 +- .../libcrypto/man/man3/X509_CRL_get0_by_serial.3 | 2 +- .../libcrypto/man/man3/X509_EXTENSION_set_object.3 | 2 +- secure/lib/libcrypto/man/man3/X509_LOOKUP.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_hash_dir.3 | 2 +- .../lib/libcrypto/man/man3/X509_LOOKUP_meth_new.3 | 2 +- .../man/man3/X509_NAME_ENTRY_get_object.3 | 2 +- .../man/man3/X509_NAME_add_entry_by_txt.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_get0_der.3 | 2 +- .../man/man3/X509_NAME_get_index_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/X509_NAME_print_ex.3 | 2 +- secure/lib/libcrypto/man/man3/X509_PUBKEY_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_SIG_get0.3 | 2 +- .../libcrypto/man/man3/X509_STORE_CTX_get_error.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_CTX_new.3 | 6 +- .../man/man3/X509_STORE_CTX_set_verify_cb.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_add_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509_STORE_get0_param.3 | 2 +- secure/lib/libcrypto/man/man3/X509_STORE_new.3 | 2 +- .../man/man3/X509_STORE_set_verify_cb_func.3 | 2 +- .../man/man3/X509_VERIFY_PARAM_set_flags.3 | 4 +- secure/lib/libcrypto/man/man3/X509_add_cert.3 | 6 +- secure/lib/libcrypto/man/man3/X509_check_ca.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_host.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_issued.3 | 2 +- .../libcrypto/man/man3/X509_check_private_key.3 | 2 +- secure/lib/libcrypto/man/man3/X509_check_purpose.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp.3 | 2 +- secure/lib/libcrypto/man/man3/X509_cmp_time.3 | 2 +- secure/lib/libcrypto/man/man3/X509_digest.3 | 8 +- secure/lib/libcrypto/man/man3/X509_dup.3 | 6 +- .../man/man3/X509_get0_distinguishing_id.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_notBefore.3 | 2 +- .../lib/libcrypto/man/man3/X509_get0_signature.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get0_uids.3 | 2 +- .../libcrypto/man/man3/X509_get_extension_flags.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_pubkey.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_serialNumber.3 | 2 +- .../lib/libcrypto/man/man3/X509_get_subject_name.3 | 2 +- secure/lib/libcrypto/man/man3/X509_get_version.3 | 2 +- secure/lib/libcrypto/man/man3/X509_load_http.3 | 2 +- secure/lib/libcrypto/man/man3/X509_new.3 | 2 +- secure/lib/libcrypto/man/man3/X509_sign.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify.3 | 2 +- secure/lib/libcrypto/man/man3/X509_verify_cert.3 | 2 +- .../lib/libcrypto/man/man3/X509v3_get_ext_by_NID.3 | 2 +- secure/lib/libcrypto/man/man3/b2i_PVK_bio_ex.3 | 2 +- .../libcrypto/man/man3/d2i_PKCS8PrivateKey_bio.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_PrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_RSAPrivateKey.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_SSL_SESSION.3 | 2 +- secure/lib/libcrypto/man/man3/d2i_X509.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_CMS_bio_stream.3 | 2 +- .../lib/libcrypto/man/man3/i2d_PKCS7_bio_stream.3 | 2 +- secure/lib/libcrypto/man/man3/i2d_re_X509_tbs.3 | 2 +- secure/lib/libcrypto/man/man3/o2i_SCT_LIST.3 | 2 +- secure/lib/libcrypto/man/man3/s2i_ASN1_IA5STRING.3 | 2 +- secure/lib/libcrypto/man/man5/config.5 | 4 +- secure/lib/libcrypto/man/man5/fips_config.5 | 2 +- secure/lib/libcrypto/man/man5/x509v3_config.5 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-RSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_ASYM_CIPHER-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-AES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-ARIA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-BLOWFISH.7 | 2 +- .../lib/libcrypto/man/man7/EVP_CIPHER-CAMELLIA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CAST.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-CHACHA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-DES.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-IDEA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-RC5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SEED.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_CIPHER-SM4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-HKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KB.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-KRB5KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PBKDF2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-PKCS12KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SCRYPT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SS.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-SSHKDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS13_KDF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-TLS1_PRF.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X942-ASN1.7 | 2 +- .../lib/libcrypto/man/man7/EVP_KDF-X942-CONCAT.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KDF-X963.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEM-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-ECDH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_KEYEXCH-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-CMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-GMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-KMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Poly1305.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MAC-Siphash.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-BLAKE2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD4.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MD5.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-MDC2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-NULL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-RIPEMD160.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA1.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHA3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SHAKE.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-SM3.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-WHIRLPOOL.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_MD-common.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DH.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-DSA.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-EC.7 | 8 +- secure/lib/libcrypto/man/man7/EVP_PKEY-FFC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-RSA.7 | 4 +- secure/lib/libcrypto/man/man7/EVP_PKEY-SM2.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_PKEY-X25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-CTR-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HASH-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-HMAC-DRBG.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-SEED-SRC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND-TEST-RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_RAND.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-DSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ECDSA.7 | 2 +- .../lib/libcrypto/man/man7/EVP_SIGNATURE-ED25519.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-HMAC.7 | 2 +- secure/lib/libcrypto/man/man7/EVP_SIGNATURE-RSA.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-FIPS.7 | 17 +++- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-base.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-default.7 | 2 +- .../lib/libcrypto/man/man7/OSSL_PROVIDER-legacy.7 | 2 +- secure/lib/libcrypto/man/man7/OSSL_PROVIDER-null.7 | 2 +- secure/lib/libcrypto/man/man7/RAND.7 | 2 +- secure/lib/libcrypto/man/man7/RSA-PSS.7 | 2 +- secure/lib/libcrypto/man/man7/X25519.7 | 2 +- secure/lib/libcrypto/man/man7/bio.7 | 2 +- secure/lib/libcrypto/man/man7/crypto.7 | 4 +- secure/lib/libcrypto/man/man7/ct.7 | 2 +- secure/lib/libcrypto/man/man7/des_modes.7 | 2 +- secure/lib/libcrypto/man/man7/evp.7 | 2 +- secure/lib/libcrypto/man/man7/fips_module.7 | 24 +++++- secure/lib/libcrypto/man/man7/life_cycle-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-digest.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-kdf.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-mac.7 | 2 +- secure/lib/libcrypto/man/man7/life_cycle-pkey.7 | 8 +- secure/lib/libcrypto/man/man7/life_cycle-rand.7 | 2 +- secure/lib/libcrypto/man/man7/migration_guide.7 | 10 +-- secure/lib/libcrypto/man/man7/openssl-core.h.7 | 2 +- .../libcrypto/man/man7/openssl-core_dispatch.h.7 | 2 +- .../lib/libcrypto/man/man7/openssl-core_names.h.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-env.7 | 2 +- secure/lib/libcrypto/man/man7/openssl-glossary.7 | 10 +-- secure/lib/libcrypto/man/man7/openssl-threads.7 | 2 +- .../lib/libcrypto/man/man7/openssl_user_macros.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store-file.7 | 2 +- secure/lib/libcrypto/man/man7/ossl_store.7 | 2 +- .../lib/libcrypto/man/man7/passphrase-encoding.7 | 2 +- secure/lib/libcrypto/man/man7/property.7 | 2 +- .../lib/libcrypto/man/man7/provider-asym_cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-base.7 | 2 +- secure/lib/libcrypto/man/man7/provider-cipher.7 | 2 +- secure/lib/libcrypto/man/man7/provider-decoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-digest.7 | 2 +- secure/lib/libcrypto/man/man7/provider-encoder.7 | 2 +- secure/lib/libcrypto/man/man7/provider-kdf.7 | 6 +- secure/lib/libcrypto/man/man7/provider-kem.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keyexch.7 | 2 +- secure/lib/libcrypto/man/man7/provider-keymgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider-mac.7 | 2 +- secure/lib/libcrypto/man/man7/provider-object.7 | 6 +- secure/lib/libcrypto/man/man7/provider-rand.7 | 2 +- secure/lib/libcrypto/man/man7/provider-signature.7 | 2 +- secure/lib/libcrypto/man/man7/provider-storemgmt.7 | 2 +- secure/lib/libcrypto/man/man7/provider.7 | 2 +- secure/lib/libcrypto/man/man7/proxy-certificates.7 | 2 +- secure/lib/libcrypto/man/man7/ssl.7 | 2 +- secure/lib/libcrypto/man/man7/x509.7 | 2 +- secure/usr.bin/openssl/man/CA.pl.1 | 2 +- secure/usr.bin/openssl/man/openssl-asn1parse.1 | 2 +- secure/usr.bin/openssl/man/openssl-ca.1 | 2 +- secure/usr.bin/openssl/man/openssl-ciphers.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmds.1 | 2 +- secure/usr.bin/openssl/man/openssl-cmp.1 | 2 +- secure/usr.bin/openssl/man/openssl-cms.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl.1 | 2 +- secure/usr.bin/openssl/man/openssl-crl2pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-dgst.1 | 2 +- secure/usr.bin/openssl/man/openssl-dhparam.1 | 6 +- secure/usr.bin/openssl/man/openssl-dsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-dsaparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-ec.1 | 2 +- secure/usr.bin/openssl/man/openssl-ecparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-enc.1 | 2 +- secure/usr.bin/openssl/man/openssl-engine.1 | 2 +- secure/usr.bin/openssl/man/openssl-errstr.1 | 2 +- secure/usr.bin/openssl/man/openssl-fipsinstall.1 | 2 +- .../usr.bin/openssl/man/openssl-format-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-gendsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-genpkey.1 | 6 +- secure/usr.bin/openssl/man/openssl-genrsa.1 | 10 +-- secure/usr.bin/openssl/man/openssl-info.1 | 2 +- secure/usr.bin/openssl/man/openssl-kdf.1 | 39 +++++++-- secure/usr.bin/openssl/man/openssl-list.1 | 2 +- secure/usr.bin/openssl/man/openssl-mac.1 | 2 +- .../openssl/man/openssl-namedisplay-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-nseq.1 | 2 +- secure/usr.bin/openssl/man/openssl-ocsp.1 | 2 +- .../openssl/man/openssl-passphrase-options.1 | 2 +- secure/usr.bin/openssl/man/openssl-passwd.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs12.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs7.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkcs8.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkey.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyparam.1 | 2 +- secure/usr.bin/openssl/man/openssl-pkeyutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-prime.1 | 2 +- secure/usr.bin/openssl/man/openssl-rand.1 | 2 +- secure/usr.bin/openssl/man/openssl-rehash.1 | 2 +- secure/usr.bin/openssl/man/openssl-req.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsa.1 | 2 +- secure/usr.bin/openssl/man/openssl-rsautl.1 | 8 +- secure/usr.bin/openssl/man/openssl-s_client.1 | 6 +- secure/usr.bin/openssl/man/openssl-s_server.1 | 2 +- secure/usr.bin/openssl/man/openssl-s_time.1 | 2 +- secure/usr.bin/openssl/man/openssl-sess_id.1 | 2 +- secure/usr.bin/openssl/man/openssl-smime.1 | 2 +- secure/usr.bin/openssl/man/openssl-speed.1 | 2 +- secure/usr.bin/openssl/man/openssl-spkac.1 | 2 +- secure/usr.bin/openssl/man/openssl-srp.1 | 2 +- secure/usr.bin/openssl/man/openssl-storeutl.1 | 2 +- secure/usr.bin/openssl/man/openssl-ts.1 | 2 +- .../openssl/man/openssl-verification-options.1 | 4 +- secure/usr.bin/openssl/man/openssl-verify.1 | 2 +- secure/usr.bin/openssl/man/openssl-version.1 | 2 +- secure/usr.bin/openssl/man/openssl-x509.1 | 6 +- secure/usr.bin/openssl/man/openssl.1 | 2 +- secure/usr.bin/openssl/man/tsget.1 | 2 +- 921 files changed, 1887 insertions(+), 1364 deletions(-) diff --cc secure/lib/libcrypto/Makefile.asm index 201fe94a5c33,000000000000..d1fec7c961cd mode 100644,000000..100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@@ -1,507 -1,0 +1,507 @@@ +# $FreeBSD$ +# Use this to help generate the asm *.S files after an import. It is not +# perfect by any means, but does what is needed. +# Do a 'make -f Makefile.asm all' and it will generate *.S. Move them +# to the arch subdir, and correct any exposed paths and $ FreeBSD $ tags. + +.include "Makefile.inc" + +.if defined(ASM_aarch64) + +.PATH: ${LCRYPTO_SRC}/crypto \ + ${LCRYPTO_SRC}/crypto/aes/asm \ + ${LCRYPTO_SRC}/crypto/bn/asm \ + ${LCRYPTO_SRC}/crypto/chacha/asm \ + ${LCRYPTO_SRC}/crypto/ec/asm \ + ${LCRYPTO_SRC}/crypto/modes/asm \ + ${LCRYPTO_SRC}/crypto/poly1305/asm \ + ${LCRYPTO_SRC}/crypto/sha/asm + +PERLPATH= -I${LCRYPTO_SRC}/crypto/perlasm + +# cpuid +SRCS= arm64cpuid.pl + +# aes +SRCS+= aesv8-armx.pl vpaes-armv8.pl + +# bn +SRCS+= armv8-mont.pl + +# chacha +SRCS+= chacha-armv8.pl + +# ec *** 222768 LINES SKIPPED *** From nobody Thu Aug 10 16:18:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMBtD6pbZz4mV9t for ; Thu, 10 Aug 2023 16:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMBtD6KbBz4J5Q; Thu, 10 Aug 2023 16:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691684292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10Asj2GqIt63syvhtxR3pffGZmEIT3WKkXUMp3XF7Ho=; b=X2zp3elzCQITSzJozcD+SOenAxQvXmcqzkO49dalSykoTcZBTAHK3Lt1SP5vq8BtKnKJNK 1tSjdjEnu++eDdNBg9ZptP5RQqe1f4+bvkccXwygfBgb8bhDX+AyiIeLcWUcuOT5K2Jwp7 plAa4/OP2MO7mbpygi4ww+47VOXUpmid+IfzEhpwUFsq7hynJid8PrOik7Ds+f7u5T1xyd NiiFo7W/kEnFjrUCJjxEu2+h5dEdSsqEaTjp3r+gt0Ki3RrsB6bKqPI1yqDQFN22h+LzKo lNgl222uMI4wiarJEws20PjPOxZRE0U54ii87i7MdPz7Lpv7pepm2RiAHvixVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691684292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=10Asj2GqIt63syvhtxR3pffGZmEIT3WKkXUMp3XF7Ho=; b=iwekC36aLjDU8DPH+J9sCwSEQGAzdryQ0XDW/bv7mwlhCmw1nlOduV8QG5ld9Uyys3sJ0C RoVVmPrJuEjFBuy6jy6agIPM2C4owXwHMqQa2pMe36QeBkBRmHNeNRkjFn6yopOT592/Wp Zki0dKCbyIiLAkq8PpHvFoW0j1/p7valcDMvFVy1onJJKNMyvVs5YwFXfPrLAQ+4IFZn53 CYihPWYw9tffUdFXIMEnLeviEebrwLqI0fRVbR6hY9aj/wkPe9e8kubmPJ1CNj3FMPpX4D k6F4kvLE+10blVffNsGb7Pkt/v+OtKD4D7keIRVpRLcCgDad1IQbNxZ/7jmyQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691684292; a=rsa-sha256; cv=none; b=at/1b1zzvJVXOyR5LBzGYzKRGf3N+cgMOaFeXQodqdjUaD22iqPwLCxl6fVR4eC4EaWMIy Z8zqAGzyBBIQo5HkDQIcNKAjC+9ETNjbuPU5BYr+f4qCGzB4mLLZ96O/R5R7Udd//Yu1W3 9GulMChf0ou/gBk73qAgqZhW1hynts4IivWjfwvwEUkA0uQ9TD1DrpTg9COZFJJI7aJ9++ pZfF0J8jxAGoY4MzhtZGiNUSDtS1fWb4jF3d4WBd/jHsVxJT/oohFTx5/8r03lHNa8Z9AZ HydJJfcSqKBQ0dsCqdTtnXV69E+criw035wNUPahdDfeRO4LAe2nQ2jAbyl9/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMBtD56nPz13dk; Thu, 10 Aug 2023 16:18:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AGICqh009942; Thu, 10 Aug 2023 16:18:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AGICD6009941; Thu, 10 Aug 2023 16:18:12 GMT (envelope-from git) Date: Thu, 10 Aug 2023 16:18:12 GMT Message-Id: <202308101618.37AGICD6009941@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: e524ba4db420..78f30535bcdb - vendor/openssh - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openssh X-Git-Reftype: branch X-Git-Commit: 78f30535bcdb64cf743b416327ecb0f00e25b2aa X-Git-Oldrev: e524ba4db420aa72d11792aa317da381eb32fcce X-Git-Newrev: 78f30535bcdb64cf743b416327ecb0f00e25b2aa Auto-Submitted: auto-generated The branch vendor/openssh has been updated by emaste: URL: https://cgit.FreeBSD.org/src/log/?id=e524ba4db420..78f30535bcdb 78f30535bcdb Vendor import of OpenSSH 9.4p1 From nobody Thu Aug 10 16:18:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMBtS6nf6z4mV7g for ; Thu, 10 Aug 2023 16:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMBtS6973z4JW4; Thu, 10 Aug 2023 16:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691684304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iWhSb/PWaUVXAtNPgtxsKV0PXZFwQbPpUeXwAabJeb8=; b=tSLmJfeBpeAksjDwXzr7Fxp9AVwGi8oDFU67ZwU9eLpUAPpis/zApbb/7QYcYNV/iHnZB6 r+T9tEUlHnrTIjw6rn+xblkbPg/z25xfs4NEYLtvnlCx8BOkvLWfvHqNQKZrPYSWMBD85S +0WBKDrCk5Xjzvd4DG9ktZOZVZ5zyolgk16rnci9UqrXDhslmTH703ha45JZzVBUKuSMxl PA39csMKhb89XLTKRKGa+90NAuegcfI6y4a/KtbUAHSqpH9ycUJukWfEkcM1oUH4VFTYU7 I3xGfmA4v5WYDM2BPklUX1RBE8VWJvYiKb8MryhmODigOCnB4XKa2mekjrteQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691684304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iWhSb/PWaUVXAtNPgtxsKV0PXZFwQbPpUeXwAabJeb8=; b=IeklPjw6TiTtXos4fGHc1ZXyiuvmMFnfhx2CvlAcSHkqDtGchhQg7AcJPFd4apiLDkCBea tmFUrNBsNFn1aeaMBfIaMRhrY+TJEW2SSztSTExXDJbUWx2oBrpfi+QRk4/u1FJvAaWZJv +XtuqYuASnjrL5+kfRqKFnIne0O75YgJzUGrAkFCHnOITepVbsWb2KfPgbFb0kNq0gx+p1 y6VbDQn3vyMW++ui0h5r2tyAv+XZlUXqdMp3t+evvJtreQ9H9wseiE9VgGsT5Yy5TfAn3R xbFXt0caCEvieR6AGmO59mZU0qHg2Hqe4yjm8hF25q2Al74wd7iqPUiSSpXG/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691684304; a=rsa-sha256; cv=none; b=lu5CJyqAOEWwgWBbqrYUXevYpErClinkon8P4ypH4vT6EVCFm2njVyZ2f8Nk/UdCJI2kNu 5conhdEPaxmRd09nraQiBAGvlpRBnrBbwbspjedF6PAcKE0lCGyK7KYoc/cxGPYSp4GJHl TIEwXf5gTQTdPnbMtPZf1crtF8pGNN0CC3FkNhzKJv1E79e2gkZOicRVp9JFDl3wGe6anT L2hYXaltdrJAYazbM3ALCPNgZb7x6w1MJ1bSFwzVFBK9oxjnQ1wVj7JEza/IgtazC2vqcl ZUnSOCoeeXToTdEZQLn9vLS5uPnEBY4IEfRYyyvufJMe3Tpha1J6KRTMGT4Mfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMBtS4xrkz140b; Thu, 10 Aug 2023 16:18:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AGIOP9010057; Thu, 10 Aug 2023 16:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AGIOrR010056; Thu, 10 Aug 2023 16:18:24 GMT (envelope-from git) Date: Thu, 10 Aug 2023 16:18:24 GMT Message-Id: <202308101618.37AGIOrR010056@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Ed Maste Subject: git: 1ba28b2b282d - Create tag vendor/openssh/9.4p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/tags/vendor/openssh/9.4p1 X-Git-Reftype: annotated tag X-Git-Commit: 1ba28b2b282d645c817e50fce3d98e40150c8a56 Auto-Submitted: auto-generated The annotated tag vendor/openssh/9.4p1 has been created by emaste: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/openssh/9.4p1 tag vendor/openssh/9.4p1 Tagger: Ed Maste TaggerDate: 2023-08-10 16:17:54 +0000 Tag OpenSSH 9.4p1 commit 78f30535bcdb64cf743b416327ecb0f00e25b2aa Author: Ed Maste AuthorDate: 2023-08-10 16:16:53 +0000 Commit: Ed Maste CommitDate: 2023-08-10 16:16:53 +0000 Vendor import of OpenSSH 9.4p1 From nobody Thu Aug 10 17:05:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMCwK25pmz4pm80; Thu, 10 Aug 2023 17:05: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 4RMCwK1GvJz4N2x; Thu, 10 Aug 2023 17:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691687105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6DOU8i8F6mnsQTusoNTwrfzIPKE/FMRmVVFfYHqHf+k=; b=j1jFkmlo2Y6MC8TJ/fkOpIp/FK9HfAwkyL1mkg34Ee2xuFHSTUrEuBhZGToUfcUENmr/ff SbNzpStA3MaK2g9WencGrn5YgsmGI8pXnxGqMlVqCwNyugscALTpWBfUKaG4YJ3pTKS1WU AfElls4OuWAIVpnul9vwcbiY1u9vwk+X5lH0faum5WxepVZVdwzODTmrQOmepcWpKeT8Ji 2aw7RSiDT1eNGHJshQhx5gZmG2btuXBiY0DVZN4DFApwe6h9zNHxbkZWbpQHX5mtE9gIxo h+LJEMLBYj79E+VrzwAbMeWHsRQLCZbRbLJiNSUlVGkbI8yq7obWzth1Oef6Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691687105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6DOU8i8F6mnsQTusoNTwrfzIPKE/FMRmVVFfYHqHf+k=; b=FDyMFl54GzX4TrZuYo1SN1NJurNPRgp7JYkAxctxnA6Qe5JC/pPFDR5nlYTB34r6otqwAD FReRuJL4M1jf5+yYEq6rdWLQBzVDs3BfjqGFMMXic6gRYikQJA3vWD3jckKIIV5SP3UNQc 6ByyOgfNPc5tc5xUkdQwt7/A0K4UncBuwW2zjXYY76L3H1rFJq4xJrllPZFinUXM83SPyH 4RoIBC57ZlvJklCRWwbA6DuXl0PhOnICfrKCvlfZLTgx30hHA2hV8O+c0sxjj7p1et9RI2 6xqdixYV5XIeYy2xnRODcsA712oC48GTaXKXLKKMWE4hohnHunQj1j376Oe0jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691687105; a=rsa-sha256; cv=none; b=XOSrFruk0/6vOADBaQcHqsAB79C+QTlTjt9v2XGoTWm17KqSSGA73wG/c8+L5toqY36QCu vQuo6dbhxuRPaHwQxECRLnnhOYvSukAbLOKMf6ybaXO0z2SULSOkb92S2KOipNMemoxzVK vFRb0jO/IETXAiBM/eQYIFS5/Xzs3U1YcyIxm4HC7zJEhUduzoQdwldaqj2bXA/1EuMavE GJOPjL3KHKNR06uRro4gfUL3LDig2lq+CP5he75Xh7bZqsfL19Z4b/8VDnqGiUJQP/yNd0 zQYc+He06qDYaXF6pLJlpB0TycJcwiUHfFxG0X/6zvvGLu7Lbz9UJV6w035yIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMCwK0KG5z14rq; Thu, 10 Aug 2023 17:05: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 37AH54js094049; Thu, 10 Aug 2023 17:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AH54K0094046; Thu, 10 Aug 2023 17:05:04 GMT (envelope-from git) Date: Thu, 10 Aug 2023 17:05:04 GMT Message-Id: <202308101705.37AH54K0094046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 60a41168d195 - main - UFS: panic rather than forcibly unmount the root fs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60a41168d195cc09f7351c2c2bcafc389ed52406 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=60a41168d195cc09f7351c2c2bcafc389ed52406 commit 60a41168d195cc09f7351c2c2bcafc389ed52406 Author: Chuck Silvers AuthorDate: 2023-08-10 16:55:47 +0000 Commit: Chuck Silvers CommitDate: 2023-08-10 16:59:06 +0000 UFS: panic rather than forcibly unmount the root fs If the root fs is forcibly unmounted then basically every process will die with a SEGV as soon as it tries to run again because libc.so is gone, which leaves the system basically hung. It seems better to just panic instead, so let's do that. Requested-by: karels Reviewed-by: imp, mckusick, karels Sponsored-by: Netflix Differential Revision: https://reviews.freebsd.org/D41387 --- sys/ufs/ffs/ffs_vfsops.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 64236d4e98d9..b2cd2d30bc04 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -303,6 +303,9 @@ ffs_fsfail_cleanup_locked(struct ufsmount *ump, int error) mtx_assert(UFS_MTX(ump), MA_OWNED); if (error == ENXIO && (ump->um_flags & UM_FSFAIL_CLEANUP) == 0) { ump->um_flags |= UM_FSFAIL_CLEANUP; + if (ump->um_mountp == rootvnode->v_mount) + panic("UFS: root fs would be forcibly unmounted"); + /* * Queue an async forced unmount. */ From nobody Thu Aug 10 17:33:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMDYN3S97z4pp4T; Thu, 10 Aug 2023 17:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMDYN2wVnz4Q5N; Thu, 10 Aug 2023 17:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691688824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+f1f/OsL1+6nnijWfDva8+8L6mOVBm1Nn6PyQlHtoVw=; b=eCT8YfEG/OFDsonKHRlfj4F5CMLrePKOtMwJnyClxQqxxWk9FSzype0aBqi726R6UyaHir YOzmfzFJo8FXpqfvTjIeBu8nWfmOvflWfHvHgnkKDgcO/u6n4izV47WD1dyBw4agTwI/q9 o+HmYoRCwWhxf6d9Q5AunEDirpxSB8zDblQ6X8YIGKfFoXa323vQN0r7JuRhoFa2s3c8Wc myxuGf4V97T17kfjnynnHReD58mjGIEScjL4HX6MBZz9hWnICzLEkIn91KHUcsT4Q4sjDl c+9CLXfmBfsfepZJVCWNdZWQ+PeecBwMYsc9LFPHWvVmBsCTWSPcGhZ+Bks3EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691688824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+f1f/OsL1+6nnijWfDva8+8L6mOVBm1Nn6PyQlHtoVw=; b=guWvjUxpAsTOBXfnnZ+T7hb3F4UXAhkAxzXKSjER4yM8Hcw3Rd8JtY4XEQDLpe3wkSdsjT 5xaWcJpfrVVKmmwN5ebwk/P+rXAroE3+u8j6U6lgOxmDtBbBpDIrs8S1IL/wYAc8f7Deh7 r581fGcA4uK2FTWsMM4/tAkKryiZNMW98MBZ5P0ScaJgZl7Lpr30QKUQBY2YaH0EOQP8e5 XLB4KMHm5kf3oqfSb0yFkhHcu3uPmD9/q7QKc1E3wtz0hf3wg0VyFAFbFfv+/x75YVk4ef TREtG+wUlpDN/Mk4DkjLEYwiRYtQvpc3FvnpAbyTKxvE9G1ZWIhNvMvR23c2AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691688824; a=rsa-sha256; cv=none; b=RNi0dRkokELRMqOHUJtrvQ5tIffxa7t/KPisn9DBM/s0gtND0jb4AAb6sqCeQAI3jBB6J4 GbEn1uPBAQL5IZbN2R+w9USKz/47sn8pJ1D72Glxz4RHp6y+mTDccHHkymtoKcHNlP/n1K /1rWM3DwTmNz+eR5Zmet6bZyd7Xrs3SLjUO5pq8QfyhnlFaSIxFFu9e2NQvog0FCKmmevq 5lvfdtRqVAjXfQwZj0XWGs8Rz3TE6A0xzkPM8RUuOwCFBhVmYK0TKPexuiJGu0zkuKxv/1 HFEs1HgqoPC4Xt79BazKVfhxF7nqPBF6mZgLTRzIJqZCErGdDWJRB4FzP8flhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMDYN1zyRz15QT; Thu, 10 Aug 2023 17:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AHXiCP042983; Thu, 10 Aug 2023 17:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AHXiJH042981; Thu, 10 Aug 2023 17:33:44 GMT (envelope-from git) Date: Thu, 10 Aug 2023 17:33:44 GMT Message-Id: <202308101733.37AHXiJH042981@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: 2bd446d7f1a0 - main - kern: osd: avoid dereferencing freed slots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2bd446d7f1a03fbf6d98ace4548f8793599f48fb Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd446d7f1a03fbf6d98ace4548f8793599f48fb commit 2bd446d7f1a03fbf6d98ace4548f8793599f48fb Author: Kyle Evans AuthorDate: 2023-08-10 17:32:33 +0000 Commit: Kyle Evans CommitDate: 2023-08-10 17:33:26 +0000 kern: osd: avoid dereferencing freed slots If a slot is freed that isn't the last one, we'll set its destructor to NULL to indicate that it's been freed and leave a hole in the slot map. Check osd_destructors in osd_call() to avoid dereferencing a method that is potentially from a module that's been unloaded. This scenario would most commonly surface when two modules are loaded that osd_register(), then the earlier one deregisters and an osd_call() is made after the fact. In the specific report that triggered the investigation, kldload if_wg -> kldload linux* -> kldunload if_wg -> destroy a jail -> panic. Noted in the review, but left for follow-up work, is that the realloc that may happen in osd_deregister() should likely go away and the assumption that reallocating to a smaller size cannot fail is actually not correct. Reported by: dim Reviewed by: markj, jamie Differential Revision: https://reviews.freebsd.org/D41404 --- sys/kern/kern_osd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c index 23178731b899..ced6df31cf44 100644 --- a/sys/kern/kern_osd.c +++ b/sys/kern/kern_osd.c @@ -396,6 +396,9 @@ osd_call(u_int type, u_int method, void *obj, void *data) error = 0; sx_slock(&osdm[type].osd_module_lock); for (i = 0; i < osdm[type].osd_ntslots; i++) { + /* Hole in the slot map; avoid dereferencing. */ + if (osdm[type].osd_destructors[i] == NULL) + continue; methodfun = osdm[type].osd_methods[i * osdm[type].osd_nmethods + method]; if (methodfun != NULL && (error = methodfun(obj, data)) != 0) From nobody Thu Aug 10 18:14:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMFRv6myLz4psLb; Thu, 10 Aug 2023 18:14: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 4RMFRv4vwGz4TLZ; Thu, 10 Aug 2023 18:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691691243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/lDKXV7jrZlZg5I1kLWO5lmUvQ4sg/khjXaKHjfl0Q=; b=rHxkk5rEkXL2RimsALL4f9z044s/YNybqIfsHbY0I21mjVoIXW5auuCsUB8YUNUFNDpK5C Bew06Oh/1FCl9L/rwR0OSyVzkdKLEk/71umtnAG8WI63BQ4LvKs/OBZUDbXn8SJHTNd7Is OWUWQXUrUzeR8KVP9TsQt3DfgM6wmFYXXXHDr7SQoTfRr47PJdwUtEAy1FQYgE6GZ4ufcy HhSbRcJqEg/cBHYp2QuIYAzaMiE6myaYkVBtMV8C8vUNxHw6jFHsbxkUcp1qD7/825i2oB OmBIFhxwSXZtiqwVtgw09jmS0QJJvSuAcz9ku+7oDKtYACjW1AFvDohxNBTx0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691691243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z/lDKXV7jrZlZg5I1kLWO5lmUvQ4sg/khjXaKHjfl0Q=; b=wHewvByJTwsm9fH2QXcD/zf5cfYjspXai6+UJD71xjaORFXdW/NdnxoQ7H9ehPIGcKrDma 1+MuoeCiXi2n1gDjP3fYqCQMAdYVDDisuTlG64+4SlCj2o3AtzIUfDhlzbjHAEsOOXwIiU nYr5AjbB8UirkFGbllX9UJDY4SgpRt5F0E5AWpRuX9zR/3Ofof1D1oSjC8FUUAd1FRQuS4 ByCq0L4WztQsCjNN1w5OlnDkDCDASWA8Vvi9GfBXaUgwQRGE14DBY7SRXN2ouZ4YwC+XfM NdxgE/BSddOIpSia3ofO+lHv6JEPSG8meqUHpU+pfaN0NU2tMVZ05Am8JHsJDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691691243; a=rsa-sha256; cv=none; b=me5jrln5I0zKbwgkidp3l60hnRW6NI+GUc+tnqH8eoFhHPubaD6y6qrRSnDnL980GTDUa1 Do8qRR/HA6/TLm+1qfuFtb+q12tJJX0DmmqhZKyO9XYjuNroZQytiQrWr0uxHIBUw7EEtV +nKUZ4dHia8WF0i8kqYieJ1d1PYiMRtzF62bj+z0BdST1M0fQrXX/PEJumkhC6LjxibtIi kXhebYZPUg7u4XrWGl5Z6eRLVWDljdfOguRt3Bj/MAIkwR3VnUWX69vkR8gZk+keWf2Vnd 0wJwmfb/nxxuXZz7r4pdkgMLVz5Vvwc4FLaTchrvamHI2Y3OKNHF2Jq0AbWHQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMFRv40jLz16Tg; Thu, 10 Aug 2023 18:14: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 37AIE3kR010379; Thu, 10 Aug 2023 18:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AIE3gK010376; Thu, 10 Aug 2023 18:14:03 GMT (envelope-from git) Date: Thu, 10 Aug 2023 18:14:03 GMT Message-Id: <202308101814.37AIE3gK010376@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9795f14ec40a - main - netlink: Align allocations on __max_align_t, not uint64_t. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9795f14ec40acbab93aabedf05d70e0256ce9bf5 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9795f14ec40acbab93aabedf05d70e0256ce9bf5 commit 9795f14ec40acbab93aabedf05d70e0256ce9bf5 Author: John Baldwin AuthorDate: 2023-08-10 18:12:52 +0000 Commit: John Baldwin CommitDate: 2023-08-10 18:12:52 +0000 netlink: Align allocations on __max_align_t, not uint64_t. uint64_t is not sufficient alignment for allocators on all platforms. On a CHERI platform pointers require 16 byte alignment, but also if a type contained a uint128_t or long double it would not be aligned correctly either. C11 added max_align_t precisely to provide a portable type for allocators to use. Reviewed by: melifaro Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41301 --- sys/netlink/netlink_message_parser.h | 4 ++-- sys/netlink/netlink_snl.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/netlink/netlink_message_parser.h b/sys/netlink/netlink_message_parser.h index 0934057ac49f..0242177fdd26 100644 --- a/sys/netlink/netlink_message_parser.h +++ b/sys/netlink/netlink_message_parser.h @@ -41,12 +41,12 @@ struct linear_buffer { char *base; /* Base allocated memory pointer */ uint32_t offset; /* Currently used offset */ uint32_t size; /* Total buffer size */ -}; +} __aligned(_Alignof(__max_align_t)); static inline void * lb_alloc(struct linear_buffer *lb, int len) { - len = roundup2(len, sizeof(uint64_t)); + len = roundup2(len, _Alignof(__max_align_t)); if (lb->offset + len > lb->size) return (NULL); void *data = (void *)(lb->base + lb->offset); diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 0292725bd135..8bb7b076b7b7 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -74,7 +75,7 @@ struct linear_buffer { uint32_t offset; /* Currently used offset */ uint32_t size; /* Total buffer size */ struct linear_buffer *next; /* Buffer chaining */ -}; +} __aligned(alignof(__max_align_t)); static inline struct linear_buffer * lb_init(uint32_t size) @@ -98,7 +99,7 @@ lb_free(struct linear_buffer *lb) static inline char * lb_allocz(struct linear_buffer *lb, int len) { - len = roundup2(len, sizeof(uint64_t)); + len = roundup2(len, alignof(__max_align_t)); if (lb->offset + len > lb->size) return (NULL); void *data = (void *)(lb->base + lb->offset); From nobody Thu Aug 10 19:51:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMHcZ5ZnXz4q0wR; Thu, 10 Aug 2023 19:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMHcZ4wVCz4Zg4; Thu, 10 Aug 2023 19:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691697102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ja0PPbtwcwaoG+1OE/g8tGjdWzYfaSpxaHUgpTj6oBA=; b=u4esdD8Xmdz/I2371hHpQvx7iri47UvsTGoDNHNgLQpnybZlEgiZmx+BwUDQxsDoDO5dEY kQ7B3Nd0VSlhTVp1FUE/I6dCp+2qpME0vCIcLlglZDOuR0HhMpm2J9br/5oOCltYESgWY4 ITmx2LMmOhDqK1p7Vbetj8Um2So+7TriYx4poYVWBlRA+0TzsDj8Y0iR0CTJfD+Og7W+hT BApEFiYwaw7844nMdoCHTo3Qh5hNqYPfpDamnqmpCuxR11tVOphCCGc5sLJZFfSD46YnxB kuTlMBji4kuOvszeFGOf2z22SaA269D5bHPkthbvoJZp/Y3i6pxEwbF18NxXGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691697102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ja0PPbtwcwaoG+1OE/g8tGjdWzYfaSpxaHUgpTj6oBA=; b=pIbdcM91GhNepT2cJ6VC8vA6gmMI4WmcwfiWrFYKIPCKw1vt5NXfd8FgZRNMFd66kulzY4 2pcFUjt4Qqa70r+9AzMSt/z19djb7KvPku27WgHL+3Hh+Aj+dXEgg1mTFVLKSiY4yrUeb4 bSN0Ok6iUoy/HvQxXIhAK0ZAoZFcqePjQVRVUN5d6/icEobrhAdNPeE70wTLVCWzi948se l9tfkG7ztcoMw+Tt1Tn3CEkSlfoUNa0OtVQ1lEPhtpXjGurI8atVZyiRs7RDmy2SUCgeab UebTGhSr6I2BUGFnwzTaj+OXXvgd587fsXDdfHN6WMzrSMsHzYc+Omy61Jng1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691697102; a=rsa-sha256; cv=none; b=lsTXuM67eC+NwUnC/5Ou4hUzKWQaU5jXeSggtiQTL5RjbhbKYOFchUTbaTq2XdQAJNKhUe e4+1kTiFjR1oDxwqguiH+nVdrvA3wXWddG0pvs+wfrVmi7sZD+35OUSVb9C6Piv1nb/yNk eK2wrEnpOfo9KkECkyZyxXcUXAk7hsJqePxPfvy0UNB8opZBYhS+IOHPsGBeFKyi2hs1bd fHbz1MAjtAruPRrZxvoo5sW45XpwUeSMPEuCq9T9rOzqZYM3RqzCPbh8hiEy1r+n+qpJlK 7gXrW1vEGSJjCbADgo2RwHIB9dwort1H71DK4silQuxu+tkR5VTGtvu0ozlcqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMHcZ40Fwz18QX; Thu, 10 Aug 2023 19:51:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37AJpgv7070649; Thu, 10 Aug 2023 19:51:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37AJpgud070646; Thu, 10 Aug 2023 19:51:42 GMT (envelope-from git) Date: Thu, 10 Aug 2023 19:51:42 GMT Message-Id: <202308101951.37AJpgud070646@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: 2409231121ba - main - mountd: Fix type of signal variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2409231121ba6fc0ce5c16dc070b564c613c8fc5 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=2409231121ba6fc0ce5c16dc070b564c613c8fc5 commit 2409231121ba6fc0ce5c16dc070b564c613c8fc5 Author: Rick Macklem AuthorDate: 2023-08-10 19:50:35 +0000 Commit: Rick Macklem CommitDate: 2023-08-10 19:50:35 +0000 mountd: Fix type of signal variable Without this patch got_sighup(), which is the SIGHUP handler, would set a variable of type int. This would appear to be incorrect, although it has worked reliably. This patch changes the type to "_Atomic(int)", which appears to be all that is needed to correct it. Reported by: pen@lysator.lui.se Reviewed by: theraven, karels (prev version), kevans (prev version) Differential Revision: https://reviews.freebsd.org/D41265 --- usr.sbin/mountd/mountd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 1924284bb93a..22dfcc3c1abb 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -290,7 +290,7 @@ static int resvport_only = 1; static int nhosts = 0; static int dir_only = 1; static int dolog = 0; -static int got_sighup = 0; +static _Atomic(int) got_sighup = 0; static int xcreated = 0; static char *svcport_str = NULL; From nobody Thu Aug 10 20:50:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMJwJ6p9Wz4q4PP; Thu, 10 Aug 2023 20:50:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMJwJ557Cz3CwX; Thu, 10 Aug 2023 20:50:24 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2680f27b52dso870116a91.0; Thu, 10 Aug 2023 13:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691700623; x=1692305423; h=to:references:message-id:cc:date:in-reply-to:from:subject :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ZHJYQjmU9F0dfs5do2ELjJprTmzsVCXutrZz0gqznMQ=; b=lAOUZwXLcZ8kzxUI/zt0Gdhvxi7DI5rdi3H0vLokfGglEBNOm0kf/6CcS+d+pFnrLU hprtrhvr0rk+gh13oAUr2j3w/7qlZ0cJqf1u5G4VpyikK3jWFUh7OH9QBNqzbRVvAvzG BTA5J8P8pXc7devSzx88iXgkgSPPEDZ4U+DBJNeXa7V8GyZiFiuh2GkWQjkXXwtSy/cS wUF+f2Sv3rZbuTOrvO0Sv/4wUdr8FHxzAFCfgHultYU/fwOaZlZ52c8ZltTYYtw6Axdj 3GfPkz8IGdU8cfO3GcrljlU1LEa8K+IwcQI1MpRA3dR6KuGXK2JzziYp9R/XH4HpPEuP JI/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691700623; x=1692305423; 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=ZHJYQjmU9F0dfs5do2ELjJprTmzsVCXutrZz0gqznMQ=; b=jYtd/CfmM15/JiPn+opQn5lpKSHnw7Q8/zCfU2L2/vcaXR5R+F81NLK7M4dZv9YB6r U6Dk962qzP7uqKZO8YqjC1//57RdkqphwNpv+M1UFVOvLg/yMyviE9CGybc2Jsq/+WP9 qrZesSSs4fXlFGdXVstKLwiEosJy3EB8ZOEkJipZ0LWIO3SKuo+m1kQlB9DdgFJcl6uH TDtxq37lXGsTg18lpHwdE+82lXGiHOnnWvhHX1RgM0lbgIBp6TCapoYqNMfPsmsNsh/J AMD0gsRF3f8e+IAj6ywpXoPQBBsP5XZfC+vV7sLdEVC+AwPiwxAavANld2BUV8p+kOWd HUVg== X-Gm-Message-State: AOJu0YyRvcjc9AFfIcDvCT+V4V5d4VZeLlHN/bbiVVdgqgqm07RxVlZc FtKTPPGVmfYVMYVDNXq7G7cTb/hcRFs= X-Google-Smtp-Source: AGHT+IHWBVhkze8H17vKxEKhe+GrVPVxlZUabMyPrhWqxEowNOkFKIi9NtchVWiJi3QHIP+yOHnwFQ== X-Received: by 2002:a17:90b:33d0:b0:268:b0b:a084 with SMTP id lk16-20020a17090b33d000b002680b0ba084mr2917051pjb.46.1691700623354; Thu, 10 Aug 2023 13:50:23 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id v22-20020a17090331d600b001b895a18472sm2213194ple.117.2023.08.10.13.50.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Aug 2023 13:50:22 -0700 (PDT) Content-Type: multipart/signed; boundary="Apple-Mail=_EF4A41E8-7F7A-4389-AB1D-4B8F265E5CA1"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 811e0a31acaf - main - fusefs tests: handle -Wdeprecated* issues with GoogleTest 1.14.0 From: Enji Cooper In-Reply-To: <20230810145214.7FD4A197@slippy.cwsent.com> Date: Thu, 10 Aug 2023 13:50:21 -0700 Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Message-Id: References: <202308100232.37A2WgNG040490@gitrepo.freebsd.org> <20230810145214.7FD4A197@slippy.cwsent.com> To: Cy Schubert X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Rspamd-Queue-Id: 4RMJwJ557Cz3CwX 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] --Apple-Mail=_EF4A41E8-7F7A-4389-AB1D-4B8F265E5CA1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 10, 2023, at 7:52 AM, Cy Schubert = wrote: >=20 > In message <202308100232.37A2WgNG040490@gitrepo.freebsd.org>, Enji = Cooper > writes =E2=80=A6 > Probably precipitated by the local revert of 28f6c2f29280 due to its = build > failure, this causes the following build failure. Yes, you'd have to revert both changes since this change requires = GoogleTest 1.14.0. Cheers, -Enji --Apple-Mail=_EF4A41E8-7F7A-4389-AB1D-4B8F265E5CA1 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----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmTVTY0ACgkQ5JFNMZeD GN47JQ//UhZ0tnqvS9qacKyYK9vBpGr73H5kKKsHU+EwUFsYr7mKrGHcEpf/tlsU usJw842esHLjltNR70gcg/C1mq5dGuB+aBN2yVTN14VsMQ61P//yjT4lucAzacB1 BYvBN4h6mkr/XX3JmsW7yhoP9m/tLRhoZxzcdVZV09OqBkOVGimVwoRyrsQUa34N sZd4Bp5HNF0tWvm+at3vDJRyoAH8EeSwOCiu4rZScuBII6u7LMaNEOFpyDM/Csn0 JGvIfpNQ6xfX7I4vdXBTOUoyNIQyFbnj2EmWZWT8pNwqpHM7C1ckNTiQ0boOEpY5 ds/+GLl7XhAoe7jalAV5TbC0b+DIgmLG/jHTJy+uJdfpkBEamgDWeSPZReTgfEZ1 enwtqUpMLt1MxNJ5LhXflM90XayjhrUPXJrB98TenVllTbbyDqHmxmMS6jpg77Nx EiGf8w5Y+wC2xHeBLbxPMMmFL4S6IeMgex9pQVOzxKEY36wZ9OVPJvTouQOxQSTl Z0/SGaTHGoKMYjLaHasM7VGltwLNaRRw7KCec4NPZwdmt/WVsRjqgQU/DrVsndq3 o5m8Hbd+gbB6gusOYaIbqWvtIUAGfsl1dASsnBtcqIm7qwa9CEtUNwEZyrnae6ci GJ3u+iMRy4S9J+gFOHgfD9/9sfRTWiPLhCxP46yvh/tUvh4LenE= =P4LB -----END PGP SIGNATURE----- --Apple-Mail=_EF4A41E8-7F7A-4389-AB1D-4B8F265E5CA1-- From nobody Thu Aug 10 23:33:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMNXb6HYmz4Tk5B; Thu, 10 Aug 2023 23:33: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 4RMNXb2hjBz3YdY; Thu, 10 Aug 2023 23:33:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691710415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A62JLDb5pCHuusHK09aKfslqFE/uNILzS8Wo4vIMHfA=; b=YHZZFCrf0vFvfnPpoMKW+PwBY5pGEM12agxzrS5N1Uu0bTOEaUSV/XGumpeM4uaXdMMocg OItmldu64Z10uNXoGrnMlyG+lJ0OL1GGuLeNzPoHdLaQ85bN52jlWVZyrbQC6Vzmr6kW32 InprlOwvhughc4qSeISzgJfsGO3uqPmeudWm9COUZdN72cWjAxe9Ucp1gtiNMO+ZyYg0Oa q01q0iznIC9F8whZ9LvP0oqqgXcyJzS9uAES3I3LfIfQsRa4xYYJgQcFHToHmD734zC8ZI C4iRPSVb+TjcKs/9EJWzlnZf8RHZ6Hp0U2f0UkNdVM6t3QM+78Tm2hIizfoSRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691710415; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A62JLDb5pCHuusHK09aKfslqFE/uNILzS8Wo4vIMHfA=; b=S3eyox81C5TO1HTXm24RDajld1s5oSeFxA5p4KS5tW8L+7wxEXhXfz5ZGn0fXP2j8T7BH/ iqQquwAJC6n3qMgHaMMVX/kL9C+pcndW7sa5XMIydjay+mAWegD+KeoVy7gSYku0KlEpvB OctcSD2UVzPDWtSGrVNf5rZXSdk2jluOLTNXyXUZiwhMBjmeZiKiTGpbRU5QOJPh21OSXK rN5YxWGVOSmf/2CKZwHPJjJ0zyBMj5xaSkrzLp6FCkALKZ9sBK4FqQzZ/Qlp+NDZ/xRGCT W/PPseluwKHEvmAO6xfA0Z7L6PePTE3Hd10bjzEMFfVjIlOKfVQNWrs003EnrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691710415; a=rsa-sha256; cv=none; b=sxH12ubDR2K0VyxWbZS6osq45oLb25LR/2QsyiigcToPsztWo2p6es1tycj0L8dghyuB/N dSzDtqX7D/tPmb78v+kRn4OwxEg+ZF3pFwgXlTHfi/WcdCY1OZDhqBvcAfY4DrjrlehrON c4osz8ycwOiePMDr9Sr+SvYxCaHKncr+0PSWApHMHyl3+ziiL06dsU8s93PeAfXEp7KMQx isgu7GIzTMtsCw4xjq9EhRyoFssrzFpyWY92f6zYTB5Gpkn+/gtCBPsRJoBdXo3/tzGmDA mtoIDu3EPzIfxf2R7tcOkm75UIqjeMxkW8KVfz8vEtCfFxAV+y2olp6lKfGSHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMNXb18zzz2dc; Thu, 10 Aug 2023 23:33: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 37ANXZeK041600; Thu, 10 Aug 2023 23:33:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ANXZrZ041597; Thu, 10 Aug 2023 23:33:35 GMT (envelope-from git) Date: Thu, 10 Aug 2023 23:33:35 GMT Message-Id: <202308102333.37ANXZrZ041597@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: c45e66dca3e4 - main - Unbreak usr.bin/dc with OpenSSL 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c45e66dca3e4f3073132b6f3e94623c2314f679c Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c45e66dca3e4f3073132b6f3e94623c2314f679c commit c45e66dca3e4f3073132b6f3e94623c2314f679c Author: Enji Cooper AuthorDate: 2023-08-11 03:36:48 +0000 Commit: Enji Cooper CommitDate: 2023-08-11 06:33:44 +0000 Unbreak usr.bin/dc with OpenSSL 3 OpenSSL's BN_zero API has had a void return value since 1.1.x: chase the change to unbreak the build on OpenSSL 3.x with MK_GH_BC == no. MFC after: 2 weeks Reviewed by: emaste, kevans Differential Revision: https://reviews.freebsd.org/D41410 --- usr.bin/dc/bcode.c | 6 +++--- usr.bin/dc/inout.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.bin/dc/bcode.c b/usr.bin/dc/bcode.c index ded130facc81..d9a42073e6b3 100644 --- a/usr.bin/dc/bcode.c +++ b/usr.bin/dc/bcode.c @@ -378,7 +378,7 @@ split_number(const struct number *n, BIGNUM *i, BIGNUM *f) bn_checkp(BN_copy(i, n->number)); if (n->scale == 0 && f != NULL) - bn_check(BN_zero(f)); + BN_zero(f); else if (n->scale < sizeof(factors)/sizeof(factors[0])) { rem = BN_div_word(i, factors[n->scale]); if (f != NULL) @@ -811,7 +811,7 @@ load(void) v = stack_tos(&bmachine.reg[idx]); if (v == NULL) { n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); push_number(n); } else push(stack_dup_value(v, ©)); @@ -896,7 +896,7 @@ load_array(void) v = frame_retrieve(stack, idx); if (v == NULL || v->type == BCODE_NONE) { n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); push_number(n); } else diff --git a/usr.bin/dc/inout.c b/usr.bin/dc/inout.c index e2461923d819..29d8d147e9e7 100644 --- a/usr.bin/dc/inout.c +++ b/usr.bin/dc/inout.c @@ -192,7 +192,7 @@ readnumber(struct source *src, u_int base, u_int bscale) bool dot = false, sign = false; n = new_number(); - bn_check(BN_zero(n->number)); + BN_zero(n->number); while ((ch = (*src->vtable->readchar)(src)) != EOF) { @@ -230,8 +230,8 @@ readnumber(struct source *src, u_int base, u_int bscale) base_n = BN_new(); exponent = BN_new(); divisor = new_number(); - bn_check(BN_zero(base_n)); - bn_check(BN_zero(exponent)); + BN_zero(base_n); + BN_zero(exponent); bn_check(BN_add_word(base_n, base)); bn_check(BN_add_word(exponent, iscale)); From nobody Thu Aug 10 23:55:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMP1w189lz4TlfG; Thu, 10 Aug 2023 23:55: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 4RMP1w0dGwz3bFp; Thu, 10 Aug 2023 23:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691711732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyRjnDYlv6TGXLA/+uskL+DQX2jckiwd6RYxG2V4CGg=; b=pvLRjhsofyjC3uqLi+7HWCL2/t6BCLaDYyhiXn39TutwXu755+c7KmI1chKaWziFA67ty1 JWpRJWYW5yD8VSMHSQKQVw+/daShV5ioZADijM36VmFU4ZQRXLYkezaIbPpIwyaULNDvlX u9t8FvLDOmgI0TmMmSwCGaony7u6N4SJyO7ngR2QJVqiboMel4OilC/IJDjAIpkKSTFw+0 EM5yvGL0fse+j35BKQyuXVK5Ee43UFhW9OLjISaCCPyyRFqRjbGc1jL1/Mfh20WPYV3koM w8pRxL6J5BY4ZkX2f5r2Zl8rxtcbcyanqNNv0pOJnxbVv5AEhdqK7e+opKzxMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691711732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VyRjnDYlv6TGXLA/+uskL+DQX2jckiwd6RYxG2V4CGg=; b=rzkvv/VQeYhdtqGN2KungYuymm44XyuYVlYIbj9VcjRtJNRpcNKV5JBaelqL4zgo+iogvo pX6d4JkX0uyxWNjvQ4mo+0ODUvH3O5LxCGR65Nzis0Vtea9eij+TMhotBJ2CmuA2+FMaxk gCcoVIUc+RJN/6iD33IJGZgLlrWIUX0+78rPEK7kCdeW3U87NXYde5YxzfTRpW/4jt59bb U8azqAvL9oBOGBSjUt03gTGm0sXg0aQ9iIYypvwmqeOYkuYWtOQ9o2vNFx8lphEJpTmX1s 08lFxkmrxpQpisMCURqNSsKjYdhf2PQuYxTeeQRFEzf6Ega/pCSAH9IoIgESxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691711732; a=rsa-sha256; cv=none; b=uxdPR0ZyH6CLpoBVbBa3z8iguZlCwtJcuLYwSa7M0KTGmtA3X8VtxagHBo5eCT1Mq43e8O ZtuoMzGOyBU6ZzEA2uipAaBJvDJeKicqbuxcUe6JFj/7xvamqwjIv/9VzdMfxKMs2PAFTD cCxrnZeTRlAsKOmw/cxnmMJNEfoX6Z4xn68bSxfv+BCLFEoWyxIEoLz8Mv3R9PzC0me78D Qe8paDHVDKziVjJAPCSOtrFc7GzTTkxCbV0m+Y6yKJZmTVnLRndjJdOeKxTKbcmQ3BjhFR sZvOHmFhMAyQ+IHdFkRCp/X/FHjhauwR6QFb0Fdl91u1WLm5wWL1zCZc9LgC6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMP1v6jMbz2jb; Thu, 10 Aug 2023 23:55: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 37ANtVg7074916; Thu, 10 Aug 2023 23:55:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ANtVE7074912; Thu, 10 Aug 2023 23:55:31 GMT (envelope-from git) Date: Thu, 10 Aug 2023 23:55:31 GMT Message-Id: <202308102355.37ANtVE7074912@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: 8aaa12308992 - main - Makefile.libcompat: Fix DTRACE variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8aaa1230899239a90f35e73436377a6f5f79bbf9 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8aaa1230899239a90f35e73436377a6f5f79bbf9 commit 8aaa1230899239a90f35e73436377a6f5f79bbf9 Author: Jessica Clarke AuthorDate: 2023-08-10 23:48:01 +0000 Commit: Jessica Clarke CommitDate: 2023-08-10 23:48:01 +0000 Makefile.libcompat: Fix DTRACE variable Back when Makefile.lib32 was turned into Makefile.libcompat, a typo was introduced; it should have been LIBCOMPATDTRACE, but instead gained a dollar sign in it as LIB$COMPATDTRACE (and with COMPATDTRACE not being defined, was equivalent to ${LIB:U${DTRACE}}). This then meant it was not converted to LIB${_LIBCOMPAT}DTRACE in 91d7edd549f5 ("Generalise libcompat to be a list rather than a single option") and instead left broken. Belatedly fix this long-standing seemingly-inconsequential bug. Fixes: dba75e9fa5a9 ("Move Makefile.lib32 to Makefile.libcompat and generalize it.") --- Makefile.libcompat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.libcompat b/Makefile.libcompat index da9c326756aa..c4a98773f1bd 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -20,7 +20,7 @@ LIB${_LIBCOMPAT}WMAKEENV+= \ LIBDIR=/usr/lib${libcompat} \ SHLIBDIR=/usr/lib${libcompat} \ LIBDATADIR=/usr/lib${libcompat} \ - DTRACE="${LIB$COMPATDTRACE:U${DTRACE}}" + DTRACE="${LIB${_LIBCOMPAT}DTRACE:U${DTRACE}}" .if ${MK_META_MODE} != "no" # Don't rebuild build-tools targets during normal build. LIB${_LIBCOMPAT}WMAKEENV+= BUILD_TOOLS_META=.NOMETA From nobody Fri Aug 11 00:02:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMPB12nkpz4TlmP; Fri, 11 Aug 2023 00:02: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 4RMPB12Ld1z3brF; Fri, 11 Aug 2023 00:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691712153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n635CcqllOoFX9Pk88tgZ5ApNFHjyze5IZOv+OzctZw=; b=EHl8ID1DDwfA9xImWg1YJeUlqoNNMJN8z1WQ/RWIPImThXSIww984QpRe+3IHl+W+Cc3AH ZswqkQ2B0A46mABYcxvEXWqDjG2mJt1hJMloV8Sh+1hAo7sq5nCa6KurXGtiydngx2vxru NSD860Eo4QqqhIPxoHjBVlJzmB0ufMhrMmXh3HQ/jPwZiK0qF91tHuX4PvjPAaM37qozpS bjDOOTTGL2BGSx++ol8Udsg9XXZZwl3zpmh9leiDwFDwRYV223jW6VNaT2JD3w+t2ViMGq NDI+QmFoIghc+scAOuln5rlItH2SiujTxzHSID+DM3o+iwroBZhSeOhcl3+DaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691712153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n635CcqllOoFX9Pk88tgZ5ApNFHjyze5IZOv+OzctZw=; b=VJBWHRruDJvsjzC/rMJAiGo3mmGYaT0070v9Zx0ym7lVBKaw/VKR9vQNNvFMZP+/Cuogqr o6k7da2A4PRCM5dHOH3CPHb6BR/gtHri5UUcS/FvqMe1sM95p8Lsdjvnn+uEQZZGoeVe0V w6v6HJxxa1fXFe/+9grzNScSA/S/iYIBPMZn/MGOLtOG8g7nVZ9GtphX8PpNHV4qsXdiof +hQPagEbEa4z17srZtLdTedvZuDW4Lm4vZq6YptBtMW0VA+icCdwkbzK2fcmv2B2l4AJkD Sn4BDPlsY2EOqmAZqX6mTUNlPnzZbc7hfYn5TRMOEXvE3+Y1LO8KjFHIK7FVzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691712153; a=rsa-sha256; cv=none; b=eHNcBKM7ygpRwjzT/qdoz3i5uSwt9HkvDrAO1YUFRzvsJt7d35+jvVKLCdamI8+K5HbTtm u5R5aMSLiJCtU5PokNNBRj212a/qFOoQtQD4HOs+Qe7EKRGUk2PYqfOkC5vLd1WkgX9qRL o+7HtR5JsDphFGADtIWK8Ge+msRX0gE1agiIVcqZl/djZ12hHWpQgJ2PcwZ1x1M0bpfstU nxQMxjamyIe9JHuhlBShOLc8gidE+luk6VGhFhyn2x6lf5UkJlfwP7WgrFJMoabTYqlJ2s l0oF+j1j07oPmxL1kR4N8ba/pCfSoMJPMMCZITHhOsTcbu+zfZPUM9uJSudimQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMPB11Smrz3BX; Fri, 11 Aug 2023 00:02: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 37B02Xim091680; Fri, 11 Aug 2023 00:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B02Xio091677; Fri, 11 Aug 2023 00:02:33 GMT (envelope-from git) Date: Fri, 11 Aug 2023 00:02:33 GMT Message-Id: <202308110002.37B02Xio091677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 136fc495615f - main - release: update main to ALPHA1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 136fc495615f6d5cf7fb2284aff56c59a64a58b6 Auto-Submitted: auto-generated The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=136fc495615f6d5cf7fb2284aff56c59a64a58b6 commit 136fc495615f6d5cf7fb2284aff56c59a64a58b6 Author: Glen Barber AuthorDate: 2023-08-11 00:02:11 +0000 Commit: Glen Barber CommitDate: 2023-08-11 00:02:11 +0000 release: update main to ALPHA1 Update CURRENT to ALPHA1 as part of the 14.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index e21b3f5ce2e2..f05e6d0a2481 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="CURRENT" +BRANCH="ALPHA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Aug 11 00:17:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMPWc16vwz4Tmtr; Fri, 11 Aug 2023 00:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMPWc0crZz3ctx; Fri, 11 Aug 2023 00:17:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691713068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SinIOlQf+g3YD/lMmHNW2vodBDCOLsw0J+5+gKz0L7c=; b=GX7rQZzWFJ/tmu8nYWw/arASVwb7A6vs8DrarDpaUQfOflmhYtLzQ3C3EaOscELU3VMVwz fnG8HeavFAN4JpVyCu6OquXZSZCDgdXyOPAFi1PEgriVK9ChADttnl9BTJTZ4TshoKDvWz Z9nRGoGvs0KCqakC2FXQebHrTIsjibOzA3hGV0d97ve0eUvH3KAgN0JnlnoJYBbiskFa60 BGp6/rTQNN5Pa3HNRhVVVgfOUPNOhpbeFVVDONv8O64gvdVRyz6kvjeJhHWcNUtAbhscnQ 2ec62fyldeZ1g1sbvqx4I1DrR6xugH3dJmCzVCCl7M7pQnVDV3QeDvG0euNEsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691713068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SinIOlQf+g3YD/lMmHNW2vodBDCOLsw0J+5+gKz0L7c=; b=dxL+QDwzJLbVA85h9DG+g4pu76LjLYGmFiYcJIaHVDZOkgOSqp/sA0JgTSW375OXdZdtNG FzhQAUCo1GxQNIQZH78rzuuCA2O6HmPexZJ/otGupWY/weYDtpc4ck4JqCtjjWDGFaOVoh Y5nJ1PhaJwileJEAcsnOa8sZ50SX5yNLbBsnLyLgluykj/F2GqB2g8WP8U7DJlOd1Qf6sZ wop/P6Xy1Hys7a+/v0Cc7ruzY4jyo4Rn1dBYRSKoakQxGDanCVGqdzP+7fH1p3UqB0QmVW /qXckPDRBKOV9GUhCxN0vx1pAdwyV47siqMavBImf4wKpI/hxYr0NqNwsT4RZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691713068; a=rsa-sha256; cv=none; b=Ybu/f+0Tb7t5w9El5uw39Pr02KPiuOgZy2CSDskh8IzST4KHCDYuxIYzS/ZWk3mlqKW8d9 N6gTk8DVyf5A/SREJ9MKUrtfJbiwXm4CfabCnW4EcZW7GCDo25WyQaGdHotZkapZu2e/Sv 6YJKogcPzxCBZ5gpIa4v1lydwiF66uvh3o+3BYqb3S+SfVf2XIT3RpQ8zf7gFNd5EzEpzB u29K/AkEUBd9+cfRWL4Tzoo0jlQXBseNj8ZzBNPgN789cp2kI9lsa8Y7BhLqNnoswqQpXX C5SoDR03C8ZWnZuf4Kstcl4cMQMRDXnCaK00QqOvOinciZsxsvxcT8DjJFMT7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMPWb6nMzz3Vn; Fri, 11 Aug 2023 00:17:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B0HlFH009393; Fri, 11 Aug 2023 00:17:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B0HlYI009390; Fri, 11 Aug 2023 00:17:47 GMT (envelope-from git) Date: Fri, 11 Aug 2023 00:17:47 GMT Message-Id: <202308110017.37B0HlYI009390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: fb055b01eb04 - main - OpenSSL: regen opensslv.h for OpenSSL 3.0.10 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb055b01eb04914ea1aadc7c88090093a8481fe7 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=fb055b01eb04914ea1aadc7c88090093a8481fe7 commit fb055b01eb04914ea1aadc7c88090093a8481fe7 Author: Jung-uk Kim AuthorDate: 2023-08-11 00:17:23 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-11 00:17:23 +0000 OpenSSL: regen opensslv.h for OpenSSL 3.0.10 --- crypto/openssl/include/openssl/opensslv.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index 5bb97d596448..3c221e1ac231 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 9 +# define OPENSSL_VERSION_PATCH 10 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.9" -# define OPENSSL_FULL_VERSION_STR "3.0.9" +# define OPENSSL_VERSION_STR "3.0.10" +# define OPENSSL_FULL_VERSION_STR "3.0.10" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "30 May 2023" +# define OPENSSL_RELEASE_DATE "1 Aug 2023" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE From nobody Fri Aug 11 00:48:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMQC44Twfz4Tplw; Fri, 11 Aug 2023 00:48: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 4RMQC43tPJz3ffg; Fri, 11 Aug 2023 00:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691714912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWO7TAZcvIWH2OOnbf23GMBEh0ZFpfShhMUlvC4hm5M=; b=CHDBv24fxGymLYYkl8J4CRBQw9daTFUW6ABMI/xnpIwqzwYkdEcZnnuUqqwA5jXnMlGEhT HCUJ/C7etEk50uLl8CeGN+8mI42AtfVCRm5jhfgz+AU8SFT+yqAmorgZj5GZAggU74ZzSh HiItNUpccVaj22gvRcSFt+WoAtPLK/BF16mSwd1yhzc2iy8xKV2viqGmqcXrcBSbuupGJc ID1uGG45d+FIpLoUCOwBCmPKa3m53RsklgdhIKttJ8b+Xo4tNHy3DIUDqb9iUFpO7eOUIO 6g9tIYhTGBcM46WxycoFWidrh7Qojl/1eLQ9atD3SNqomVQme8gkxnt/rv7MMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691714912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RWO7TAZcvIWH2OOnbf23GMBEh0ZFpfShhMUlvC4hm5M=; b=mP1hNoBuIu7PiOrCiP21ntcEmjxWNrvGCGpGOtg8+RVCHwn3l6df3ysK9YWQ2Hkt1Qe2o2 KO1k9bvMcsNVIxBNicvjmzvYF7CQzZ/9yYNswH987usJdtX/yafAS76fYilxwfK1wv9YIF afceTlVGZLdQn7zGkwH0R2e9yzscMCeou5cJ1fT1I++OFH/qbTp0nCNCIiyiAymIxXwRyl VdeJ62ZKQ6WwTzrX60vH4fsw6vDGIGi8fjegodvxK4iPeLof5Sg2xWdmWM/pApv2RDQ0WX GwxFrFwOFK7YXLHn/I5KcVDhRjCKd5H+wO31gxTvQ9j40S1q12Jhl8o0r6BzwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691714912; a=rsa-sha256; cv=none; b=A80CqbKtMkh2CPkxEzMxwvbc5C+BxK5wXrvYzJKmgiB9bJ1YeWNDhttiioUjg+QYV+2Z90 ZwvAZXd52hIPjyvfaNjYwIzxWOmNQPcK2wCWDTb7T669crVsjQ6oIF4M1nXkEE42O2P8/0 lsgmCKaYZtm1qiBMfHjwlRJOdHPy1ddOE9XN0QPOmii1WP990fRiDA70u2FPa4tgqksPAz WA2TSR/UTikMBzVYfVNp4f1ZbllHyu7o1t3ChAm4NctMJ7VdI9J0VOQ14o7ClirZfj0H7N uv67I5g9sxfDAK/leljCsiJ2Eo0VNQkcirHCUsAx7k6b3Yr0ACYh++fbIc1VeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMQC42rjkz4D5; Fri, 11 Aug 2023 00:48: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 37B0mWAt058561; Fri, 11 Aug 2023 00:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B0mWv6058558; Fri, 11 Aug 2023 00:48:32 GMT (envelope-from git) Date: Fri, 11 Aug 2023 00:48:32 GMT Message-Id: <202308110048.37B0mWv6058558@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: f05948d4e98d - main - cpuset(8): move to /bin/ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f05948d4e98d3abd0965a2994e9e42add6908ff3 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=f05948d4e98d3abd0965a2994e9e42add6908ff3 commit f05948d4e98d3abd0965a2994e9e42add6908ff3 Author: Enji Cooper AuthorDate: 2023-05-11 05:54:51 +0000 Commit: Enji Cooper CommitDate: 2023-08-11 07:49:02 +0000 cpuset(8): move to /bin/ Summary: This change moves /usr/bin/cpuset to /bin/cpuset so it is more readily available on hosts where the /usr partition might not be mounted at the time / has been mounted. Remove some complexity from rc.subr(8) since /bin is assumed to always be present if/when / is mounted. MFC after: 2 weeks MFC with: 0661f93892a2, 271d552379af Test Plan: - Test out rc.subr change. - Confirm that the installation logic does what's needed. Relnotes: yes (moving cpuset may impact strict file permissions/mode checking) Reviewers: kevans Subscribers: imp Differential Revision: https://reviews.freebsd.org/D40057 --- bin/Makefile | 1 + {usr.bin => bin}/cpuset/Makefile | 2 ++ {usr.bin => bin}/cpuset/Makefile.depend | 0 {usr.bin => bin}/cpuset/cpuset.1 | 0 {usr.bin => bin}/cpuset/cpuset.c | 0 libexec/rc/rc.subr | 4 ++-- usr.bin/Makefile | 1 - 7 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 83bf79dcb9f9..075c91394f04 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -8,6 +8,7 @@ SUBDIR= cat \ chio \ chmod \ cp \ + cpuset \ date \ dd \ df \ diff --git a/usr.bin/cpuset/Makefile b/bin/cpuset/Makefile similarity index 59% rename from usr.bin/cpuset/Makefile rename to bin/cpuset/Makefile index 74643f5e35b6..8626303bb254 100644 --- a/usr.bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -4,4 +4,6 @@ PROG= cpuset LIBADD= jail +SYMLINKS+= ${BINDIR}/cpuset /usr/bin/cpuset + .include diff --git a/usr.bin/cpuset/Makefile.depend b/bin/cpuset/Makefile.depend similarity index 100% rename from usr.bin/cpuset/Makefile.depend rename to bin/cpuset/Makefile.depend diff --git a/usr.bin/cpuset/cpuset.1 b/bin/cpuset/cpuset.1 similarity index 100% rename from usr.bin/cpuset/cpuset.1 rename to bin/cpuset/cpuset.1 diff --git a/usr.bin/cpuset/cpuset.c b/bin/cpuset/cpuset.c similarity index 100% rename from usr.bin/cpuset/cpuset.c rename to bin/cpuset/cpuset.c diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 0114dd5ca5a8..bd6c6c6b7679 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -52,7 +52,7 @@ ID="/usr/bin/id" IDCMD="if [ -x $ID ]; then $ID -un; fi" PS="/bin/ps -ww" JID=0 -CPUSET="/usr/bin/cpuset" +CPUSET="/bin/cpuset" # rc_service provides the path to the service script that we are executing. # This is not being set here in an execution context, necessarily, so it's @@ -981,7 +981,7 @@ run_rc_command() esac _cpusetcmd= - if [ -n "$_cpuset" -a -x $CPUSET ]; then + if [ -n "$_cpuset" ]; then _cpusetcmd="$CPUSET -l $_cpuset" fi diff --git a/usr.bin/Makefile b/usr.bin/Makefile index e027eaf81f24..b4f504e0eec7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -28,7 +28,6 @@ SUBDIR= alias \ column \ comm \ compress \ - cpuset \ csplit \ ctlstat \ cut \ From nobody Fri Aug 11 00:54:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMQKn2DLMz4TpvV; Fri, 11 Aug 2023 00:54: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 4RMQKn1klkz3gSd; Fri, 11 Aug 2023 00:54:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691715261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Njf0Yzr5lH1lOG6pLk3zQ9wqMNsg868irq7pSDbyCxk=; b=tJAViWWxeS87kbRV63Ru6N+OzvdyaN5kN+EQevJ43Pw80OHC44kA6yI1T4uB2GQydJdLlu 938FpyjXoClp7NwaRji/bFndNVzwE0yksuPw+rMbXCZYDjQMIE3auV62xaxXggb+xXRQWi 6VVot+pMkKU0yv9DCEBNFXtUkoTozQiEFENwdHBtxFnihBa8NGuQoYr66SbdSUQOXWn6/a +6HnrUh86Wc80Lqq8Fo9eI5WrKFjgtrjJsenTsBA3awW1MMzu4QIqdRzhaHsvXMlIS0kKc PxCoE0gV2eV4dCY+qPFJcV+RjmsHGv6Vo1NtbfRV/BJnLvJelSirIN/MJyHL7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691715261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Njf0Yzr5lH1lOG6pLk3zQ9wqMNsg868irq7pSDbyCxk=; b=arCvHhqGtvMx1mmsOxXSXJZvqT3iamAe2nXTib7SZphvHd/H/zJyWUg8yQGVL3PGWcB8la eRbmY0mXWOurVNfXdkL86zra8yDpiPgz8n6R/2LL5Yu3mUhumcr/Dc6zwiFx9gUEcEaZTf NhkDOraY2Y6jThMxXIEv/Tsgfx2Ydg5WeQM1RcVGXFx6rExkg+98/ohEj9Wna1UVUAHiUI XhL1hNuLTczi/ut0KUzF5Lcpb4Qn5QmQ+EmKrHTIpIKXnltf2rWir0qdmgNty74B0yZtcJ iNYyNymZFAh1BtrtsEPiifKPHX8nyBKCApZf36wkSN4r+tSqPy0qURj99Tqnew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691715261; a=rsa-sha256; cv=none; b=E+7el1OQ/jtoTgwMHP23M0vgb54Iks5VEgLKpDVbARdUxekY4aOXtNyF5/JBAWuhhnIvHj Hvwy+n3wXvTF8wcAMfPZyxYce2PVlDejSi7OS19Q0hV8N5d3cJWdAxT+hsvuoPRCDkj3tY 1rE6usooIlNoNwcUPKbffrM7p+8RRBgJ59sQOZe5IzfWXLQO0elYH9vw/oIC1pRHFYgfIx 4BJy8pWWk4bd9lwiMmfI3gzojxfkKhlzGrzGESADmt5X/f5HYQnjAfM4jyTjJdo51iAS9R wJpzBlh1IyC4TeTbBac6d0KxzvSctl1QHF1Cz4iPdffLO7KqdrFnMkGESo3dQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMQKn0Vblz4Tn; Fri, 11 Aug 2023 00:54: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 37B0sKl6075218; Fri, 11 Aug 2023 00:54:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B0sK3G075215; Fri, 11 Aug 2023 00:54:20 GMT (envelope-from git) Date: Fri, 11 Aug 2023 00:54:20 GMT Message-Id: <202308110054.37B0sK3G075215@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: 886fd36e1ac2 - main - Clean up and document UFS/FFS error returns. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 886fd36e1ac2082f1b0decb89d70e1e7a0dc3043 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=886fd36e1ac2082f1b0decb89d70e1e7a0dc3043 commit 886fd36e1ac2082f1b0decb89d70e1e7a0dc3043 Author: Kirk McKusick AuthorDate: 2023-08-11 00:50:23 +0000 Commit: Kirk McKusick CommitDate: 2023-08-11 00:54:06 +0000 Clean up and document UFS/FFS error returns. The ffs_inotovp() function returns a vnode from a mounted filesystem for an inode number with specified generation number. We now consistently return ESTALE if the inode with given generation number no longer exists on that filesystem. The ffs_reload() function reloads all incore data for a filesystem. It is used after running fsck on a mounted filesystem and finding things to fix. It now returns the EINTEGRITY error if it is unable to find a valid superblock. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_vfsops.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index b2cd2d30bc04..41c3582a91ae 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -796,7 +796,7 @@ ffs_reload(struct mount *mp, int flags) newfs->fs_bsize > MAXBSIZE || newfs->fs_bsize < sizeof(struct fs)) { brelse(bp); - return (EIO); /* XXX needs translation */ + return (EINTEGRITY); } /* * Preserve the summary information, read-only status, and @@ -2052,6 +2052,11 @@ ffs_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) vpp, 0)); } +/* + * Return a vnode from a mounted filesystem for inode with specified + * generation number. Return ESTALE if the inode with given generation + * number no longer exists on that filesystem. + */ int ffs_inotovp(struct mount *mp, ino_t ino, @@ -2067,7 +2072,6 @@ ffs_inotovp(struct mount *mp, struct cg *cgp; struct buf *bp; uint64_t cg; - int error; ump = VFSTOUFS(mp); fs = ump->um_fs; @@ -2082,9 +2086,8 @@ ffs_inotovp(struct mount *mp, */ if (fs->fs_magic == FS_UFS2_MAGIC) { cg = ino_to_cg(fs, ino); - error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp); - if (error != 0) - return (error); + if (ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp) != 0) + return (ESTALE); if (ino >= cg * fs->fs_ipg + cgp->cg_initediblk) { brelse(bp); return (ESTALE); @@ -2092,9 +2095,8 @@ ffs_inotovp(struct mount *mp, brelse(bp); } - error = ffs_vgetf(mp, ino, lflags, &nvp, ffs_flags); - if (error != 0) - return (error); + if (ffs_vgetf(mp, ino, lflags, &nvp, ffs_flags) != 0) + return (ESTALE); ip = VTOI(nvp); if (ip->i_mode == 0 || ip->i_gen != gen || ip->i_effnlink <= 0) { From nobody Fri Aug 11 02:10:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMS1l4L54z4Tvf4 for ; Fri, 11 Aug 2023 02:10: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 4RMS1l3rmfz4HRx; Fri, 11 Aug 2023 02:10:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691719835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0cEcp57IpdRkLgOXTN3D61HJQ5qN3lv9v8YMjdTQVw=; b=QTfqtIl99GJnTWkhvbzHPp1QNCrxoPbuM3kLTEiUBLoNbeRFPh9vbihEhKYqFc2ssFFf7U ILEnm/PWhH/4Bn0DZYFeX+eDE4U7yzCSzAz8kFRdYeWPpqlItfBUK9DXYIoHQGl7OAsznJ jtBPFJVbZPIWVTo3qwGVRdKtYTBlZe5wGUEu+RwNoVd/T74n7QKQY/2BhbXboH1e9Xm1GH Rz4jg+xvFXkvfSTN2p0/wj4Vsu2e6rXJu7taaA07x0BMB/Pq7bDiiKfQZpd1ZWt6FAWmwu E+qTNL6QH/6HlaJHdZmkrqUAUDCJskH6up6lJcH4llvmUah8xpB2j2wtb7AWfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691719835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O0cEcp57IpdRkLgOXTN3D61HJQ5qN3lv9v8YMjdTQVw=; b=Sah+UT3e0ASzsnePWeX2qXeqosBlvL3mAnwJI3llznjUgjg0zITShW58SOoXl7X9q/wwY+ 0jlkHwDzmiMjGHCpN6atzcChHK+yC0fGK0qT1hj4lPUMiE9V9oHY3AZUqwlhvDwcMtVz+n j6dI3HuAew4vibhQmhDj6P44CCKV2OM0aAb7VyOxNf058XSIXpKi8c5OZM3S8g0ll636Ur bO0b2dKJg17uRREBDEa6koXFtM5Ozz2HsZKVJ1YN4NfPRFFQ+OeWi9N7qc9svOS3VBQbtK 9ayzg2jQYkiGjMFwbvfNWTkLqCHnz/VgXy3WxDT9mXdXpSEw2FGOPmrCsb5IrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691719835; a=rsa-sha256; cv=none; b=XECnQEUA6bjo7HZiiE4XvczTVaG+A3yAA1gvO97f2J8PZEioVq0OZ+Ai6DXHArfBEHWCUT qCpWAIdYqBCqjkG1pwzxFLxB9vSX9K0+TY1o883Br/mSG1eyjYa9IZK4yG7n4i9jbDJpMU Xv4bBnThX6jsPqP+gMTgPKoLspDhgBbeYtTZQCLAciIJuvANFXV7ArByyQMp/FAlesHn3x NJNTrCtkxfVUXGk56UcKB/JzGu1O8AdE+G2FgBG53vbJaMkTj9Pw/RuDN7mdY4e/xEhA2H rbEohlPfT0JiIz4nNwA4ONB6+bRYT4I1GL/FmzUEQSIP84VsuyeRvcpfs6s92A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMS1l2d1nz5yj; Fri, 11 Aug 2023 02:10: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 37B2AZ2h001647; Fri, 11 Aug 2023 02:10:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B2AZYb001646; Fri, 11 Aug 2023 02:10:35 GMT (envelope-from git) Date: Fri, 11 Aug 2023 02:10:35 GMT Message-Id: <202308110210.37B2AZYb001646@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: d328162dcb73..dc9c7dc6ec9e - vendor/NetBSD/tests - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/vendor/NetBSD/tests X-Git-Reftype: branch X-Git-Commit: dc9c7dc6ec9ecb5449d71d79ae13f9782c866b73 X-Git-Oldrev: d328162dcb73d9041fe8ceb9fbae7276c3dacb53 X-Git-Newrev: dc9c7dc6ec9ecb5449d71d79ae13f9782c866b73 Auto-Submitted: auto-generated The branch vendor/NetBSD/tests has been updated by ngie: URL: https://cgit.FreeBSD.org/src/log/?id=d328162dcb73..dc9c7dc6ec9e dc9c7dc6ec9e Import new NetBSD tests snapshot From nobody Fri Aug 11 02:13:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMS503TYtz4TvdG; Fri, 11 Aug 2023 02:13: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 4RMS502pY8z4JLb; Fri, 11 Aug 2023 02:13:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691720004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWhycCxDIQSrL9awwjaL1VedaJo75OrvyYmqlOopWRc=; b=vCAs4eob4GNDqxie35Wt/wJZD5VO0jY3Qn/b2zybCfXzGnvY4v9wbFc3um0mE5YCyFWLM9 Z1LKNgVTNjlcznQdZwXeytjFV3K6sx9M9q/g/ySCQXEi9Ug8OOJpDylYXFaIjM1ajbtCmW 8LgM9d/wD/yQoSWf3VJILjV0VQit8QR7dj4/C6CHRpxIX1bV0Unl7l2HkNfpCDvXpTxV0j deZPRieFR4x8rNBY8NFD/t2G1KP2z7JriOCwChnZJ3lmVAxMtiFexVNuWwKf21h8oKriQG Hc6W0eOriFg1Ai9/HiVgeTaBp9bITH7kc0CuNt7CgWi+KhhcI91ABE1PUfd6tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691720004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HWhycCxDIQSrL9awwjaL1VedaJo75OrvyYmqlOopWRc=; b=uHQDeK+oc791DnB4Nvw1H0FqXxKmVrkIJG3z2nY9VO+n4uVcsZKp4DDQA3HrZviLj0Y1KP D47fOp1VgkMG7+uDMIc6k94hdn/tlirD1k+e/K6yezpZGLmVJSnHjsYqc2zzw5cXb9xfaX fzRVepZdPvz4qnCwRxuRGZKkq7aZ6yhHrUBLqhA7WMt9d6FYujv7kfsEyxXww/FmtePTSM 6kSSyhj0lqbvEcc+P7342LMz5kTgU75599epmJuDrEJ+lbE99d6J8hv1FmJLRtbxght5Ef 1pog8/w4LY/8fimJ9arZs8qiv9hDJr1oI8Xv4aRMFubg+TGw4Vn/MsYsJHKt1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691720004; a=rsa-sha256; cv=none; b=eClabeALS4hgOWLi6Gi94Y1GLNkppEyH7IH6yTXZmxprHs/9gn8prGoMzMq2KUCruvWpwk +5vBlYLxNwvFD2zTlf0EQqpB6zsySssCs3y1hKzrEXuHOL9MnYKR18aoon4HqvtmX1236H jQsKn6UeT2qb/4JGj9UnqIl+l36s52C1JLZYMtIwrb1g7Ro4vUWuui0kXnxKsZziOY0VNH PgE/IGTH8j5bqUJTLVzFceFuYFx3YmZ5p3W+yOC4FlpKuetE2urCtmmuixWd9YVskuMem7 9grG2HSjavEJYRVnAavMWA7yyy/IRXALx/Ve9GfT8Lfa6lX9+gWihWexcJTtFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMS501cDJz61q; Fri, 11 Aug 2023 02:13: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 37B2DOtA008643; Fri, 11 Aug 2023 02:13:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B2DOWB008640; Fri, 11 Aug 2023 02:13:24 GMT (envelope-from git) Date: Fri, 11 Aug 2023 02:13:24 GMT Message-Id: <202308110213.37B2DOWB008640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bfed2417f472 - main - qcom: fix panic in qcom_mdio_ipq4018 implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfed2417f472f87e720b37bdac9ffd75ca2abc54 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bfed2417f472f87e720b37bdac9ffd75ca2abc54 commit bfed2417f472f87e720b37bdac9ffd75ca2abc54 Author: Bjoern A. Zeeb AuthorDate: 2023-08-11 02:05:45 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-11 02:12:55 +0000 qcom: fix panic in qcom_mdio_ipq4018 implementation Fix a boot-time panic in qcom_mdio_ipq4018 due to a missing bus function and hook the file up to the build so that it will not rot away. Test booted on an ipq807x in 2022. X-Differential Revision: extracted from D37882 --- sys/arm64/conf/std.qcom | 1 + sys/conf/files.arm64 | 1 + sys/dev/qcom_mdio/qcom_mdio_ipq4018.c | 3 +++ 3 files changed, 5 insertions(+) diff --git a/sys/arm64/conf/std.qcom b/sys/arm64/conf/std.qcom index 4bac8ab83dca..af7e0add8b40 100644 --- a/sys/arm64/conf/std.qcom +++ b/sys/arm64/conf/std.qcom @@ -4,6 +4,7 @@ # Qualcomm Snapdragon drivers device qcom_gcc # Global Clock Controller +device qcom_mdio # MDIO support # Serial (COM) ports device uart_msm # Qualcomm MSM UART driver diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 31c296d49d86..29d805dd64b7 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -643,6 +643,7 @@ dev/flash/flexspi/flex_spi.c optional clk flex_spi soc_nxp_ls fdt # Qualcomm arm64/qualcomm/qcom_gcc.c optional qcom_gcc fdt +dev/qcom_mdio/qcom_mdio_ipq4018.c optional qcom_mdio fdt mdio mii # RockChip Drivers arm64/rockchip/rk3328_codec.c optional fdt rk3328codec soc_rockchip_rk3328 diff --git a/sys/dev/qcom_mdio/qcom_mdio_ipq4018.c b/sys/dev/qcom_mdio/qcom_mdio_ipq4018.c index 5045a8d440f8..8e4a28c5984f 100644 --- a/sys/dev/qcom_mdio/qcom_mdio_ipq4018.c +++ b/sys/dev/qcom_mdio/qcom_mdio_ipq4018.c @@ -273,6 +273,9 @@ static device_method_t qcom_mdio_ipq4018_methods[] = { DEVMETHOD(device_attach, qcom_mdio_ipq4018_attach), DEVMETHOD(device_detach, qcom_mdio_ipq4018_detach), + /* Bus interface */ + DEVMETHOD(bus_add_child, bus_generic_add_child), + /* MDIO interface */ DEVMETHOD(mdio_readreg, qcom_mdio_ipq4018_readreg), DEVMETHOD(mdio_writereg, qcom_mdio_ipq4018_writereg), From nobody Fri Aug 11 02:37:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMScM2g10z4m35c; Fri, 11 Aug 2023 02:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMScM1ZLvz4KZ2; Fri, 11 Aug 2023 02:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691721427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KV305mQkXZwDhaCeZMyAwOssIuabOSMjCVZOk8uLEyE=; b=nuh3EvrlzRIaIpe22/QDDHLcgnAUz5JnkfMELY3fR5XsOcIIvNq0JYC4IcjdSIwW3lbuYs TfbTl0NAtBp3KCtDo73LqireHXY2NPIoN6vavIoLb3kAW4Yk4sed1f0LCfpVk3Ll+NVd6Z lN24B3ADBA/0z5i8m2afhr/dTlAnKU+QhSvWmaq92A1zJRu5Yr4YC0YLgal+wwb+hiYNoW YK06wjpK6mhObAN4eDAGjUFmTXfIFV8ydE6iqKWqmpV9rgT3ildXHQQcFUyFU8AZFuqYQV ++aL+u5zn7KTeQHjagh97Lo5b4ByhYr4ROUxRJX9m2dcTTy5w66YUzaO+oIXJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691721427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KV305mQkXZwDhaCeZMyAwOssIuabOSMjCVZOk8uLEyE=; b=FD1Y8mDEsIdhqvayg3IMpbC7HRfAwqSoXIKY53CJzYJa/WSyp7XJiEaIGqLbJAQiPoivFp m/GOTJAhWGVhnCsdpNbmti6WDhk14h416t764pUZwxCnZjg22KM7+wZtE/N4Cj72Q/isJR lH9vJmQrVZT0XY90g+XovRirHrdoAkyMXgcMlcu9pyBCXJMp6sl2JS3hgEprshsnTIsiSK K3V/RAaUxUXzX0NjQRaQF33EFjtGCdYYQOqy8UNaeQInLdcfgcXIKi8mqvaNOnw/vqeghF LJ5SW0bzgPA/e4Hs+zs9sdPGektZ+JQAU9Bb3b6HNWFREjd+7wY66LBPvnPMwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691721427; a=rsa-sha256; cv=none; b=XKnIJUVauptT7W+Ku4linYD+HJEvqapRMyZprhQSp7TdiX9aoiXnAeQNIg0ZUGQ48WHOvF D9ya8o+s6DgXB+kTyhTIwdlok6ZAKQsAYDAh1I5ztSsupfbkfIOVcYg0tlfzLdrAQ412UY 01HUc+Npe0kGicWazo3ZU6SODN3/gVWpB2DR5D9hBFkGM02XT79D4Zt8J0gFdSP8hk0L1t Rltwz7AaKg4pwPKsmezNqZ2Q9e4SBWA2AiOQmjQ9i4mqsPc5AGoOsXDiyhfEiXvTPfQ1EK hioFETqxHBgHB4tOEAbEKYia8K3gbHvS9inqXjN1OgmK6Oz2K/68aPY7PltzHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMScM0gGJz71P; Fri, 11 Aug 2023 02:37:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B2b6SW041879; Fri, 11 Aug 2023 02:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B2b6CY041876; Fri, 11 Aug 2023 02:37:06 GMT (envelope-from git) Date: Fri, 11 Aug 2023 02:37:06 GMT Message-Id: <202308110237.37B2b6CY041876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 6b405053c997 - main - OpenSSL: clean up botched merges in OpenSSL 3.0.9 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6b405053c9977e2991a8a880f197f56107e29d87 Auto-Submitted: auto-generated The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=6b405053c9977e2991a8a880f197f56107e29d87 commit 6b405053c9977e2991a8a880f197f56107e29d87 Author: Jung-uk Kim AuthorDate: 2023-08-11 02:36:15 +0000 Commit: Jung-uk Kim CommitDate: 2023-08-11 02:36:15 +0000 OpenSSL: clean up botched merges in OpenSSL 3.0.9 import No functional change intended. --- crypto/openssl/crypto/bn/bn_local.h | 20 -------------------- crypto/openssl/doc/man3/SSL_CTX_set_options.pod | 23 ----------------------- 2 files changed, 43 deletions(-) diff --git a/crypto/openssl/crypto/bn/bn_local.h b/crypto/openssl/crypto/bn/bn_local.h index 7c4d1d3ab78a..50e9d26e215b 100644 --- a/crypto/openssl/crypto/bn/bn_local.h +++ b/crypto/openssl/crypto/bn/bn_local.h @@ -62,26 +62,6 @@ # define BN_SOFT_LIMIT (4096 / BN_BYTES) # endif -/* - * This should limit the stack usage due to alloca to about 4K. - * BN_SOFT_LIMIT is a soft limit equivalent to 2*OPENSSL_RSA_MAX_MODULUS_BITS. - * Beyond that size bn_mul_mont is no longer used, and the constant time - * assembler code is disabled, due to the blatant alloca and bn_mul_mont usage. - * Note that bn_mul_mont does an alloca that is hidden away in assembly. - * It is not recommended to do computations with numbers exceeding this limit, - * since the result will be highly version dependent: - * While the current OpenSSL version will use non-optimized, but safe code, - * previous versions will use optimized code, that may crash due to unexpected - * stack overflow, and future versions may very well turn this into a hard - * limit. - * Note however, that it is possible to override the size limit using - * "./config -DBN_SOFT_LIMIT=" if necessary, and the O/S specific - * stack limit is known and taken into consideration. - */ -# ifndef BN_SOFT_LIMIT -# define BN_SOFT_LIMIT (4096 / BN_BYTES) -# endif - # ifndef OPENSSL_SMALL_FOOTPRINT # define BN_MUL_COMBA # define BN_SQR_COMBA diff --git a/crypto/openssl/doc/man3/SSL_CTX_set_options.pod b/crypto/openssl/doc/man3/SSL_CTX_set_options.pod index 1d5656b3ca63..176f8d25fc31 100644 --- a/crypto/openssl/doc/man3/SSL_CTX_set_options.pod +++ b/crypto/openssl/doc/man3/SSL_CTX_set_options.pod @@ -317,29 +317,6 @@ only understands up to SSLv3. In this case the client must still use the same SSLv3.1=TLSv1 announcement. Some clients step down to SSLv3 with respect to the server's answer and violate the version rollback protection.) -=item SSL_OP_ENABLE_KTLS - -Enable the use of kernel TLS. In order to benefit from kernel TLS OpenSSL must -have been compiled with support for it, and it must be supported by the -negotiated ciphersuites and extensions. The specific ciphersuites and extensions -that are supported may vary by platform and kernel version. - -The kernel TLS data-path implements the record layer, and the encryption -algorithm. The kernel will utilize the best hardware -available for encryption. Using the kernel data-path should reduce the memory -footprint of OpenSSL because no buffering is required. Also, the throughput -should improve because data copy is avoided when user data is encrypted into -kernel memory instead of the usual encrypt then copy to kernel. - -Kernel TLS might not support all the features of OpenSSL. For instance, -renegotiation, and setting the maximum fragment size is not possible as of -Linux 4.20. - -Note that with kernel TLS enabled some cryptographic operations are performed -by the kernel directly and not via any available OpenSSL Providers. This might -be undesirable if, for example, the application requires all cryptographic -operations to be performed by the FIPS provider. - =back The following options no longer have any effect but their identifiers are From nobody Fri Aug 11 03:11:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMTMf5mVGz4m55Q; Fri, 11 Aug 2023 03:11: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 4RMTMf3lnfz4Mrh; Fri, 11 Aug 2023 03:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691723470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH7sucwOTrhT4XwGWaF8IkyeQtQQqkt3BkkLlLEiyH0=; b=h1oUT9wwRGhR0C8NlCwCa5QC9S9gBkCKPZrbdECEbz33076hyWfFUohowzd7CLXf94NTqN ntn2l9F55rnP2x7J96fWujAhoz+tZZ/BlRalqkds6qG3JZUlekCCYppDwfj09hDe2jho5N ZtbmE55GMPSQLkZlmY9rVKPO6p7zPWTvAKPBG8Q/Bokx1kcYliWGrtE6N74dvqOpX81PI9 Et++iD3ZQDynHW0CPxRPsnbeKi3k9lb5mvUjokEfTESnde4O+ifB1KW69IRVDTsDM9EjxZ niC4+CJlLHyLlKcD3GPaD++3gX9nlJEJjOjW91DHnpGDlv/8qBq3J28+gO9Z6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691723470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iH7sucwOTrhT4XwGWaF8IkyeQtQQqkt3BkkLlLEiyH0=; b=ialoohgB3zKdYyU4KgELm/8gdint25KPPPpOSmT5QUBJdYcg9To2MEJGLkYjD2jLe78uqr X1BTdlZgB3uP/DCu/7Tbzwr7LR6yiHQIBuomwrrsQn26cJJmJ+rKK3NuRx70+ri32bdukp jG67ebkQ9mMvgtyqN5qNi8U6DA9uDofVwMhu4eKOOckffTWHQOMNkAq2J1dX5jNXGQ5PkJ fipDMHxoeWzv/5uK9l02Bm5kYPo4UKp5lFBFnETlE8F1/+ptXEezx2IXmK/Gr8aNIxp2yc jzEt6YiEPvFVnpFsq2sSZlrZqnoy1B6BDr7PMsvGhvw4sX42b29X+4jB3bL6Nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691723470; a=rsa-sha256; cv=none; b=vavlnHkCbxJFNAoTANAaHgkaWlch2zsB7GuR9zaIJxSrkGZ0SlCtMJ1polnVco3oWylYh+ 7RThE3LR0kvKGM1nS9cr93dol097ATQk7N8p9Xrl4Am7xpMF8B3xHgPjEU8vz6RyqogW7m VEAPizzSZHtzUrum3pr23kR9Mi5uWKkyIsRKqbF47y9HBM7fSDHnyGnzUsCylPHs9szW+z 5WRZNJckX7DSRnfO6Nqku00tARcpXSWxsdMjb9hPScaXSfe8HrXjzTRIqsdh9MSbwQAOIJ tHALeNiymOTcqX3U+ga5c6il1WgcZquEEhpoXNpZsdomxYRM1X0Obi5/5iGk8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMTMf2nh2z7dW; Fri, 11 Aug 2023 03:11:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B3BA7N005981; Fri, 11 Aug 2023 03:11:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B3BAmT005978; Fri, 11 Aug 2023 03:11:10 GMT (envelope-from git) Date: Fri, 11 Aug 2023 03:11:10 GMT Message-Id: <202308110311.37B3BAmT005978@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: 535af610a4fd - main - ssh: Update to OpenSSH 9.4p1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 535af610a4fdace6d50960c0ad9be0597eea7a1b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=535af610a4fdace6d50960c0ad9be0597eea7a1b commit 535af610a4fdace6d50960c0ad9be0597eea7a1b Merge: 6b405053c997 78f30535bcdb Author: Ed Maste AuthorDate: 2023-08-11 03:10:18 +0000 Commit: Ed Maste CommitDate: 2023-08-11 03:10:18 +0000 ssh: Update to OpenSSH 9.4p1 Excerpts from the release notes: * ssh-agent(1): PKCS#11 modules must now be specified by their full paths. Previously dlopen(3) could search for them in system library directories. * ssh(1): allow forwarding Unix Domain sockets via ssh -W. * ssh(1): add support for configuration tags to ssh(1). This adds a ssh_config(5) "Tag" directive and corresponding "Match tag" predicate that may be used to select blocks of configuration similar to the pf.conf(5) keywords of the same name. * ssh(1): add a "match localnetwork" predicate. This allows matching on the addresses of available network interfaces and may be used to vary the effective client configuration based on network location. * ssh-agent(1): improve isolation between loaded PKCS#11 modules by running separate ssh-pkcs11-helpers for each loaded provider. * ssh-agent(1), ssh(1): improve defences against invalid PKCS#11 modules being loaded by checking that the requested module contains the required symbol before loading it. * ssh(1): don't incorrectly disable hostname canonicalization when CanonicalizeHostname=yes and ProxyJump was expicitly set to "none". bz3567 Full release notes at https://www.openssh.com/txt/release-9.4 Relnotes: Yes Sponsored by: The FreeBSD Foundation crypto/openssh/.github/ci-status.md | 6 +- crypto/openssh/.github/configs | 45 +- crypto/openssh/.github/setup_ci.sh | 17 +- crypto/openssh/.github/workflows/c-cpp.yml | 26 +- crypto/openssh/.github/workflows/selfhosted.yml | 2 +- crypto/openssh/ChangeLog | 13191 ++++++++++--------- crypto/openssh/INSTALL | 8 +- crypto/openssh/PROTOCOL.agent | 4 +- crypto/openssh/PROTOCOL.krl | 55 +- crypto/openssh/README | 2 +- crypto/openssh/addr.c | 4 +- crypto/openssh/auth-options.c | 29 +- crypto/openssh/auth-pam.c | 4 +- crypto/openssh/auth2-gss.c | 12 +- crypto/openssh/auth2-pubkey.c | 35 +- crypto/openssh/canohost.c | 4 +- crypto/openssh/chacha.c | 3 +- crypto/openssh/channels.c | 19 +- crypto/openssh/channels.h | 8 +- crypto/openssh/cipher-aes.c | 2 +- crypto/openssh/cipher-chachapoly-libcrypto.c | 3 +- crypto/openssh/cipher-chachapoly.c | 3 +- crypto/openssh/clientloop.c | 14 +- crypto/openssh/config.h | 94 +- crypto/openssh/configure.ac | 107 +- crypto/openssh/contrib/redhat/openssh.spec | 2 +- crypto/openssh/contrib/ssh-copy-id | 75 +- crypto/openssh/contrib/ssh-copy-id.1 | 79 +- crypto/openssh/contrib/suse/openssh.spec | 2 +- crypto/openssh/gss-serv.c | 2 +- crypto/openssh/kexgexs.c | 4 +- crypto/openssh/krl.c | 280 +- crypto/openssh/krl.h | 10 +- crypto/openssh/match.c | 5 +- crypto/openssh/misc.c | 95 +- crypto/openssh/misc.h | 3 +- crypto/openssh/moduli | 868 +- crypto/openssh/monitor.c | 5 +- crypto/openssh/monitor_wrap.c | 6 +- crypto/openssh/mux.c | 76 +- crypto/openssh/openbsd-compat/bsd-getentropy.c | 6 +- crypto/openssh/openbsd-compat/bsd-snprintf.c | 31 +- .../openssh/openbsd-compat/libressl-api-compat.c | 556 +- crypto/openssh/openbsd-compat/openssl-compat.c | 20 +- crypto/openssh/openbsd-compat/openssl-compat.h | 158 +- crypto/openssh/openbsd-compat/port-linux.c | 39 +- .../openbsd-compat/regress/opensslvertest.c | 29 +- .../openssh/openbsd-compat/regress/snprintftest.c | 6 +- .../openssh/openbsd-compat/regress/strtonumtest.c | 2 +- crypto/openssh/packet.c | 4 +- crypto/openssh/poly1305.c | 3 +- crypto/openssh/progressmeter.c | 3 +- crypto/openssh/readconf.c | 108 +- crypto/openssh/readconf.h | 3 +- crypto/openssh/regress/Makefile | 10 +- crypto/openssh/regress/agent-ptrace.sh | 2 +- crypto/openssh/regress/forcecommand.sh | 8 +- crypto/openssh/regress/forward-control.sh | 6 +- crypto/openssh/regress/misc/sk-dummy/sk-dummy.c | 27 +- crypto/openssh/regress/percent.sh | 5 +- crypto/openssh/regress/sftp-chroot.sh | 23 +- .../openssh/regress/unittests/misc/test_ptimeout.c | 4 +- .../openssh/regress/unittests/sshkey/test_file.c | 2 + crypto/openssh/regress/unittests/sshsig/tests.c | 2 +- .../regress/unittests/test_helper/test_helper.c | 2 +- crypto/openssh/scp.c | 23 +- crypto/openssh/servconf.c | 20 +- crypto/openssh/sftp-client.c | 54 +- crypto/openssh/sftp-common.c | 4 +- crypto/openssh/sftp-server.c | 4 +- crypto/openssh/sftp.c | 12 +- crypto/openssh/sk-usbhid.c | 14 +- crypto/openssh/ssh-add.c | 6 +- crypto/openssh/ssh-agent.1 | 14 +- crypto/openssh/ssh-agent.c | 8 +- crypto/openssh/ssh-keygen.1 | 6 +- crypto/openssh/ssh-keygen.c | 16 +- crypto/openssh/ssh-keyscan.c | 28 +- crypto/openssh/ssh-pkcs11-client.c | 389 +- crypto/openssh/ssh-pkcs11.c | 43 +- crypto/openssh/ssh-sk.c | 8 +- crypto/openssh/ssh-xmss.c | 4 +- crypto/openssh/ssh.1 | 19 +- crypto/openssh/ssh.c | 59 +- crypto/openssh/ssh_config | 2 +- crypto/openssh/ssh_config.5 | 39 +- crypto/openssh/ssh_namespace.h | 3 + crypto/openssh/sshconnect2.c | 12 +- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 14 +- crypto/openssh/sshkey.c | 18 +- crypto/openssh/sshkey.h | 4 +- crypto/openssh/sshsig.c | 11 +- crypto/openssh/version.h | 8 +- 94 files changed, 8883 insertions(+), 8229 deletions(-) diff --cc crypto/openssh/INSTALL index 77b56a9bb734,000000000000..adc6e0825738 mode 100644,000000..100644 --- a/crypto/openssh/INSTALL +++ b/crypto/openssh/INSTALL @@@ -1,297 -1,0 +1,293 @@@ +1. Prerequisites +---------------- + +A C compiler. Any C89 or better compiler that supports variadic macros +should work. Where supported, configure will attempt to enable the +compiler's run-time integrity checking options. Some notes about +specific compilers: + - clang: -ftrapv and -sanitize=integer require the compiler-rt runtime + (CC=clang LDFLAGS=--rtlib=compiler-rt ./configure) + +To support Privilege Separation (which is now required) you will need +to create the user, group and directory used by sshd for privilege +separation. See README.privsep for details. + + +The remaining items are optional. + +A working installation of zlib: +Zlib 1.1.4 or 1.2.1.2 or greater (earlier 1.2.x versions have problems): +https://zlib.net/ + +libcrypto from either of LibreSSL or OpenSSL. Building without libcrypto +is supported but severely restricts the available ciphers and algorithms. - - LibreSSL (https://www.libressl.org/) - - OpenSSL (https://www.openssl.org) with any of the following versions: - - 1.0.x >= 1.0.1 or 1.1.0 >= 1.1.0g or any 1.1.1 - - Note that due to a bug in EVP_CipherInit OpenSSL 1.1 versions prior to - 1.1.0g can't be used. ++ - LibreSSL (https://www.libressl.org/) 3.1.0 or greater ++ - OpenSSL (https://www.openssl.org) 1.1.1 or greater + +LibreSSL/OpenSSL should be compiled as a position-independent library +(i.e. -fPIC, eg by configuring OpenSSL as "./config [options] -fPIC" +or LibreSSL as "CFLAGS=-fPIC ./configure") otherwise OpenSSH will not +be able to link with it. If you must use a non-position-independent +libcrypto, then you may need to configure OpenSSH --without-pie. + +If you build either from source, running the OpenSSL self-test ("make +tests") or the LibreSSL equivalent ("make check") and ensuring that all +tests pass is strongly recommended. + +NB. If you operating system supports /dev/random, you should configure +libcrypto (LibreSSL/OpenSSL) to use it. OpenSSH relies on libcrypto's +direct support of /dev/random, or failing that, either prngd or egd. + +PRNGD: + +If your system lacks kernel-based random collection, the use of Lutz +Jaenicke's PRNGd is recommended. It requires that libcrypto be configured +to support it. + +http://prngd.sourceforge.net/ + +EGD: + +The Entropy Gathering Daemon (EGD) supports the same interface as prngd. +It also supported only if libcrypto is configured to support it. + +http://egd.sourceforge.net/ + +PAM: + +OpenSSH can utilise Pluggable Authentication Modules (PAM) if your +system supports it. PAM is standard most Linux distributions, Solaris, +HP-UX 11, AIX >= 5.2, FreeBSD, NetBSD and Mac OS X. + +Information about the various PAM implementations are available: + +Solaris PAM: http://www.sun.com/software/solaris/pam/ +Linux PAM: http://www.kernel.org/pub/linux/libs/pam/ +OpenPAM: http://www.openpam.org/ + +If you wish to build the GNOME passphrase requester, you will need the GNOME +libraries and headers. + +GNOME: +http://www.gnome.org/ + +Alternatively, Jim Knoble has written an excellent X11 +passphrase requester. This is maintained separately at: + +http://www.jmknoble.net/software/x11-ssh-askpass/ + +TCP Wrappers: + +If you wish to use the TCP wrappers functionality you will need at least +tcpd.h and libwrap.a, either in the standard include and library paths, +or in the directory specified by --with-tcp-wrappers. Version 7.6 is +known to work. + +http://ftp.porcupine.org/pub/security/index.html + +LibEdit: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: + +http://www.thrysoee.dk/editline/ +http://sourceforge.net/projects/libedit/ + +LDNS: + +LDNS is a DNS BSD-licensed resolver library which supports DNSSEC. + +http://nlnetlabs.nl/projects/ldns/ + +Autoconf: + +If you modify configure.ac or configure doesn't exist (eg if you checked +the code out of git yourself) then you will need autoconf-2.69 and +automake-1.16.1 to rebuild the automatically generated files by running +"autoreconf". Earlier versions may also work but this is not guaranteed. + +http://www.gnu.org/software/autoconf/ +http://www.gnu.org/software/automake/ + +Basic Security Module (BSM): + +Native BSM support is known to exist in Solaris from at least 2.5.1, +FreeBSD 6.1 and OS X. Alternatively, you may use the OpenBSM +implementation (http://www.openbsm.org). + +makedepend: + +https://www.x.org/archive/individual/util/ + +If you are making significant changes to the code you may need to rebuild +the dependency (.depend) file using "make depend", which requires the +"makedepend" tool from the X11 distribution. + +libfido2: + +libfido2 allows the use of hardware security keys over USB. libfido2 +in turn depends on libcbor. libfido2 >= 1.5.0 is strongly recommended. +Limited functionality is possible with earlier libfido2 versions. + +https://github.com/Yubico/libfido2 +https://github.com/pjk/libcbor + + +2. Building / Installation +-------------------------- + +To install OpenSSH with default options: + +./configure +make +make install + +This will install the OpenSSH binaries in /usr/local/bin, configuration files +in /usr/local/etc, the server in /usr/local/sbin, etc. To specify a different +installation prefix, use the --prefix option to configure: + +./configure --prefix=/opt +make +make install + +Will install OpenSSH in /opt/{bin,etc,lib,sbin}. You can also override +specific paths, for example: + +./configure --prefix=/opt --sysconfdir=/etc/ssh +make +make install + +This will install the binaries in /opt/{bin,lib,sbin}, but will place the +configuration files in /etc/ssh. + +If you are using PAM, you may need to manually install a PAM control +file as "/etc/pam.d/sshd" (or wherever your system prefers to keep +them). Note that the service name used to start PAM is __progname, +which is the basename of the path of your sshd (e.g., the service name +for /usr/sbin/osshd will be osshd). If you have renamed your sshd +executable, your PAM configuration may need to be modified. + +A generic PAM configuration is included as "contrib/sshd.pam.generic", +you may need to edit it before using it on your system. If you are +using a recent version of Red Hat Linux, the config file in +contrib/redhat/sshd.pam should be more useful. Failure to install a +valid PAM file may result in an inability to use password +authentication. On HP-UX 11 and Solaris, the standard /etc/pam.conf +configuration will work with sshd (sshd will match the other service +name). + +There are a few other options to the configure script: + +--with-audit=[module] enable additional auditing via the specified module. +Currently, drivers for "debug" (additional info via syslog) and "bsm" +(Sun's Basic Security Module) are supported. + +--with-pam enables PAM support. If PAM support is compiled in, it must +also be enabled in sshd_config (refer to the UsePAM directive). + +--with-prngd-socket=/some/file allows you to enable EGD or PRNGD +support and to specify a PRNGd socket. Use this if your Unix lacks +/dev/random. + +--with-prngd-port=portnum allows you to enable EGD or PRNGD support +and to specify a EGD localhost TCP port. Use this if your Unix lacks +/dev/random. + +--with-lastlog=FILE will specify the location of the lastlog file. +./configure searches a few locations for lastlog, but may not find +it if lastlog is installed in a different place. + +--without-lastlog will disable lastlog support entirely. + +--with-osfsia, --without-osfsia will enable or disable OSF1's Security +Integration Architecture. The default for OSF1 machines is enable. + +--with-tcp-wrappers will enable TCP Wrappers (/etc/hosts.allow|deny) +support. + +--with-utmpx enables utmpx support. utmpx support is automatic for +some platforms. + +--without-shadow disables shadow password support. + +--with-ipaddr-display forces the use of a numeric IP address in the +$DISPLAY environment variable. Some broken systems need this. + +--with-default-path=PATH allows you to specify a default $PATH for sessions +started by sshd. This replaces the standard path entirely. + +--with-pid-dir=PATH specifies the directory in which the sshd.pid file is +created. + +--with-xauth=PATH specifies the location of the xauth binary + +--with-ssl-dir=DIR allows you to specify where your Libre/OpenSSL +libraries are installed. + +--with-ssl-engine enables Libre/OpenSSL's (hardware) ENGINE support + +--without-openssl builds without using OpenSSL. Only a subset of ciphers +and algorithms are supported in this configuration. + +--without-zlib builds without zlib. This disables the Compression option. + +--with-4in6 Check for IPv4 in IPv6 mapped addresses and convert them to +real (AF_INET) IPv4 addresses. Works around some quirks on Linux. + +If you need to pass special options to the compiler or linker, you +can specify these as environment variables before running ./configure. +For example: + +CC="/usr/foo/cc" CFLAGS="-O" LDFLAGS="-s" LIBS="-lrubbish" ./configure + +3. Configuration +---------------- + +The runtime configuration files are installed by in ${prefix}/etc or +whatever you specified as your --sysconfdir (/usr/local/etc by default). + +The default configuration should be instantly usable, though you should +review it to ensure that it matches your security requirements. + +To generate a host key, run "make host-key". Alternately you can do so +manually using the following commands: + + ssh-keygen -t [type] -f /etc/ssh/ssh_host_key -N "" + +for each of the types you wish to generate (rsa, dsa or ecdsa) or + + ssh-keygen -A + +to generate keys for all supported types. + +Replacing /etc/ssh with the correct path to the configuration directory. +(${prefix}/etc or whatever you specified with --sysconfdir during +configuration). + +If you have configured OpenSSH with EGD/prngd support, ensure that EGD or +prngd is running and has collected some entropy first. + +For more information on configuration, please refer to the manual pages +for sshd, ssh and ssh-agent. + +4. (Optional) Send survey +------------------------- + +$ make survey +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] +$ make send-survey + +This will send configuration information for the currently configured +host to a survey address. This will help determine which configurations +are actually in use, and what valid combinations of configure options +exist. The raw data is available only to the OpenSSH developers, however +summary data may be published. + +5. Problems? +------------ + +If you experience problems compiling, installing or running OpenSSH, +please refer to the "reporting bugs" section of the webpage at +https://www.openssh.com/ diff --cc crypto/openssh/config.h index 4a274147b22e,000000000000..385e53c82ea3 mode 100644,000000..100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@@ -1,2132 -1,0 +1,2042 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* Define if you have a getaddrinfo that fails for the all-zeros IPv6 address + */ +/* #undef AIX_GETNAMEINFO_HACK */ + +/* Define if your AIX loginfailed() function takes 4 arguments (AIX >= 5.2) */ +/* #undef AIX_LOGINFAILED_4ARG */ + +/* System only supports IPv4 audit records */ +/* #undef AU_IPv4 */ + +/* Define if your resolver libs need this for getrrsetbyname */ +/* #undef BIND_8_COMPAT */ + +/* The system has incomplete BSM API */ +/* #undef BROKEN_BSM_API */ + +/* broken in chroots on older kernels */ +/* #undef BROKEN_CLOSEFROM */ + +/* Define if cmsg_type is not passed correctly */ +/* #undef BROKEN_CMSG_TYPE */ + +/* getaddrinfo is broken (if present) */ +/* #undef BROKEN_GETADDRINFO */ + +/* getgroups(0,NULL) will return -1 */ +/* #undef BROKEN_GETGROUPS */ + +/* getline is not what we expect */ +/* #undef BROKEN_GETLINE */ + +/* FreeBSD glob does not do what we need */ +#define BROKEN_GLOB 1 + +/* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */ +/* #undef BROKEN_INET_NTOA */ + +/* Define if your struct dirent expects you to allocate extra space for d_name + */ +/* #undef BROKEN_ONE_BYTE_DIRENT_D_NAME */ + +/* System poll(2) implementation is broken */ +/* #undef BROKEN_POLL */ + +/* Can't do comparisons on readv */ +/* #undef BROKEN_READV_COMPARISON */ + +/* NetBSD read function is sometimes redirected, breaking atomicio comparisons + against it */ +/* #undef BROKEN_READ_COMPARISON */ + +/* Needed for NeXT */ +/* #undef BROKEN_SAVED_UIDS */ + +/* Define if your setregid() is broken */ +/* #undef BROKEN_SETREGID */ + +/* Define if your setresgid() is broken */ +/* #undef BROKEN_SETRESGID */ + +/* Define if your setresuid() is broken */ +/* #undef BROKEN_SETRESUID */ + +/* Define if your setreuid() is broken */ +/* #undef BROKEN_SETREUID */ + +/* LynxOS has broken setvbuf() implementation */ +/* #undef BROKEN_SETVBUF */ + +/* QNX shadow support is broken */ +/* #undef BROKEN_SHADOW_EXPIRE */ + +/* Define if your snprintf is busted */ +/* #undef BROKEN_SNPRINTF */ + +/* strndup broken, see APAR IY61211 */ +/* #undef BROKEN_STRNDUP */ + +/* strnlen broken, see APAR IY62551 */ +/* #undef BROKEN_STRNLEN */ + +/* strnvis detected broken */ +#define BROKEN_STRNVIS 1 + +/* tcgetattr with ICANON may hang */ +/* #undef BROKEN_TCGETATTR_ICANON */ + +/* updwtmpx is broken (if present) */ +/* #undef BROKEN_UPDWTMPX */ + +/* Define if you have BSD auth support */ +/* #undef BSD_AUTH */ + +/* Define if you want to specify the path to your lastlog file */ +/* #undef CONF_LASTLOG_FILE */ + +/* Define if you want to specify the path to your utmp file */ +/* #undef CONF_UTMP_FILE */ + +/* Define if you want to specify the path to your wtmpx file */ +/* #undef CONF_WTMPX_FILE */ + +/* Define if you want to specify the path to your wtmp file */ +/* #undef CONF_WTMP_FILE */ + +/* Need to call setpgrp as root */ +/* #undef DISABLE_FD_PASSING */ + +/* Define if you don't want to use lastlog */ +/* #undef DISABLE_LASTLOG */ + +/* Define if you don't want to use your system's login() call */ +/* #undef DISABLE_LOGIN */ + +/* Define if you don't want to use pututline() etc. to write [uw]tmp */ +/* #undef DISABLE_PUTUTLINE */ + +/* Define if you don't want to use pututxline() etc. to write [uw]tmpx */ +/* #undef DISABLE_PUTUTXLINE */ + +/* Define if you want to disable shadow passwords */ +/* #undef DISABLE_SHADOW */ + +/* Define if you don't want to use utmp */ +#define DISABLE_UTMP 1 + +/* Define if you don't want to use utmpx */ +/* #undef DISABLE_UTMPX */ + +/* Define if you don't want to use wtmp */ +#define DISABLE_WTMP 1 + +/* Define if you don't want to use wtmpx */ +#define DISABLE_WTMPX 1 + +/* Enable for PKCS#11 support */ +#define ENABLE_PKCS11 /**/ + +/* Enable for U2F/FIDO support */ +#define ENABLE_SK /**/ + +/* Enable for built-in U2F/FIDO support */ +/* #undef ENABLE_SK_INTERNAL */ + +/* define if fflush(NULL) does not work */ +/* #undef FFLUSH_NULL_BUG */ + +/* File names may not contain backslash characters */ +/* #undef FILESYSTEM_NO_BACKSLASH */ + +/* fsid_t has member val */ +/* #undef FSID_HAS_VAL */ + +/* fsid_t has member __val */ +/* #undef FSID_HAS___VAL */ + +/* getpgrp takes one arg */ +#define GETPGRP_VOID 1 + +/* Conflicting defs for getspnam */ +/* #undef GETSPNAM_CONFLICTING_DEFS */ + +/* Define if your system glob() function has the GLOB_ALTDIRFUNC extension */ +#define GLOB_HAS_ALTDIRFUNC 1 + +/* Define if your system glob() function has gl_matchc options in glob_t */ +#define GLOB_HAS_GL_MATCHC 1 + +/* Define if your system glob() function has gl_statv options in glob_t */ +/* #undef GLOB_HAS_GL_STATV */ + +/* Define this if you want GSSAPI support in the version 2 protocol */ +/* #undef GSSAPI */ + +/* Define if you want to use shadow password expire field */ +/* #undef HAS_SHADOW_EXPIRE */ + +/* Define if your system uses access rights style file descriptor passing */ +/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */ + +/* Define if you have ut_addr in utmp.h */ +/* #undef HAVE_ADDR_IN_UTMP */ + +/* Define if you have ut_addr in utmpx.h */ +/* #undef HAVE_ADDR_IN_UTMPX */ + +/* Define if you have ut_addr_v6 in utmp.h */ +/* #undef HAVE_ADDR_V6_IN_UTMP */ + +/* Define if you have ut_addr_v6 in utmpx.h */ +/* #undef HAVE_ADDR_V6_IN_UTMPX */ + +/* Define to 1 if you have the `arc4random' function. */ +#define HAVE_ARC4RANDOM 1 + +/* Define to 1 if you have the `arc4random_buf' function. */ +#define HAVE_ARC4RANDOM_BUF 1 + +/* Define to 1 if you have the `arc4random_stir' function. */ +/* #undef HAVE_ARC4RANDOM_STIR */ + +/* Define to 1 if you have the `arc4random_uniform' function. */ +#define HAVE_ARC4RANDOM_UNIFORM 1 + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* OpenBSD's gcc has bounded */ +/* #undef HAVE_ATTRIBUTE__BOUNDED__ */ + +/* Have attribute nonnull */ +#define HAVE_ATTRIBUTE__NONNULL__ 1 + +/* OpenBSD's gcc has sentinel */ +/* #undef HAVE_ATTRIBUTE__SENTINEL__ */ + +/* Define to 1 if you have the `aug_get_machine' function. */ +/* #undef HAVE_AUG_GET_MACHINE */ + +/* Define to 1 if you have the `auth_hostok' function. */ +#define HAVE_AUTH_HOSTOK 1 + +/* Define to 1 if you have the `auth_timeok' function. */ +#define HAVE_AUTH_TIMEOK 1 + +/* Define to 1 if you have the `b64_ntop' function. */ +/* #undef HAVE_B64_NTOP */ + +/* Define to 1 if you have the `b64_pton' function. */ +/* #undef HAVE_B64_PTON */ + +/* Define if you have the basename function. */ +#define HAVE_BASENAME 1 + +/* Define to 1 if you have the `bcopy' function. */ +#define HAVE_BCOPY 1 + +/* Define to 1 if you have the `bcrypt_pbkdf' function. */ +/* #undef HAVE_BCRYPT_PBKDF */ + +/* Define to 1 if you have the `bindresvport_sa' function. */ +#define HAVE_BINDRESVPORT_SA 1 + +/* Define to 1 if you have the `blf_enc' function. */ +/* #undef HAVE_BLF_ENC */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BLF_H */ + +/* Define to 1 if you have the `Blowfish_expand0state' function. */ +/* #undef HAVE_BLOWFISH_EXPAND0STATE */ + +/* Define to 1 if you have the `Blowfish_expandstate' function. */ +/* #undef HAVE_BLOWFISH_EXPANDSTATE */ + +/* Define to 1 if you have the `Blowfish_initstate' function. */ +/* #undef HAVE_BLOWFISH_INITSTATE */ + +/* Define to 1 if you have the `Blowfish_stream2word' function. */ +/* #undef HAVE_BLOWFISH_STREAM2WORD */ + +/* Define to 1 if you have the `BN_is_prime_ex' function. */ +#define HAVE_BN_IS_PRIME_EX 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSD_LIBUTIL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSM_AUDIT_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BSTRING_H */ + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* calloc(0, x) returns NULL */ +#define HAVE_CALLOC 1 + +/* Define if you have caph_cache_tzdata */ +#define HAVE_CAPH_CACHE_TZDATA 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CAPSICUM_HELPERS_H 1 + +/* Define to 1 if you have the `cap_rights_limit' function. */ +#define HAVE_CAP_RIGHTS_LIMIT 1 + +/* Define to 1 if you have the `clock' function. */ +#define HAVE_CLOCK 1 + +/* Have clock_gettime */ +#define HAVE_CLOCK_GETTIME 1 + +/* define if you have clock_t data type */ +#define HAVE_CLOCK_T 1 + +/* Define to 1 if you have the `closefrom' function. */ +#define HAVE_CLOSEFROM 1 + +/* Define to 1 if you have the `close_range' function. */ +#define HAVE_CLOSE_RANGE 1 + +/* Define if gai_strerror() returns const char * */ +#define HAVE_CONST_GAI_STRERROR_PROTO 1 + +/* Define if your system uses ancillary data style file descriptor passing */ +#define HAVE_CONTROL_IN_MSGHDR 1 + +/* Define to 1 if you have the `crypt' function. */ +#define HAVE_CRYPT 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPTO_SHA2_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_CRYPT_H */ + +/* Define if you are on Cygwin */ +/* #undef HAVE_CYGWIN */ + +/* Define if your libraries define daemon() */ +#define HAVE_DAEMON 1 + +/* Define to 1 if you have the declaration of `AI_NUMERICSERV', and to 0 if + you don't. */ +#define HAVE_DECL_AI_NUMERICSERV 1 + +/* Define to 1 if you have the declaration of `authenticate', and to 0 if you + don't. */ +/* #undef HAVE_DECL_AUTHENTICATE */ + +/* Define to 1 if you have the declaration of `bzero', and to 0 if you don't. + */ +#define HAVE_DECL_BZERO 1 + +/* Define to 1 if you have the declaration of `ftruncate', and to 0 if you + don't. */ +#define HAVE_DECL_FTRUNCATE 1 + +/* Define to 1 if you have the declaration of `getentropy', and to 0 if you + don't. */ +#define HAVE_DECL_GETENTROPY 1 + +/* Define to 1 if you have the declaration of `getpeereid', and to 0 if you + don't. */ +#define HAVE_DECL_GETPEEREID 1 + +/* Define to 1 if you have the declaration of `GLOB_NOMATCH', and to 0 if you + don't. */ +#define HAVE_DECL_GLOB_NOMATCH 1 + +/* Define to 1 if you have the declaration of `GSS_C_NT_HOSTBASED_SERVICE', + and to 0 if you don't. */ +/* #undef HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE */ + +/* Define to 1 if you have the declaration of `howmany', and to 0 if you + don't. */ +#define HAVE_DECL_HOWMANY 1 + +/* Define to 1 if you have the declaration of `h_errno', and to 0 if you + don't. */ +#define HAVE_DECL_H_ERRNO 1 + +/* Define to 1 if you have the declaration of `loginfailed', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINFAILED */ + +/* Define to 1 if you have the declaration of `loginrestrictions', and to 0 if + you don't. */ +/* #undef HAVE_DECL_LOGINRESTRICTIONS */ + +/* Define to 1 if you have the declaration of `loginsuccess', and to 0 if you + don't. */ +/* #undef HAVE_DECL_LOGINSUCCESS */ + +/* Define to 1 if you have the declaration of `MAXSYMLINKS', and to 0 if you + don't. */ +#define HAVE_DECL_MAXSYMLINKS 1 + +/* Define to 1 if you have the declaration of `memmem', and to 0 if you don't. + */ +#define HAVE_DECL_MEMMEM 1 + +/* Define to 1 if you have the declaration of `NFDBITS', and to 0 if you + don't. */ +#define HAVE_DECL_NFDBITS 1 + +/* Define to 1 if you have the declaration of `offsetof', and to 0 if you + don't. */ +#define HAVE_DECL_OFFSETOF 1 + +/* Define to 1 if you have the declaration of `O_NONBLOCK', and to 0 if you + don't. */ +#define HAVE_DECL_O_NONBLOCK 1 + +/* Define to 1 if you have the declaration of `passwdexpired', and to 0 if you + don't. */ +/* #undef HAVE_DECL_PASSWDEXPIRED */ + +/* Define to 1 if you have the declaration of `readv', and to 0 if you don't. + */ +#define HAVE_DECL_READV 1 + +/* Define to 1 if you have the declaration of `setauthdb', and to 0 if you + don't. */ +/* #undef HAVE_DECL_SETAUTHDB */ + +/* Define to 1 if you have the declaration of `SHUT_RD', and to 0 if you + don't. */ +#define HAVE_DECL_SHUT_RD 1 + +/* Define to 1 if you have the declaration of `UINT32_MAX', and to 0 if you + don't. */ +#define HAVE_DECL_UINT32_MAX 1 + +/* Define to 1 if you have the declaration of `writev', and to 0 if you don't. + */ +#define HAVE_DECL_WRITEV 1 + +/* Define to 1 if you have the declaration of `_getlong', and to 0 if you + don't. */ +#define HAVE_DECL__GETLONG 0 + +/* Define to 1 if you have the declaration of `_getshort', and to 0 if you + don't. */ +#define HAVE_DECL__GETSHORT 0 + +/* Define to 1 if you have the `DES_crypt' function. */ +#define HAVE_DES_CRYPT 1 + +/* Define if you have /dev/ptmx */ +/* #undef HAVE_DEV_PTMX */ + +/* Define if you have /dev/ptc */ +/* #undef HAVE_DEV_PTS_AND_PTC */ + - /* Define to 1 if you have the `DH_get0_key' function. */ - #define HAVE_DH_GET0_KEY 1 - - /* Define to 1 if you have the `DH_get0_pqg' function. */ - #define HAVE_DH_GET0_PQG 1 - - /* Define to 1 if you have the `DH_set0_key' function. */ - #define HAVE_DH_SET0_KEY 1 - - /* Define to 1 if you have the `DH_set0_pqg' function. */ - #define HAVE_DH_SET0_PQG 1 - - /* Define to 1 if you have the `DH_set_length' function. */ - #define HAVE_DH_SET_LENGTH 1 - +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the `dirfd' function. */ +#define HAVE_DIRFD 1 + +/* Define to 1 if you have the `dirname' function. */ +#define HAVE_DIRNAME 1 + +/* Define to 1 if you have the `dlopen' function. */ +#define HAVE_DLOPEN 1 + +/* Define to 1 if you have the `DSA_generate_parameters_ex' function. */ +#define HAVE_DSA_GENERATE_PARAMETERS_EX 1 + - /* Define to 1 if you have the `DSA_get0_key' function. */ - #define HAVE_DSA_GET0_KEY 1 - - /* Define to 1 if you have the `DSA_get0_pqg' function. */ - #define HAVE_DSA_GET0_PQG 1 - - /* Define to 1 if you have the `DSA_set0_key' function. */ - #define HAVE_DSA_SET0_KEY 1 - - /* Define to 1 if you have the `DSA_set0_pqg' function. */ - #define HAVE_DSA_SET0_PQG 1 - - /* Define to 1 if you have the `DSA_SIG_get0' function. */ - #define HAVE_DSA_SIG_GET0 1 - - /* Define to 1 if you have the `DSA_SIG_set0' function. */ - #define HAVE_DSA_SIG_SET0 1 - - /* Define to 1 if you have the `ECDSA_SIG_get0' function. */ - #define HAVE_ECDSA_SIG_GET0 1 - - /* Define to 1 if you have the `ECDSA_SIG_set0' function. */ - #define HAVE_ECDSA_SIG_SET0 1 - +/* Define to 1 if you have the `EC_KEY_METHOD_new' function. */ +#define HAVE_EC_KEY_METHOD_NEW 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ELF_H 1 + +/* Define to 1 if you have the `endgrent' function. */ +#define HAVE_ENDGRENT 1 + +/* Define to 1 if you have the header file. */ - /* #undef HAVE_ENDIAN_H */ ++#define HAVE_ENDIAN_H 1 + +/* Define to 1 if you have the `endutent' function. */ +/* #undef HAVE_ENDUTENT */ + +/* Define to 1 if you have the `endutxent' function. */ +#define HAVE_ENDUTXENT 1 + +/* Define to 1 if you have the `err' function. */ +#define HAVE_ERR 1 + +/* Define to 1 if you have the `errx' function. */ +#define HAVE_ERRX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERR_H 1 + +/* Define if your system has /etc/default/login */ +/* #undef HAVE_ETC_DEFAULT_LOGIN */ + +/* Define to 1 if you have the `EVP_chacha20' function. */ +#define HAVE_EVP_CHACHA20 1 + +/* Define to 1 if you have the `EVP_CIPHER_CTX_get_iv' function. */ +/* #undef HAVE_EVP_CIPHER_CTX_GET_IV */ *** 11214 LINES SKIPPED *** From nobody Fri Aug 11 03:33:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMTsR00xcz4m6NB; Fri, 11 Aug 2023 03:33: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 4RMTsQ40pBz4QRd; Fri, 11 Aug 2023 03:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691724810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHApIOSWMvQI1QMX/mFfulYkQ3tFcZluAtaRvOU5ZrQ=; b=HYkEhr+YfnsrJEnWVnCPCNJOreuC/ewZYVVivRgr3wR6mvhfiT3meMrqjEj7NXLpfIDnWN x3cFsJ33hOdhiVB403QcdXXedaLzVM05g2ioGP0kvL371c46FFDmEWPp+1Zpv1Hkh6D0q0 dyzyap/0i7w9YZdPHcCZHVxlc/PmrddiWHMUuZeCCutGGuDunfa7SSVhcfU9bbd6MIEkFc EFVkJpgYqsF6x5QsV3CXD4olJRZ7G62N6cbr+evtuZjBIyvzjRhsW6ugFLxBb/HBzxa7Cn KyN622htuHgLfZBOZzLOZKxEitteyaeKK/LvCfUy/28TbTX224D+0PYKhupfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691724810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHApIOSWMvQI1QMX/mFfulYkQ3tFcZluAtaRvOU5ZrQ=; b=m/3zIobSlRKT+Fye8uYJdGcT5ZChDB8pR3nRm0bXowxTIpPFWWFUTYtz+/Pa1/5+s+ubh3 AGCAMI7FG/2eHwmcLwsHHBMrDrBWg+LZygwbzSYy0kzhtc7g7nuhQ6pB2el70hHIg2EeSd Jhu5WBk91SDjvW9Oq+sri6/ilb+yVn0qwqlSXrR+hFE13EtI1zypO/sP7e4j0sqzyrBzgv 6xh1NLMqKpsSnMNxN2YVcp0fj90Q6x1vd+viDa1iVWrMlc0n2Pq+U6R0+8LbpGeuNQH19P iOy2yaUE4jfv32TvEF+Cxhpp0YETPWbxnitQvgPBKEQaPYdPRiBuiXtJp3FyHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691724810; a=rsa-sha256; cv=none; b=Mjz0SY1kqkBEAkUfb3TdFFk/mTDBNhpe09QNZvWyJwA+SbndErq80oWcAVqgBhdyr6hL1K gQagKewCij6ZwmRWiiooOq9kMYcOJH/7MppEHLOZ2rY82RqGXYezQmnkwVEuPfyTm8Vh83 ENQyNBuHkMbjkTVGZK36KByXFmJBwIG8bAMxenHQdRQJ2VZeHGU361DeJe37fZEsNKBUN7 gQDErphZIkfNkSr9vkVNn0WB/NHZPmr7VAtrvdVlkMtgpqBs7UKLujF26ScqSuY13EDL4k vYe/Nqof5foOEIDe56HM+ORJ7yF2IK1l6sgSKU1pyhgbOu62CS4XUPecRPibvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMTsQ2t07z8HX; Fri, 11 Aug 2023 03:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B3XU7B042819; Fri, 11 Aug 2023 03:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B3XUsM042816; Fri, 11 Aug 2023 03:33:30 GMT (envelope-from git) Date: Fri, 11 Aug 2023 03:33:30 GMT Message-Id: <202308110333.37B3XUsM042816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 7b9bd54ae86d - main - mana: fix a KASSERT panic on recursed lock access in mana_cfg_vport List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b9bd54ae86db1ac81d10964be4e3acf1b877495 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9bd54ae86db1ac81d10964be4e3acf1b877495 commit 7b9bd54ae86db1ac81d10964be4e3acf1b877495 Author: Wei Hu AuthorDate: 2023-08-11 03:30:38 +0000 Commit: Wei Hu CommitDate: 2023-08-11 03:30:38 +0000 mana: fix a KASSERT panic on recursed lock access in mana_cfg_vport The panic stack looks like this: panic: _sx_xlock_hard: recursed on non-recursive sx MANA port lock @ /usr/src/sys/dev/mana/mana_en.c:1022 KDB: stack backtrace: vpanic() at vpanic+0x150/frame 0xfffffe011b3c1970 panic() at panic+0x43/frame 0xfffffe011b3c19d0 _sx_xlock_hard() at _sx_xlock_hard+0x82d/frame 0xfffffe011b3c1a70 _sx_xlock() at _sx_xlock+0xb0/frame 0xfffffe011b3c1ab0 mana_cfg_vport() at mana_cfg_vport+0x79/frame 0xfffffe011b3c1b40 mana_alloc_queues() at mana_alloc_queues+0x3b/frame 0xfffffe011b3c1c50 mana_up() at mana_up+0x40/frame 0xfffffe011b3c1c70 mana_ioctl() at mana_ioctl+0x25b/frame 0xfffffe011b3c1cb0 ifhwioctl() at ifhwioctl+0xd11/frame 0xfffffe011b3c1db0 hn_xpnt_vf_init() at hn_xpnt_vf_init+0x15f/frame 0xfffffe011b3c1e10 The lock has already been held in the caller. Remove this redundant lock attempt. Reported by: NetApp Sponsored by: Microsoft --- sys/dev/mana/mana_en.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 9d9a4084efe1..4bab6719e59f 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -983,14 +983,12 @@ mana_query_vport_cfg(struct mana_port_context *apc, uint32_t vport_index, void mana_uncfg_vport(struct mana_port_context *apc) { - MANA_APC_LOCK_LOCK(apc); apc->vport_use_count--; if (apc->vport_use_count < 0) { mana_err(NULL, "WARNING: vport_use_count less than 0: %u\n", apc->vport_use_count); } - MANA_APC_LOCK_UNLOCK(apc); } int @@ -1019,13 +1017,10 @@ mana_cfg_vport(struct mana_port_context *apc, uint32_t protection_dom_id, * QPs on a physical port up to the hardware limits independent of the * Ethernet usage on the same port. */ - MANA_APC_LOCK_LOCK(apc); if (apc->vport_use_count > 0) { - MANA_APC_LOCK_UNLOCK(apc); return EBUSY; } apc->vport_use_count++; - MANA_APC_LOCK_UNLOCK(apc); mana_gd_init_req_hdr(&req.hdr, MANA_CONFIG_VPORT_TX, sizeof(req), sizeof(resp)); From nobody Fri Aug 11 04:19:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMVv34mJ6z4m9rV; Fri, 11 Aug 2023 04:19: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 4RMVv34FnTz4WLx; Fri, 11 Aug 2023 04:19:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691727599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MiILhtMtBfPRaeDOfKIEf8hf+ARvNoAlHVRbM43m49I=; b=tubwsX0fbnJzPDi5PQA+o75xzw0ghBmuGwdKABVjO8/NtMkxMoiqqG6RiceZuf95ixog4F JiyFFHXWGazMUI3TwIaAmw6S2xe5J4XEc2JvUB5sLVNgOlUPdA5rdc09H3FwBlBvZrDyHt TT19YUpFMHwZ2si1wF7/P8ufCsAzBjtkpVkJnVvgeCGe5Y9HvO5pOpNxaToP6znjWWkSid Pw3N5ecra1WAzGLTVF+IErMWEIyCF1p+XyNfP4HEvGMMinB8D+vHmymjk5GZ7Zo18N6/u5 rlM9XMTSDaQujjlKRC2NT7WAQFaXk/RNicmqkkFLjfBiLK1Uc+6g75qTYltJcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691727599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MiILhtMtBfPRaeDOfKIEf8hf+ARvNoAlHVRbM43m49I=; b=xlacVTK1pi+yfyDYa26HSXgGXMmLx6kko5UQY+uPLZBfkuBG/qv2k5X95ZSEA6Xbgk8Ncw iMuiWi88n8AceHVf1htCJtAOt231ZWbJJ33z7G0ZOUA19gfB86PN/sHPSsWCPurz2JV6fs iDlgiYpah5JdGsH04JmjmXkk1jXXIf4+Wo8VU4zS9JgrcBpF5WR+erSBsoVxzbE0TFh2jp YMraulPJBvlZ4mQY1AGJFykvmmQGcMJNNICWa63MBVXkgTZmag6byWZLMVqF4C6lcWJlXa 9f3attTRJqGl81b3nN0I9EpsBmV61sXcp2xEfVtzL7n6g9bdbnz58iEz+ALrgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691727599; a=rsa-sha256; cv=none; b=mJ974IF3Q9OTRWJGaOlVcaHyztO6vALT0e+DmOzu8K68hM/PBu+MMgifmyGsJGx8Xjxgdq VocgdAk//++w07fb+chKfM311Oklw6WQqfygkTm9AghfJ9FFcjzv7AWq9D5aUIJ4gG2KEF PjDdwNtLMFzcY4H0azdHmu+nVh9fpQJIE4d59HclhcUujGb2w28Z2jDU3jg40M5misil/8 QeejkzQjVm92rYs0eTtrzcZSXyCCJUTHNXX7zVfufGSx6FfBTsYzatRILLJkusY6fuNTS7 kNHOW+McCdQMH40Zour9lFetHzOeXY/FY324dy2rbgiJn+i8ydv0Avp+z+U5qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMVv33J7Sz9GD; Fri, 11 Aug 2023 04:19: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 37B4JxlA011064; Fri, 11 Aug 2023 04:19:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B4JxqD011060; Fri, 11 Aug 2023 04:19:59 GMT (envelope-from git) Date: Fri, 11 Aug 2023 04:19:59 GMT Message-Id: <202308110419.37B4JxqD011060@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: e835ee68e133 - main - Link /usr/bin/cpuset to a relative path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e835ee68e13361b841c983fa4a49dd6c19dcdec4 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=e835ee68e13361b841c983fa4a49dd6c19dcdec4 commit e835ee68e13361b841c983fa4a49dd6c19dcdec4 Author: Enji Cooper AuthorDate: 2023-08-11 08:11:57 +0000 Commit: Enji Cooper CommitDate: 2023-08-11 11:20:16 +0000 Link /usr/bin/cpuset to a relative path This creates an appropriate symlink instead of a potentially incorrect path pointing to the absolute path for cpuset(8) on the host. MFC after: 2 weeks MFC with: f05948d4e98d3abd0965a Requested by: imp Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41419 --- bin/cpuset/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile index 8626303bb254..2fa60ccc069f 100644 --- a/bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -4,6 +4,6 @@ PROG= cpuset LIBADD= jail -SYMLINKS+= ${BINDIR}/cpuset /usr/bin/cpuset +SYMLINKS+= ../../bin/cpuset /usr/bin/cpuset .include From nobody Fri Aug 11 04:57:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMWkg6Dyqz4mDGH for ; Fri, 11 Aug 2023 04:57:47 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMWkg48BCz4YDs for ; Fri, 11 Aug 2023 04:57:47 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3178dd81ac4so1383810f8f.3 for ; Thu, 10 Aug 2023 21:57:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691729865; x=1692334665; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=79xxSD7+hZJdZZnFLfAq4ES3gV8knDqie0RADbs6TpE=; b=Y2csbkQjw1rPf6gXoqxmJeq593/wLH4FXHVNN13fCE5jTQ5AOwOzQgbuv7ueIcm9go /QKVQF4ZsGxJySU7I/AhuNy0ijvHQr2uFNJfcVfWN+XIPRMJQ7hA5qq5gAer5tVTlQXh WJx6YQj9HuRqJ6tWvgmRYxT/QDZ6ieWE+cVfmyWEUASrKK/jjV10oCDoEoSYWzMSFdbE Z0U+Q1VqcLRFXlwh0fJSj3Hu4TLJFV0cAslF8xbVSCaa3mVvl+YKOz62AbfOVCZsHvUu vx7X04hdTPTIgG11iyDLqGZK4ABrpsotZD2113RtGVjFSu6utMJfo9+9wVnBRhU0VOKF ZbjA== X-Gm-Message-State: AOJu0YynrZBTVGJGQIgzkmEQnj7l78m33peBQwhBCoicIUvB7XA9FQUB Q6jB7KT7ri+2qqMxV6z/7eLeAHQXoQJ5QyVnj2c= X-Google-Smtp-Source: AGHT+IHB7nrDsbXJp5A82u8VXWN3ZOM2dos4lmJTeKov/bl4xX5VN63JA4rOvCPn9RZB6/KxneXzaA== X-Received: by 2002:adf:f349:0:b0:317:3d6c:5b27 with SMTP id e9-20020adff349000000b003173d6c5b27mr501545wrp.46.1691729865598; Thu, 10 Aug 2023 21:57:45 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id b13-20020adfe30d000000b003113ed02080sm4084793wrj.95.2023.08.10.21.57.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Aug 2023 21:57:45 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: e835ee68e133 - main - Link /usr/bin/cpuset to a relative path From: Jessica Clarke In-Reply-To: <202308110419.37B4JxqD011060@gitrepo.freebsd.org> Date: Fri, 11 Aug 2023 05:57:34 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7B427A50-E2C3-487F-953F-9C3A2752F981@freebsd.org> References: <202308110419.37B4JxqD011060@gitrepo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RMWkg48BCz4YDs X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 11 Aug 2023, at 05:19, Enji Cooper wrote: >=20 > The branch main has been updated by ngie: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3De835ee68e13361b841c983fa4a49dd6c= 19dcdec4 >=20 > commit e835ee68e13361b841c983fa4a49dd6c19dcdec4 > Author: Enji Cooper > AuthorDate: 2023-08-11 08:11:57 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-11 11:20:16 +0000 >=20 > Link /usr/bin/cpuset to a relative path >=20 > This creates an appropriate symlink instead of a potentially = incorrect > path pointing to the absolute path for cpuset(8) on the host. >=20 > MFC after: 2 weeks > MFC with: f05948d4e98d3abd0965a > Requested by: imp > Reviewed by: kevans > Differential Revision: https://reviews.freebsd.org/D41419 > --- > bin/cpuset/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile > index 8626303bb254..2fa60ccc069f 100644 > --- a/bin/cpuset/Makefile > +++ b/bin/cpuset/Makefile > @@ -4,6 +4,6 @@ PROG=3D cpuset >=20 > LIBADD=3D jail >=20 > -SYMLINKS+=3D ${BINDIR}/cpuset /usr/bin/cpuset > +SYMLINKS+=3D ../../bin/cpuset /usr/bin/cpuset Hi, The existing style is ../..${BINDIR} (see pkill and timeout as examples). Jess From nobody Fri Aug 11 05:39:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMXgB6RXrz4mH5t; Fri, 11 Aug 2023 05:39: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 4RMXgB5vTZz4dK6; Fri, 11 Aug 2023 05:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691732390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3z95KS8r1iVxS3SWEjJ8rt5gTB9tp+SFPUEkkFX41k=; b=SiXoENPC/tjnHNjB8ERIksfmPCHp+8oMz8vGDE5PztA5hace9pnWw8paWYjbgGD0Df0Bw5 9q4LdCFwbjChc5BEnZ6Rgm4IL/5potw3iyWN5Fc7b7i9ROLbcewjF3W3vf7NqZjyuNAdr2 0eN2qNvpurbwTa8Z7wtnfZtwk8B6qn7ayKNyTcNp1Zj7qaINbjnmn9iT9pncawUt0lVJKs r2wM3y0eekXC65NhotYLLpoPDRFod79zRyefM8DPOjGD3t5z9Fx1ZLBzco/rtu+RUCRElL 9YU48LjOMCJfAX55JJ+h4a1fKazhrLVCqPW2ukyEEqbuw3uhamhIncRAfVsATg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691732390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3z95KS8r1iVxS3SWEjJ8rt5gTB9tp+SFPUEkkFX41k=; b=bpKsPodwC3caYO9rO2xrYH5EFKdcXfwgC1TJ4H1oHVIjtFj6FLclz0FWdGKfR8yJmcxAeQ oz0MvIxx/JppOOBA8N6nNBn9ZjkZ6wa927xDpn+H7nyAHTRt5lunax7vOiba5/y77lCz5y MLlCCZLNhQ8xKwGXbPnlW75E/h7FEs0ggS/MlyBGo4ePQURsTc+dYRnpOesvS7sxMYBLfL TqtfpRgNIKvLG+gfaIYnLGbw9IhHKK8qQXluD9sHU8v9fQL8IOr4vvzP0IWMhLAR4xVwsu wwpPayGvZSpoD7+C6saoM4pIcbr6soHuGBBvi9jU71PReGaNWee4XICxajg+dw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691732390; a=rsa-sha256; cv=none; b=qeNl5zFAoJ97mJwoi2wXQVXIGNRuYVC9YjaaCTDXm724wJ3OFR/NCn2rB4ujxRNxGewbVS i/K+X8BkJNP8DShnV2ewim7erpk/LzMRNVB1UYqWhaT2+dDiM2mfgKzIX9XbhFf8FsUKFg VfMsBkwqWn7n0esrSgS3lEqi0ZBV6WBZIjCH1/GXgty4cAWegGK6j2dPmiuvo+BkjX3h09 CfrmluyIa50QwdgEmgNM3Fa57QAGbXcVI0v3pHGFCe0FtboZfESwjwRw3MbRsUlCfNYt9z XadeQYADwXHUSWN4qDaDyN2OF5/NXYJWVq7QGyp96Tprz7lBbFRdKpG5MwB9Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMXgB4n4mzCVb; Fri, 11 Aug 2023 05:39: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 37B5dooL043772; Fri, 11 Aug 2023 05:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B5dofK043770; Fri, 11 Aug 2023 05:39:50 GMT (envelope-from git) Date: Fri, 11 Aug 2023 05:39:50 GMT Message-Id: <202308110539.37B5dofK043770@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: 677023529d6a - main - Cleanups to UFS/FFS ffs_checkblk(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 677023529d6a46da52ed780eb299c6754a75f6ef Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=677023529d6a46da52ed780eb299c6754a75f6ef commit 677023529d6a46da52ed780eb299c6754a75f6ef Author: Kirk McKusick AuthorDate: 2023-08-11 05:38:56 +0000 Commit: Kirk McKusick CommitDate: 2023-08-11 05:39:35 +0000 Cleanups to UFS/FFS ffs_checkblk(). Rename to ffs_checkfreeblk() to better describe that it is checking to find out if a block or fragment is free. Clarify its implementation. No functional change intended. MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index f6bf4c1dadc0..166c5bc7c65c 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -114,7 +114,7 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, struct vnode *, ufs2_daddr_t, long, ino_t, struct workhead *); #ifdef INVARIANTS -static int ffs_checkblk(struct inode *, ufs2_daddr_t, long); +static int ffs_checkfreeblk(struct inode *, ufs2_daddr_t, long); #endif static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, int); @@ -600,7 +600,7 @@ ffs_reallocblks_ufs1( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -721,7 +721,7 @@ ffs_reallocblks_ufs1( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -804,7 +804,8 @@ ffs_reallocblks_ufs1( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -865,7 +866,7 @@ ffs_reallocblks_ufs2( end_lbn = start_lbn + len - 1; #ifdef INVARIANTS for (i = 0; i < len; i++) - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 1"); for (i = 1; i < len; i++) @@ -985,7 +986,7 @@ ffs_reallocblks_ufs2( soff = -i; } #ifdef INVARIANTS - if (!ffs_checkblk(ip, + if (!ffs_checkfreeblk(ip, dbtofsb(fs, buflist->bs_children[i]->b_blkno), fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 2"); if (dbtofsb(fs, buflist->bs_children[i]->b_blkno) != *bap) @@ -1068,7 +1069,8 @@ ffs_reallocblks_ufs2( NOTRIM_KEY : SINGLETON_KEY); bp->b_blkno = fsbtodb(fs, blkno); #ifdef INVARIANTS - if (!ffs_checkblk(ip, dbtofsb(fs, bp->b_blkno), fs->fs_bsize)) + if (!ffs_checkfreeblk(ip, dbtofsb(fs, bp->b_blkno), + fs->fs_bsize)) panic("ffs_reallocblks: unallocated block 3"); #endif #ifdef DIAGNOSTIC @@ -2285,7 +2287,7 @@ ffs_blkfree_cg(struct ufsmount *ump, printf("dev=%s, bno = %jd, bsize = %ld, size = %ld, fs = %s\n", devtoname(dev), (intmax_t)bno, (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_blkfree_cg: bad size"); + panic("ffs_blkfree_cg: invalid size"); } #endif if ((uint64_t)bno >= fs->fs_size) { @@ -2748,11 +2750,11 @@ ffs_blkfree(struct ufsmount *ump, #ifdef INVARIANTS /* - * Verify allocation of a block or fragment. Returns true if block or - * fragment is allocated, false if it is free. + * Verify allocation of a block or fragment. + * Return 1 if block or fragment is free. */ static int -ffs_checkblk(struct inode *ip, +ffs_checkfreeblk(struct inode *ip, ufs2_daddr_t bno, long size) { @@ -2760,34 +2762,34 @@ ffs_checkblk(struct inode *ip, struct cg *cgp; struct buf *bp; ufs1_daddr_t cgbno; - int i, error, frags, free; + int i, error, frags, blkalloced; uint8_t *blksfree; fs = ITOFS(ip); if ((uint64_t)size > fs->fs_bsize || fragoff(fs, size) != 0) { printf("bsize = %ld, size = %ld, fs = %s\n", (long)fs->fs_bsize, size, fs->fs_fsmnt); - panic("ffs_checkblk: bad size"); + panic("ffs_checkfreeblk: bad size"); } if ((uint64_t)bno >= fs->fs_size) - panic("ffs_checkblk: bad block %jd", (intmax_t)bno); + panic("ffs_checkfreeblk: too big block %jd", (intmax_t)bno); error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); if (error) - panic("ffs_checkblk: cylinder group read failed"); + panic("ffs_checkfreeblk: cylinder group read failed"); blksfree = cg_blksfree(cgp); cgbno = dtogd(fs, bno); if (size == fs->fs_bsize) { - free = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); + blkalloced = ffs_isblock(fs, blksfree, fragstoblks(fs, cgbno)); } else { frags = numfrags(fs, size); - for (free = 0, i = 0; i < frags; i++) + for (blkalloced = 0, i = 0; i < frags; i++) if (isset(blksfree, cgbno + i)) - free++; - if (free != 0 && free != frags) - panic("ffs_checkblk: partially free fragment"); + blkalloced++; + if (blkalloced != 0 && blkalloced != frags) + panic("ffs_checkfreeblk: partially free fragment"); } brelse(bp); - return (!free); + return (blkalloced == 0); } #endif /* INVARIANTS */ From nobody Fri Aug 11 06:03:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMYC348J5z4mJYX; Fri, 11 Aug 2023 06:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMYC33Zm0z3CKy; Fri, 11 Aug 2023 06:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691733839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBJVJDX85Wsgav8Ya9g1dwl8EFOzxCKyOHs0nQYtD+I=; b=l8C+m/NZYXcHmgCc4XukNgWTrwUZYYmMbry8z4ISaF0jmxFYTBB1yjBilOeotJCA89sHxt PmE5IKb0J1YQGD8J9IRBwLV4eygVLbCJP2v6O+/C1nBpTKMofM9JXOU6rM96/Wg7g+AhNJ uW+rNKMT3OlClP6JZf39KWdo0v58bhkNcNVileJU3CxOG5GLuo6OWzsQ3UayWqCIhDIxbp 1gqCh/WNvr7HVTRBYI3ldBOeOUAQBbafuwkR1WB9JYZCo5ZOaJubdyByxucHzQJa0gVWs8 tHHAyasEmppweVJcI38KbtVgmd+DHybJB5kLsKa1uGjIv+p7bYqXeC+14R+OsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691733839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBJVJDX85Wsgav8Ya9g1dwl8EFOzxCKyOHs0nQYtD+I=; b=w3x0vWRnGqHmfeOez9BMUxizEEIm6NWpVvnM9lugVY3POnsC3gLkpO76/xZwqLRXX1P0YN lm7orMMv5Zrk7KqrS7dmVotN1xvhVdSgnaM8bz08p4zx/xaG4KuUYBN8MFtss3j4ebw1Am Hc+VcfbyhJAKR7NkTFbVxd1CjJzyVuwl3b+k8AvQLJx8HnDgD8aJZ5rRhaSWHttrYntOSG c59gArJ93wm388ArpKHY0TLdOd5IdqzR00tH1h54aDwHjsVGWuHCDsxq7pVmZKYGKGw0zT wXVp+mot8ULwu4x7dJ4xhtaLi+xaUjzpTZ4X8H8y1haqp8nKy9pKIuqOoW3xpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691733839; a=rsa-sha256; cv=none; b=rtPYYfsbDJtoxnxZ1ej7Uz3xpQiU2/eqXs6oGAag6+fwPZC6Aiy9tDo8M4oGtnKgztXfgF kOt3t/fMDhfOBYUiR8dnmmwFphqy/o3AkdPsAk9ay2D6NIGogKB5IZA1aUFzUoUysGFPRH 3y9/UwPN9Zp5St/SvSpbE6W8+6mpyLh9PGM12DkPRROENDg6ZL+8z0CFNTRfb1ppDUeTFS kDXQUBxnHdkWdGPMv8H6nmV7iS4AP6/eI0YkV1Jka8u4coFTrRpVxaAokwRCzZcNX8lwtC 28+pIk9lCfDC4STKug1qQetqKVbq62GBeYbUFiFaxoc9Beov9XLsJ+RJ1iN43A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMYC32f2mzCVD; Fri, 11 Aug 2023 06:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37B63xcg092591; Fri, 11 Aug 2023 06:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B63xaG092588; Fri, 11 Aug 2023 06:03:59 GMT (envelope-from git) Date: Fri, 11 Aug 2023 06:03:59 GMT Message-Id: <202308110603.37B63xaG092588@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: c3046779b241 - main - Optimize operations on UFS/FFS filesystems with bad cylinder group(s). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3046779b241768394a336de115e88cc7c10d922 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c3046779b241768394a336de115e88cc7c10d922 commit c3046779b241768394a336de115e88cc7c10d922 Author: Kirk McKusick AuthorDate: 2023-08-11 06:02:47 +0000 Commit: Kirk McKusick CommitDate: 2023-08-11 06:02:47 +0000 Optimize operations on UFS/FFS filesystems with bad cylinder group(s). If a UFS/FFS filesystem develops a broken cylinder group (which is usually detected when its check hash fails), that cylinder group will not be usable until the filesystem has been unmounted and fsck has been run to repair it. On the first attempt to to allocate resources from the broken cylinder group, its available resources are set to zero in the superblock summary information. Since it will appear to have no resources available, no further calls will be made to allocate resources from it. When resources are freed to the broken cylinder group, the resource free routines will find the cylinder group unusable so the resource will simply be discarded and thus will not show up in the superblock summary information until they are recovered by fsck. Reported-by: Peter Holm Tested-by: Peter Holm MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 53 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 166c5bc7c65c..d2627647360a 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -116,6 +116,7 @@ static void ffs_blkfree_cg(struct ufsmount *, struct fs *, #ifdef INVARIANTS static int ffs_checkfreeblk(struct inode *, ufs2_daddr_t, long); #endif +static void ffs_checkcgintegrity(struct fs *, uint64_t, int); static ufs2_daddr_t ffs_clusteralloc(struct inode *, uint64_t, ufs2_daddr_t, int); static ino_t ffs_dirpref(struct inode *); @@ -1722,8 +1723,10 @@ ffs_fragextend(struct inode *ip, return (0); } UFS_UNLOCK(ump); - if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) + if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); goto fail; + } bno = dtogd(fs, bprev); blksfree = cg_blksfree(cgp); for (i = numfrags(fs, osize); i < frags; i++) @@ -1793,8 +1796,10 @@ ffs_alloccg(struct inode *ip, return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0 || - (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) + (cgp->cg_cs.cs_nbfree == 0 && size == fs->fs_bsize)) { + ffs_checkcgintegrity(fs, cg, error); goto fail; + } if (size == fs->fs_bsize) { UFS_LOCK(ump); blkno = ffs_alloccgblk(ip, bp, bpref, rsize); @@ -1971,6 +1976,7 @@ ffs_clusteralloc(struct inode *ip, return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); UFS_LOCK(ump); return (0); } @@ -2115,6 +2121,7 @@ check_nifree: return (0); UFS_UNLOCK(ump); if ((error = ffs_getcg(fs, ump->um_devvp, cg, 0, &bp, &cgp)) != 0) { + ffs_checkcgintegrity(fs, cg, error); UFS_LOCK(ump); return (0); } @@ -2762,7 +2769,7 @@ ffs_checkfreeblk(struct inode *ip, struct cg *cgp; struct buf *bp; ufs1_daddr_t cgbno; - int i, error, frags, blkalloced; + int i, frags, blkalloced; uint8_t *blksfree; fs = ITOFS(ip); @@ -2773,9 +2780,8 @@ ffs_checkfreeblk(struct inode *ip, } if ((uint64_t)bno >= fs->fs_size) panic("ffs_checkfreeblk: too big block %jd", (intmax_t)bno); - error = ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp); - if (error) - panic("ffs_checkfreeblk: cylinder group read failed"); + if (ffs_getcg(fs, ITODEVVP(ip), dtog(fs, bno), 0, &bp, &cgp) != 0) + return (0); blksfree = cg_blksfree(cgp); cgbno = dtogd(fs, bno); if (size == fs->fs_bsize) { @@ -3042,7 +3048,7 @@ ffs_getcg(struct fs *fs, bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); - return (EIO); + return (EINTEGRITY); } if (!cg_chkmagic(cgp) || cgp->cg_cgx != cg) { if (ppsratecheck(&VFSTOUFS(mp)->um_last_integritymsg, @@ -3062,7 +3068,7 @@ ffs_getcg(struct fs *fs, bp->b_flags &= ~B_CKHASH; bp->b_flags |= B_INVAL | B_NOCACHE; brelse(bp); - return (EIO); + return (EINTEGRITY); } bp->b_flags &= ~B_CKHASH; bp->b_xflags |= BX_BKGRDWRITE; @@ -3096,6 +3102,37 @@ ffs_ckhash_cg(struct buf *bp) cgp->cg_ckhash = ckhash; } +/* + * Called when a cylinder group read has failed. If an integrity check + * is the cause of failure then the cylinder group will not be usable + * until the filesystem has been unmounted and fsck has been run to + * repair it. To avoid future attempts to allocate resources from the + * cylinder group, its available resources are set to zero in the + * superblock summary information. Since it will appear to have no + * resources available, no further calls will be made to allocate + * resources from it. When resources are freed to the cylinder group + * the resource free routines will find the cylinder group unusable so + * the resource will simply be discarded and thus will not show up in + * the superblock summary information until they are recovered by fsck. + */ +static void +ffs_checkcgintegrity(struct fs *fs, + uint64_t cg, + int error) +{ + + if (error != EINTEGRITY) + return; + fs->fs_cstotal.cs_nffree -= fs->fs_cs(fs, cg).cs_nffree; + fs->fs_cs(fs, cg).cs_nffree = 0; + fs->fs_cstotal.cs_nbfree -= fs->fs_cs(fs, cg).cs_nbfree; + fs->fs_cs(fs, cg).cs_nbfree = 0; + fs->fs_cstotal.cs_nifree -= fs->fs_cs(fs, cg).cs_nifree; + fs->fs_cs(fs, cg).cs_nifree = 0; + fs->fs_maxcluster[cg] = 0; + fs->fs_fmod = 1; +} + /* * Fserr prints the name of a filesystem with an error diagnostic. * From nobody Fri Aug 11 07:52:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMbcm5KMNz4mRG9; Fri, 11 Aug 2023 07:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMbcm4Zsqz3LPq; Fri, 11 Aug 2023 07:52:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691740376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyCuwGW+tAhxny2UhN+J1M47HPQQLGol+qti32t99yw=; b=rbJF8xZoIDIYNocEvdSMX1uVtvkBjh1fTbzA1+2uytNbRPZSUlx8MGwR+i5//z6lR90Ztg 5M7QFZiUKttoFEhS44yGbaT9FcLqlMGczkQP5GfuMzenewj2Cp3sgMtj7K1jdaaSu3SF7U 7pbDTmKISfTii8lwQx+AKnoKMBM5JGg3J0N8KpceAklbdqZXhW1Df3T4qQFr8xy2Byd35y xWtJFHPF3tuYdqceXRHCfCBnR8JEtS2Lo36hWppbdOt1Kbn4zl+74vfevKcagquyMMIrpn 4upKWfJHI5kQW3GF4mda8RM2hZjetTLjdjQQoknlW3t8IKdC0jT/3X7ArQsVUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691740376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyCuwGW+tAhxny2UhN+J1M47HPQQLGol+qti32t99yw=; b=OJgwKODGAf4adG0CyOrCRSHqFFJEmmRwIjJEMKIPKC7tr3YckP8oqf6uSwya+kr0KRIU2+ Mhjrh3fMvg1x329iMlSIfUwEHjiznCOqyAdjIXILghrAEpjV7XWHaPP4FfAG0HxhLpPaQk h7hZUlKnDOHZ9jWnkjZPyRO5Y4sLMeHcwRsNJBg8tjzuafe3IFgp60hIhXFoLnBD2Ct4WV CswWNQnvDxKQ3zzE2jQ0VuVaBNRjAQfFaKeiDRbaRJm7qKgMYxpJuwbeH+lF4ow9fuB1Gm HGqKIMgXUTNO8ogdT17yY1RwLJuRiFprtx57D3qQvnEZx0TChgihxDoglFoa/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691740376; a=rsa-sha256; cv=none; b=CtkGXgjN+4UV4VGNdgU//ge9q+gT+2kRZ4TyQfQyN91tzoFkio7opN7AV2zr8w/AyI6TZs exSIBJnK7+Nmw74zssEf8Cvqh6nKCSVIS0/MtxofEpkHc+NA4k491OeaQon7nKHm2vG+Eu 3Pe8UaYaeiP6Y4+pywedUhTvbXsjP4OFt3zkxKkX42X/JMgdDdaM2iLwJEMCzXl9k3S6kg 4wbyyGhRDnXFtrOyLJdIOx2meGHAhuWFeQ71kCh7Q1cJQ1ZsHs0yaYWNM0owoNu44EbYvW a5WNZJM4RfkiJC4ktGK9tud2X04IotLfwipseVuadLLMbsn8xEW9IEANdf5J/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMbcm3f8YzWxV; Fri, 11 Aug 2023 07:52: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 37B7quu3075691; Fri, 11 Aug 2023 07:52:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37B7qupG075688; Fri, 11 Aug 2023 07:52:56 GMT (envelope-from git) Date: Fri, 11 Aug 2023 07:52:56 GMT Message-Id: <202308110752.37B7qupG075688@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: 580cadd6a5f0 - main - vtnet: allow IFF_ALLMULTI to be set without VIRTIO_NET_F_CTRL_RX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 580cadd6a5f0828691ec0b94798728a1028afa33 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=580cadd6a5f0828691ec0b94798728a1028afa33 commit 580cadd6a5f0828691ec0b94798728a1028afa33 Author: Kristof Provost AuthorDate: 2023-08-08 07:15:53 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 07:42:29 +0000 vtnet: allow IFF_ALLMULTI to be set without VIRTIO_NET_F_CTRL_RX If the host doesn't announce VIRTIO_NET_F_CTRL_RX we cannot disable all multicast traffic. Previously we'd refuse to set the IFF_ALLMULTI flag, which is the exact opposite of what is actually happening. This broke things such as igmpproxy. See also: https://redmine.pfsense.org/issues/14301 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41356 --- sys/dev/virtio/network/if_vtnet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 359ef0c423bb..82f7c6a47589 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1299,8 +1299,11 @@ vtnet_ioctl_ifflags(struct vtnet_softc *sc) if (sc->vtnet_flags & VTNET_FLAG_CTRL_RX) vtnet_rx_filter(sc); else { - if ((if_getflags(ifp) ^ sc->vtnet_if_flags) & IFF_ALLMULTI) - return (ENOTSUP); + /* + * We don't support filtering out multicast, so + * ALLMULTI is always set. + */ + if_setflagbits(ifp, IFF_ALLMULTI, 0); if_setflagbits(ifp, IFF_PROMISC, 0); } } From nobody Fri Aug 11 10:09:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMfdn67dQz4pqhS; Fri, 11 Aug 2023 10:09: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 4RMfdn5bwgz3Vvk; Fri, 11 Aug 2023 10:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gn+IvT9oVs8JJ/qM1ZAmMu3rGx4fH9/rSytQPegdp5c=; b=IV6IscloiOTjoEtf+AThurPqQiovUCr0uoYzlKlkQhDcvPsTh52l2T4+dwQPD9tb12uTdn I+2niKsXIFwYaMuCtx34X2IyYs74TatHGDVWgpN6ULZZYLsuLLVdCujRxdwFRsaf6mtJIN 28wXWS/UhptAaPvNMwyynYis1Ckwr2OFS0wqn7kBX3qP0jvC8ZfBGYgXUsDuaVHdxutk8y xtcLIq4vQFlrpGBon6wSZoGCLC+VGJTyaLrWqKZaUjSV/ss+UWzt3dSg1o2N731rP6pDaj 1seIsDIMV2glWM7jFOftgpxtMAv2LVJYOxn/nBrZf7JO0H9aJMVFeTtXXjXAOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gn+IvT9oVs8JJ/qM1ZAmMu3rGx4fH9/rSytQPegdp5c=; b=FJ6m1VjFSDtybHvZVI105vOmJADg21GFrIMHWV2NKIb5R6GLMR28eXIK30Q9mGBwQja579 8/qg+2Rh2rbmK3WdRatxnuYTAYojncXkW8cy9g7ov2fOwmejfQzLSJKbMe4F8xhfGH+zoj rdyEUUel0HTmPtYqfdGc1a+HWcuZ9ggCw5d+4L6mL21WKgF7OSM+ZypfsyVLHSeaU2CRpq ZoCEvrcNEOxi3e0ZOSkW6j/7S92Xe0jKJ8iImkb+JBa4GrBseOQUOYPZuErUIe1m0CfJbo cP6Mo6BGWib6CbNOLNtXNOG3R/t4CC/EMBeBtaqPy5OvSK+yUjuETRt14yUj3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691748541; a=rsa-sha256; cv=none; b=c5vC5QiGQ7sKqA8t/9lKZFGDhhZjmFFZx+ZbIz5pfjR1faCTNh2tmZBeutu70tlkNffAbu 81Ge9UiFx02CtwOEBJpIAvuxnTqHgA4FndjLAQe77pqe/59/nyYVHwJi6KcQr6KqG+6LRV jAR2MIojOerV6kpPUnJjCxB2+BjgdADdg4iiJwCQ1fNKRmWe53BiMkndPoi1/xjdsbgBDE 4lssU2oC3g+/5sw9foXPvmyO7tt7/TjyF6EPGv3fZi4ZPdz1LU2l2ZpF22cXtOMXiwQwLT vEtVMy9CImbKd+8dwXX1DyB4K5RY6CTxKC1J2cjfokAkYYC+lml539S9r6+uig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMfdn4fsvzb8N; Fri, 11 Aug 2023 10:09:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BA91uV093773; Fri, 11 Aug 2023 10:09:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BA91SR093770; Fri, 11 Aug 2023 10:09:01 GMT (envelope-from git) Date: Fri, 11 Aug 2023 10:09:01 GMT Message-Id: <202308111009.37BA91SR093770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 455b78443ee5 - stable/13 - linux: binutils as requires %eflags instead of %flags for CFI. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 455b78443ee5612557f3f076c6d27c79de9ec1e7 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=455b78443ee5612557f3f076c6d27c79de9ec1e7 commit 455b78443ee5612557f3f076c6d27c79de9ec1e7 Author: John Baldwin AuthorDate: 2023-06-30 16:36:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-11 10:08:10 +0000 linux: binutils as requires %eflags instead of %flags for CFI. This applies the changes to linux32_locore.asm from commit a35572b16e38 to the i386 copy. (cherry picked from commit f4de136aa82978107aa98f91ca1928870b7d310a) --- sys/i386/linux/linux_locore.asm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/i386/linux/linux_locore.asm b/sys/i386/linux/linux_locore.asm index 9aef5ad21d26..bebd05686149 100644 --- a/sys/i386/linux/linux_locore.asm +++ b/sys/i386/linux/linux_locore.asm @@ -23,7 +23,11 @@ ENTRY(linux_vdso_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP @@ -54,7 +58,11 @@ ENTRY(linux_vdso_rt_sigcode) .cfi_offset %ds, L_SC_DS .cfi_offset %cs, L_SC_CS .cfi_offset %ss, L_SC_SS +#ifdef __clang__ .cfi_offset %flags, L_SC_EFLAGS +#else + .cfi_offset %eflags, L_SC_EFLAGS +#endif .cfi_offset %edi, L_SC_EDI .cfi_offset %esi, L_SC_ESI .cfi_offset %ebp, L_SC_EBP From nobody Fri Aug 11 10:09:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMfdq275vz4pqv6; Fri, 11 Aug 2023 10:09: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 4RMfdp6hgcz3Vsj; Fri, 11 Aug 2023 10:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fOLL4sP4cDiX8eiqglMZB79glWtvAxA3kTdZeq1KMU=; b=NhI8lu60fCvzUZpuy0PuB3JF/8rCV2fyxTkAiBjpcOvTOgoGIV9tKr6fBuBmLuDISMWGhe 74S+NAhouNSQij4WVgv5B8rOldCplw7fnmbX0NYa9FhPZ7DGhNyE0R84Z8y2NHfknedSjz hq3autkBZvCBdgzBGPp/amUkrpGEWD/e2DYvi9PDZL9Mjx+tmENcvywTHbo9n1CNCWibGM S6CEA3mXSheDr/5+kkQwaKhWOjpgt7ZRDD2W4hXHK0lzpakQveIBRKo/I49KxsoNJIon3/ R8x3f0PYmPOOOXqpaVnMn4CH/0HhLl0XuYVmMs63o0XqAwvrhNfNy68liOiV1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691748542; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6fOLL4sP4cDiX8eiqglMZB79glWtvAxA3kTdZeq1KMU=; b=vAM80zGojhJrCFENx/DnldsOGbqnkogJbP9Wtej+cnE3maY2xYkcBn1L3DyG2RGoXz83/z OQc5fZRD1IhOwEawpYVdQaYi9Wlf6a8u2BbUG1hMubPOgyW+iKOUlGNUokWPXqOhnj8fOz kqgui2LjOMjgvLsak1uX1MF7C4BjCEBhZcVjBeZ79/GwXSgnAp9eHxuFBSab+isZxbsSIa YneLpp7je5p0W4yrDt3EiNKUzO+TpgnU6sBC8NZeJNwkfkgJDGOYZp7tStPK5LZCfYIrJf Zu1j7Erw+l9CJnVLB/3wtEHE4aetBCtCwiaZMfqEhq5qWo/559Pwa3UoFlRsfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691748542; a=rsa-sha256; cv=none; b=aBFW8CXDWFqk3KU22W07naQddsDJqEZeDADoLxe2PNs7ZqqTUpqrGT0a3CexT9Kyrt8N5P hkOEla1XyU3iVOtcV9KeQA8ecRM8TV/FAa+tfLSj00bJHV7wufZ3OEovA66BCP8PsDYn8P OPNULzm5UW9gA25+Rk60rS98R4c34++16JpjcB5t5wdpSSPONS5G3y+dJPTP57CLfs5k5Q BmkE11libYEDRqzBcBPe+5rzn2wL4HaOdNJhqlA6Nhx3CQ7b6/Y52NIWKqudV2PUzIiQpw xJsAlCxha0Frwj4imE4VlCK5ok8hDvyM7JtiqerVrhtJLq2IAWrNv0KwKKoNTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMfdp5gNBzbLC; Fri, 11 Aug 2023 10:09: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 37BA92hN093817; Fri, 11 Aug 2023 10:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BA92oG093814; Fri, 11 Aug 2023 10:09:02 GMT (envelope-from git) Date: Fri, 11 Aug 2023 10:09:02 GMT Message-Id: <202308111009.37BA92oG093814@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 97cbac33c6d2 - stable/13 - linux(4): Add elf_hwcap2 to x86 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 97cbac33c6d223617b0084a64bd55b0e3b8ec549 Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=97cbac33c6d223617b0084a64bd55b0e3b8ec549 commit 97cbac33c6d223617b0084a64bd55b0e3b8ec549 Author: Dmitry Chagin AuthorDate: 2023-07-28 08:56:59 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-11 10:08:31 +0000 linux(4): Add elf_hwcap2 to x86 On x86 Linux via AT_HWCAP2 the user controlled (by tunables) processor capabilities are exposed. Reviewed by: Differential Revision: https://reviews.freebsd.org/D41165 MFC after: 2 weeks (cherry picked from commit 4281dab8bc11b3b2f3b58be5e0f67806329bddae) --- sys/amd64/linux/linux_sysvec.c | 2 +- sys/amd64/linux32/linux32_sysvec.c | 2 +- sys/i386/linux/linux.h | 2 +- sys/i386/linux/linux_sysvec.c | 1 + sys/x86/linux/linux_x86.c | 18 +++++++++++++++++- sys/x86/linux/linux_x86.h | 6 ++++++ 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 290e21247b0d..dde7ae571524 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -232,7 +232,7 @@ linux64_arch_copyout_auxargs(struct image_params *imgp, Elf_Auxinfo **pos) AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO_EHDR, linux_vdso_base); AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, 0); + AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, linux_x86_elf_hwcap2()); AUXARGS_ENTRY((*pos), LINUX_AT_PLATFORM, PTROUT(linux_platform)); } diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 2a7860cc3381..da5f585a2696 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -146,7 +146,7 @@ linux32_arch_copyout_auxargs(struct image_params *imgp, Elf_Auxinfo **pos) AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO, __kernel_vsyscall); AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO_EHDR, linux_vdso_base); AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP, cpu_feature); - AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, 0); + AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, linux_x86_elf_hwcap2()); AUXARGS_ENTRY((*pos), LINUX_AT_PLATFORM, PTROUT(linux_platform)); } diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 4784be5b0f77..dff4ed449943 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -94,7 +94,7 @@ typedef struct { /* * Miscellaneous */ -#define LINUX_AT_COUNT 21 /* Count of used aux entry types. +#define LINUX_AT_COUNT 22 /* Count of used aux entry types. * Keep this synchronized with * linux_copyout_auxargs() code. */ diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index c486fe1a09a5..09f11340b414 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -145,6 +145,7 @@ linux32_arch_copyout_auxargs(struct image_params *imgp, Elf_Auxinfo **pos) AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO_EHDR, linux_vdso_base); AUXARGS_ENTRY((*pos), LINUX_AT_SYSINFO, __kernel_vsyscall); AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP, cpu_feature); + AUXARGS_ENTRY((*pos), LINUX_AT_HWCAP2, linux_x86_elf_hwcap2()); AUXARGS_ENTRY((*pos), LINUX_AT_PLATFORM, PTROUT(linux_platform)); } diff --git a/sys/x86/linux/linux_x86.c b/sys/x86/linux/linux_x86.c index 34ae66ec4954..c72102d9f426 100644 --- a/sys/x86/linux/linux_x86.c +++ b/sys/x86/linux/linux_x86.c @@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include +#include #include @@ -96,4 +98,18 @@ bsd_to_linux_trapcode(int code) return (code < nitems(_bsd_to_linux_trapcode) ? _bsd_to_linux_trapcode[code] : LINUX_T_UNKNOWN); -} \ No newline at end of file +} + +u_int +linux_x86_elf_hwcap2(void) +{ + static u_int elf_hwcap2 = 0; + static bool elf_hwcap2_valid = false; + + if (!elf_hwcap2_valid) { + if ((cpu_stdext_feature & CPUID_STDEXT_FSGSBASE) != 0) + elf_hwcap2 |= LINUX_HWCAP2_FSGSBASE; + elf_hwcap2_valid = true; + } + return (elf_hwcap2); +} diff --git a/sys/x86/linux/linux_x86.h b/sys/x86/linux/linux_x86.h index 2763b60f1649..5ce0852d9a18 100644 --- a/sys/x86/linux/linux_x86.h +++ b/sys/x86/linux/linux_x86.h @@ -32,10 +32,16 @@ #define LINUX_VDSO_CPU_RDPID 1 #define LINUX_VDSO_CPU_RDTSCP 2 +/* More machine dependent hints about processor capabilities. */ +#define LINUX_HWCAP2_RING3MWAIT 0x00000001 +#define LINUX_HWCAP2_FSGSBASE 0x00000002 + int linux_vdso_tsc_selector_idx(void); int linux_vdso_cpu_selector_idx(void); int linux_translate_traps(int, int); int bsd_to_linux_trapcode(int); +u_int linux_x86_elf_hwcap2(void); + #endif /* _X86_INCLUDE_LINUX_LINUX_X86_H_ */ From nobody Fri Aug 11 12:13:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPP5xlpz4q10X; Fri, 11 Aug 2023 12: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 4RMjPP5Hkrz3gFh; Fri, 11 Aug 2023 12: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=1691756009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hhBIkpzhJ592mYWj+rQIKdGSxO2d5A9QrntPsmfgPWw=; b=wQaamx+qnpxa4WW7G+uevBYf4+2IRuFHD7wZNqyZSdp3pr+Qoc53qyKf+W6u7aXYRr8sNf 0zPC673AS0fXl/WOhgMkuYMJr5sAOXTH4TBfRbbC1Cy/oWZMiSMOW/4Lv3jGMwSyDhjbWy sFr+lM9C/WZeoeH4OIUB2ctCuXHBiCqqzaTQzjQTOaG9OaJJh2ys9G1h6PqsR93SXbyAwl JaGP72o0P2bQu5mOmhxiCQF4MBMDpvG4inxGJKNa0mDQv66M1jXyWTrH3MtbLAVt6xuc4Y 2+ZzBVimLxSIfXrhCc0ylh+7q+BU5MxC1OUPW7Pw9B3z88TkdreqmpU2fXrixg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756009; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hhBIkpzhJ592mYWj+rQIKdGSxO2d5A9QrntPsmfgPWw=; b=PZK0R5bX6UEO4bmApfMwT8NXnUCAAk/FWkLqMLqH2RpBrGg8kDoQGkT/XbWqVfFYa5IOQN Kt0IeNeysbEBNOKDQRZYzGoaZIkGmY7Uf4GrjITv1f2suH9ZtB29NzBEnrjZhZFhGEsNF0 vZlxceJyq6KRP/zXxdoy8jGQCIFaiKmssWFRIld07ySXzIpm9DzP7HE3lmGwYf0a1HyvG4 /BsjCR8/TN6oViBeb087Y3GSxIRLwXpJg2HM8McbD6ZOE1hL/vjlGdljKlKEBiBafJp95k niIh9JtYqLZEhnQwjtwALc8NwacdIZ2QM6WE9LxWoZZS0mK+mtRpJ5WcCfTnsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756009; a=rsa-sha256; cv=none; b=VNOpG3pLYXeE6viIk70h4YAquI8YHU16h+nPjsZlDOYY21/auuEIDYScs4E7DtBMRWF5Bt a/JGFIt9hYd1TPL2yrN1I9jfwHrDJNRQVQjrlaIdoiuiYMRwYjSCjVPkYDyHqIgfUZmraG PTN+Sj1YZAiIlP+ICH/P0FCIKcyGm8kmpMhgaKg3MGSNtWNQICTj0Aa8CbtDOi84kQDLxM mpwfKnmqGwiH+b2XUySc1wbfNFU8uqis4lglg9xjv2v85VHqF1NXqs70Ws+Y/aP/+DwIjl nZFO+BCATilcMziL7MvhpFxrsGrJQ7Cj1q3waPX39XOvwveA3nSDmNP6q0DlLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPP4LMQzfLB; Fri, 11 Aug 2023 12: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 37BCDTO6008407; Fri, 11 Aug 2023 12: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 37BCDTZw008404; Fri, 11 Aug 2023 12:13:29 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:29 GMT Message-Id: <202308111213.37BCDTZw008404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 836dc3507e0d - stable/13 - pf: use sctp_calculate_cksum() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 836dc3507e0da06a60762eca8f98c80530eb7173 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=836dc3507e0da06a60762eca8f98c80530eb7173 commit 836dc3507e0da06a60762eca8f98c80530eb7173 Author: Kristof Provost AuthorDate: 2023-07-07 08:04:51 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf: use sctp_calculate_cksum() This function is always available, even if the SCTP or SCTP_SUPPORT options are not set. That lets us remove an ifdef, and also means we improve pf's SCTP handling when the options are not set. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40911 (cherry picked from commit 61e22e9b2905f405170c249a2239f324229b60d1) --- sys/netpfil/pf/pf.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c9c0995cc4e7..57c9bb3bf3b1 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -104,9 +104,8 @@ __FBSDID("$FreeBSD$"); #include #endif /* INET6 */ -#if defined(SCTP) || defined(SCTP_SUPPORT) +#include #include -#endif #include #include @@ -412,6 +411,21 @@ VNET_DEFINE(struct intr_event *, pf_swi_ie); VNET_DEFINE(uint32_t, pf_hashseed); #define V_pf_hashseed VNET(pf_hashseed) +static void +pf_sctp_checksum(struct mbuf *m, int off) +{ + uint32_t sum = 0; + + /* Zero out the checksum, to enable recalculation. */ + m_copyback(m, off + offsetof(struct sctphdr, checksum), + sizeof(sum), (caddr_t)&sum); + + sum = sctp_calculate_cksum(m, off); + + m_copyback(m, off + offsetof(struct sctphdr, checksum), + sizeof(sum), (caddr_t)&sum); +} + int pf_addr_cmp(struct pf_addr *a, struct pf_addr *b, sa_family_t af) { @@ -5977,12 +5991,10 @@ pf_route(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, in_delayed_cksum(m0); m0->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; } -#if defined(SCTP) || defined(SCTP_SUPPORT) if (m0->m_pkthdr.csum_flags & CSUM_SCTP & ~ifp->if_hwassist) { - sctp_delayed_cksum(m0, (uint32_t)(ip->ip_hl << 2)); + pf_sctp_checksum(m0, (uint32_t)(ip->ip_hl << 2)); m0->m_pkthdr.csum_flags &= ~CSUM_SCTP; } -#endif /* * If small enough for interface, or the interface will take From nobody Fri Aug 11 12:13:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPQ6rZnz4q19w; Fri, 11 Aug 2023 12:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMjPQ6Jrsz3gGH; Fri, 11 Aug 2023 12:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bysG/6fz+gRoYrtVqiYL2r7Pt+vtTkc7tnfb1jqLGsc=; b=ZeAMqhCH2NJD10cmycSLEyY3lfUFf6tYXwlVeokFKN8XELU+vAL2uivucz5ruE3sA3BqUI 26MeYgLwo6XJEdZln4Bc0xqPneFkOtPv6n5++FghM5ZkF4ZPIcN0dSwIxNKJwMC7n7M3PF Hbzy674ISg2fS4FuFyHUtXHxiofKY3hJt+xZ23/Gso/qwqnC+rg3uZs/dFdwNyP5qEJTlI aOP3Jmzuu5jsRPvhPE0s99lbjQIdhYlE06T6W6suaZFIPaMzEqul6J5rdtdQfaYpfVRbp2 SUMLKRFFU+f2xuWvfBsJA7X6gzSK6Nv/IniKB250kYZU5DAfMLP7pa0rDF24Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bysG/6fz+gRoYrtVqiYL2r7Pt+vtTkc7tnfb1jqLGsc=; b=ZzP2peruu+IvckN9fWYPOnfC8AeGMKuzPgX2rdXNb7Kkr/++auih9Uh5js9tHX8XD84UdT yGjZPE6GCz1TYmz58WyCWo9XIbc/QKVLgjPFED5H5s5siuRDl5OJvTYDzGoQa1z38rEeiX R87iii/+cnjaHJjO74w4vU4bcH1aMfaqJPDqXr1tOUgFEpQYXDIXHAWZ8VJtozdTdCLvvS xhYUN3mc6m0U07xaMbCTAnLDwSyf/4vHo/LbXaNgek6cOtYOOkrbhl5xf77A/Wvqt5P/Zk 0PET6is5oq3urhOCWw/F8CvDacyHqjWxP+J+u5v9B/CMoKO2dDDseZ0G3iYkPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756010; a=rsa-sha256; cv=none; b=GBaCuTUESJ6hNKfMmgjKPbUuSoyuz51Uqk0d4+BESPLXvk8OEF0+3ccrLvDIJvOc4kfvLs je9LECDlQO/Ovt8FSLOcRujQhKgYVCTzQ7nKNrgK74IWUJPU5qiOMVUXc5nRlAo6/gI2fc HYE1Rxm4sPVMuf90CrwmF2V32wef9NhZ9wsTWihtLxGkAepDAWxwho3J+aOFEhPEqcJKVZ sZb7jDuE4ijqL6yiaPOzueeP9kFjdlS+VIpLDHWc9336CDyMpBI0JzvpwZ6bNI4Qxa88OI 87jAYP2WWLqEd5w7xreT6Zwzw9cf/TCIg/keHhfJOfzLraM62IsHNw4iw4xLSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPQ5MXZzfJ7; Fri, 11 Aug 2023 12:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BCDUZF008459; Fri, 11 Aug 2023 12:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDUXx008456; Fri, 11 Aug 2023 12:13:30 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:30 GMT Message-Id: <202308111213.37BCDUXx008456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9b14d6c17355 - stable/13 - pfctl: SCTP can have port numbers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b14d6c17355d0f516991cefd240bf51e8c26959 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b14d6c17355d0f516991cefd240bf51e8c26959 commit 9b14d6c17355d0f516991cefd240bf51e8c26959 Author: Kristof Provost AuthorDate: 2023-04-26 14:59:40 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pfctl: SCTP can have port numbers MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40861 (cherry picked from commit 0bd4a6837c4bc3dd6168c5679c21c58d41a6910e) --- sbin/pfctl/parse.y | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 043f8faee27b..1a7ce483ef7f 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -4797,8 +4797,9 @@ filter_consistent(struct pfctl_rule *r, int anchor_call) int problems = 0; if (r->proto != IPPROTO_TCP && r->proto != IPPROTO_UDP && + r->proto != IPPROTO_SCTP && (r->src.port_op || r->dst.port_op)) { - yyerror("port only applies to tcp/udp"); + yyerror("port only applies to tcp/udp/sctp"); problems++; } if (r->proto != IPPROTO_ICMP && r->proto != IPPROTO_ICMPV6 && @@ -4865,17 +4866,18 @@ rdr_consistent(struct pfctl_rule *r) { int problems = 0; - if (r->proto != IPPROTO_TCP && r->proto != IPPROTO_UDP) { + if (r->proto != IPPROTO_TCP && r->proto != IPPROTO_UDP && + r->proto != IPPROTO_SCTP) { if (r->src.port_op) { - yyerror("src port only applies to tcp/udp"); + yyerror("src port only applies to tcp/udp/sctp"); problems++; } if (r->dst.port_op) { - yyerror("dst port only applies to tcp/udp"); + yyerror("dst port only applies to tcp/udp/sctp"); problems++; } if (r->rpool.proxy_port[0]) { - yyerror("rpool port only applies to tcp/udp"); + yyerror("rpool port only applies to tcp/udp/sctp"); problems++; } } @@ -6350,6 +6352,8 @@ getservice(char *n) s = getservbyname(n, "tcp"); if (s == NULL) s = getservbyname(n, "udp"); + if (s == NULL) + s = getservbyname(n, "sctp"); if (s == NULL) { yyerror("unknown port %s", n); return (-1); From nobody Fri Aug 11 12:13:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPR6wnkz4TjQw; Fri, 11 Aug 2023 12:13: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 4RMjPR6nDmz3gcS; Fri, 11 Aug 2023 12:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Fc+ajbCLwHIF8RjOQE5RlWXjdVjeXyl9kTy7WPCQGc=; b=c1da54BuyvFWOnyqa5jV1txKVPlPcWB9VEU0Lg/L+G7KIrNDHwTmUKICmGARwG73q/cEqD I9VA7DbAUB+2CWU2zLlhUmGgADtgV1bB8JmmqD6/CpCGHGySUoDXIfMhTsaPsDzyez3BYG p+Acs1yIPZPdtp94OxMbct+c4poVtBi6FHKOQpFycR1XaO1Ppwo4pNJj39VRDn+dqB0hmA wTIkUifrz2NHJPJW2n0278bdUnnSTID4OaVOOFMG0cZa6tvEXg37ayqHHkNEBcudeUJ82s 46Ob1q1DCkbcexzQ/xMf7QiyTNlYlPlG4XmkmjFPRXABBe8e0QcO0glJWSKx7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Fc+ajbCLwHIF8RjOQE5RlWXjdVjeXyl9kTy7WPCQGc=; b=KRWnvceg+uyqkewKUpdKM5OqbW6hLxuemmlk005Uyu2IJL5+mqqDW6Re2hUQqbAfhszzhS R0FSFIVB9fB2Te3+Qyn9IsoLGB2amnIfZLGXad1j0bQYkNl3Yo03FJ+sAVc/ycnPicyJ02 xgUNk5wHU6AAjTte1gvQggIvmvTvdObsFjqh6cp/A5imbJjKAX8Gffc7cY+ZfamuBrGy65 nBgcYOGCzLWfCTsuqiwAGheF4hoBXfziHNz1fpWEl/YV2xh6N6BZiAYKVoa+GJM5vafBCn OrNwPl6wdbg0CjDzn+xoYESmiuWQbr49wbG3fEHUxiv6jV3srN+o0En3MigH5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756011; a=rsa-sha256; cv=none; b=PReX390Iaj0NRdayklYOVfhxlHkpRPE6PAZxh0CkSEPCmaP1alXSLxCbzuDdMoGpHnjoC6 wEAODqIMjYXFxaTK71COYLw7qkh2emK3YG1xp+7yivfdodc0ephW6s7WHR8US9ppfV344Y ysw5vfRy5wTWHpDzej/BiHlmSsCD8EP55LhhJh4s6X4bJf2rQMAfqdDkj/zxMIMTjTi5AO +0vuUrNCHD25jl3cylom06DPmKnb0GjPUX/9Bjq0BFU2nTzjrdQupGKGB1YXQLTPCl2a8X a7SXC5zbwUKIzKxhoV7iO2NHGKhe66nzH9pbdV3ryn5f4qyHDh1UjbvaLZMhiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPR5s6rzdgT; Fri, 11 Aug 2023 12:13: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 37BCDV8M008498; Fri, 11 Aug 2023 12:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDVGm008495; Fri, 11 Aug 2023 12:13:31 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:31 GMT Message-Id: <202308111213.37BCDVGm008495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9b60a37c1e9b - stable/13 - pf: initial SCTP support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9b60a37c1e9b77162cf3816ef32a50345c111c59 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9b60a37c1e9b77162cf3816ef32a50345c111c59 commit 9b60a37c1e9b77162cf3816ef32a50345c111c59 Author: Kristof Provost AuthorDate: 2023-04-27 08:58:02 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf: initial SCTP support Basic state tracking for SCTP. This means we scan through the packet to identify the different chunks (so we can identify state changes). MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40862 (cherry picked from commit 010ee43f5673eea4c86f846893eadc3c5529b2f8) --- sbin/pfctl/pf_print_state.c | 34 +++++++++ sys/net/pfvar.h | 13 ++++ sys/netpfil/pf/pf.c | 133 ++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_norm.c | 180 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 360 insertions(+) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index b66a296d6080..a6c1ab9bf267 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #define TCPSTATES #include +#include #include #include #include @@ -206,6 +207,36 @@ print_seq(struct pfctl_state_peer *p) p->seqhi - p->seqlo); } + +static const char * +sctp_state_name(int state) +{ + switch (state) { + case SCTP_CLOSED: + return ("CLOSED"); + case SCTP_BOUND: + return ("BOUND"); + case SCTP_LISTEN: + return ("LISTEN"); + case SCTP_COOKIE_WAIT: + return ("COOKIE_WAIT"); + case SCTP_COOKIE_ECHOED: + return ("COOKIE_ECHOED"); + case SCTP_ESTABLISHED: + return ("ESTABLISHED"); + case SCTP_SHUTDOWN_SENT: + return ("SHUTDOWN_SENT"); + case SCTP_SHUTDOWN_RECEIVED: + return ("SHUTDOWN_RECEIVED"); + case SCTP_SHUTDOWN_ACK_SENT: + return ("SHUTDOWN_ACK_SENT"); + case SCTP_SHUTDOWN_PENDING: + return ("SHUTDOWN_PENDING"); + default: + return ("?"); + } +} + void print_state(struct pfctl_state *s, int opts) { @@ -300,6 +331,9 @@ print_state(struct pfctl_state *s, int opts) const char *states[] = PFUDPS_NAMES; printf(" %s:%s\n", states[src->state], states[dst->state]); + } else if (proto == IPPROTO_SCTP) { + printf(" %s:%s\n", sctp_state_name(src->state), + sctp_state_name(dst->state)); #ifndef INET6 } else if (proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES && dst->state < PFOTHERS_NSTATES) { diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 4b7f34122337..55bd25a3d29e 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #endif @@ -1290,6 +1291,7 @@ struct pf_pdesc { union pf_headers { struct tcphdr tcp; struct udphdr udp; + struct sctphdr sctp; struct icmp icmp; #ifdef INET6 struct icmp6_hdr icmp6; @@ -1319,6 +1321,15 @@ struct pf_pdesc { u_int8_t dir; /* direction */ u_int8_t sidx; /* key index for source */ u_int8_t didx; /* key index for destination */ +#define PFDESC_SCTP_INIT 0x0001 +#define PFDESC_SCTP_INIT_ACK 0x0002 +#define PFDESC_SCTP_COOKIE 0x0004 +#define PFDESC_SCTP_ABORT 0x0008 +#define PFDESC_SCTP_SHUTDOWN 0x0010 +#define PFDESC_SCTP_SHUTDOWN_COMPLETE 0x0020 +#define PFDESC_SCTP_DATA 0x0040 +#define PFDESC_SCTP_OTHER 0x0080 + u_int16_t sctp_flags; }; #endif @@ -2013,6 +2024,8 @@ int pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *, int pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_kstate *, struct pf_state_peer *, struct pf_state_peer *, int *); +int pf_normalize_sctp(int, struct pfi_kkif *, struct mbuf *, int, + int, void *, struct pf_pdesc *); u_int32_t pf_state_expires(const struct pf_kstate *); void pf_purge_expired_fragments(void); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 57c9bb3bf3b1..16e0ee762f6a 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -290,6 +290,9 @@ static int pf_test_state_udp(struct pf_kstate **, int, static int pf_test_state_icmp(struct pf_kstate **, int, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); +static int pf_test_state_sctp(struct pf_kstate **, + struct pfi_kkif *, struct mbuf *, int, + void *, struct pf_pdesc *, u_short *); static int pf_test_state_other(struct pf_kstate **, int, struct pfi_kkif *, struct mbuf *, struct pf_pdesc *); static u_int16_t pf_calc_mss(struct pf_addr *, sa_family_t, @@ -3700,6 +3703,11 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, dport = pd->hdr.udp.uh_dport; hdrlen = sizeof(pd->hdr.udp); break; + case IPPROTO_SCTP: + sport = pd->hdr.sctp.src_port; + dport = pd->hdr.sctp.dest_port; + hdrlen = sizeof(pd->hdr.sctp); + break; #ifdef INET case IPPROTO_ICMP: if (pd->af != AF_INET) @@ -4138,6 +4146,11 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, pf_set_protostate(s, PF_PEER_DST, PFUDPS_NO_TRAFFIC); s->timeout = PFTM_UDP_FIRST_PACKET; break; + case IPPROTO_SCTP: + pf_set_protostate(s, PF_PEER_SRC, SCTP_COOKIE_WAIT); + pf_set_protostate(s, PF_PEER_DST, SCTP_CLOSED); + s->timeout = PFTM_TCP_FIRST_PACKET; + break; case IPPROTO_ICMP: #ifdef INET6 case IPPROTO_ICMPV6: @@ -5693,6 +5706,66 @@ pf_test_state_icmp(struct pf_kstate **state, int direction, struct pfi_kkif *kif } } +static int +pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, + struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) +{ + struct pf_state_key_cmp key; + struct pf_state_peer *src; //, *dst; + struct sctphdr *sh = &pd->hdr.sctp; + u_int8_t psrc; //, pdst; + + bzero(&key, sizeof(key)); + key.af = pd->af; + key.proto = IPPROTO_SCTP; + if (pd->dir == PF_IN) { /* wire side, straight */ + PF_ACPY(&key.addr[0], pd->src, key.af); + PF_ACPY(&key.addr[1], pd->dst, key.af); + key.port[0] = sh->src_port; + key.port[1] = sh->dest_port; + } else { /* stack side, reverse */ + PF_ACPY(&key.addr[1], pd->src, key.af); + PF_ACPY(&key.addr[0], pd->dst, key.af); + key.port[1] = sh->src_port; + key.port[0] = sh->dest_port; + } + + STATE_LOOKUP(kif, &key, pd->dir, *state, pd); + + if (pd->dir == (*state)->direction) { + src = &(*state)->src; + psrc = PF_PEER_SRC; + } else { + src = &(*state)->dst; + psrc = PF_PEER_DST; + } + + /* Track state. */ + if (pd->sctp_flags & PFDESC_SCTP_INIT) { + if (src->state < SCTP_COOKIE_WAIT) { + pf_set_protostate(*state, psrc, SCTP_COOKIE_WAIT); + (*state)->timeout = PFTM_TCP_OPENING; + } + } + if (pd->sctp_flags & PFDESC_SCTP_COOKIE) { + if (src->state < SCTP_ESTABLISHED) { + pf_set_protostate(*state, psrc, SCTP_ESTABLISHED); + (*state)->timeout = PFTM_TCP_ESTABLISHED; + } + } + if (pd->sctp_flags & (PFDESC_SCTP_SHUTDOWN | PFDESC_SCTP_ABORT | + PFDESC_SCTP_SHUTDOWN_COMPLETE)) { + if (src->state < SCTP_SHUTDOWN_PENDING) { + pf_set_protostate(*state, psrc, SCTP_SHUTDOWN_PENDING); + (*state)->timeout = PFTM_TCP_CLOSING; + } + } + + (*state)->expire = time_uptime; + + return (PF_PASS); +} + static int pf_test_state_other(struct pf_kstate **state, int direction, struct pfi_kkif *kif, struct mbuf *m, struct pf_pdesc *pd) @@ -6550,6 +6623,36 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb * break; } + case IPPROTO_SCTP: { + if (!pf_pull_hdr(m, off, &pd.hdr.sctp, sizeof(pd.hdr.sctp), + &action, &reason, AF_INET)) { + log = action != PF_PASS; + goto done; + } + pd.sport = &pd.hdr.sctp.src_port; + pd.dport = &pd.hdr.sctp.dest_port; + if (pd.hdr.sctp.src_port == 0 || pd.hdr.sctp.dest_port == 0) { + action = PF_DROP; + REASON_SET(&reason, PFRES_SHORT); + goto done; + } + action = pf_normalize_sctp(dir, kif, m, 0, off, h, &pd); + if (action == PF_DROP) + goto done; + action = pf_test_state_sctp(&s, kif, m, off, h, &pd, + &reason); + if (action == PF_PASS) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule.ptr; + a = s->anchor.ptr; + } else { + action = pf_test_rule(&r, &s, pd.dir, kif, m, off, + &pd, &a, &ruleset, inp); + } + break; + } + case IPPROTO_ICMP: { if (!pf_pull_hdr(m, off, &pd.hdr.icmp, ICMP_MINLEN, &action, &reason, AF_INET)) { @@ -6996,6 +7099,36 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb break; } + case IPPROTO_SCTP: { + if (!pf_pull_hdr(m, off, &pd.hdr.sctp, sizeof(pd.hdr.sctp), + &action, &reason, AF_INET6)) { + log = action != PF_PASS; + goto done; + } + pd.sport = &pd.hdr.sctp.src_port; + pd.dport = &pd.hdr.sctp.dest_port; + if (pd.hdr.sctp.src_port == 0 || pd.hdr.sctp.dest_port == 0) { + action = PF_DROP; + REASON_SET(&reason, PFRES_SHORT); + goto done; + } + action = pf_normalize_sctp(dir, kif, m, 0, off, h, &pd); + if (action == PF_DROP) + goto done; + action = pf_test_state_sctp(&s, kif, m, off, h, &pd, + &reason); + if (action == PF_PASS) { + if (V_pfsync_update_state_ptr != NULL) + V_pfsync_update_state_ptr(s); + r = s->rule.ptr; + a = s->anchor.ptr; + } else { + action = pf_test_rule(&r, &s, pd.dir, kif, m, off, + &pd, &a, &ruleset, inp); + } + break; + } + case IPPROTO_ICMP: { action = PF_DROP; DPFPRINTF(PF_DEBUG_MISC, diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index ae026fb9cee1..06aa577b45a7 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -55,6 +55,8 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include +#include #ifdef INET6 #include @@ -1988,6 +1990,184 @@ pf_normalize_tcpopt(struct pf_krule *r, struct mbuf *m, struct tcphdr *th, return (rewrite); } +static int +pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) +{ + struct sctp_chunkhdr ch = { }; + int chunk_off = sizeof(struct sctphdr); + int chunk_start; + + while (off + chunk_off < pd->tot_len) { + if (!pf_pull_hdr(m, off + chunk_off, &ch, sizeof(ch), NULL, + NULL, pd->af)) + return (PF_DROP); + + /* Length includes the header, this must be at least 4. */ + if (ntohs(ch.chunk_length) < 4) + return (PF_DROP); + + chunk_start = chunk_off; + chunk_off += roundup(ntohs(ch.chunk_length), 4); + + switch (ch.chunk_type) { + case SCTP_INITIATION: { + struct sctp_init_chunk init; + + if (!pf_pull_hdr(m, off + chunk_start, &init, + sizeof(init), NULL, NULL, pd->af)) + return (PF_DROP); + + /* + * RFC 9620, Section 3.3.2, "The Initiate Tag is allowed to have + * any value except 0." + */ + if (init.init.initiate_tag == 0) + return (PF_DROP); + if (init.init.num_inbound_streams == 0) + return (PF_DROP); + if (init.init.num_outbound_streams == 0) + return (PF_DROP); + if (ntohl(init.init.a_rwnd) < SCTP_MIN_RWND) + return (PF_DROP); + + /* + * RFC 9260, Section 3.1, INIT chunks MUST have zero + * verification tag. + */ + if (pd->hdr.sctp.v_tag != 0) + return (PF_DROP); + + pd->sctp_flags |= PFDESC_SCTP_INIT; + break; + } + case SCTP_INITIATION_ACK: + pd->sctp_flags |= PFDESC_SCTP_INIT_ACK; + break; + case SCTP_ABORT_ASSOCIATION: + pd->sctp_flags |= PFDESC_SCTP_ABORT; + break; + case SCTP_SHUTDOWN: + case SCTP_SHUTDOWN_ACK: + pd->sctp_flags |= PFDESC_SCTP_SHUTDOWN; + break; + case SCTP_SHUTDOWN_COMPLETE: + pd->sctp_flags |= PFDESC_SCTP_SHUTDOWN_COMPLETE; + break; + case SCTP_COOKIE_ECHO: + case SCTP_COOKIE_ACK: + pd->sctp_flags |= PFDESC_SCTP_COOKIE; + break; + case SCTP_DATA: + pd->sctp_flags |= PFDESC_SCTP_DATA; + break; + default: + pd->sctp_flags |= PFDESC_SCTP_OTHER; + break; + } + } + + /* Validate chunk lengths vs. packet length. */ + if (off + chunk_off != pd->tot_len) + return (PF_DROP); + + /* + * INIT, INIT_ACK or SHUTDOWN_COMPLETE chunks must always be the only + * one in a packet. + */ + if ((pd->sctp_flags & PFDESC_SCTP_INIT) && + (pd->sctp_flags & ~PFDESC_SCTP_INIT)) + return (PF_DROP); + if ((pd->sctp_flags & PFDESC_SCTP_INIT_ACK) && + (pd->sctp_flags & ~PFDESC_SCTP_INIT_ACK)) + return (PF_DROP); + if ((pd->sctp_flags & PFDESC_SCTP_SHUTDOWN_COMPLETE) && + (pd->sctp_flags & ~PFDESC_SCTP_SHUTDOWN_COMPLETE)) + return (PF_DROP); + + return (PF_PASS); +} + +int +pf_normalize_sctp(int dir, struct pfi_kkif *kif, struct mbuf *m, int ipoff, + int off, void *h, struct pf_pdesc *pd) +{ + struct pf_krule *r, *rm = NULL; + struct sctphdr *sh = &pd->hdr.sctp; + u_short reason; + sa_family_t af = pd->af; + int srs; + + PF_RULES_RASSERT(); + + /* Unconditionally scan the SCTP packet, because we need to look for + * things like shutdown and asconf chunks. */ + if (pf_scan_sctp(m, ipoff, off, pd) != PF_PASS) + goto sctp_drop; + + 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); + while (r != NULL) { + pf_counter_u64_add(&r->evaluations, 1); + if (pfi_kkif_match(r->kif, kif) == r->ifnot) + r = r->skip[PF_SKIP_IFP].ptr; + else if (r->direction && r->direction != dir) + r = r->skip[PF_SKIP_DIR].ptr; + else if (r->af && r->af != af) + r = r->skip[PF_SKIP_AF].ptr; + else if (r->proto && r->proto != pd->proto) + r = r->skip[PF_SKIP_PROTO].ptr; + else if (PF_MISMATCHAW(&r->src.addr, pd->src, af, + r->src.neg, kif, M_GETFIB(m))) + r = r->skip[PF_SKIP_SRC_ADDR].ptr; + else if (r->src.port_op && !pf_match_port(r->src.port_op, + r->src.port[0], r->src.port[1], sh->src_port)) + r = r->skip[PF_SKIP_SRC_PORT].ptr; + else if (PF_MISMATCHAW(&r->dst.addr, pd->dst, af, + r->dst.neg, NULL, M_GETFIB(m))) + r = r->skip[PF_SKIP_DST_ADDR].ptr; + else if (r->dst.port_op && !pf_match_port(r->dst.port_op, + r->dst.port[0], r->dst.port[1], sh->dest_port)) + r = r->skip[PF_SKIP_DST_PORT].ptr; + else { + rm = r; + break; + } + } + + if (srs) { + /* With scrub rules present SCTP normalization happens only + * if one of rules has matched and it's not a "no scrub" rule */ + if (rm == NULL || rm->action == PF_NOSCRUB) + return (PF_PASS); + + pf_counter_u64_critical_enter(); + pf_counter_u64_add_protected(&r->packets[dir == PF_OUT], 1); + pf_counter_u64_add_protected(&r->bytes[dir == PF_OUT], pd->tot_len); + pf_counter_u64_critical_exit(); + } + + /* Verify we're a multiple of 4 bytes long */ + if ((pd->tot_len - off - sizeof(struct sctphdr)) % 4) + goto sctp_drop; + + /* INIT chunk needs to be the only chunk */ + if (pd->sctp_flags & PFDESC_SCTP_INIT) + if (pd->sctp_flags & ~PFDESC_SCTP_INIT) + goto sctp_drop; + + return (PF_PASS); + +sctp_drop: + REASON_SET(&reason, PFRES_NORM); + if (rm != NULL && r->log) + PFLOG_PACKET(kif, m, AF_INET, pd->dir, reason, r, NULL, NULL, pd, + 1); + + return (PF_DROP); +} + #ifdef INET static void pf_scrub_ip(struct mbuf **m0, u_int32_t flags, u_int8_t min_ttl, u_int8_t tos) From nobody Fri Aug 11 12:13:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPT2mhTz4q17S; Fri, 11 Aug 2023 12:13: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 4RMjPT12Pmz3gJ0; Fri, 11 Aug 2023 12:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pbIfv2T8oNRIxtfSbMw455O2lR42L/bi+tt1Qh6Wii8=; b=dGGYfFEXHOwd0ZQhhnptlAgNAt3Fx+GAk2Y7cVAJ2j5ge+hfwFnagS1ZM7WJL5jxh3JA+5 eRMlAHA/KwtH6OVoXoE3mXw8bwK1qiTbXwadyxXqUVKwz4HUnqeJl63T0ZxF9csJ+pez6/ 9EEr5U+aG0Z8T0MhXPgmImkGikR+oGqOhk1bs88V2DYDlUI/Bmy0t7gbR1Su7U45let1Iz r0RGW7qaz3/wM5ncxR9lRS0mqq4cP8EUekWTQwbgeoxnPANjPUOxEf0/kYorFq6T+P4ZUD Y82hi+lUpSwBUFjqxdHUi6LISOgi1RE0Wnab1lgrdUFH+7CXrAwHWJQ1HYTe6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pbIfv2T8oNRIxtfSbMw455O2lR42L/bi+tt1Qh6Wii8=; b=vcxw2ntX3AcXi/CiLrLsv+zYCvLRQHyq2A2AY93uhuW3+oEm1HTkPFsCnEvqwlPM7TLlYO YGGfIIkC4dlZhVjX2/WKbt67U9KfcqkyuxMHK9kvmXsxo+8pp0ohmXCGn8YD32RQtzHk3V alcz37cC9yRxzv4ySH+qs9R9H5aSRPu0DC8JlS+EDG5xSuzWaE4mts5VBf19vXwRez66tQ dvZsNUdg4BgsooCyGd/zwqK0Hus+OE1ihNaGiHMA3IvWoN+UoFi5gcrux2x5J5fp1foBV9 xEWRqx5qjj1YzFCI6NinHeTzkrWHCF/BA1FXV5jb4izmb5FclxvIcOUXzzKpWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756013; a=rsa-sha256; cv=none; b=EPB+8WeXEVkSuGw4LKC1ZWXQKD2N9tSEPvRpfDp1FjhjGJBig+edC3W4wtfiT8r+rP36g2 pVjMl1wiMD8TKbV9iVD+eHCx98pTp8wGCBZp3aRcl+8dDJ4HYiq6yK4Vw2qku3Pnoe2Pd5 pCvU9oC+yxNF5vD5SIYobcwENI0D3QtnPpPCxPyXgE0xuoor/5NmAdHKJz2e7pzWjRPKla dN+CEmwXuvzHXsQVjNBz8mmcjeNGwOgRZYi0IStb8oJzjJcx0dhwK1dvIZNquy08bocbum dUqCjMtIwH0CC6q+Vzj7fASy2kE9DQlxU3V2GqhxGS0yuQo2M9Ar594NBIG5vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPT02KQzfRD; Fri, 11 Aug 2023 12:13: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 37BCDWDf008543; Fri, 11 Aug 2023 12:13:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDWwK008540; Fri, 11 Aug 2023 12:13:32 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:32 GMT Message-Id: <202308111213.37BCDWwK008540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: a9e6ca87f104 - stable/13 - pf tests: basic SCTP connection test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a9e6ca87f104bb127b324b9c30ddf507d112d235 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=a9e6ca87f104bb127b324b9c30ddf507d112d235 commit a9e6ca87f104bb127b324b9c30ddf507d112d235 Author: Kristof Provost AuthorDate: 2023-04-27 09:13:40 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf tests: basic SCTP connection test pf can now inspect SCTP. Check that we can set up a connection. IPv4 and IPv6 tests. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40863 (cherry picked from commit 95363473793986eeecf19f7ed78d05f25cfa7b87) --- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/sctp.sh | 190 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 26e5710d6f81..0ea2bd60e7da 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -24,6 +24,7 @@ ATF_TESTS_SH+= altq \ ridentifier \ route_to \ rules_counter \ + sctp \ set_skip \ set_tos \ src_track \ diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh new file mode 100644 index 000000000000..5064fe316e5e --- /dev/null +++ b/tests/sys/netpfil/pf/sctp.sh @@ -0,0 +1,190 @@ +# $FreeBSD$ +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright © 2023 Orange Business Services +# +# 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 + +sctp_init() +{ + pft_init + if ! kldstat -q -m sctp; then + atf_skip "This test requires SCTP" + fi +} + +atf_test_case "basic_v4" "cleanup" +basic_v4_head() +{ + atf_set descr 'Basic SCTP connection over IPv4 passthrough' + atf_set require.user root +} + +basic_v4_body() +{ + sctp_init + + j="sctp:basic_v4" + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + vnet_mkjail ${j}b ${epair}b + + jexec ${j}a ifconfig ${epair}a 192.0.2.1/24 up + jexec ${j}b ifconfig ${epair}b 192.0.2.2/24 up + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -c 1 192.0.2.2 + + jexec ${j}a pfctl -e + pft_set_rules ${j}a \ + "block" \ + "pass in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi + + # Now with scrub rules present, so normalization is done + pft_set_rules ${j}a \ + "scrub on ${j}a" \ + "block" \ + "pass in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc --sctp -N -l 1234 & + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi + + # Now fail with a blocked port + echo "foo" | jexec ${j}a nc --sctp -N -l 1235 & + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 192.0.2.1 1235) + if [ "$out" == "foo" ]; then + atf_fail "SCTP port block failed" + fi + + # Now fail with a blocked port but passing source port + out=$(jexec ${j}b nc --sctp -N -w 3 -p 1234 192.0.2.1 1235) + if [ "$out" == "foo" ]; then + atf_fail "SCTP port block failed" + fi +} + +basic_v4_cleanup() +{ + pft_cleanup +} + +atf_test_case "basic_v6" "cleanup" +basic_v6_head() +{ + atf_set descr 'Basic SCTP connection over IPv6' + atf_set require.user root +} + +basic_v6_body() +{ + sctp_init + + j="sctp:basic_v6" + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + vnet_mkjail ${j}b ${epair}b + + jexec ${j}a ifconfig ${epair}a inet6 2001:db8::a/64 up no_dad + jexec ${j}b ifconfig ${epair}b inet6 2001:db8::b/64 up no_dad + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -6 -c 1 2001:db8::b + + jexec ${j}a pfctl -e + pft_set_rules ${j}a \ + "block proto sctp" \ + "pass in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi + + # Now with scrub rules present, so normalization is done + pft_set_rules ${j}a \ + "scrub on ${j}a" \ + "block proto sctp" \ + "pass in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 & + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi + + # Now fail with a blocked port + echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1235 & + sleep 1 + + out=$(jexec ${j}b nc --sctp -N -w 3 2001:db8::a 1235) + if [ "$out" == "foo" ]; then + atf_fail "SCTP port block failed" + fi + + # Now fail with a blocked port but passing source port + out=$(jexec ${j}b nc --sctp -N -w 3 -p 1234 2001:db8::a 1235) + if [ "$out" == "foo" ]; then + atf_fail "SCTP port block failed" + fi +} + +basic_v6_cleanup() +{ + pft_cleanup +} + + +atf_init_test_cases() +{ + atf_add_test_case "basic_v4" + atf_add_test_case "basic_v6" +} From nobody Fri Aug 11 12:13:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPV2j2Qz4q1B1; Fri, 11 Aug 2023 12:13: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 4RMjPV1knDz3gRx; Fri, 11 Aug 2023 12:13:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urjITSVESrCx6nQ7ZY7QtMbx0HY12eSemJAruBSWfNc=; b=A2eimjYejSX9I6onAQp2OBNK+NXtOX1ZSoAftyf8TnWdJPKeqYxncYgszFfICBymE9lXcc pvvD++Gj3/TCPJqhryUGzZj8Ki1LvZjo/SHDcV0aViRBodEn6v6+Kz3SsSOci4mwFiKsz7 mV784n6h7ghDujJiU21TCNYphzb/I+NYLgPk8THYdNCDfXx1Ljy17Qz/4nVm6N8vrg9V9f CjhfbiXuivrUW3EzwmTmrc5odQ4H+lz57vDc3wCumjou3fe/DLIBSJ07ntTQOiMv4Hdyba Sj+pVMLWt3rfNIZOZw9hsV3FRgFg26DXGZheWO/Pg7zyFQVVlWVqfaH+PnkSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=urjITSVESrCx6nQ7ZY7QtMbx0HY12eSemJAruBSWfNc=; b=yo8ZC5EtH4nbeo04hhRA6HCCFo3zRtaWDWSTk4fpVFfOkfPbnD4x4m7ph+9PEQlljOuAJb r6/5PCO8Q2PMcvdkJXq/cfzx9tLG0Bm+9LK6sjB5m3qYE/ptA/EuqfGqT5L0fIoE9db3oh zUcq/k31DrC/b9Qpy9j9x9G0xdr4j5RjAntnvOt82Y2nD7HdRfulkFvVqlynyNG//22sZ6 Gi/qOh+8kkrrHecAym6sGuwr6jQ8b7Nm9i2FIN0+jRrlp1jIwCmckIA/EaoSvs3m2zFZiO DuenfFjjmSAbeJngQ1C3a0GDzAciJGzWXdDU9qYSbbB58ITICa0OYSagLhdbEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756014; a=rsa-sha256; cv=none; b=Ke1x2YWncHlP0uS5SA8DcjY3sf6kFzN1VC3xk0bOwrOIkxC5ny4G6Z998o01k7yw33ACer QMHplH718ZsR9DcCaYCToHTiLw1qV453+egD2PkLrA8wDA7vVzMUaTXTySGpZYAQ/rsDif 5W16fqi1ID6bTQ27Ho01IrGR4sjmdbinBfCzKxPmL3qdhEn4yPeXZSv73EwmokzFbfE+m4 rPih5UAOJHWr1j3nURu/esDIJ/V6ODeISTuJuszmoXnzTDQhrg7nYI2tvGgBxzvf/IrQqb ciqhSkcTuMmzqAjUoByWGj6stEgdN1M4tZXfP4fXaM5t85yU7U++o/QRiiXWHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPV0qcyzdgV; Fri, 11 Aug 2023 12:13: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 37BCDY7F008585; Fri, 11 Aug 2023 12:13:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDYMY008582; Fri, 11 Aug 2023 12:13:34 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:34 GMT Message-Id: <202308111213.37BCDYMY008582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 540c8cd7adc5 - stable/13 - pf: support 'return' for SCTP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 540c8cd7adc5b30fa11ea47822c333863b0663b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=540c8cd7adc5b30fa11ea47822c333863b0663b5 commit 540c8cd7adc5b30fa11ea47822c333863b0663b5 Author: Kristof Provost AuthorDate: 2023-05-31 14:03:39 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf: support 'return' for SCTP Send an SCTP Abort message if we're refusing a connection, just like we send a RST for TCP. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40864 (cherry picked from commit d1bc1e9e1ae04016e16154884914d839566ebaec) --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_norm.c | 2 + 3 files changed, 120 insertions(+) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 55bd25a3d29e..99c504d99368 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1330,6 +1330,7 @@ struct pf_pdesc { #define PFDESC_SCTP_DATA 0x0040 #define PFDESC_SCTP_OTHER 0x0080 u_int16_t sctp_flags; + u_int32_t sctp_initiate_tag; }; #endif diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 16e0ee762f6a..ce5e1b813bb2 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -2911,6 +2911,120 @@ pf_build_tcp(const struct pf_krule *r, sa_family_t af, return (m); } +static void +pf_send_sctp_abort(sa_family_t af, struct pf_pdesc *pd, + uint8_t ttl, int rtableid) +{ + struct mbuf *m; +#ifdef INET + struct ip *h = NULL; +#endif /* INET */ +#ifdef INET6 + struct ip6_hdr *h6 = NULL; +#endif /* INET6 */ + struct sctphdr *hdr; + struct sctp_chunkhdr *chunk; + struct pf_send_entry *pfse; + int off = 0; + + MPASS(af == pd->af); + + m = m_gethdr(M_NOWAIT, MT_DATA); + if (m == NULL) + return; + + m->m_data += max_linkhdr; + m->m_flags |= M_SKIP_FIREWALL; + /* The rest of the stack assumes a rcvif, so provide one. + * This is a locally generated packet, so .. close enough. */ + m->m_pkthdr.rcvif = V_loif; + + /* IPv4|6 header */ + switch (af) { +#ifdef INET + case AF_INET: + bzero(m->m_data, sizeof(struct ip) + sizeof(*hdr) + sizeof(*chunk)); + + h = mtod(m, struct ip *); + + /* IP header fields included in the TCP checksum */ + + h->ip_p = IPPROTO_SCTP; + h->ip_len = htons(sizeof(*h) + sizeof(*hdr) + sizeof(*chunk)); + h->ip_ttl = ttl ? ttl : V_ip_defttl; + h->ip_src = pd->dst->v4; + h->ip_dst = pd->src->v4; + + off += sizeof(struct ip); + break; +#endif /* INET */ +#ifdef INET6 + case AF_INET6: + bzero(m->m_data, sizeof(struct ip6_hdr) + sizeof(*hdr) + sizeof(*chunk)); + + h6 = mtod(m, struct ip6_hdr *); + + /* IP header fields included in the TCP checksum */ + h6->ip6_vfc |= IPV6_VERSION; + h6->ip6_nxt = IPPROTO_SCTP; + h6->ip6_plen = htons(sizeof(*h6) + sizeof(*hdr) + sizeof(*chunk)); + h6->ip6_hlim = ttl ? ttl : V_ip6_defhlim; + memcpy(&h6->ip6_src, &pd->dst->v6, sizeof(struct in6_addr)); + memcpy(&h6->ip6_dst, &pd->src->v6, sizeof(struct in6_addr)); + + off += sizeof(struct ip6_hdr); + break; +#endif /* INET6 */ + } + + /* SCTP header */ + hdr = mtodo(m, off); + + hdr->src_port = pd->hdr.sctp.dest_port; + hdr->dest_port = pd->hdr.sctp.src_port; + hdr->v_tag = pd->sctp_initiate_tag; + hdr->checksum = 0; + + /* Abort chunk. */ + off += sizeof(struct sctphdr); + chunk = mtodo(m, off); + + chunk->chunk_type = SCTP_ABORT_ASSOCIATION; + chunk->chunk_length = htons(sizeof(*chunk)); + + /* SCTP checksum */ + off += sizeof(*chunk); + m->m_pkthdr.len = m->m_len = off; + + pf_sctp_checksum(m, off - sizeof(*hdr) - sizeof(*chunk));; + + if (rtableid >= 0) + M_SETFIB(m, rtableid); + + /* Allocate outgoing queue entry, mbuf and mbuf tag. */ + pfse = malloc(sizeof(*pfse), M_PFTEMP, M_NOWAIT); + if (pfse == NULL) { + m_freem(m); + return; + } + + switch (af) { +#ifdef INET + case AF_INET: + pfse->pfse_type = PFSE_IP; + break; +#endif /* INET */ +#ifdef INET6 + case AF_INET6: + pfse->pfse_type = PFSE_IP6; + break; +#endif /* INET6 */ + } + + pfse->pfse_m = m; + pf_send(pfse); +} + void pf_send_tcp(const struct pf_krule *r, sa_family_t af, const struct pf_addr *saddr, const struct pf_addr *daddr, @@ -3014,6 +3128,9 @@ pf_return(struct pf_krule *r, struct pf_krule *nr, struct pf_pdesc *pd, ntohl(th->th_ack), ack, TH_RST|TH_ACK, 0, 0, r->return_ttl, 1, 0); } + } else if (pd->proto == IPPROTO_SCTP && + (r->rule_flag & PFRULE_RETURN)) { + pf_send_sctp_abort(af, pd, r->return_ttl, r->rtableid); } else if (pd->proto != IPPROTO_ICMP && af == AF_INET && r->return_icmp) pf_send_icmp(m, r->return_icmp >> 8, diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 06aa577b45a7..ac02896d0762 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2037,6 +2037,8 @@ pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) if (pd->hdr.sctp.v_tag != 0) return (PF_DROP); + pd->sctp_initiate_tag = init.init.initiate_tag; + pd->sctp_flags |= PFDESC_SCTP_INIT; break; } From nobody Fri Aug 11 12:13:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPW3bNHz4q0yc; Fri, 11 Aug 2023 12:13: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 4RMjPW32R2z3gg8; Fri, 11 Aug 2023 12:13:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k7yfR60hg9iuomtn+pd8pu3fAixI2kD2toRVy0keB9g=; b=m9XLx2ON3us9m+hX88hfTy3pghw5G3MISdB1PBC0/xhESGI8E6jZ8C+OVDVxl+03Av4SNb hWTHhMFeUQerrQWJ8r+sNWFLXob137YEPLvEyx7Y9DP7fG2SSvWIrL/qV8nEzUzWMJ8PT8 a+F1BWkrMUG0cKIdd7HVqrZHzZitFQa2AxPv4jkS+WblylYJFAc4qT5N/UpRzBFp+nUdDb RrmfhBQ0pfLEkFuJAflqZzshHP4sh9jOk5MuvlwaSLTn2V6FlsmSxlvTuM06iNSipTxKO3 cZeC+y//5ncpcKgQnEW97MFUtDKzcchiBsuSu/4x3TK9azrZD8LYeNp/0dZyIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k7yfR60hg9iuomtn+pd8pu3fAixI2kD2toRVy0keB9g=; b=xHDrdLikYNKl8+H5WH5YBbUagM32WlH2s3O/8vP+i5445bKJ+rjsNiKU0xOYVZh76K/Chi I6nOMHC5gqxikPLURvS/kqHnovrRwJ7mnaB2ZrBh3IXUCa+Ko4Y2m4lBjhWwxnSWO4NLlG Hi+GGPQdsdCsEv0xGPFSvVPsY1MEazKAbG7cfhLkfg+eQclgs9S2AAbk0a6BRIy0CNjIjT qEFajA0hx7eIbaBuPMrRdcfdw/DnJ7kRqEQHGi9Ju1ORdsm2/hg2s17YllnZe9m4EwtZoZ GXAOXZZg9L2TS/d51Ge1LTni52uk0CH/QqBH1yw2kTCcyRO7QUz3ejgy6P1PqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756015; a=rsa-sha256; cv=none; b=ss1k4KRW0/Exa43gNp2WeDk3TbvSFSfUhFougHcGnKZtk+QpOBSrHmCSGaEVRxzxWSBVFf s9o0HeonE6MknJH7vN9tapOb/b/9su1T+j3Zo8CTa5v/YXvI/TBEaXqzTgISGVLrAQTxuf Wz9CS6lIvqMa8kucvLjDO5+cUHdjmFU8nN6JOsIjPdHn+ej+aiwtArgPdzEWjL+liXWK+m zZ1PIbTUvzppIeVL263FkOI9chESmQCKrXCi+LP+RODr7lbWAoOxvJdjVRZEB+cd53V10s prkC/tOYfvW9N7bEcAKMxtPf0sLhsAci0IK0bvXMMpQEwLXhvNinaUA9tyHGLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPW24JhzdgW; Fri, 11 Aug 2023 12:13: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 37BCDZ9j008628; Fri, 11 Aug 2023 12:13:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDZXV008625; Fri, 11 Aug 2023 12:13:35 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:35 GMT Message-Id: <202308111213.37BCDZXV008625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: dc9da87bd334 - stable/13 - pf tests: test SCTP 'return' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc9da87bd334906375eb35c3adaceaf0b6b4f2e3 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dc9da87bd334906375eb35c3adaceaf0b6b4f2e3 commit dc9da87bd334906375eb35c3adaceaf0b6b4f2e3 Author: Kristof Provost AuthorDate: 2023-05-31 19:45:29 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf tests: test SCTP 'return' Ensure that we send a correct abort message for 'block return' rules. Test this by validating that nc doesn't sit around waiting for a connection. It should give up immediately when it receives the abort. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40865 (cherry picked from commit 2d42aa9d7ba64fe7166f76234a595637f0c212cf) --- tests/sys/netpfil/pf/sctp.sh | 117 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 5064fe316e5e..59697ad37be2 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -182,9 +182,126 @@ basic_v6_cleanup() pft_cleanup } +atf_test_case "abort_v4" "cleanup" +abort_v4_head() +{ + atf_set descr 'Test sending ABORT messages' + atf_set require.user root +} + +abort_v4_body() +{ + sctp_init + + j="sctp:abort_v4" + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + vnet_mkjail ${j}b ${epair}b + + jexec ${j}a ifconfig ${epair}a 192.0.2.1/24 up + jexec ${j}b ifconfig ${epair}b 192.0.2.2/24 up + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -c 1 192.0.2.2 + + jexec ${j}a pfctl -e + pft_set_rules ${j}a \ + "block return in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + # If we get the abort we'll exit immediately, if we don't timeout will + # stop nc. + out=$(jexec ${j}b timeout 3 nc --sctp -N 192.0.2.1 1234) + if [ $? -eq 124 ]; then + atf_fail 'Abort not received' + fi + if [ "$out" == "foo" ]; then + atf_fail "block failed entirely" + fi + + # Without 'return' we will time out. + pft_set_rules ${j}a \ + "block in proto sctp to port 1234" + + out=$(jexec ${j}b timeout 3 nc --sctp -N 192.0.2.1 1234) + if [ $? -ne 124 ]; then + atf_fail 'Abort sent anyway?' + fi +} + +abort_v4_cleanup() +{ + pft_cleanup +} + +atf_test_case "abort_v6" "cleanup" +abort_v4_head() +{ + atf_set descr 'Test sending ABORT messages over IPv6' + atf_set require.user root +} + +abort_v6_body() +{ + sctp_init + + j="sctp:abort_v6" + epair=$(vnet_mkepair) + + vnet_mkjail ${j}a ${epair}a + vnet_mkjail ${j}b ${epair}b + + jexec ${j}a ifconfig ${epair}a inet6 2001:db8::a/64 no_dad + jexec ${j}b ifconfig ${epair}b inet6 2001:db8::b/64 no_dad + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -6 -c 1 2001:db8::b + + jexec ${j}a pfctl -e + pft_set_rules ${j}a \ + "block return in proto sctp to port 1234" + + echo "foo" | jexec ${j}a nc -6 --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + # If we get the abort we'll exit immediately, if we don't timeout will + # stop nc. + out=$(jexec ${j}b timeout 3 nc --sctp -N 2001:db8::a 1234) + if [ $? -eq 124 ]; then + atf_fail 'Abort not received' + fi + if [ "$out" == "foo" ]; then + atf_fail "block failed entirely" + fi + + # Without 'return' we will time out. + pft_set_rules ${j}a \ + "block in proto sctp to port 1234" + + out=$(jexec ${j}b timeout 3 nc --sctp -N 2001:db8::a 1234) + if [ $? -ne 124 ]; then + atf_fail 'Abort sent anyway?' + fi +} + +abort_v4_cleanup() +{ + pft_cleanup +} atf_init_test_cases() { atf_add_test_case "basic_v4" atf_add_test_case "basic_v6" + atf_add_test_case "abort_v4" + atf_add_test_case "abort_v6" } From nobody Fri Aug 11 12:13:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPX4Wxvz4TjR7; Fri, 11 Aug 2023 12:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMjPX3zxlz3gfV; Fri, 11 Aug 2023 12:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yl51ye/4J616L46HISdrOIcDBIntz0twYrwnIQ7Tb10=; b=OSXaSTPVTqtf2VkkBtd5noyvxyPpL6ZjL7FnCacXGscSdKbIwM4PwGrIvrlqXBcCLreqcc gjvPipK6M/Xn8kKgiAHRzXthY6EEkbL4u3lq5jtypstcd3FEZcrtuy/7yHrwZXNWV5m1Uo EQxTjqnhyW8FrwnozykpwoNm2g3GZVBKyh5c1Bn8c9OTy/VQ7+jaH8H8hJCm257xGAxMPs VoTwOkkv/fjSy+Dt+ozUqMvAha/YIqszCKtQ2J0hWeG150GFBg1Sd1dI/VPF3PSfOqPcpe HiM0JwTlhmj9omvCgAMh2J9BvJKEGiZmWpmS0y+K0+9tviRCNFdiWVP1V7fadw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yl51ye/4J616L46HISdrOIcDBIntz0twYrwnIQ7Tb10=; b=jNaxGWzp3bmFNeO6E2SXQ8FUSXL8IoXU8mU20u26i6VltsidmOlyeG4ASY8YLkWMOq+N9U GIIaoaDpB57U/3bpG3ouxD228Lm1x9D8ZZ9VrMYVOng9vW4xCbBKtBY8JUGLvPSukhKGfa BigMYuXiTfFFmM3nWBlgCJiybEmFOE5e0kmjH9Suaz8hCnpy9Hb912os6QbC8JJQD/SAj2 FEaOkuCRKj1x2TifAeRi8GpSHZebztnnZVZd5iDXgRuDroCuRz+FYAAU8gPNj2RnTJGMkG 2gmt0o8NTffIwLQlRFaOWvjgiwDm1gJ/RjtOTYA0S9RFpVk81BHek5NM4o/1fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756016; a=rsa-sha256; cv=none; b=U/bLTHPnMY2hEFUpevtQ0Mc3b3b6ZGJD4K3QWZKqUes8jLNoXJfYCyylFdlKYF5/xMQkLa aDheYed0ayP3EgskIKGc2CaQpaCkkpFMGmqHPDG/ltaD1o2eylDD9M9vC7W+cg2Dq5e11z GsQQK47PRxO2yAd7bnIUhyqUZwwM6jyneWfa27CzdqUnv6B6g6flEAmorTAVSYXvWXTAC+ Z5eQYCWtkeB6iIr+cfgzrtO+Cp1BFF0EU6nIPA6528ynIRJ1SV1mSBDQWZtHypK79HjgMK 6x6ACgfqwKOtexJf0kqWiQ5La4FgnNp9ReS9yUcptG7Vq5umfe/GEU06OoUctQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPX34z2zdpd; Fri, 11 Aug 2023 12:13:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BCDaBt008682; Fri, 11 Aug 2023 12:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDalb008679; Fri, 11 Aug 2023 12:13:36 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:36 GMT Message-Id: <202308111213.37BCDalb008679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: bd658cda0284 - stable/13 - pf: add SCTP NAT support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd658cda0284209b1ce460c86b67d5b73810ec6b Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd658cda0284209b1ce460c86b67d5b73810ec6b commit bd658cda0284209b1ce460c86b67d5b73810ec6b Author: Kristof Provost AuthorDate: 2023-06-01 13:04:48 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:09 +0000 pf: add SCTP NAT support Support NAT-ing SCTP connections. This is mostly similar to UDP and TCP, but we refuse to change ports for SCTP, to avoid interfering with multihomed connections. As a result we also never copy the SCTP header back or recalculate checksums as we'd do for TCP or UDP (because we don't modify the header for SCTP). We do use the existing pf_change_ap() function to modify the packet, because we may still need to update the IPv4 header checksum. Reviewed by: tuexen MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40866 (cherry picked from commit 6053adafaa54204f91c43939fa334bde835403cb) --- sys/netpfil/pf/pf.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_lb.c | 14 ++++++++++++- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index ce5e1b813bb2..5cd97c35a3f7 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -502,6 +502,23 @@ pf_packet_rework_nat(struct mbuf *m, struct pf_pdesc *pd, int off, m_copyback(m, off, sizeof(*uh), (caddr_t)uh); break; } + case IPPROTO_SCTP: { + struct sctphdr *sh = &pd->hdr.sctp; + uint16_t checksum = 0; + + if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af)) { + pf_change_ap(m, pd->src, &sh->src_port, pd->ip_sum, + &checksum, &nk->addr[pd->sidx], + nk->port[pd->sidx], 1, pd->af); + } + if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af)) { + pf_change_ap(m, pd->dst, &sh->dest_port, pd->ip_sum, + &checksum, &nk->addr[pd->didx], + nk->port[pd->didx], 1, pd->af); + } + + break; + } case IPPROTO_ICMP: { struct icmp *ih = &pd->hdr.icmp; @@ -3923,6 +3940,25 @@ pf_test_rule(struct pf_krule **rm, struct pf_kstate **sm, int direction, } rewrite++; break; + case IPPROTO_SCTP: { + uint16_t checksum = 0; + + if (PF_ANEQ(saddr, &nk->addr[pd->sidx], af) || + nk->port[pd->sidx] != sport) { + pf_change_ap(m, saddr, &pd->hdr.sctp.src_port, + pd->ip_sum, &checksum, + &nk->addr[pd->sidx], + nk->port[pd->sidx], 1, af); + } + if (PF_ANEQ(daddr, &nk->addr[pd->didx], af) || + nk->port[pd->didx] != dport) { + pf_change_ap(m, daddr, &pd->hdr.sctp.dest_port, + pd->ip_sum, &checksum, + &nk->addr[pd->didx], + nk->port[pd->didx], 1, af); + } + break; + } #ifdef INET case IPPROTO_ICMP: nk->port[0] = nk->port[1]; @@ -5880,6 +5916,26 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, (*state)->expire = time_uptime; + /* translate source/destination address, if necessary */ + if ((*state)->key[PF_SK_WIRE] != (*state)->key[PF_SK_STACK]) { + uint16_t checksum = 0; + struct pf_state_key *nk = (*state)->key[pd->didx]; + + if (PF_ANEQ(pd->src, &nk->addr[pd->sidx], pd->af) || + nk->port[pd->sidx] != pd->hdr.sctp.src_port) { + pf_change_ap(m, pd->src, &pd->hdr.sctp.src_port, + pd->ip_sum, &checksum, &nk->addr[pd->sidx], + nk->port[pd->sidx], 1, pd->af); + } + + if (PF_ANEQ(pd->dst, &nk->addr[pd->didx], pd->af) || + nk->port[pd->didx] != pd->hdr.sctp.dest_port) { + pf_change_ap(m, pd->dst, &pd->hdr.sctp.dest_port, + pd->ip_sum, &checksum, &nk->addr[pd->didx], + nk->port[pd->didx], 1, pd->af); + } + } + return (PF_PASS); } diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 3190e5311ff5..a208e752e68e 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -237,7 +237,15 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, * port search; start random, step; * similar 2 portloop in in_pcbbind */ - if (!(proto == IPPROTO_TCP || proto == IPPROTO_UDP || + if (proto == IPPROTO_SCTP) { + key.port[1] = sport; + if (!pf_find_state_all_exists(&key, PF_IN)) { + *nport = sport; + return (0); + } else { + return (1); /* Fail mapping. */ + } + } else if (!(proto == IPPROTO_TCP || proto == IPPROTO_UDP || proto == IPPROTO_ICMP) || (low == 0 && high == 0)) { /* * XXX bug: icmp states don't use the id on both sides. @@ -698,6 +706,10 @@ pf_get_translation(struct pf_pdesc *pd, struct mbuf *m, int off, int direction, PF_POOLMASK(naddr, naddr, &r->rpool.cur->addr.v.a.mask, daddr, pd->af); + /* Do not change SCTP ports. */ + if (pd->proto == IPPROTO_SCTP) + break; + if (r->rpool.proxy_port[1]) { uint32_t tmp_nport; From nobody Fri Aug 11 12:13:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPZ07tPz4q0yk; Fri, 11 Aug 2023 12:13: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 4RMjPY4z14z4BYg; Fri, 11 Aug 2023 12:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5gOVszV00O3KMbLGoN0k0gbLMqoI9IN4fi3Kc0S2ow=; b=Uc+KzNZS6m7SnMYk5HOj98yMr0FdyZOgOhsgFSsIYOrOtOQAiO98e6r2721ImuGsT/ru8V jrBqUoZRf1B+RoBqRvsx427RteEN2WdNtvY9A/MgmzuC8k3fZDQwbvqsTLPyw+JP560lOL LTW00tOypJoPC0tnA7Fp2B8xugW6u7SA+uPBAcS7U/ktT8cSK7PEEismGXq/n0yZtu3aW9 qQ5C6LZBtEeJPuIrK3utZr0WZ/C9j+V6dq7BjbnEFVhbc9SMbDpYA0wsLjVhJLrg5vIZ5k 5xj8rBM6Pq8LS5U3IvcWp8dE1vorhz204qM8ay4VxgShQtIHFPKC9Ac/eniNOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5gOVszV00O3KMbLGoN0k0gbLMqoI9IN4fi3Kc0S2ow=; b=MMBSWfhem4AA9Kc3MVKhS8XczRsOnG7dZAFuBJb4g3RSwdW2HFslDiRCbnzqkGGkmuT+cC gbft/ygEl2VwUKLklmFSr9+WJEM3zWaMdyDAPHfkXe0Z63o5ffRxqAG7bH6tM6PNBVU39a aJObMW1SV0lFxqVmuajS0XEDApfcyR3K/YXYyaWz+j6Q5JP2yNclx2qwWJsUoDSYqDm5/+ 5OPYhGTodhbgkkG5/60cUNx9h1wvljMI76bgGjWNLX0mIgmke0BOrYay3UezMfeojy9ft/ UEfZHdxeAjfIgs+oYTkU/V5SYIEwdEYmD1bqy0NpPSiKfHCbqwItsiqQXaxTRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756017; a=rsa-sha256; cv=none; b=Fk0d/y+RWNuoE58pPV59vJIKemkUCH8HTF4oheShLYkR6s+2V84rRX3ThTMD8P9WrSvbas ZnJP7sOBjLhaR0E89ZB+mc57Y9LEjeF6W26cZZHoTy5XFV1xhKGclyY7VRMbCsUzOcjmYM S5HD2U0e4UxC6sENIItWRbW2vwSvTR8LU+tJLwq9zNo2TJXjPSV+sm+IVevLDbz3imLd00 tZCVV4nEwCgWBTyiHcTMxFrVfTUhgojXrfRo6D1JirltCx/CXEmxb6WyDpIesIohi7iJna 7GwOb3nHmQYKI9hkYOg88Ur3qjVhCTnOhBS5aG96FP2nVMfuSrMeLVuD5ED4iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPY3lMbzdgX; Fri, 11 Aug 2023 12:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BCDb3X008724; Fri, 11 Aug 2023 12:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDb4k008721; Fri, 11 Aug 2023 12:13:37 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:37 GMT Message-Id: <202308111213.37BCDb4k008721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: dc0a6fb58471 - stable/13 - pf tests: test SCTP NAT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dc0a6fb5847149fd55d5bbb21c0e2c532e51be76 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=dc0a6fb5847149fd55d5bbb21c0e2c532e51be76 commit dc0a6fb5847149fd55d5bbb21c0e2c532e51be76 Author: Kristof Provost AuthorDate: 2023-06-01 13:28:58 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:10 +0000 pf tests: test SCTP NAT MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40867 (cherry picked from commit 1e02b7cb07ce31ad3c9e8c8be806d2825febb5ab) --- tests/sys/netpfil/pf/sctp.sh | 106 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 59697ad37be2..659c11c62113 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -298,10 +298,116 @@ abort_v4_cleanup() pft_cleanup } +atf_test_case "nat_v4" "cleanup" +nat_v4_head() +{ + atf_set descr 'Test NAT-ing SCTP over IPv4' + atf_set require.user root +} + +nat_v4_body() +{ + sctp_init + + j="sctp:nat_v4" + epair_c=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + vnet_mkjail ${j}srv ${epair_srv}a + vnet_mkjail ${j}gw ${epair_srv}b ${epair_c}a + vnet_mkjail ${j}c ${epair_c}b + + jexec ${j}srv ifconfig ${epair_srv}a 198.51.100.1/24 up + # No default route in srv jail, to ensure we're NAT-ing + jexec ${j}gw ifconfig ${epair_srv}b 198.51.100.2/24 up + jexec ${j}gw ifconfig ${epair_c}a 192.0.2.1/24 up + jexec ${j}gw sysctl net.inet.ip.forwarding=1 + jexec ${j}c ifconfig ${epair_c}b 192.0.2.2/24 up + jexec ${j}c route add default 192.0.2.1 + + jexec ${j}gw pfctl -e + pft_set_rules ${j}gw \ + "nat on ${epair_srv}b from 192.0.2.0/24 -> (${epair_srv}b)" \ + "pass" + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -c 1 198.51.100.1 + + echo "foo" | jexec ${j}srv nc --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + out=$(jexec ${j}c nc --sctp -N -w 3 198.51.100.1 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi +} + +nat_v4_cleanup() +{ + pft_cleanup +} + +atf_test_case "nat_v6" "cleanup" +nat_v6_head() +{ + atf_set descr 'Test NAT-ing SCTP over IPv6' + atf_set require.user root +} + +nat_v6_body() +{ + sctp_init + + j="sctp:nat_v6" + epair_c=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + vnet_mkjail ${j}srv ${epair_srv}a + vnet_mkjail ${j}gw ${epair_srv}b ${epair_c}a + vnet_mkjail ${j}c ${epair_c}b + + jexec ${j}srv ifconfig ${epair_srv}a inet6 2001:db8::1/64 up no_dad + # No default route in srv jail, to ensure we're NAT-ing + jexec ${j}gw ifconfig ${epair_srv}b inet6 2001:db8::2/64 up no_dad + jexec ${j}gw ifconfig ${epair_c}a inet6 2001:db8:1::1/64 up no_dad + jexec ${j}gw sysctl net.inet6.ip6.forwarding=1 + jexec ${j}c ifconfig ${epair_c}b inet6 2001:db8:1::2/64 up no_dad + jexec ${j}c route add -6 default 2001:db8:1::1 + + jexec ${j}gw pfctl -e + pft_set_rules ${j}gw \ + "nat on ${epair_srv}b from 2001:db8:1::/64 -> (${epair_srv}b)" \ + "pass" + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -6 -c 1 2001:db8::1 + + echo "foo" | jexec ${j}srv nc -6 --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + out=$(jexec ${j}c nc --sctp -N -w 3 2001:db8::1 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi +} + +nat_v6_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4" atf_add_test_case "basic_v6" atf_add_test_case "abort_v4" atf_add_test_case "abort_v6" + atf_add_test_case "nat_v4" + atf_add_test_case "nat_v6" } From nobody Fri Aug 11 12:13:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPb0f6Bz4TjRB; Fri, 11 Aug 2023 12:13: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 4RMjPZ5hJVz3gkf; Fri, 11 Aug 2023 12:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Qnd5owr7NoG8Q4U4dRX039tQhtYRWNcxFqwnwZ+Cgc=; b=GXzj5QHQDB4Grpc0QdHFnrFB//G3eoQzZvU45d+hq14+vM3o1X5HV3WEcAS3B8T8ZbSvBL ERitFNNM23IOxYtGTMQLL6HcgC7LrpGhNzKIiCmcQ/bp9gts9e6/CQP6w8qvzVnPEEB5Ad Bna/AmrQ2eanvUGFDxWxOGamZaMohJP6HlEBEBCB8HEpWNR5aYC2krLcLR6ZT9AI6NpUjM CxRWBheja2hkILAE5hT7m1gkNMLpKTKBKF6ROkadeKVboLD0q/8jzMgFpg2fJ3ic1a68b9 gKnfpntmZUGAEuFgwFecSA1ZHV8COY3IxPCy7aZMr9xbPhGtkeGk/IoOv5MNfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Qnd5owr7NoG8Q4U4dRX039tQhtYRWNcxFqwnwZ+Cgc=; b=iqj3Ok2oJNTxug5B/PzwixLamCJ7TeWgkfpxw3XD2mBdubb2sOGVxJJkj81Bst1dfkUD64 U+KW/E3RHd3VUgGxHfP1KnujMiZ+hSZkMd932n0mMO6wOHZ52L8xqfaN0Jhav4SqehZb0s +dWP0GPSa29BNPpu6zLChhU9ZOTPc32YEi54YQizYh3pOY+FOYn83m7GiJJn+a4oaVvw6A 03tGdG+GKH9yAEkfbxvgOdw/lnsOvyaKuGrBBsyjQetAjgyFYdiVF3YWp3WK8VyuGs86jY GPELi3wHgrLla5hO2i5Y+Kem30ADdvmJODNOrHQT2JDaF76woROoyehTqy2Iyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756018; a=rsa-sha256; cv=none; b=IJDhma+BgFJhm8VQzbk0P1EUNBn+L9snSlK/pQRrSs/YYLrMwSPpByxNwgKiJylL2i7e3k cugxuwJKIN7hoIUkRcxWJw1tJxrcNALBQqi7F9ls7WwoUT2u9zNEJmjhfBmYGd9AGrgCFB 2S8+YMF26tiJpFnLckxrHNbSpceorCWHFCEiZ9NyFxK/S1XMWmd9Qenao4oHh8OSaEVk+U l4PzxfmScSHt0RSNRGBpkJzf6HBIaS8ObVX59cMd4yBlm/aM5Vf2oLVhOi5I8NmEVrTV+B 79zX/ryn3/kl2dror586QDdbMDkDZ6dKGmjH/TO3JzhwaITC2NlVxa2kzAREvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPZ4lZczfRG; Fri, 11 Aug 2023 12:13: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 37BCDc6e008769; Fri, 11 Aug 2023 12:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDci3008766; Fri, 11 Aug 2023 12:13:38 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:38 GMT Message-Id: <202308111213.37BCDci3008766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1cb393fbd4c2 - stable/13 - pf tests: test 'rdr' for SCTP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1cb393fbd4c2a272b6e4fadd03cde2cd9d60b240 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1cb393fbd4c2a272b6e4fadd03cde2cd9d60b240 commit 1cb393fbd4c2a272b6e4fadd03cde2cd9d60b240 Author: Kristof Provost AuthorDate: 2023-06-01 16:03:07 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:10 +0000 pf tests: test 'rdr' for SCTP Explicitly test that we cannot change the port number with rdr. That's not a desireable feature on SCTP, because it could break multihomed connections. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40868 (cherry picked from commit 4369a57514f227c989d4de87d1ce54470279ba41) --- tests/sys/netpfil/pf/sctp.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 659c11c62113..2c736017f9fa 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -402,6 +402,73 @@ nat_v6_cleanup() pft_cleanup } +atf_test_case "rdr_v4" "cleanup" +rdr_v4_head() +{ + atf_set descr 'Test rdr SCTP over IPv4' + atf_set require.user root +} + +rdr_v4_body() +{ + sctp_init + + j="sctp:rdr_v4" + epair_c=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + vnet_mkjail ${j}srv ${epair_srv}a + vnet_mkjail ${j}gw ${epair_srv}b ${epair_c}a + vnet_mkjail ${j}c ${epair_c}b + + jexec ${j}srv ifconfig ${epair_srv}a 198.51.100.1/24 up + # No default route in srv jail, to ensure we're NAT-ing + jexec ${j}gw ifconfig ${epair_srv}b 198.51.100.2/24 up + jexec ${j}gw ifconfig ${epair_c}a 192.0.2.1/24 up + jexec ${j}gw sysctl net.inet.ip.forwarding=1 + jexec ${j}c ifconfig ${epair_c}b 192.0.2.2/24 up + jexec ${j}c route add default 192.0.2.1 + + jexec ${j}gw pfctl -e + pft_set_rules ${j}gw \ + "rdr pass on ${epair_srv}b proto sctp from 198.51.100.0/24 to any port 1234 -> 192.0.2.2 port 1234" \ + "pass" + + echo "foo" | jexec ${j}c nc --sctp -N -l 1234 & + + # Wait for the server to start + sleep 1 + + out=$(jexec ${j}srv nc --sctp -N -w 3 198.51.100.2 1234) + if [ "$out" != "foo" ]; then + atf_fail "SCTP connection failed" + fi + + # Despite configuring port changes pf will not do so. + echo "bar" | jexec ${j}c nc --sctp -N -l 1234 & + + pft_set_rules ${j}gw \ + "rdr pass on ${epair_srv}b proto sctp from 198.51.100.0/24 to any port 1234 -> 192.0.2.2 port 4321" \ + "pass" + + # This will fail + out=$(jexec ${j}srv nc --sctp -N -w 3 198.51.100.2 4321) + if [ "$out" == "bar" ]; then + atf_fail "Port was unexpectedly changed." + fi + + # This succeeds + out=$(jexec ${j}srv nc --sctp -N -w 3 198.51.100.2 1234) + if [ "$out" != "bar" ]; then + atf_fail "Port was unexpectedly changed." + fi +} + +rdr_v4_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4" @@ -410,4 +477,5 @@ atf_init_test_cases() atf_add_test_case "abort_v6" atf_add_test_case "nat_v4" atf_add_test_case "nat_v6" + atf_add_test_case "rdr_v4" } From nobody Fri Aug 11 12:13:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPc1912z4TjRJ; Fri, 11 Aug 2023 12:13: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 4RMjPb6rbhz4CX6; Fri, 11 Aug 2023 12:13:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZH4aumL1l+N1P8eYJXZisJwjvI5ixwHU0lsvJsCQZJ4=; b=czODAisneQHEkn7hhr2dw9kzMzfsoeSWoXgiTLTuABD1P0HQcb8y4NqZaBbWosSWj+4/HB J8+Nb/tsa/nn5wn4rgO8PPZswEb3zHsN/2uiorRQQUxN66ejEdh1FnBvuth/s17u0CiuDR AmF+LxV2T0ti6epW+IfEJ59idy3L+HeBCmBUzUIR5npgeAXCGWFkJ7KlHonGJGs/xFmbRt rSfSpO28dbHGqvA0VXL8BreUFoUAYS69n4cy4FpwjQOoIDbjy+VM1PA4T/FxmgzpeVJbZU WBO0gQymfGZYXnESDmZheVOHaQV+YJtJ/GHIat3BwdsgMzC09OnpLjV2KuXM6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZH4aumL1l+N1P8eYJXZisJwjvI5ixwHU0lsvJsCQZJ4=; b=trvMen1KNIbii73jV5Ji7CFrfI0ZF5jGuSBKJapvGP1cHL3JVnOz5OiGn3oX7bbHs3lDS7 GF0ge8g/jyBssP2hs8o727hukgHFN6nnFJQgUcu/m14Lz7wy5pHH8HhqYd0Rxu5L478g9G cU0eq21DzR+f+d205zKHcY1AGmcq2Sv8Oyq1t3NRlimSm3G7rEEf0mZ9jMkvEkheGmmqvo 2Eq5R2HbQMjnHo4eZnhjwMDEV01ByoG5SII6Od4CZRa/y+MNdW2GgV6X7yFym1Bl5uprz/ zZ5GtEMIEbF498/4LFApbBcrUMSAmhS9J2k78ho2/gXHwXYNb1mh58DrkBUFIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756020; a=rsa-sha256; cv=none; b=ByO4s4PrWXBjluG4zeFbEu9Jl9837wU2d5dplsX0tq0Gd/6sda2490SjorMYQxJPHUwmd1 RgoxRWIvAfxq8CPRnC5cbhD6ygQMP2uZRdZ3x2bRzMCpHIJeukUdo6Wx5ywhZcfR4WKDOi H3VLYMQu6pI7rBEJzVOys649DgeamGzsBZPZ6jZkWa41lnbsJ5mXw6Y8D/xK1vapao9+n+ zyfRXYZFE8GoPgiXg2QcBlWauSLGpJnk4CO1YVMp+UgnZ6ibF23d4Y/8LH7iyBc7FRWVA2 vc7Q8MkebgpFWYagx3RycfPzq9IrWo3roGo9SAeINsY/AH3sdJIUKVJNX0Tg6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPb5q6Xzdms; Fri, 11 Aug 2023 12:13: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 37BCDdFC008813; Fri, 11 Aug 2023 12:13:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDdYa008810; Fri, 11 Aug 2023 12:13:39 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:39 GMT Message-Id: <202308111213.37BCDdYa008810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: d77d4c6a0419 - stable/13 - pf tests: test SCTP pfsync List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d77d4c6a04192859dabee22ce49d8e115a20d45c Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=d77d4c6a04192859dabee22ce49d8e115a20d45c commit d77d4c6a04192859dabee22ce49d8e115a20d45c Author: Kristof Provost AuthorDate: 2023-06-07 09:55:06 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:10 +0000 pf tests: test SCTP pfsync Ensure that SCTP connections survive a failover to the backup pf instance. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40869 (cherry picked from commit b7a9a5773a0fdf9b9c7839d79d76dbc6b69a6c4b) --- tests/sys/netpfil/pf/sctp.sh | 188 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.sh b/tests/sys/netpfil/pf/sctp.sh index 2c736017f9fa..ec131a6384cc 100644 --- a/tests/sys/netpfil/pf/sctp.sh +++ b/tests/sys/netpfil/pf/sctp.sh @@ -469,6 +469,193 @@ rdr_v4_cleanup() pft_cleanup } +atf_test_case "pfsync" "cleanup" +pfsync_head() +{ + atf_set descr 'Test pfsync-ing SCTP connections' + atf_set require.user root +} + +pfsync_body() +{ + # + Builds bellow topology and initiate an SCTP connection + # from client to server. + # + Tests that the connection remains open when we fail over from + # router one to router two. + # + # ┌──────┐ + # │client│ + # └───┬──┘ + # │ + # ┌───┴───┐ + # │bridge0│ + # └┬─────┬┘ + # │ │ + # ┌────────────────┴─┐ ┌─┴────────────────┐ + # │ one ├─┤ two │ + # └────────────────┬─┘ └─┬────────────────┘ + # │ │ + # ┌┴─────┴┐ + # │bridge1│ + # └───┬───┘ + # │ + # ┌───┴──┐ + # │server│ + # └──────┘ + + sctp_init + pfsynct_init + if ! kldstat -q -m carp + then + atf_skip "This test requires carp" + fi + + j="sctp:pfsync" + + tmp=`pwd` + + bridge0=$(vnet_mkbridge) + bridge1=$(vnet_mkbridge) + + epair_c=$(vnet_mkepair) + epair_one0=$(vnet_mkepair) + epair_two0=$(vnet_mkepair) + epair_sync=$(vnet_mkepair) + epair_one1=$(vnet_mkepair) + epair_two1=$(vnet_mkepair) + epair_srv=$(vnet_mkepair) + + ifconfig ${bridge0} addm ${epair_c}a addm ${epair_one0}a addm ${epair_two0}a + ifconfig ${epair_one0}a up + ifconfig ${epair_two0}a up + ifconfig ${epair_c}a up + ifconfig ${bridge0} up + + ifconfig ${bridge1} addm ${epair_srv}a addm ${epair_one1}a addm ${epair_two1}a + ifconfig ${epair_one1}a up + ifconfig ${epair_two1}a up + ifconfig ${epair_srv}a up + ifconfig ${bridge1} up + + vnet_mkjail ${j}c ${epair_c}b + jexec ${j}c ifconfig ${epair_c}b 192.0.2.2/24 up + jexec ${j}c route add default 192.0.2.1 + + vnet_mkjail ${j}one ${epair_one0}b ${epair_one1}b ${epair_sync}a + jexec ${j}one ifconfig ${epair_one0}b 192.0.2.3/24 up + jexec ${j}one ifconfig ${epair_one0}b \ + alias 192.0.2.1/32 vhid 1 pass 1234 + jexec ${j}one ifconfig ${epair_one1}b 198.51.100.3/24 up + jexec ${j}one ifconfig ${epair_one1}b \ + alias 198.51.100.2/32 vhid 2 pass 4321 + jexec ${j}one ifconfig ${epair_sync}a 203.0.113.1/24 up + jexec ${j}one ifconfig pfsync0 \ + syncdev ${epair_sync}a \ + maxupd 1 \ + up + jexec ${j}one sysctl net.inet.ip.forwarding=1 + + vnet_mkjail ${j}two ${epair_two0}b ${epair_two1}b ${epair_sync}b + jexec ${j}two ifconfig ${epair_two0}b 192.0.2.4/24 up + jexec ${j}two ifconfig ${epair_two0}b \ + alias 192.0.2.1/32 vhid 1 pass 1234 + jexec ${j}two ifconfig ${epair_two1}b 198.51.100.4/24 up + jexec ${j}two ifconfig ${epair_two1}b \ + alias 198.51.100.2/32 vhid 2 pass 4321 + jexec ${j}two ifconfig ${epair_sync}b 203.0.113.2/24 up + jexec ${j}two ifconfig pfsync0 \ + syncdev ${epair_sync}b \ + maxupd 1 \ + up + jexec ${j}two sysctl net.inet.ip.forwarding=1 + + vnet_mkjail ${j}srv ${epair_srv}b + jexec ${j}srv ifconfig ${epair_srv}b 198.51.100.1/24 up + jexec ${j}srv route add default 198.51.100.2 + + # Demote two, to avoid dealing with asymmetric routing + jexec ${j}two sysctl net.inet.carp.demotion=50 + + jexec ${j}one pfctl -e + pft_set_rules ${j}one \ + "block all" \ + "pass proto { icmp, pfsync, carp }" \ + "pass proto sctp to port 1234" \ + "pass proto tcp to port 1234" + + jexec ${j}two pfctl -e + pft_set_rules ${j}two \ + "block all" \ + "pass proto { icmp, pfsync, carp }" \ + "pass proto sctp to port 1234" \ + "pass proto tcp to port 1234" + + # Give carp time to get set up + sleep 2 + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -c 1 198.51.100.1 + + # Now start up an SCTP connection + touch ${tmp}/input + tail -F ${tmp}/input | jexec ${j}srv nc --sctp -l 1234 & + sleep 1 + + jexec ${j}c nc --sctp 198.51.100.1 1234 > ${tmp}/output & + echo "1" >> ${tmp}/input + + # Give time for the traffic to arrive + sleep 1 + line=$(tail -n -1 ${tmp}/output) + if [ "${line}" != "1" ]; + then + echo "Found ${line}" + cat ${tmp}/output + atf_fail "Initial SCTP connection failed" + fi + + # Verify that two has the connection too + state=$(jexec ${j}two pfctl -ss | grep sctp) + if [ -z "${state}" ]; + then + jexec ${j}two pfctl -ss + atf_fail "Failed to find SCTP state on secondary pfsync host" + fi + + # Now fail over (both carp IPs should switch here) + jexec ${j}one sysctl net.inet.carp.demotion=100 + + while ! jexec ${j}one ifconfig ${epair_one0}b | grep MASTER; + do + sleep 1 + done + while ! jexec ${j}one ifconfig ${epair_one1}b | grep MASTER; + do + sleep 1 + done + + # Sanity check + atf_check -s exit:0 -o ignore \ + jexec ${j}c ping -c 1 198.51.100.1 + + # And check that the connection is still live + echo "2" >> ${tmp}/input + sleep 1 + line=$(tail -n -1 ${tmp}/output) + if [ "${line}" != "2" ]; + then + echo "Found ${line}" + cat ${tmp}/output + atf_fail "SCTP failover failed" + fi +} + +pfsync_cleanup() +{ + pfsynct_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic_v4" @@ -478,4 +665,5 @@ atf_init_test_cases() atf_add_test_case "nat_v4" atf_add_test_case "nat_v6" atf_add_test_case "rdr_v4" + atf_add_test_case "pfsync" } From nobody Fri Aug 11 12:13:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMjPd27D4z4TjNW; Fri, 11 Aug 2023 12:13: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 4RMjPd0ggfz3glP; Fri, 11 Aug 2023 12:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3YG4t29lqQ8Y9J48nwGPvX2ZFhE2GtBwO8OyMQAFws=; b=iGexz/fd73GYjBhByn58VMSbszSKMZ/rjlby31W1BAbbbtVUUHYtpb6QvAuzw7OwqXmkyI Mp7zt8CqTktcAE4P6HsqY7rDciCr/huZYGmfi1VsK/MYXfn7OVl58oBAxONqvrQhRhCWTM 4ALPokwvOm5C8WX0mDMsOEMU/Is0X+pxS7nnGRwafIzQEgL/Xu5sskga3MiEEIi6Eu32Bu gpynDDgNcPZMbj1Cgkc9vPTpcf9ExpWgPHeyZE3sRLedoMXsy5iMg1DWxUg6kwCpwixx5q Mkzfk45UfOa8JkcTDvgGJFO7+tnWatBjOh6+y5bufKTZFX8yL8qSgDlHxxjQqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691756021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a3YG4t29lqQ8Y9J48nwGPvX2ZFhE2GtBwO8OyMQAFws=; b=hYLIaE52h9mWyd8qR1IdXjlwim4wCDjyO2m8P+IAPONH0ilvRbRjYuxwJaLPQqCJxS84ke hK9GEScHYDaPFtSU5r8dhUpZgthHBHuQK76YXjOaWJ7kNTiElDFkOlcARBivbsxKuUnHh8 L56rlB0LU2nmkUaMWwGa3fE+MPPy73oE66ET4RdLk7MK6uhHrhShEU6ERUAexiDSLoRcGL AFiWXOZgc21tq8ytd2686X5yzB/GVSQMMVEm3XjJJtX1XoCkbpgeBxA01zXc5XP1+bGUpY MmW+mFmqf22jhXzUV5DYH0HXnfQ2akP3m6PNlj3LO5x4SyY1ra8vwKJYAAUspQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691756021; a=rsa-sha256; cv=none; b=J8UcCeCpYg4yxJ0Rn/wPGFiVeiYg658wVIOnYMA6ZTnOJ2/ltQMR82OMHJf8newyCv1BlY amojlArukbrBkE1B3LuaUHURMgYkRUEKdThbnm0e2Qwhv43dR7zhPwmtbTjteYnDBY6PsR IPfKj3cYvpB+yQMHkh0b8jLDEUMFfNiKaD9P+Fn0abW54hWBfjJSSsYUNp45tBc4QoCZA5 oTEynEvPDyf5FqzaDnxo63jQn3dxM33Jx6nh8C5bWc6R/RgwnC/3PpCvuBPjYTQg7m3q78 KM4TyE8w8SXYaB2FPeI1t7G0cz7wMIhm2FGSQRlANpG3x8OQi9TmeBoQKClj1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMjPc6XR8zdpf; Fri, 11 Aug 2023 12:13: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 37BCDeXU008852; Fri, 11 Aug 2023 12:13:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BCDeGl008849; Fri, 11 Aug 2023 12:13:40 GMT (envelope-from git) Date: Fri, 11 Aug 2023 12:13:40 GMT Message-Id: <202308111213.37BCDeGl008849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c46419526269 - stable/13 - pf.conf.5: document SCTP support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c46419526269025a797a365a240b8fcd307e4281 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c46419526269025a797a365a240b8fcd307e4281 commit c46419526269025a797a365a240b8fcd307e4281 Author: Kristof Provost AuthorDate: 2023-06-21 08:04:07 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 12:13:10 +0000 pf.conf.5: document SCTP support Mention SCTP in the pf.conf.5 Reviewed by: tuexen MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D40870 (cherry picked from commit 47d0c1fe7d3279e9d38df75cf0c359b1fbc26d5e) --- share/man/man5/pf.conf.5 | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index cc1b902e0006..95710027bdf3 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -28,7 +28,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 25, 2021 +.Dd June 21, 2023 .Dt PF.CONF 5 .Os .Sh NAME @@ -491,6 +491,7 @@ action: Packet is silently dropped. .It Ar return A TCP RST is returned for blocked TCP packets, +an SCTP ABORT chunk is returned for blocked SCTP packets, an ICMP UNREACHABLE is returned for blocked UDP packets, and all other packets are silently dropped. .El @@ -515,6 +516,7 @@ actions are possible: Incoming packet is silently dropped. .It Ar return Incoming packet is dropped and TCP RST is returned for TCP packets, +an SCTP ABORT chunk is returned for blocked SCTP packets, an ICMP UNREACHABLE is returned for UDP packets, and no response is sent for other packets. .El @@ -1139,8 +1141,8 @@ A stateful connection is automatically created to track packets matching such a rule as long as they are not blocked by the filtering section of .Nm pf.conf . The translation engine modifies the specified address and/or port in the -packet, recalculates IP, TCP and UDP checksums as necessary, and passes it to -the packet filter for evaluation. +packet, recalculates IP, TCP and UDP checksums as necessary, and passes +it to the packet filter for evaluation. .Pp Since translation occurs before filtering the filter engine will see packets as they look after any @@ -1276,6 +1278,7 @@ and layer 4 (see .Xr icmp 4 , .Xr icmp6 4 , .Xr tcp 4 , +.Xr sctp 4 , .Xr udp 4 ) headers. In addition, packets may also be @@ -1325,7 +1328,8 @@ can be overridden by specifying a message as a code or number. .It Ar return This causes a TCP RST to be returned for .Xr tcp 4 -packets and an ICMP UNREACHABLE for UDP and other packets. +packets, an SCTP ABORT for SCTP +and an ICMP UNREACHABLE for UDP and other packets. .El .Pp Options returning ICMP packets currently have no effect if @@ -1515,6 +1519,7 @@ Common protocols are .Xr icmp 4 , .Xr icmp6 4 , .Xr tcp 4 , +.Xr sctp 4 , and .Xr udp 4 . For a list of all the protocol name to number mappings used by @@ -2717,6 +2722,14 @@ reference to an anchor name containing characters will require double quote .Pq Sq \&" characters around the anchor name. +.Sh SCTP CONSIDERATIONS +.Xr pf 4 +supports +.Xr sctp 4 +connections. +It can match ports, track state and NAT SCTP traffic. +However, it will not alter port numbers during nat or rdr translations. +Doing so would break SCTP multihoming. .Sh TRANSLATION EXAMPLES This example maps incoming requests on port 80 to port 8080, on which a daemon is running (because, for example, it is not run as root, @@ -3162,6 +3175,7 @@ Service name database. .Xr pf 4 , .Xr pfsync 4 , .Xr tcp 4 , +.Xr sctp 4 , .Xr udp 4 , .Xr hosts 5 , .Xr pf.os 5 , From nobody Fri Aug 11 13:57:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMljG32sLz4Tqv6; Fri, 11 Aug 2023 13:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RMljG2W6Cz4PXX; Fri, 11 Aug 2023 13:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691762242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Snf/mR4jZM9eSF23M6r3EAl5Hc5NkweRaBAnxPIr9s=; b=F8AjVqXS+eQzhp0ZNfN9W61tGWR7QgkjA/eC640jSd3668LuKupnCPx9Y896M0rLTrLJzr ci97v5QbcUFV+Zp9F8UvtepR4Nk6hwA3SIMvGrJ3QSzDjatKKyV2+sLgL0RidUVj1pJJdt ivrdwT29TG/vIJLu/QVFvB8Ey8jgMRehK6NUt1hND4fGDAqehnkCxP+uzh85cEF6Isk4Xa A+GrfAApC+qr5VWIL+Vcpvh0CPVvLZofZg4OMaHyBmdoP3btxIDhy1MkDNngaxZO/aPKER 1KRPWcs6HhLfYshqc9xAbDiZ2xGP4Hpy6Yf9wxMdPZukrwTc63Op5vb2GGEsyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691762242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Snf/mR4jZM9eSF23M6r3EAl5Hc5NkweRaBAnxPIr9s=; b=XpAncucJ1fq8E7tb0pdfdxZq49kfsQnvuajncVGTrl+1GmrmCUJ5ckcOLHg/4sukmlgdt9 DU9QIDYKXkO9GTA817XHG4LlML5SAxgqsGaHxxkmRkW+/Yd5R8T+h4So5Av2AP7XsFjUUr ruyXalpK5CSltSU+MqC36nTaGM/VYK8+OGNTBtAPXTqGJEf5M476A5tTv5ScvF5XhAovNx cv2ahIzRzg113Y6u7GdNJ7uiQIrkYTQ2BDj292+qDCEECCTfDz8I1q2TyFecmc6CRNdRfk jpriGKn2n+2g/o8dMht7wD9Keu0Klihfj3LKfFYQ93WIxoUI8ZueOK+qIZUjBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691762242; a=rsa-sha256; cv=none; b=i8I54rc2IieWg59wMVe17hDl48xmcPX3zPVaVCykvP6uhYWvgWpqIkx6vt4I2EJGtRorBT AUOQyP6M0viPwmnMoyJFyvg9LBjwqhh97yEmaFHdVFYC5v8vRe5KAJqKet8KihIlVc/1Z1 dK+lGEk+x16Ms8pWZCp2e/dUp/cbanKJw8N5CfFJ08f2Ovu4wsQRn5D1M5HlKQr17DpT/l gBo1g8YkgEOFfFV8U0xzLVHRLLhIQO/Kr5blntUIcrnod3baLaTCpEGcsdkMkyUHmrc6IA 16/zomTvkEuaKJl7ffwBLVRA9G41SajbMqBkJOQu3gW9M7cnniPJknyvI3hcrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMljG1Z1FzhnH; Fri, 11 Aug 2023 13:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37BDvM9c074608; Fri, 11 Aug 2023 13:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BDvMMw074605; Fri, 11 Aug 2023 13:57:22 GMT (envelope-from git) Date: Fri, 11 Aug 2023 13:57:22 GMT Message-Id: <202308111357.37BDvMMw074605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 54cfeb848468 - main - pkgbase: move libcom_err from kerberos to kerberos-lib List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54cfeb848468b8086fd046bdb94a0ed30f6dec15 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=54cfeb848468b8086fd046bdb94a0ed30f6dec15 commit 54cfeb848468b8086fd046bdb94a0ed30f6dec15 Author: Doug Rabson AuthorDate: 2023-08-09 07:42:16 +0000 Commit: Doug Rabson CommitDate: 2023-08-11 13:34:23 +0000 pkgbase: move libcom_err from kerberos to kerberos-lib This makes it possible to install kerberos-lib (which is used by common utilities such as curl) without pulling in the rest of kerberos. MFC after: 1 week --- lib/libcom_err/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 4bb69614453e..fcc060a615fb 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE= kerberos +PACKAGE= kerberos-lib LIB= com_err SRCS= com_err.c error.c From nobody Fri Aug 11 18:42:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMt1l2YRWz4mHlQ; Fri, 11 Aug 2023 18:42: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 4RMt1l1qqfz3MRv; Fri, 11 Aug 2023 18:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691779323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IN0m4IBf32VxUBUxKZ4rmRTNCWrX7347YafEEwhRBpA=; b=Uhl27l/wkOes2OCiqwkBMlOOImRK3DzHkMegZcvhAafYnuNFa7s/4DCpzadDbcserd+VFX nQEng+6eRgsxVp6qItSNAhjK5KEwlrOfyCNM2ZUPtvlqOW/au4mabBxJjU4zTotGYt9vDD yXIsooF9RDwgGO7ekKeKq+Bl0eub048Ka8usyEWT3juWxQNBGAUQguFOF3Ic7WPjFXjxzW wyKC/VMy1TtZt8JZ13LUysvSpMUSKPY/Bkpz8h7E/DjOo7OuA9//bg04Ib0d/G0ejB/0Bd VPuwKFlGw2+PjOTDvxzSOCNJDpo7MaqCupzvq4Dyl1s2K/pYlFJ/AESiZnf3LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691779323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IN0m4IBf32VxUBUxKZ4rmRTNCWrX7347YafEEwhRBpA=; b=p9X+RVIpRyXdk9pYmGz4aVLCvM0j7eT1m1xgzhGyUuE0AkomndFAHPSNJImSnZeoNKm13i P1TsUN+R7MLLFKanZfLzEuppeHd6h8MytsVOx9jZkpbx+juB1R79+SWyA0ZG4oUvZtVooL nKl2J4Y3V3PYNWhlEWe3mGTD7SyecIi9WR2w7QV7rDBCn5/fCZbFo0bpOH6w+Eb2XXKB2N rKqtTv4R/0cTl5yYCKUP4yfn/s83i8o8y35bNTvWFn3PeWK02bn9s9J55JN9VN6Tbml40Z J7cNQ/mzH5PlkeVtGM4ELJptupOu9MFsP7nuL7W+Qmci6Iw8RTxJ8yYKW0PNCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691779323; a=rsa-sha256; cv=none; b=JdDEz0wMsfP1Al9paChj7X5kv1CLCcvjHjRlxYHyJXW5rbka7g3zg51TT+Aiu/Cgcd8wx8 R6o09k/lGsCJytVW/JBwfXxW4STJHLyneFUeqbolNaVIdF7kaBsitYvl3YQbZxUmFDofEe 5izPF4LceVXYubd+9VvPEGGmeN3hFRsBcpZKGgi0HaGY33/UCHfdNHNj7kFpc34yjbK5/p kCbLveARWKgxk9Co7/1iRXMiXFF2VpnZLhlX3ecJaEKHWRDgu1TzawVz1J6zAW1VHElpv0 +D/db/29bQe8096vXmRtTbVifbnpwk7Ahmxc5Ean025fb16jzNKdcxXyxQsvVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMt1l0sxJzqDv; Fri, 11 Aug 2023 18:42: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 37BIg3cm051865; Fri, 11 Aug 2023 18:42:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BIg3fO051862; Fri, 11 Aug 2023 18:42:03 GMT (envelope-from git) Date: Fri, 11 Aug 2023 18:42:03 GMT Message-Id: <202308111842.37BIg3fO051862@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: 765ad5b28d3f - main - tmpfs: add the "pgread" mount option to the allowed options list for mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 765ad5b28d3fa272208aedc3047a6a3dff561037 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=765ad5b28d3fa272208aedc3047a6a3dff561037 commit 765ad5b28d3fa272208aedc3047a6a3dff561037 Author: Konstantin Belousov AuthorDate: 2023-08-11 18:00:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-11 18:01:49 +0000 tmpfs: add the "pgread" mount option to the allowed options list for mount Fixes: 0f613ab85e5a5274704d179f39fb15163d46e7c4 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/tmpfs/tmpfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index b04b3c084b3b..f7dbadc1fd95 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -93,7 +93,7 @@ static int tmpfs_statfs(struct mount *, struct statfs *); static const char *tmpfs_opts[] = { "from", "easize", "size", "maxfilesize", "inodes", "uid", "gid", "mode", - "export", "union", "nonc", "nomtime", "nosymfollow", NULL + "export", "union", "nonc", "nomtime", "nosymfollow", "pgread", NULL }; static const char *tmpfs_updateopts[] = { From nobody Fri Aug 11 22:51:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RMzYS3pqwz4prVV; Fri, 11 Aug 2023 22:51: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 4RMzYS3CWVz4FTs; Fri, 11 Aug 2023 22:51:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691794284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wmlg0jzfqG0X0B6aqQXntk0PKs+RXfxyg7WwqdqFX6Q=; b=unCrcdJIbPdVWCLzXcnOMQh8Us9jKcLIrHYXfrEr+/nzQjl5hnvOEk9rjg77uXexdoXu56 2dbSI+P20qbm18Isqs9OAIyjmhxpJZ5mxfFg7DtgXaglm0KuDdhtRXs36oQ0NYgJxBqnbn cp9cwZeHucxtU5egb0tbxRO1erNkg0WZeKVAFuInhyu7Q3Sg25bcjZILt18gPQkgDSijAa aKzcPFa/HMeED58vvh/gPQWBmXWoh85NM8ChPCmzBCiNu++9tDBIESEdUEgRdMrQGaaIra zWkfIy+T1y3/71+If+8ORllcD6NcpJPs2qdlXibasUiRg90fEvVekmm2cj72MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691794284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wmlg0jzfqG0X0B6aqQXntk0PKs+RXfxyg7WwqdqFX6Q=; b=SDwjKybf1GNXVTxPZRmqOkhXIigoN5I9OTjyjsp3reEE/JrIoDprm5a8HOmQ65UXh458TM 9EjnDEXhAVfSS62dSE//jNgoX1yF2TDZnRyTVlWsyQdbhgfhUbVja/vYMPn1aIuqUu0wZ5 PiFdkC49vdSSmTEfVPPU6oswM2B27Kjs/rktu3KKKVGxBfxDvuSaOA22xhIBjNOAONhDow TuW1SGxvYCSLnf9OHorIMJ7OP0qKqkMkpL9wdXLF3nt6UAJwMgG4fwB0j9HRmXrYxDAO7R sIVkK4fPwyykTngqympDqzPyX3bhQsIa4/cIwKYxQHWhdDLJeR5DyViIlmVM8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691794284; a=rsa-sha256; cv=none; b=g6xUSgagRAyncrw5cwuWGAmHTPtbLBylxWzFhRx9OdUDG5WUSn9Rol3FaJ2aAEeDDhROsa Uh06K1kcXRqkpm0rGz/lbeM72f2LRbRuLGvBIJzjZJpBVjaRyFK1MEu7T34RVRbO03FFAJ Di07eO4w7wQbVVxt8bZR71j6nqLRXQlI5lqFAbcwkkKLyYhdtwPHu8QKg1yMqgxTJZ/iJ9 YiR8+rVqzSwSCjZvmTMmkoMbHtExzL6MHhsYEHhM7QlXuM+lMSCbaLLYasiDqO7FEeNuZG LENen3/kBfLt3U5z4/VBu4fG0cwsdRTD8I0vD+F3pg2C3xvG6AvB0a4NVEiG/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RMzYS2G5YzxLX; Fri, 11 Aug 2023 22:51: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 37BMpONj064627; Fri, 11 Aug 2023 22:51:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37BMpOnC064624; Fri, 11 Aug 2023 22:51:24 GMT (envelope-from git) Date: Fri, 11 Aug 2023 22:51:24 GMT Message-Id: <202308112251.37BMpOnC064624@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: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f11a33ceeb385477cb22d9ad5941061c5a26be9 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5f11a33ceeb385477cb22d9ad5941061c5a26be9 commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9 Author: Paul Vixie AuthorDate: 2023-08-11 18:17:16 +0000 Commit: Kristof Provost CommitDate: 2023-08-11 22:50:37 +0000 if_vlan: do not enable LRO for bridge interaces If the parent interface is not a bridge and can do LRO and checksum offloading on VLANs, then guess it may do LRO on VLANs. False positive here cost nothing, while false negative may lead to some confusions. According to Wikipedia: "LRO should not operate on machines acting as routers, as it breaks the end-to-end principle and can significantly impact performance." The same reasoning applies to machines acting as bridges. PR: 254596 MFC after: 3 weeks --- sys/net/if_vlan.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 6aa872a19364..92e4e4247e3d 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2067,14 +2067,22 @@ vlan_capabilities(struct ifvlan *ifv) } /* - * If the parent interface can do LRO and checksum offloading on - * VLANs, then guess it may do LRO on VLANs. False positive here - * cost nothing, while false negative may lead to some confusions. + * If the parent interface is not a bridge and can do LRO and + * checksum offloading on VLANs, then guess it may do LRO on VLANs. + * False positive here cost nothing, while false negative may lead + * to some confusions. According to Wikipedia: + * + * "LRO should not operate on machines acting as routers, as it breaks + * the end-to-end principle and can significantly impact performance." + * + * The same reasoning applies to machines acting as bridges. */ - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) - cap |= p->if_capabilities & IFCAP_LRO; - if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; + if (ifp->if_bridge == NULL) { + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) + cap |= p->if_capabilities & IFCAP_LRO; + if (p->if_capenable & IFCAP_VLAN_HWCSUM) + ena |= p->if_capenable & IFCAP_LRO; + } /* * If the parent interface can offload TCP connections over VLANs then From nobody Sat Aug 12 00:07:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN1FG4Mjtz4pxs8 for ; Sat, 12 Aug 2023 00:07:30 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (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 4RN1FG1wrmz4M03 for ; Sat, 12 Aug 2023 00:07:30 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-26928c430b2so1471127a91.0 for ; Fri, 11 Aug 2023 17:07:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1691798849; x=1692403649; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=6mrhiYCfBLOxIh98oLf7kXLXTp9saNhC41ZG4+LkiLM=; b=mWyNccBducJ0CwUscEnk/8X4Q7FciHrCpEg2Hbr0CRv9dsCE7gZiiGTQA//w3J4HqZ uwEUmXh1YGG63ZLTqJQmy5i0focft8eSDxiyZAYL9G9XhiXv4qfghA/7XIjUQ1YyCyzj +e5lWigZYHubF/XbIwLPcAIEoMLNJZAWvCzCo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691798849; x=1692403649; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6mrhiYCfBLOxIh98oLf7kXLXTp9saNhC41ZG4+LkiLM=; b=JqKfGxZqzmpVwxAg9WtH4QC/UaDbvKOUGqFdUzUb+e/qbtsdMz1pLzmxIx1k1kuab7 n/X9YOe4l3fsB7bLSEiXnHwRQm2g+9A1IMtVgLb6tGAtaCJChOu0iAJisi4QAeJFtC5n tAjBjXmND4bXJmtPDQJaGdZtTfqvKIXGmcecinX75rC6BFtNeKJs1gVJCLfvdvkJfI1O X1XpVZXd/ayqco41lFw0qy/c7vP6PO6/uHmcbYvD9ZVtHzPGIF6Z4siRqbSEroGJp5XZ zREImHH8Vdo7655S3nNwc52/4l7s7dpOITqzsLbD7cDqhQOfhJbWsuTpQOtkhwGwEEUd EYaA== X-Gm-Message-State: AOJu0YzQ+S3v9NxLw6uDPDyHrJc7V/focJPH44dOhsQvT0lrLvzwT93H lkln1+SxClYukrBHGcCRxirvX8DoetmSs0ANMAsyJKg3vAZ5tGWzyVM= X-Google-Smtp-Source: AGHT+IHeRUGKc9d47yhQDLnx6eWA+URumrw+l6K3H57P4mVurQIHqomoPAW7HjWyGqiiGKwrbtD1IzuiQ5NynQ+QPo0= X-Received: by 2002:a17:90a:9dcb:b0:268:29a3:bd05 with SMTP id x11-20020a17090a9dcb00b0026829a3bd05mr2059292pjv.48.1691798848680; Fri, 11 Aug 2023 17:07:28 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> In-Reply-To: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> From: Kevin Bowling Date: Fri, 11 Aug 2023 17:07:16 -0700 Message-ID: Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RN1FG1wrmz4M03 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] I am wondering what is going on with this patch, it doesn't seem like a full fix. At the very least we should clean up the "can't disable some capabilities" message. I've been looking at this for a couple hours and am wondering what is going on in if_bridge.. it looks like it correctly loops over the interfaces and masks ifcaps it doesn't like using the interface's ioctl SIOCSIFCAP. A similar pattern is used in if_lagg. I don't see any issue there so far. I also don't see the SIOCSICAP ioctl failing nor did vixie's message report that. I checked on a cxgbe(9) bridged vlan setup I have and see this message "bridge0: can't disable some capabilities on vlan0: 0x400" So I am wondering if the bug is that if_vlan SIOCSIFCAP is disregarding the ioctl's request mask.. it is just blindly calling vlan_capabilities. Regards, Kevin On Fri, Aug 11, 2023 at 3:51=E2=80=AFPM Kristof Provost wr= ote: > > The branch main has been updated by kp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D5f11a33ceeb385477cb22d9ad5= 941061c5a26be9 > > commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9 > Author: Paul Vixie > AuthorDate: 2023-08-11 18:17:16 +0000 > Commit: Kristof Provost > CommitDate: 2023-08-11 22:50:37 +0000 > > if_vlan: do not enable LRO for bridge interaces > > If the parent interface is not a bridge and can do LRO and > checksum offloading on VLANs, then guess it may do LRO on VLANs. > False positive here cost nothing, while false negative may lead > to some confusions. According to Wikipedia: > > "LRO should not operate on machines acting as routers, as it breaks > the end-to-end principle and can significantly impact performance." > > The same reasoning applies to machines acting as bridges. > > PR: 254596 > MFC after: 3 weeks > --- > sys/net/if_vlan.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c > index 6aa872a19364..92e4e4247e3d 100644 > --- a/sys/net/if_vlan.c > +++ b/sys/net/if_vlan.c > @@ -2067,14 +2067,22 @@ vlan_capabilities(struct ifvlan *ifv) > } > > /* > - * If the parent interface can do LRO and checksum offloading on > - * VLANs, then guess it may do LRO on VLANs. False positive here > - * cost nothing, while false negative may lead to some confusions= . > + * If the parent interface is not a bridge and can do LRO and > + * checksum offloading on VLANs, then guess it may do LRO on VLANs= . > + * False positive here cost nothing, while false negative may lead > + * to some confusions. According to Wikipedia: > + * > + * "LRO should not operate on machines acting as routers, as it br= eaks > + * the end-to-end principle and can significantly impact performan= ce." > + * > + * The same reasoning applies to machines acting as bridges. > */ > - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > - cap |=3D p->if_capabilities & IFCAP_LRO; > - if (p->if_capenable & IFCAP_VLAN_HWCSUM) > - ena |=3D p->if_capenable & IFCAP_LRO; > + if (ifp->if_bridge =3D=3D NULL) { > + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > + cap |=3D p->if_capabilities & IFCAP_LRO; > + if (p->if_capenable & IFCAP_VLAN_HWCSUM) > + ena |=3D p->if_capenable & IFCAP_LRO; > + } > > /* > * If the parent interface can offload TCP connections over VLANs= then > From nobody Sat Aug 12 01:25:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN2yt3v6mz4q3hb; Sat, 12 Aug 2023 01:25: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 4RN2yt36SFz4TRC; Sat, 12 Aug 2023 01:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691803510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SU8TxOgNndW1L3tRwYBkPDI6weJ6aVie7g22MerWZQA=; b=UGO60s9iMwa0QDe4Lrrim5jNNb6N0Ob2Bjy3qcisUjI1Dnv0VH3LYeooSAWN/NZAdzi1Lr zxKl14iPr24JIgVooec2jbD+fPojiFnphYJWoz54ShLcA9aiaP0nPRF6BL2zz5jK0ahFwH zScqlFp/t2s/NA8SE9gxSl+TuXoR76659sP/9xQNrbxqsSpOYz/+wy7V9UzdaLgd34omUJ qh6Ulyr3LiivGJbw5g4nrj5cA2JWB7sagXxcSqOEnX/9L304qL+K8Df59lFrRr5uTlCdVg ME3T2AxUWCSfk++aTbPbUHaR4Euf3GOb44c3fEhXUoR1nA30Bu5wMfANvBpL6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691803510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SU8TxOgNndW1L3tRwYBkPDI6weJ6aVie7g22MerWZQA=; b=MTwybI4LGc/mcIZRh3U7sE33pwF4Tt0vZhOyO6HkDk121WdA5XR7pps/dEJZLVC0IGB6Bw FJxVLbDsRIHZqGrXyFJV5ITltG1//8hm3lYwedx5weCAhuV8Ijj2vPdozIkO3Sg3a+SEFL qeVxgCXg+aYqJOh44Q4QbhS0p8lvJfyn9WjFQVOSoYJxuhk1HmtjFJM6dwDGILRq0HKDt8 Vv2HSnCXkzBn0eJUojrjOBgY0W7NVs32RK2wGKJo09PDSdeiqt9ACGUGwhQbvIJ+lfhUy/ d0b0iWhjBxWrZ9m2rvRbwrSHxH6YRj9y6ScoaNREzQpCYyuKdpfw0JBIJoG2NA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691803510; a=rsa-sha256; cv=none; b=Slf91UztH6FeQxD4drsMACr0HUKXog7JtSlsWB4ZZQagCgE5EtPoAOGYVNuMBTBLxpZHU9 mx9lOPwuK+XEJLH9kfdoeGIFK4oz+/ACwdMq4K2heuVmm4bvAowcwgCyAwppIgH6MeDPJ4 SAm3XUCpKfS+5P4wLQyZq4WfYp3p7VqxlRn/PoH6642F8gGJIMGgC5FO49h5/K7S54Dy/s kYjKvRCs0YRX66eOSX3IQ+co8swM68N7zK/dXzK5SgjeQkchRazCtMN8Ynh0brWgPSphYx 4rkADmjq5dVhh++CRgRzBjIr6DqCdl1LUP/J+CBD/NfsUEanIZd2GGZ3bSAr6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN2yt2Bk5z11lB; Sat, 12 Aug 2023 01:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C1PARZ021112; Sat, 12 Aug 2023 01:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C1PAT2021109; Sat, 12 Aug 2023 01:25:10 GMT (envelope-from git) Date: Sat, 12 Aug 2023 01:25:10 GMT Message-Id: <202308120125.37C1PAT2021109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: b231322dbe95 - main - tests: Also exclude powerpc/powerpcspe from mmap_map_32bit_test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b231322dbe9559c2dc43698c3bb1e832cd8bbfa9 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=b231322dbe9559c2dc43698c3bb1e832cd8bbfa9 commit b231322dbe9559c2dc43698c3bb1e832cd8bbfa9 Author: Li-Wen Hsu AuthorDate: 2023-08-12 01:24:15 +0000 Commit: Li-Wen Hsu CommitDate: 2023-08-12 01:24:15 +0000 tests: Also exclude powerpc/powerpcspe from mmap_map_32bit_test Sponsored by: The FreeBSD Foundation --- tests/sys/vm/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index 5517bbcbd108..c460ba9d8db7 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -10,7 +10,8 @@ ATF_TESTS_C+= mlock_test \ shared_shadow_inval_test .if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ - (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") + (${MACHINE} != "powerpc" || (${MACHINE_ARCH} != "powerpc" && \ + ${MACHINE_ARCH} != "powerpcspe")) # MAP_32BIT is only available on 64-bit platforms BINDIR= ${TESTSDIR} ATF_TESTS_SH+= mmap_map_32bit_test From nobody Sat Aug 12 01:28:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN3321gGjz4q47d for ; Sat, 12 Aug 2023 01:28:46 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-oa1-x2b.google.com (mail-oa1-x2b.google.com [IPv6:2001:4860:4864:20::2b]) (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 4RN3312vCYz4TnT for ; Sat, 12 Aug 2023 01:28:45 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=kev009.com header.s=google header.b=sKqw+yJu; spf=pass (mx1.freebsd.org: domain of kevin.bowling@kev009.com designates 2001:4860:4864:20::2b as permitted sender) smtp.mailfrom=kevin.bowling@kev009.com; dmarc=none Received: by mail-oa1-x2b.google.com with SMTP id 586e51a60fabf-1bfca0ec8b9so2198406fac.2 for ; Fri, 11 Aug 2023 18:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1691803724; x=1692408524; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=kB1TNYi94MlDzT6NjhbL3bNKM27jyM9fIEnj6rc2g8E=; b=sKqw+yJuTybBCLiQxaYZUWfdNzLZjfGZHynYQY+5hSCrtTNRut2WRrNqkm/3f+gvcp TRx0IJnUxbKdfM0E8iALJ/AUxhcPDnqBJgrXgHgneeZIlVng/562LAyPTlU0Oabdl2dq GfqrFPCY3KEqC2WBwOLBGOBdT7xXnsEZ5z5tY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691803724; x=1692408524; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kB1TNYi94MlDzT6NjhbL3bNKM27jyM9fIEnj6rc2g8E=; b=NFq/rVguGY0OhHl/0CNRsRiChfiC+fn7vEdzDN+7R1FVO4exBenFF2hU7XZR8A97U0 5aMH++yUKa249rp62A4VK8yrM+vS8D0jh79kEw7bvOzy0rHygEwzyMpQbDpDCUBxJtPC MgNirITHOtXwHcYqvYL+LVftqGGAZJLI/eiXaCz4dL4wMFJTW0216X1/bPyJNr7jUOqy TamD5tjh5Z3UD9y4d2aFapQqXkkImmf4bbCFRxU0HGWn2n4dBTySLPFbFtObzqHZXXRk hKOwM14N0pDBG56HNANR7gR6B30Abt03wIGuMQKFkFsu9Uewo9VUMaQ6ldOfoTxBGtmd AJTA== X-Gm-Message-State: AOJu0YzHDbJ1njVCyzC0joYpVbC46qnbuOiwzW56ZD8FQpGJM5KDBJGp 2CaLkS5F8jPUDvTbzezKgRf+T62BwxCsQxfo4uadFA== X-Google-Smtp-Source: AGHT+IEAGFTCUkaiTUdYNTdXmEMN5Z50Di9LFYj6qetTmWTYqXDZdfenZNn3OYZ+UAehjRauEH+V689ci2rJ1kETlHU= X-Received: by 2002:a05:6870:9629:b0:1bb:bcc3:c96 with SMTP id d41-20020a056870962900b001bbbcc30c96mr3619246oaq.33.1691803723711; Fri, 11 Aug 2023 18:28:43 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> In-Reply-To: From: Kevin Bowling Date: Fri, 11 Aug 2023 18:28:32 -0700 Message-ID: Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-3.27 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.97)[-0.968]; R_SPF_ALLOW(-0.20)[+ip6:2001:4860:4000::/36]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_ONE(0.00)[1]; R_DKIM_PERMFAIL(0.00)[kev009.com:s=google]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2001:4860:4864:20::2b:from]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[kev009.com:~]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[kev009.com]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Spamd-Bar: --- X-Rspamd-Queue-Id: 4RN3312vCYz4TnT I think this may be a better fix, currently untested diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 6aa872a19364..51f0bc63ebda 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2074,7 +2074,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_HWCSUM) cap |=3D p->if_capabilities & IFCAP_LRO; if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |=3D p->if_capenable & IFCAP_LRO; + ena |=3D mena & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs th= en On Fri, Aug 11, 2023 at 5:07=E2=80=AFPM Kevin Bowling wrote: > > I am wondering what is going on with this patch, it doesn't seem like > a full fix. At the very least we should clean up the "can't disable > some capabilities" message. > > I've been looking at this for a couple hours and am wondering what is > going on in if_bridge.. it looks like it correctly loops over the > interfaces and masks ifcaps it doesn't like using the interface's > ioctl SIOCSIFCAP. A similar pattern is used in if_lagg. I don't see > any issue there so far. I also don't see the SIOCSICAP ioctl failing > nor did vixie's message report that. > > I checked on a cxgbe(9) bridged vlan setup I have and see this message > "bridge0: can't disable some capabilities on vlan0: 0x400" > > So I am wondering if the bug is that if_vlan SIOCSIFCAP is > disregarding the ioctl's request mask.. it is just blindly calling > vlan_capabilities. > > Regards, > Kevin > > > On Fri, Aug 11, 2023 at 3:51=E2=80=AFPM Kristof Provost = wrote: > > > > The branch main has been updated by kp: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D5f11a33ceeb385477cb22d9a= d5941061c5a26be9 > > > > commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9 > > Author: Paul Vixie > > AuthorDate: 2023-08-11 18:17:16 +0000 > > Commit: Kristof Provost > > CommitDate: 2023-08-11 22:50:37 +0000 > > > > if_vlan: do not enable LRO for bridge interaces > > > > If the parent interface is not a bridge and can do LRO and > > checksum offloading on VLANs, then guess it may do LRO on VLANs. > > False positive here cost nothing, while false negative may lead > > to some confusions. According to Wikipedia: > > > > "LRO should not operate on machines acting as routers, as it breaks > > the end-to-end principle and can significantly impact performance." > > > > The same reasoning applies to machines acting as bridges. > > > > PR: 254596 > > MFC after: 3 weeks > > --- > > sys/net/if_vlan.c | 22 +++++++++++++++------- > > 1 file changed, 15 insertions(+), 7 deletions(-) > > > > diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c > > index 6aa872a19364..92e4e4247e3d 100644 > > --- a/sys/net/if_vlan.c > > +++ b/sys/net/if_vlan.c > > @@ -2067,14 +2067,22 @@ vlan_capabilities(struct ifvlan *ifv) > > } > > > > /* > > - * If the parent interface can do LRO and checksum offloading o= n > > - * VLANs, then guess it may do LRO on VLANs. False positive he= re > > - * cost nothing, while false negative may lead to some confusio= ns. > > + * If the parent interface is not a bridge and can do LRO and > > + * checksum offloading on VLANs, then guess it may do LRO on VLA= Ns. > > + * False positive here cost nothing, while false negative may le= ad > > + * to some confusions. According to Wikipedia: > > + * > > + * "LRO should not operate on machines acting as routers, as it = breaks > > + * the end-to-end principle and can significantly impact perform= ance." > > + * > > + * The same reasoning applies to machines acting as bridges. > > */ > > - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > > - cap |=3D p->if_capabilities & IFCAP_LRO; > > - if (p->if_capenable & IFCAP_VLAN_HWCSUM) > > - ena |=3D p->if_capenable & IFCAP_LRO; > > + if (ifp->if_bridge =3D=3D NULL) { > > + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > > + cap |=3D p->if_capabilities & IFCAP_LRO; > > + if (p->if_capenable & IFCAP_VLAN_HWCSUM) > > + ena |=3D p->if_capenable & IFCAP_LRO; > > + } > > > > /* > > * If the parent interface can offload TCP connections over VLA= Ns then > > From nobody Sat Aug 12 04:40:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN7JK6NKCz4Tljh; Sat, 12 Aug 2023 04:40: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 4RN7JK3pkDz3Ltg; Sat, 12 Aug 2023 04:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691815233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWuqCHnEm/vxxYWlktCz41eeA7T3PqVMnKj1iKoXeMw=; b=Rr7rIksAM2zR3Munm/n8ysnH+Q70Pm2ZcVbatodjS6XqDXcvl9CZyBW1z91nlJomDlI0Ef VmtGiMPdopgvnThuaSwhpZwqWOG5HdKXGrYq6a48ptDH2oWVoTBZNK+kPaJXcEVJmP8vHj qtJQWhjQU8Hs/eumgma58gAjNUw4aFCAfmKjlfNUsksG+oumH5SZOE6h5Fz5MaLCyunD8i aX0mZ/bjFag3d+tFYRwr9qfSWuMVuVopqvGqI7pDmztDB1Xn7QvVdF+8IWVQO4g0wYE6Pl i8pq9IGv38jJcdPYy1sQ+reWlByp1qTG/qDVCIjBWySm2QijM9fTbiva6sh+Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691815233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWuqCHnEm/vxxYWlktCz41eeA7T3PqVMnKj1iKoXeMw=; b=o8wdcDrZTm8FHXbdV266knceHSAgWCWoU0se6iH3jqFm3e94orIxcKABfSxNWyyxhC0+UF gZkMSmL7ProhRlHSj8hqMGB/VdnweD/V7HUIJWN9+Ezn9Lb8bF+VXaRctMQtfhFFJg7PK+ gT4oXl+gxvZhIpYrHh/oNujOOHNalaiJp4sgLlX4uJ3Md2dLWFH4OkHgzK6NEmzac2vv3r Veo7fHbM0yDQSXcJo9SZczx75i7RKQMQJ8jvX4WErD/ALjOexwJrTWRjhqcN4w5y669Ufn grbRkYwYT5JlcvzB0mOKo5tYwokfp86AaMtqbY2xnY7njzW+RiFCM12FHgOtGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691815233; a=rsa-sha256; cv=none; b=uM0zqavCURbDwU3J9ncwPc1vnrC1kLAHZvafDgm1Zx7NGxX1Gflm463xPGbIZwdBNCIRvX P49MfdTFwCaKM9JUpP3fSyg7PnkR1EgL/L4LCqLcKahKBdt8MfGQCZKuxsF82xcRRHq5dK ZFi2zmq4Z/uSNH+a5GMkSb0bdBcKYOsYBL8IJ09ZJIClDnZ5kPfXQxzOBR09Hr8a31fqS8 cMUx3R1El3VWokuCw55NkaQP5SmCQ37cBJv05/0PCVsXxsH06AeWX+6pHoJyOjpsLFlASo 3KgHJytiomS7WwxToiHEpQsC4samqunVsa0bjCMpFKkj3g4bjdff32lFZP91qA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN7JK2vwbz16CJ; Sat, 12 Aug 2023 04:40: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 37C4eXXq050382; Sat, 12 Aug 2023 04:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4eXql050379; Sat, 12 Aug 2023 04:40:33 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:40:33 GMT Message-Id: <202308120440.37C4eXql050379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 962c2a492528 - main - release(7): Bump date after introducing VMFSLIST in 32ae9a6b3937 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 962c2a492528cdaf0e46783cec3de7f73dc4f742 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=962c2a492528cdaf0e46783cec3de7f73dc4f742 commit 962c2a492528cdaf0e46783cec3de7f73dc4f742 Author: Li-Wen Hsu AuthorDate: 2023-08-12 04:39:53 +0000 Commit: Li-Wen Hsu CommitDate: 2023-08-12 04:39:53 +0000 release(7): Bump date after introducing VMFSLIST in 32ae9a6b3937 Sponsored by: The FreeBSD Foundation --- share/man/man7/release.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 068837ff682f..7b7f8d6817b5 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 28, 2022 +.Dd August 6, 2023 .Dt RELEASE 7 .Os .Sh NAME From nobody Sat Aug 12 04:55:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN7dg2bSjz4Tmsm; Sat, 12 Aug 2023 04:55: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 4RN7dg22lMz3Mtx; Sat, 12 Aug 2023 04:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVGK2C3axYi72Dt0Kt4nmwMU6UNATX+xUHDPQF3H4lY=; b=Fy87WYE6d7l9Cn6nMLcTLFFo5plR9Poso8iZ1NenPaYeaA+pNgGuwtYCBHdPoxj3hIzj/9 IGMYNqpqecfp3C7+0oM7vP40L+YR9LC7QoAvjxjpKkpdrTJ2dJukuONe2OQ8LasScRRiDy WtpbPix604pClWfXIx0WVcMMFqKVNxfnJtpQbQMNl8Z+FyyBzYcVY5AsjtnMTVQelonV/R DUmZBsVx/nMv86MaJ7b6l8vyiM5O9hNgIw0gnRCAmQ2VUCVQxm5ij04hDSDWAbgRiW068Z RW0n7l7FQ68o4OIUhesOmdwUiA/S1TnVX/riuUi0rWE/sG/lh+RdNui4rz3F3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tVGK2C3axYi72Dt0Kt4nmwMU6UNATX+xUHDPQF3H4lY=; b=oS1zigWCReACYWMkrAxA0kq91NyKdgvDRsJuY8o8vju37YkpvafIqzghSOsqPRtstDRr0S DxSyk+WEO3NmDQaT5ey0h6F8baR4LWSk8YHVSugJ/sr9URIZRvPdwr8FIPkv5YlPVNQWkj c+j+AkTJ7xoVrPyJfD0NA9cL8+hP2P3GqyvEITOpdu3xKExMl/E2Yp9YDapQZnGJ+IeIyj h/y1ZrnPbLiPiVcKVyw0TKOm6zN8jOFXh+LnPItw4mnhxGbNcNgGwxMZMclYTvg0kPx6IO 0Q07DNUJOeS2uNQBVHsfuZl4K7AjZvDWLgpcUFO1fXABJE83fNByapx0gPQ4qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816135; a=rsa-sha256; cv=none; b=Lu4gyKi+sOGWl87lPogtbB+JKEUW+3EnJheAEYtJ45UlKlPgZA1HsOuNeWYOKZpawpicbp XrLgxl9dBua84+AjzSa1pxABsyhOstdDAbHVhZdckyDfO0qT9RBzsNuyNadyhVe2W5AziM s2r+LWw4FFnYD6LVrZK0hf/1IYSS53Wif8zK934g22WDJTbRyj4YCQfy0qUQ97gF7Hjk89 gu9QkjUIAYEXLKuKZMEnSygmoDKYHr8MYbPNQf+lO7bKsGyl+wsYnMJPe7OJajRiX/D8zG zqjtsSboSMG65G449XuCnffKnSUt+71X7BhcATm8iAuwUjfEk06XOOVfIa5mag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN7dg0x48z16V6; Sat, 12 Aug 2023 04:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4tYBs074415; Sat, 12 Aug 2023 04:55:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4tYJ9074413; Sat, 12 Aug 2023 04:55:34 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:34 GMT Message-Id: <202308120455.37C4tYJ9074413@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: 2726978bd801 - main - Makefile.inc1: Remove redundant test for armv[67] List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2726978bd801ceca07075f150d6ad9ef55470a21 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2726978bd801ceca07075f150d6ad9ef55470a21 commit 2726978bd801ceca07075f150d6ad9ef55470a21 Author: Warner Losh AuthorDate: 2022-07-05 16:16:19 +0000 Commit: Warner Losh CommitDate: 2023-08-12 04:55:10 +0000 Makefile.inc1: Remove redundant test for armv[67] If MACHINE is arm, then MACHINE_ARCH is going to be either armv6* or armv7*. Sponsored by: Netflix --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c102348baa6f..e3f758493fa3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -135,7 +135,7 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE} _TARGET_CPUTYPE=dummy .endif .if ${TARGET} == "arm" -.if ${TARGET_ARCH:Marmv[67]*} != "" && ${TARGET_CPUTYPE:M*soft*} == "" +.if ${TARGET_CPUTYPE:M*soft*} == "" TARGET_TRIPLE_ABI= gnueabihf .else TARGET_TRIPLE_ABI= gnueabi From nobody Sat Aug 12 04:55:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN7dh3hX7z4Tn3n; Sat, 12 Aug 2023 04:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN7dh2lrlz3Mxp; Sat, 12 Aug 2023 04:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUlgYxd/9tCeqZ64/hdUV1rLa6L6NI5y5McnQlPRyqY=; b=Nhe6sy6x+qy9QC52Yqg956RgCf4zQgDDOC9qgBYx1OOqqJIZ+dzQYkUjzo66o4KwG47xqz lVaoIxetT/88ZcpLr0MW5QxCJvglK5F7ocakr+nASZdIJsEuzj3ZXb7qroCp7aMjKqJvVH TO2hpP0GnSNswUaJIEXNIDrbhjGulViP0BBwVcuDwWsaNpw2YRWLSsCk8byAKCFcc9arQa +pWBuJhsTx741EalHgPJjaSK5BPhyiET/rKC09+8ukemodUKlOXPFSND9qdTbr8pauRe6p dGom+nnXoHJETrQUgIWdVw+PCi4DtJ19S461puUtmzcEII9sWt0mV5J8WSB1Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GUlgYxd/9tCeqZ64/hdUV1rLa6L6NI5y5McnQlPRyqY=; b=rbvy3Zvf385IOH5Y8S9dPtSHu7K0AcR/u/aAyAu01WxU0cxzFiAoZz8H3kAjQCyGEO7Mw+ U+n80SMXQ1Ms0bz8whPhv61MGWYaiHXHLE+SYWIPtbeXm1QTq9+NhKJffx6aIEII7Rk4v2 lRUToWff8QO0Ntvnu4LqWfkDHYFjggQNmTexlMD+/aoVyBZeu1Pn0q+NoNMWtM0PaYaqvJ SW64jv+SaymDf4km2lHCBgo72A3Gvb0PHVdEYc95SN15L79/yl9oRCeEDDsF41laQXZzJZ XgjVVI7cA2OTRCMccZvYWK8Hnr3NFXS56bwEtZIEcST5Dbuv5kpRMdiZGoYLEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816136; a=rsa-sha256; cv=none; b=fLYrAisxhbyd16w5F18qDOO6jSDcA+n5CgbTgUB+ZI0zU6u868M/CL+BhGHMniVqJ2hQgb LsIyZ/EJnXW4AgjrCa98r0DHHV3rRHI2uxWJncrj048EHXyo6mdEin2/tei3LDyva3duhS aGUjY8rV8ncRIklIn0uJIOLPvb5qXAus2nEr+D98nKUJvZQdHZeA8EJRse0oSZ1udkkx1h 4ka39W+n6g8mQYl3s2uTq0QqGVPGBVuSro9JsAQkr7mVKp7TnSfsdQeiy9zPZTKoEPIblP dHNHbkogBUE3VlXN6AnCMS/Bn3hR+TRJKpksJEjRG0wGGmaM++TKiWA1SkiO9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN7dh1YQtz16V7; Sat, 12 Aug 2023 04:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4taJW074477; Sat, 12 Aug 2023 04:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4ta61074474; Sat, 12 Aug 2023 04:55:36 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:36 GMT Message-Id: <202308120455.37C4ta61074474@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: 0bc26e325450 - main - clang: Minor build simplification now that armv[45] is not supported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bc26e32545069586676149efcafae98c3e3dea3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0bc26e32545069586676149efcafae98c3e3dea3 commit 0bc26e32545069586676149efcafae98c3e3dea3 Author: Warner Losh AuthorDate: 2022-07-05 16:19:32 +0000 Commit: Warner Losh CommitDate: 2023-08-12 04:55:10 +0000 clang: Minor build simplification now that armv[45] is not supported Simplify these expressions a little and remove an obsolete comment. Sponsored by: Netflix --- lib/clang/llvm.build.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index 666dff08c222..f9fd62e78f4e 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -38,12 +38,13 @@ TARGET_ARCH?= ${MACHINE_ARCH} BUILD_ARCH?= ${MACHINE_ARCH} # Armv6 and armv7 uses hard float abi, unless the CPUTYPE has soft in it. -# arm (for armv4 and armv5 CPUs) always uses the soft float ABI. # For all other targets, we stick with 'unknown'. -.if ${TARGET_ARCH:Marmv[67]*} && (!defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "") -TARGET_TRIPLE_ABI= -gnueabihf -.elif ${TARGET_ARCH:Marm*} -TARGET_TRIPLE_ABI= -gnueabi +.if ${TARGET_ARCH:Marm*} +.if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "" +TARGET_ABI= -gnueabihf +.else +TARGET_ABI= -gnueabi +.endif .else TARGET_TRIPLE_ABI= .endif From nobody Sat Aug 12 04:55:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN7dj44KSz4TnPN; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN7dj3Qjkz3NK0; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIr7fOHQwUTShm7M5v/1p19o+YciwGgQkGiVgz+tmHg=; b=tYnjiGn7OHF0K1YRhbUrMF6mIfXqFYakpHfDlhHSimYldi9JnrqDJxO8qcM4CI7BnwY09n 9kwDJaB0jrOuWWMAOVLZKHkSHufTrF5UoDqKCJkIcpNep4cwFS7csGF6sikED1+5JdJUKI gW8ORB5GlciGYManlvv9FwJUnBuW8E8OkvreJ8B1nYT1ovf2drKIBSKlX4YVElreZ4xq8l la1/e6olJpDDJ1Q0mEJnqpVSB//sVYImY+mgWh1RjBAIEYysuXzJvFgIG62yHC3WuT5QM7 YStWnTXp5q67k2Br0CTZmHk99XQXEn8BgeuXQDvdShYuBpvIpwOkmkfTPoKqag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691816137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lIr7fOHQwUTShm7M5v/1p19o+YciwGgQkGiVgz+tmHg=; b=jscNO0276pSehsqCZo3+LOO/MCvOzxIJBDnOCQvDGRIr38S5ou0SWeIAjlg07E3rr3tofB qYKcWcfj8P6fxe7/i6t980va9gkAywXn2g+zdz0o9v4eXkLAW7MhPFaKdcWSXQGTFvxBg0 JPaOPTKkCneXzZGz/ETu1MbzRyapkszuHNKToD10IJHM/TN8rwT4cvIANfUucJKQBwFIwI CfLS/ij+zjEBSNgQEa+cG6WaOjqNkjd0SYmz4KhCsQaWEvNO+59SDZj5TD3ATe+2QxzO0s VumaKYGvC636evQ39V+omHgwiz1Pz+cJ5RfeNrpDSwqE9CagV52ysh15nG7bBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691816137; a=rsa-sha256; cv=none; b=IWdV1yS04K9xEJRXzIRt+Sv8f+gEmYJ3BT8rn2fvgfwUdkloRJ/GJfpGWKzVAr/XdgOZuM Qmt5+GsfS0xrtzx3YwqNveiOhsMfNvW60aoEYshqztTIddJymx9hVTY7bEypecoGY2SnLD YLJwmZWcvyIb/492yd69z5IIHe4jj9Ov+UsE9yNiKKYOnre6zB///JwziAHTMnIivcL7h5 4pPatSWPBBf4cTGRNpw3UtKuBnkRl9FFfWU5WyggYr4ZzA8tICgdx5wGsQZdXjB29D4Y7D +ZEJQeNk6+allgtlonp0Lyq7a5saS2/i0Sw+6uummXN+kEqL7UP2LJRjTDjwwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN7dj2Y0Zz16w1; Sat, 12 Aug 2023 04:55:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C4tbQm074519; Sat, 12 Aug 2023 04:55:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C4tbM3074516; Sat, 12 Aug 2023 04:55:37 GMT (envelope-from git) Date: Sat, 12 Aug 2023 04:55:37 GMT Message-Id: <202308120455.37C4tbM3074516@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: efbfa74caf8d - main - rpi: Simplify dtb file tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 commit efbfa74caf8ddde7013bc0a82782eb40aaefa6e3 Author: Warner Losh AuthorDate: 2022-07-05 16:33:17 +0000 Commit: Warner Losh CommitDate: 2023-08-12 04:55:10 +0000 rpi: Simplify dtb file tests Now that we no longer support armv[45] devices, these tests can be simplified. While here, update the comment to reflect which rpi devices we support. It's been way more thant he Pi-B for a long time. Sponsored by: Netflix --- sys/modules/dtb/rpi/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/modules/dtb/rpi/Makefile b/sys/modules/dtb/rpi/Makefile index 482f8d5f30a6..cdc6c86777d3 100644 --- a/sys/modules/dtb/rpi/Makefile +++ b/sys/modules/dtb/rpi/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -# DTS files for the Raspberry Pi-B -.if ${MACHINE_ARCH:Marmv[67]*} != "" +# DTS files for the 32-bit and 64-bit arm-based Raspberry Pi family of devices +.if ${MACHINE_CPUARCH} == "arm" DTSO= \ spigen-rpi-b.dtso \ spigen-rpi2.dtso -.elif ${MACHINE_ARCH} == "aarch64" +.elif ${MACHINE_CPUARCH} == "aarch64" DTSO= \ spigen-rpi3.dtso \ spigen-rpi4.dtso From nobody Sat Aug 12 06:29:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jX6wqfz4Tvd2; Sat, 12 Aug 2023 06:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN9jX3Svqz3Xfq; Sat, 12 Aug 2023 06:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3J8LTZT0KFSd9eeWFTDClw1M3lsYgmAdIzerPu5SHek=; b=BTzf5fQvreOTJvORUrhZcBbZ7yWF2hvxtxIqKgeItuMt+aTsWSXN+BbBjhz1A9YhyxjjhV dFUDBVwtGYDoYMhmik9tqE9tolWy69E38y4f6NHmVJqVvcoeloKPb1HoV/9FTaPOUMq1AS i/++Ld75m/U0qc3x+LEY6d6Asj9BLcgucn9i3FBauRL07IU0r5f+FkyFIYrcSkOW2FqR4w pK+e9ViKW0Gzwomu8CeUfe5W6V1k/kJKoGjcbkS9xnRCbyJFdkx6Er4pgEvITdxDWLCtsN CNAStcx9WPFF+KVOitvw2Y0LFXt5Zmjf/MYepXmOeVgYgNBw8Im4gQQN0G1MlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3J8LTZT0KFSd9eeWFTDClw1M3lsYgmAdIzerPu5SHek=; b=HSkMXEPR3DpT9kdfVQ3R1IKXCcY1JSe1e5w1Q94pVnCaSiTDXlNMC9qkcTXmrXErTnL643 5v5aRzxcy4dikfnf1f5jVqcHVZCQhwC5jaGo8U1n8K5KpCWEzGCWZRb6WFO9bo7haXa9Hy tN0I8xkaIEvtwFvNNEDUtJnfuFEwDH1NhsvOr81YNXk9p11RNz7aTzn9F5FebjWNXs1ihy 6nJ3SMiXDVrx2w6sYPkTqlpizfYfRQt9gt9h8sp85d6GcEqkKplIzXR744zPRd+9pXySj/ 3PISgBhE6ung/FRU+h4qve8+CoNLr52x5cJ5xANv4yot0BUq+qJbU25sW8leUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821744; a=rsa-sha256; cv=none; b=NmbRyZxMuPMPuNW13j7mFcTLgaZ6+qzRbo2B/1eVppie9COiYXeUN1sVaDFwQ6Lkub9+zD nll4DK54Hd4EqBx0svPo7bIY9y2fG8UPB1T6eJKLANO7PrEnGIbHPNCJ00TjL1j0XB/x4c x7sF3sFBKZrjIsDpwXyT1u86GKrizwEn9MOnvR+BImWrYZ5dycLFElFfNARWc/1kZxF8f9 yd1gF+1xStfcaejL2mtzMFoHr2Jc057qLqPeGmWd8e85XWB576eYkWLGCrD2quhvJXutxy qdHzCVxNgX2ltxPtp41NWIVfLPmCn8Vu3aQuUoV5tQVPOg8cfeUazOb80rjnmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jX104vz19CH; Sat, 12 Aug 2023 06:29:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C6T40k024654; Sat, 12 Aug 2023 06:29:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T4TV024651; Sat, 12 Aug 2023 06:29:04 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:04 GMT Message-Id: <202308120629.37C6T4TV024651@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: 3b44ee50be81 - main - vm_map_insert(): update herald comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b44ee50be815a93d4e2b5d34d1cfc77268f6000 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b44ee50be815a93d4e2b5d34d1cfc77268f6000 commit 3b44ee50be815a93d4e2b5d34d1cfc77268f6000 Author: Konstantin Belousov AuthorDate: 2023-08-10 07:59:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_insert(): update herald comment Only a part of the object may be mapped. Noted by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 8ab38ae2a087..2829c015359a 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1603,9 +1603,8 @@ vm_map_lookup_entry( /* * vm_map_insert: * - * Inserts the given whole VM object into the target - * map at the specified address range. The object's - * size should match that of the address range. + * Inserts the given VM object into the target map at the + * specified address range. * * Requires that the map be locked, and leaves it so. * From nobody Sat Aug 12 06:29:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jZ1bKmz4TvPv; Sat, 12 Aug 2023 06:29: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 4RN9jY3rJYz3Xnl; Sat, 12 Aug 2023 06:29:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqYxQOtvji+BJ8UJtMJ6bNUncIwGWBmbUbLCkeOgKg4=; b=rYWVxf736clXOjKALQ5aRsCKOMhiD0Uz/fm7sTU9NtD2//JwNFwSyoRzBAAk8hcrScKBi7 K+/ZNAPo7xeKklgxG6Gmv9NrCpBRJdQYOOqed0DNSc6jUjuHaXLxUtbKp0Lr2/H9r5uNjR rciChSv6TeLh0oahu+3G22AoOKbzOT9/j055arSnjQOoMzUYgp2teO9BO8M0aLikXQ3vpC eaNSK5qwd+IjQb212BtLW/Ml1L2tuY4+bM6auUk1KArjuv68ugO3jnG6/qKxH3ZK/7SHsU cIBAw0vM6jjfNRdgLpx5a1sIEnPwPTFdjgAMQxnkXrPVohGcDo4dyIKk4QUNPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821745; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IqYxQOtvji+BJ8UJtMJ6bNUncIwGWBmbUbLCkeOgKg4=; b=SZ0ru+UVAlmqEgpPOBGtbSY3b5n0MFnozE+KkaG0kzCDSAA4Ed4Y6arzAkJE1TzicUxxkP RhawpTc50RCQ3OnjIs2YzUG1+M7ZjkU/FCZuNqUWDSGNIrhXdEdGTYE1cNQ3s9eQFmcAzx 2BIU3C8xKcBHS+SA48mfzqEXVE7Q6Q0E+yZ9QEiwaP/Etl4RYVbuLyvASJ99996Dp2lq5r 4shbhIhK0q57G3OUDWMKAa5N7BnJOKid5BtqGyuqrPkuHH7qefxmjl+ucYqwIwDtXnF2Jf tfY1XD+S+jwOHV0Vin7yZ7pe0Q2yb2JWpH+IW7vQrEQHZnkqCbQsQIzR/Hpkfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821745; a=rsa-sha256; cv=none; b=qIfZUnvKR/DXdLldeTngOn1Ikr8CXVJLUg3VAvRaRvlwWUUtNbF3GbaYz8vzcGpGyQUbI5 VqRPfaFiuHtc9hll7YJNUDOB0YyLDFd4sNCkfIlOvO2MmVaEt8Mzbb43f5i7zIRfteVciC 09usbXlZz64Wdaoy12XYjX1y4QCAv9hsrm2hBL5GCgySplY01F0QFTggN2xz2fLNKiaDFD dGL6UvWUQIM7lRhRrHPS9xn3cE4uSQmhbGloiD4+xjw0rAw83iSv8c4JoQv4ipMx3/cL3G CEDwqFeqjVM81cNg5FT5fBJy5iWi88WvpWo3CMxbFAMrCB9yGLkwI3BAjvBbSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jY1Zvjz18nQ; Sat, 12 Aug 2023 06:29: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 37C6T5ph024687; Sat, 12 Aug 2023 06:29:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T5nk024684; Sat, 12 Aug 2023 06:29:05 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:05 GMT Message-Id: <202308120629.37C6T5nk024684@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: ba41b0de3ef2 - main - Add vm_map_insert1(9) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba41b0de3ef2b29c5c1155c7550785ed4b491bd8 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ba41b0de3ef2b29c5c1155c7550785ed4b491bd8 commit ba41b0de3ef2b29c5c1155c7550785ed4b491bd8 Author: Konstantin Belousov AuthorDate: 2023-07-19 16:44:18 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 Add vm_map_insert1(9) The function returns the newly created entry. Use vm_map_insert1() in stack grow code to avoid gap entry re-lookup. The comment update for vm_map_try_merge_entries() was suggested by dougm. Suggested by: alc Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 75 +++++++++++++++++++++++++++++++++++++++------------------ sys/vm/vm_map.h | 2 +- 2 files changed, 52 insertions(+), 25 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 2829c015359a..f8a2903567a6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1601,19 +1601,16 @@ vm_map_lookup_entry( } /* - * vm_map_insert: - * - * Inserts the given VM object into the target map at the - * specified address range. - * - * Requires that the map be locked, and leaves it so. - * - * If object is non-NULL, ref count must be bumped by caller - * prior to making call to account for the new entry. + * vm_map_insert1() is identical to vm_map_insert() except that it + * returns the newly inserted map entry in '*res'. In case the new + * entry is coalesced with a neighbor or an existing entry was + * resized, that entry is returned. In any case, the returned entry + * covers the specified address range. */ -int -vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, - vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow) +static int +vm_map_insert1(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow, + vm_map_entry_t *res) { vm_map_entry_t new_entry, next_entry, prev_entry; struct ucred *cred; @@ -1760,7 +1757,8 @@ charged: map->size += end - prev_entry->end; vm_map_entry_resize(map, prev_entry, end - prev_entry->end); - vm_map_try_merge_entries(map, prev_entry, next_entry); + *res = vm_map_try_merge_entries(map, prev_entry, + next_entry); return (KERN_SUCCESS); } @@ -1821,7 +1819,7 @@ charged: * other cases, which are less common. */ vm_map_try_merge_entries(map, prev_entry, new_entry); - vm_map_try_merge_entries(map, new_entry, next_entry); + *res = vm_map_try_merge_entries(map, new_entry, next_entry); if ((cow & (MAP_PREFAULT | MAP_PREFAULT_PARTIAL)) != 0) { vm_map_pmap_enter(map, start, prot, object, OFF_TO_IDX(offset), @@ -1831,6 +1829,27 @@ charged: return (KERN_SUCCESS); } +/* + * vm_map_insert: + * + * Inserts the given VM object into the target map at the + * specified address range. + * + * Requires that the map be locked, and leaves it so. + * + * If object is non-NULL, ref count must be bumped by caller + * prior to making call to account for the new entry. + */ +int +vm_map_insert(vm_map_t map, vm_object_t object, vm_ooffset_t offset, + vm_offset_t start, vm_offset_t end, vm_prot_t prot, vm_prot_t max, int cow) +{ + vm_map_entry_t res; + + return (vm_map_insert1(map, object, offset, start, end, prot, max, + cow, &res)); +} + /* * vm_map_findspace: * @@ -2318,13 +2337,14 @@ vm_map_merged_neighbor_dispose(vm_map_t map, vm_map_entry_t entry) /* * vm_map_try_merge_entries: * - * Compare the given map entry to its predecessor, and merge its precessor - * into it if possible. The entry remains valid, and may be extended. - * The predecessor may be deleted. + * Compare two map entries that represent consecutive ranges. If + * the entries can be merged, expand the range of the second to + * cover the range of the first and delete the first. Then return + * the map entry that includes the first range. * * The map must be locked. */ -void +vm_map_entry_t vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev_entry, vm_map_entry_t entry) { @@ -2334,7 +2354,9 @@ vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev_entry, vm_map_mergeable_neighbors(prev_entry, entry)) { vm_map_entry_unlink(map, prev_entry, UNLINK_MERGE_NEXT); vm_map_merged_neighbor_dispose(map, prev_entry); + return (entry); } + return (prev_entry); } /* @@ -4547,10 +4569,10 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, gap_bot = top; gap_top = addrbos + max_ssize; } - rv = vm_map_insert(map, NULL, 0, bot, top, prot, max, cow); + rv = vm_map_insert1(map, NULL, 0, bot, top, prot, max, cow, + &new_entry); if (rv != KERN_SUCCESS) return (rv); - new_entry = vm_map_entry_succ(prev_entry); KASSERT(new_entry->end == top || new_entry->start == bot, ("Bad entry start/end for new stack entry")); KASSERT((orient & MAP_STACK_GROWS_DOWN) == 0 || @@ -4561,10 +4583,17 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, ("new entry lacks MAP_ENTRY_GROWS_UP")); if (gap_bot == gap_top) return (KERN_SUCCESS); - rv = vm_map_insert(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, + rv = vm_map_insert1(map, NULL, 0, gap_bot, gap_top, VM_PROT_NONE, VM_PROT_NONE, MAP_CREATE_GUARD | (orient == MAP_STACK_GROWS_DOWN ? - MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP)); + MAP_CREATE_STACK_GAP_DN : MAP_CREATE_STACK_GAP_UP), &gap_entry); if (rv == KERN_SUCCESS) { + KASSERT((gap_entry->eflags & MAP_ENTRY_GUARD) != 0, + ("entry %p not gap %#x", gap_entry, gap_entry->eflags)); + KASSERT((gap_entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) != 0, + ("entry %p not stack gap %#x", gap_entry, + gap_entry->eflags)); + /* * Gap can never successfully handle a fault, so * read-ahead logic is never used for it. Re-use @@ -4574,8 +4603,6 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * store the original stack protections in the * object offset. */ - gap_entry = orient == MAP_STACK_GROWS_DOWN ? - vm_map_entry_pred(new_entry) : vm_map_entry_succ(new_entry); gap_entry->next_read = sgp; gap_entry->offset = prot; } else { diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 82320196b98b..08bc6532b8b8 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -526,7 +526,7 @@ vm_map_entry_succ(vm_map_entry_t entry) int vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags); int vm_map_remove (vm_map_t, vm_offset_t, vm_offset_t); -void vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev, +vm_map_entry_t vm_map_try_merge_entries(vm_map_t map, vm_map_entry_t prev, vm_map_entry_t entry); void vm_map_startup (void); int vm_map_submap (vm_map_t, vm_offset_t, vm_offset_t, vm_map_t); From nobody Sat Aug 12 06:29:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jZ5dLKz4TvV3; Sat, 12 Aug 2023 06:29: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 4RN9jZ46xZz3Xtc; Sat, 12 Aug 2023 06:29:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QhbLURO/8BVmgKExIQLIe7ghQ4Vlnq1J7n0b656rrho=; b=Yi2fv5Z8JjIC3+8LIwY6vuDCU3HcCv4l95gcb5W5oT3NFGdFVTbnQGTw/q2hXwLcYYiqNl FhidiDE6pHJR+NsjdGyN5TJftGKTgcuuyiTLaJ+z9KhHPuPpWBighmdWX8/K9KyPHH9clA d+UN9OQJB7UbfTueOgeXLpZ1IBGjci8hAsbQrMXrYeeTzfl742JzwSc/dOHPaFnq4QLkXr DhUc1PFwbKHLW2884VFZ+GZspmWhMGmaHP0AuBRbmLco7yxRkquH5KOdKeiGsnuHiz8xS8 TdqqACq84PkuUtodvPZ6ZBq5s8/w1r4Ow5UlrYVo/teHk8/GvWm7nV28HIo1bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QhbLURO/8BVmgKExIQLIe7ghQ4Vlnq1J7n0b656rrho=; b=qDQL3gC9qhYSLCN1WGFCj1GiZF6cL/VkCvjRXMnqZEY4Oo43ztGBfWegUZHjPJAYvKmWA4 JK9axSG3CuJhMj/Tw8lZKRSovZANl5q24mLJB7AX7FFj6kON/slil49CS1TL640LI9jMRx y9iEpqYLIdq6Mf+QXuUbSfukoYRyinEld53DqW1SuUJ4CzVa7OFELm6d6O48bj2loJ3rVx WI8h7x33RV2f/MBdAkZcB9fW6LPaYrjHvAo3tYGZMYUAyxBeghj+dgrICk707MFQe3OuRj 5T4juOqQgQjyXYJbKltup/0TpZa94wBVLDINrVmsyGzv0yi6BAg/2Jb7nuloDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821746; a=rsa-sha256; cv=none; b=mCdzQqK3HuzJm1BcqAlEFvb3lxcAhnc3DRZlHHvgihnvQPY0537uya0JRDWBoHJGV1w/aG b/JE79XVcDv2ESqpt66MVZPT5NacIi9hF5o3OpuXd+ItJ50uHZBSTdi1qM7qtadwDI43uy VGdS1sMkM/qaP7QPkEuEGhsd0hn+1pKO+bjRbOp3W5kwyKcQRzn4QnFRW+T+TN2KQVr4FM fe5BOmkfBvP3Jh9G6AxSw1WzuI/fp0LKg9ET/QZnxPt8UjnFD8G6kK3c3Gvpv+c6B/JvpO 9m8rZMKq2urVi5EkRSQQHBNTTcXM7vCPosiXXc2ZFLDeqg80b7YeqPxDcBBILA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jZ2LqNz19CJ; Sat, 12 Aug 2023 06:29: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 37C6T6Nc024732; Sat, 12 Aug 2023 06:29:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T6AU024729; Sat, 12 Aug 2023 06:29:06 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:06 GMT Message-Id: <202308120629.37C6T6AU024729@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: 0fb6aae7f0e1 - main - vm_map.c: add CONTAINS_BITS macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0fb6aae7f0e19c0628c398bbe30297ef9245030e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0fb6aae7f0e19c0628c398bbe30297ef9245030e commit 0fb6aae7f0e19c0628c398bbe30297ef9245030e Author: Konstantin Belousov AuthorDate: 2023-07-29 17:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map.c: add CONTAINS_BITS macro Suggested by: dougm Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index f8a2903567a6..8c12f2a92bcb 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -148,6 +148,8 @@ static int vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, static void vm_map_wire_entry_failure(vm_map_t map, vm_map_entry_t entry, vm_offset_t failed_addr); +#define CONTAINS_BITS(set, bits) ((~(set) & (bits)) == 0) + #define ENTRY_CHARGED(e) ((e)->cred != NULL || \ ((e)->object.vm_object != NULL && (e)->object.vm_object->cred != NULL && \ !((e)->eflags & MAP_ENTRY_NEEDS_COPY))) @@ -2733,15 +2735,15 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; - vm_prot_t old_prot; + vm_prot_t check_prot, old_prot; int rv; if (start == end) return (KERN_SUCCESS); - if ((flags & (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT)) == - (VM_MAP_PROTECT_SET_PROT | VM_MAP_PROTECT_SET_MAXPROT) && - (new_prot & new_maxprot) != new_prot) + if (CONTAINS_BITS(flags, VM_MAP_PROTECT_SET_PROT | + VM_MAP_PROTECT_SET_MAXPROT) && + !CONTAINS_BITS(new_maxprot, new_prot)) return (KERN_OUT_OF_BOUNDS); again: @@ -2750,8 +2752,7 @@ again: if ((map->flags & MAP_WXORX) != 0 && (flags & VM_MAP_PROTECT_SET_PROT) != 0 && - (new_prot & (VM_PROT_WRITE | VM_PROT_EXECUTE)) == (VM_PROT_WRITE | - VM_PROT_EXECUTE)) { + CONTAINS_BITS(new_prot, VM_PROT_WRITE | VM_PROT_EXECUTE)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } @@ -2772,6 +2773,11 @@ again: /* * Make a first pass to check for protection violations. */ + check_prot = 0; + if ((flags & VM_MAP_PROTECT_SET_PROT) != 0) + check_prot |= new_prot; + if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) + check_prot |= new_maxprot; for (entry = first_entry; entry->start < end; entry = vm_map_entry_succ(entry)) { if ((entry->eflags & MAP_ENTRY_GUARD) != 0) @@ -2780,12 +2786,7 @@ again: vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } - if ((flags & VM_MAP_PROTECT_SET_PROT) == 0) - new_prot = entry->protection; - if ((flags & VM_MAP_PROTECT_SET_MAXPROT) == 0) - new_maxprot = entry->max_protection; - if ((new_prot & entry->max_protection) != new_prot || - (new_maxprot & entry->max_protection) != new_maxprot) { + if (!CONTAINS_BITS(entry->max_protection, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } From nobody Sat Aug 12 06:29:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jb5QKKz4TvQ7; Sat, 12 Aug 2023 06:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN9jb4KB0z3XrS; Sat, 12 Aug 2023 06:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCJhy+9zaaQI5h5OEn+eyt6JQIJagib11qf8m7Ivv9k=; b=bwAqQ3Br3voByLDaRFbn4+o4taT0CIJ2gIrtkOhbUoarMmWFlwemGKvRS/nZePKzG0VHcM GBY1bNODn81Mh/LkmOEGGzYTjjPqyq/6nH39gEtuG6mdlBmN8KXZ+HD3Kcr68y4SQZr6d7 Iqtm/34Nx5+rBQJ01QwnvmhOnq5bOJ7aKVwe+ikuXV1G2hd7nKhyX8ADzsWTMNne1Io+zT JCt8yVhm/ssEkWFQyroYt6fejd7oEgMkdfN5KG0CfybAGV61ptktyTPScA9TnttFv0ym1S r7fg1b2COZA7bq9RvhAmBfaJ1cVcsRhaOLgDn0bGxoJ7ShwqdHEg2QWr0Wg+pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UCJhy+9zaaQI5h5OEn+eyt6JQIJagib11qf8m7Ivv9k=; b=mYrcXkwsSSz+1BrFXYZgOINgEfQn0WmVI/dhuOnZP5OHDGNIa0EmCRsN+y6M8E/9sxgJ11 Zig1WltRvkkSm2JDiGnHYOY8M1NjJBprDtpI57ZjbZ+thj2a9VvwG4bzzUc19dHweZb+SB lNP2lCOXLPHZHU5WW7r75Fywdbdpef8dHsPL2QqYhBZ0DELd9ZSmsc3M9rVjmufNTEzjE2 N4to5E5tVoafSfO6IUOgxbZ/zqTYPROWO4ECQORHatiAv4Zceb1eI9o9WypVhN/A1tK6+L W9BohSsXu1HaceLpgkD05W6kkkuCfny/RCV4766NanN1HALrFZHobY19Xo3/kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821747; a=rsa-sha256; cv=none; b=XveVyxkpn9NqYFdB4GofCx5ZQtB6jcEpeK0v2Z6fGnH+t71H4PIaxX038xVJ7KyodFZnhp en8+Z4m0DnEglyVNd6QnCrrJhwzCao4kz3GVgk+rhkjRkgySGYDsjnL/veluRTVGANMlCe ZqrDelFL+6H0bIwGxdChlEjYLD+fAxIsFE8BmxZbnD/ojmQ3l04ZHJJAlrPg8fJVWsfBhO 5zuEMsThrQcuV/zeLFdYz4rcb5e3K/E9bvIu/rAFSdWX8O7Z19UP7GQmOvIBmulQe+Z5oH P8sojh5Jl/iW+rTVPoVX+HHtRuFXKBqXSYLQV5j4NSh+OAu50/HqgPucMwowcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jb3Jv5z18YF; Sat, 12 Aug 2023 06:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C6T78J024781; Sat, 12 Aug 2023 06:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T7CR024778; Sat, 12 Aug 2023 06:29:07 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:07 GMT Message-Id: <202308120629.37C6T7CR024778@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: aa928a52164f - main - vm_map_growstack(): handle max protection for stacks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa928a52164fe57965491d63e57de66e9c078e1a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aa928a52164fe57965491d63e57de66e9c078e1a commit aa928a52164fe57965491d63e57de66e9c078e1a Author: Konstantin Belousov AuthorDate: 2023-07-25 13:56:29 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_growstack(): handle max protection for stacks Do not assume that protection is same as max_protection. Store both in offset, packed in the same way as the prot syscall parameter. Reviewed by: alc, markj (previous version) Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 8c12f2a92bcb..28c44544c660 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4605,7 +4605,7 @@ vm_map_stack_locked(vm_map_t map, vm_offset_t addrbos, vm_size_t max_ssize, * object offset. */ gap_entry->next_read = sgp; - gap_entry->offset = prot; + gap_entry->offset = prot | PROT_MAX(max); } else { (void)vm_map_delete(map, bot, top); } @@ -4625,7 +4625,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; vm_size_t grow_amount, guard, max_grow; - vm_prot_t prot; + vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1 __diagused; bool gap_deleted, grow_down, is_procstack; @@ -4770,7 +4770,8 @@ retry: * The gap_entry "offset" field is overloaded. See * vm_map_stack_locked(). */ - prot = gap_entry->offset; + prot = PROT_EXTRACT(gap_entry->offset); + max = PROT_MAX_EXTRACT(gap_entry->offset); grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4784,7 +4785,7 @@ retry: gap_deleted = false; } rv = vm_map_insert(map, NULL, 0, grow_start, - grow_start + grow_amount, prot, prot, MAP_STACK_GROWS_DOWN); + grow_start + grow_amount, prot, max, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { rv1 = vm_map_insert(map, NULL, 0, gap_start, From nobody Sat Aug 12 06:29:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jd2Hlhz4TvV7; Sat, 12 Aug 2023 06:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN9jc5LNkz3Y4t; Sat, 12 Aug 2023 06:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYGoDYysZGhMB2qpp+VeFuKOmMWYfcIs4mc9yntHHv8=; b=O+B1RRU7P7GWOr/zhX2oRP2Gq3GvAFCPdffEjdnjspd+CjOy+0sN5ctAETZypdtRoSN+n4 XvZB3H7TERPXIrrHLR4K6Ui3usSOFKPKGxcbYJm1XzUaXp4WizIQhsJNIQnIplDbNIzISt Gy6usm9GVSwC/48KLjmB7pt1th8OL9HTdGJBa5I4sQnCqivbL0fk+8ymipJhleJ6w+HBEX 4i4zCLMCf0GJz2pk7R3lwjdWY5GN1eMMLTTgrXWqSNWCC+e22RceGhVj6EI+lWKBY5i3b+ Syt+Wu4lUBGENrajVkBn0UzPKiCpZq0LirX70KDUjvJRJQJqp5lNUWntKhBmDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uYGoDYysZGhMB2qpp+VeFuKOmMWYfcIs4mc9yntHHv8=; b=cnqqqoOkmskiPtF2dO1R2KpmUp9V/9idFuDlkpVVbzAaEnSHUE+m4sJcPCqPTOixv9mebU AowMlx3v4K+PCLBLDSfOwLvtyQ5xtiFN+TP8wlGdteNdpeCZSoISejDuwOf5x2k4Pw5poO EaMiHL4q4Jp3Zny30R/PI5ke7+WBYIOfRcxjMBIPhzj5exYJUth+/HzBOUz+ZKXGG6WgSU vpZ4qcam3qQ9B0wMdXyw7vk6u5FkdrN2F+KHXLiqIcXp1sJ8wYJcOx3rxfe4EBrGBjZ4R5 8VGQ4CR7uc2k58QkZYtLbMZzG4Pt4paC01HkaoExKdz5WuXBqqhPzIMsEJO+gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821748; a=rsa-sha256; cv=none; b=XEMymThIKz4LlKWtOqRq5cfl5GEj2XCR+wtnC4cvB6jAI++FMrfpxkP9jlSE6eZkxKFZKg qSbiuXGG0ePDKiBwPfNX1YErHPSA6PTFuZfGSVs/fbAx/BCB6AMXkcD3gXxpeGJfxRyaY9 q1HlRISM2ScHmCso8ASsOWsfFoKXX2Nr0+xShs5Z6T+xNJcYrpa3GFwkmPV0H8KooykwWN aDuceUqDhAtpBTCEnXPckEFpcAS3YJO49VcqkjcUoiD6QS6yAVZz10k/m/NIIIn7CMNqli FSR9tdj8arPW8PxsCf/wwuCJQUnTyjyzLg4htZj6qB+0I7r8F6Za4ufUDtvkyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jc4S38z18jV; Sat, 12 Aug 2023 06:29: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 37C6T8Mv024848; Sat, 12 Aug 2023 06:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T8OO024845; Sat, 12 Aug 2023 06:29:08 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:08 GMT Message-Id: <202308120629.37C6T8OO024845@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: 79169929f04d - main - vm_map_protect(): move guard handling at the last phase into an empty dedicated helper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 79169929f04d00e51a901d1e4cb377d2475bf660 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=79169929f04d00e51a901d1e4cb377d2475bf660 commit 79169929f04d00e51a901d1e4cb377d2475bf660 Author: Konstantin Belousov AuthorDate: 2023-07-28 00:14:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_protect(): move guard handling at the last phase into an empty dedicated helper Restructure the first phase slightly, to facilitate further changes. Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 28c44544c660..dd342752bf6c 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2722,6 +2722,13 @@ vm_map_pmap_enter(vm_map_t map, vm_offset_t addr, vm_prot_t prot, VM_OBJECT_RUNLOCK(object); } +static void +vm_map_protect_guard(vm_map_entry_t entry, vm_prot_t new_prot, + vm_prot_t new_maxprot, int flags) +{ + MPASS((entry->eflags & MAP_ENTRY_GUARD) != 0); +} + /* * vm_map_protect: * @@ -2780,12 +2787,13 @@ again: check_prot |= new_maxprot; for (entry = first_entry; entry->start < end; entry = vm_map_entry_succ(entry)) { - if ((entry->eflags & MAP_ENTRY_GUARD) != 0) - continue; if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) { vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } + if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + continue; + } if (!CONTAINS_BITS(entry->max_protection, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); @@ -2884,10 +2892,15 @@ again: entry->start < end; vm_map_try_merge_entries(map, prev_entry, entry), prev_entry = entry, entry = vm_map_entry_succ(entry)) { - if (rv != KERN_SUCCESS || - (entry->eflags & MAP_ENTRY_GUARD) != 0) + if (rv != KERN_SUCCESS) continue; + if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + vm_map_protect_guard(entry, new_prot, new_maxprot, + flags); + continue; + } + old_prot = entry->protection; if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) { From nobody Sat Aug 12 06:29:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jf1DW9z4TvgZ; Sat, 12 Aug 2023 06:29: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 4RN9jd63nlz3Xyv; Sat, 12 Aug 2023 06:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dD+36P0QYM2tTBt2wFpxK2FQMhGMeejh2eu4tr1IF8Y=; b=xH/sIXbyngzaZPf76vufPMAZ3+6KK/CDCVECgCoyw6KrpGx6OUckWgd3RM+ieNQyhE9YUQ Vyt8L/Fgu8ydXreXVA5NbHqsZZHQ7DacLf/Wm466nZMFYPIpTg07DaliU/p/samLBwDaes 4pjLKEP5MViTQNmzB3DL2+XqqeW3JtFkGA4MV4EiLD0dhN2sozIxmBXlLBFa3Xl707h3JI d1I9bFSuUTDJkbMXi8RBAd+7G0PUeXJrovR5yCqpSJQho5K+Mhor5TRtRv9haBvwCqMJmL LIO0JPmevKnkGTwfEkL8nYTOi/kRopYN1R4snmZnhgWlbls91CeOnTMaNFgj/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dD+36P0QYM2tTBt2wFpxK2FQMhGMeejh2eu4tr1IF8Y=; b=om7fv55o7PMXqkXmK2m9jiBfVcdKAJF0VlyrArX2LGG2LOPOh2cXPEqEDx7HdzmSLcZwUp qRg9jr2qUPrJ4DVTezMGOSStCNv9iP409jnpI1m8Gpffd3EMz3LebJGDmhkh/8wcz+XrrB gqQPZWx1L8Xc7a9pPVWaRHRNsCvvwB0ntJfczuPnUukY3SkyuwtVhb/xZHlcbdd4jj4A/s Mj8DOcR6DMb5DF5aKR4BWdfjuyWp6gV/SUZ4hcgbEf477sI5UZFwKHX2RM+RHJjnqkh93M uTWEpb5IjmDz5hO6Ro7o/eFzKCV7OGw8WX0/V9Zl2t/LWgms7Ktb4wHIAH8NGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821749; a=rsa-sha256; cv=none; b=u8Dt/VlX096Z9C36W1JG/ln/IQqC1k2YPvcRW/xUSevNxihBxxza4dmAqWwCVR+nYCl5NO foptk4u8EaoV4qljkCLLT+YLRtIwjnrAws7XkHu+hKgwwpIeI/WXMPJx4GnHGMRrlYxNNW e0LuuhCeNhlxq8Bb5N0+kX9c+0Lxgnw4ht3FFlF49gYK6Xi+Mcif3wJLl1i4VxpgPJhK9Y Afkoh0rlTbN8h7zZN7LQUxvP2mt1h7gY/9MuhBWYWTbquTLgJVoWhT1Z9GNYz9cMfpfu1B XuIEziWVDGPFY3nxTctksSiHOm6IT3j1lgjsHGHDKpyZIViQ+0w0Xyt9U7clTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jd58QYz18t6; Sat, 12 Aug 2023 06:29:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C6T9OL024902; Sat, 12 Aug 2023 06:29:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6T9Ql024899; Sat, 12 Aug 2023 06:29:09 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:09 GMT Message-Id: <202308120629.37C6T9Ql024899@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: 55be6be12cd9 - main - vm_map_protect(): handle stack protection stored in the stack guard List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 55be6be12cd95552a46feccb42db984c8d3cbc36 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=55be6be12cd95552a46feccb42db984c8d3cbc36 commit 55be6be12cd95552a46feccb42db984c8d3cbc36 Author: Konstantin Belousov AuthorDate: 2023-07-25 13:32:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_protect(): handle stack protection stored in the stack guard mprotect(2) on the stack region needs to adjust guard stored protection, so that e.g. enable executing on stack worked properly on stack growth. Reported by: dchagin Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index dd342752bf6c..e63fcdc7c6f1 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2726,7 +2726,22 @@ static void vm_map_protect_guard(vm_map_entry_t entry, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags) { + vm_prot_t old_prot; + MPASS((entry->eflags & MAP_ENTRY_GUARD) != 0); + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_UP | + MAP_ENTRY_STACK_GAP_DN)) == 0) + return; + + old_prot = PROT_EXTRACT(entry->offset); + if ((flags & VM_MAP_PROTECT_SET_MAXPROT) != 0) { + entry->offset = PROT_MAX(new_maxprot) | + (new_maxprot & old_prot); + } + if ((flags & VM_MAP_PROTECT_SET_PROT) != 0) { + entry->offset = new_prot | PROT_MAX( + PROT_MAX_EXTRACT(entry->offset)); + } } /* @@ -2742,7 +2757,7 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; - vm_prot_t check_prot, old_prot; + vm_prot_t check_prot, max_prot, old_prot; int rv; if (start == end) @@ -2791,10 +2806,14 @@ again: vm_map_unlock(map); return (KERN_INVALID_ARGUMENT); } - if ((entry->eflags & MAP_ENTRY_GUARD) != 0) { + if ((entry->eflags & (MAP_ENTRY_GUARD | + MAP_ENTRY_STACK_GAP_DN | MAP_ENTRY_STACK_GAP_UP)) == + MAP_ENTRY_GUARD) continue; - } - if (!CONTAINS_BITS(entry->max_protection, check_prot)) { + max_prot = (entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) != 0 ? + PROT_MAX_EXTRACT(entry->offset) : entry->max_protection; + if (!CONTAINS_BITS(max_prot, check_prot)) { vm_map_unlock(map); return (KERN_PROTECTION_FAILURE); } From nobody Sat Aug 12 06:29:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jg0qckz4Tvjm; Sat, 12 Aug 2023 06:29: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 4RN9jg06kSz3Y2J; Sat, 12 Aug 2023 06:29:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38xFcI2lnl3LGl1b2T65qtXN/veSghNBBtD00ttzyB4=; b=oL2pGuRKm/OghAJ3KSC13iBdm4dC9X9flxPD2+lcSZeWn8ZezUdHOhFL1gKP5QQ4gD87B0 2rVDkb6O70/Wp3X5p7lH0oa2yXbvrvlNGO2vozhJjlgvh7GOQWDqP99tYeitFe1YF12Yqr h+Yw4Svz5vFKOWEFO92IqOnMxqEjYBHbdfTMdtISrlgAbgpasmTqu7oK0wywoXXbUUL4Lx qsEI8EeDHGvpoirMcEyJmMq4LwxsUrjmxMudyov5BlSBqgqyJ7D1SsvIndu2OghBfs3e5u vCkU7XHNVyIB+JCrxr3sVOOTt0rhr+pva1ERq0DNW98IZ4swHqJediucb/Y8Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38xFcI2lnl3LGl1b2T65qtXN/veSghNBBtD00ttzyB4=; b=EI2Qe6Mffi90++KOR03TST+ZCvvfRdeiHrD8yxolKvNYIptr6Ig1uqOT3DQ55G71VtY6Ir ZP6c6tLjaOM0zjitWDzNvRTTHTYERgNmDsrBHf93wi+ml/f8bAhu0rG/qKpK1BsCkui5Q8 ybFPJttGGuoBING2yN3fZkVhcgPiLfJZoxKQ+m7VCg6LKyAKq4QeFnb+dzUzFHhgloqWsy T2lbt/ErRZ1xf2EDpq0n9NyrJK5deOA69RiRa3DQ608HUhyGbD3zuHdbhhhHBHE7ja1+/L N0ZCha184Pi0Vfb93ukTOB998pQbpkHIVS8oX8H8gTXcjog5DkTRCA11olr94g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821751; a=rsa-sha256; cv=none; b=xhVZAl3rHpYWlLnLYb4P61hgz4wSfVoxj/cqFgd04o2DwZ1TX5BzyAzi7Vja/DR5+FswMo AACh/8u6No07tqpVN7UQsdQs2bQFoOAnd3H6emeuP24XIoq1GV0gbVxm5fFHmHb7DjuMa7 Oev1RtbldRfU1/xiakSXKenkO2mWMlPVC1+O6PgpQ8RXj2Qy+dchNvStvxg+qNyrXuvVNE w3COGkzJEwhNKjXtidzJokFihJ+DoUB2asf/2xig6cuZlqKdZOavUnxL7xSXFm/GmewrDT C7tM8La6eb4YGOSL0Vkzxu28GuZwzvqXXK1da89QFTqXrGZJOnKB3RYRyaja7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jf6DR9z18jW; Sat, 12 Aug 2023 06:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C6TAfX024956; Sat, 12 Aug 2023 06:29:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TACW024953; Sat, 12 Aug 2023 06:29:10 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:10 GMT Message-Id: <202308120629.37C6TACW024953@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: 9d7ea6cff7a7 - main - vm_map: do not allow to merge stack gap entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 commit 9d7ea6cff7a7edc0f3d4fa8d54e6345ee027e754 Author: Konstantin Belousov AuthorDate: 2023-07-25 18:48:57 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map: do not allow to merge stack gap entries At least, offset handling is wrong for them. Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index e63fcdc7c6f1..790d81bba44b 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2293,7 +2293,8 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, * another entry. */ #define MAP_ENTRY_NOMERGE_MASK (MAP_ENTRY_GROWS_DOWN | MAP_ENTRY_GROWS_UP | \ - MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC) + MAP_ENTRY_IN_TRANSITION | MAP_ENTRY_IS_SUB_MAP | MAP_ENTRY_VN_EXEC | \ + MAP_ENTRY_STACK_GAP_UP | MAP_ENTRY_STACK_GAP_DN) static bool vm_map_mergeable_neighbors(vm_map_entry_t prev, vm_map_entry_t entry) From nobody Sat Aug 12 06:29:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jh2cNPz4Tvbs; Sat, 12 Aug 2023 06:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RN9jh1Xxpz3YCx; Sat, 12 Aug 2023 06:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lL7OpjqUE+uTLeBU2qSvvMx35kxXDdY44ULJFslRNjg=; b=s2mLaPz9bYauvgF03/5Yi7h9qmAwHiAY3pq7vqSvfL2x6dIklRC+WyMwpEj9akm3dTbcRw mEiX8hwkP/brMXlBJpvOf0+HEyFt2svmtlD4qCydzb1DTA6LjuN18IZ1irEWjDwgFGQXgi g/qFV/SIRfRM7pVLJdUPiAKOsOFt84xiZLxL/BKSECYWH40hBCPR4orEkczRCqbXzQnm6S NJhj46Y79h/SX0nEpM9mZnnyoiy14qDKe2MUFtRosnRagzD3JcYkl1k13dx8upfOASzPxw 9Z60zdNHU0GryZeR2IfU99R0GpDBPNhiPpdx5xKRbnKVezTD01zGIKs39oX6ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lL7OpjqUE+uTLeBU2qSvvMx35kxXDdY44ULJFslRNjg=; b=mKb7NGXxuLkSahmEH4HrLReiFpK8t8OENPG8tszBnYgr+lvPlSAKE8jSGoyKvuOgCtKHw6 ItJ8IaxhZrg/3OuRkCGEiX9tdDz+1l56U7hlgdjd+DR1x9eNV98dtEUmtygnQHsNor/IA2 WrTmwPZ1sGjDiP3Xk2Qm83ILnSetmKRP96lrSd3ogosXOiU7u0nCNKQ7Get9GBi9hf0+G9 PAIIpS8jM9UFzBrgaloz8HJGMpzMomSA7kguME7rScDtp83d+gfCcpxzlSHcFuzkgS/FhL GHD35oX/qf9hIFnHLIHXK5yHoSLqVDlX05k4OL6le993Tgay9p/MOEkj6Ef62Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821752; a=rsa-sha256; cv=none; b=fOr3+MmDaih0Qxoj253gfTH1QQLG6gcdPwZlkcjknhCFoqr35YQzA2fCsx8aVkV1lMztul DrE21XeZGCc97NrQ8HZ6pGrCJuujkzJ30HinkrtlfI2GYX7vJ9ayjRezaWdBS/NQE+9NNd ErJNx2mp4uFyxpUGKSIDlh5s+elixz5qGuEyUF876ddsOTwN60jRLHFSXopI3RiYE546rz g274iTXycLmoG9jL3NWL22tglD4zdmF36y0FOB8my3hybxINnBuROeSgtaBNMN8dHey2Iv ST3ww+z947RjBs5OYWG8yq4+mCMiBP8PTSAbq2SQ5ldzE/C00IhtH4rdEmOkEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jh0RWGz18jX; Sat, 12 Aug 2023 06:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37C6TBkY025016; Sat, 12 Aug 2023 06:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TBBi025013; Sat, 12 Aug 2023 06:29:11 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:11 GMT Message-Id: <202308120629.37C6TBBi025013@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: b6037edbd17d - main - vm_map_growstack(): restore stack gap data if gap entry was removed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6037edbd17dd3144aa1a7b0814cd5ebe98d765a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b6037edbd17dd3144aa1a7b0814cd5ebe98d765a commit b6037edbd17dd3144aa1a7b0814cd5ebe98d765a Author: Konstantin Belousov AuthorDate: 2023-07-25 18:52:15 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:13 +0000 vm_map_growstack(): restore stack gap data if gap entry was removed and then restored. Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 790d81bba44b..1c806d6cae34 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -4657,7 +4657,7 @@ vm_map_growstack(vm_map_t map, vm_offset_t addr, vm_map_entry_t gap_entry) struct vmspace *vm; struct ucred *cred; vm_offset_t gap_end, gap_start, grow_start; - vm_size_t grow_amount, guard, max_grow; + vm_size_t grow_amount, guard, max_grow, sgp; vm_prot_t prot, max; rlim_t lmemlim, stacklim, vmemlim; int rv, rv1 __diagused; @@ -4805,6 +4805,7 @@ retry: */ prot = PROT_EXTRACT(gap_entry->offset); max = PROT_MAX_EXTRACT(gap_entry->offset); + sgp = gap_entry->next_read; grow_start = gap_entry->end - grow_amount; if (gap_entry->start + grow_amount == gap_entry->end) { @@ -4821,10 +4822,13 @@ retry: grow_start + grow_amount, prot, max, MAP_STACK_GROWS_DOWN); if (rv != KERN_SUCCESS) { if (gap_deleted) { - rv1 = vm_map_insert(map, NULL, 0, gap_start, + rv1 = vm_map_insert1(map, NULL, 0, gap_start, gap_end, VM_PROT_NONE, VM_PROT_NONE, - MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN); + MAP_CREATE_GUARD | MAP_CREATE_STACK_GAP_DN, + &gap_entry); MPASS(rv1 == KERN_SUCCESS); + gap_entry->next_read = sgp; + gap_entry->offset = prot | PROT_MAX(max); } else vm_map_entry_resize(map, gap_entry, grow_amount); From nobody Sat Aug 12 06:29:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jk0Cpdz4Tvjr; Sat, 12 Aug 2023 06:29: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 4RN9jj2xjbz3YDG; Sat, 12 Aug 2023 06:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqb5C4fxeqyMFTNu3Fb5Ndu6SxoppcABebz5GkqQPEs=; b=abaCyryKg3gn+H26umK2+TxD9wv/Ml5cuKSNkYfHIyDUxL6+g/vM4q2Utkwx0fHtI0zK9w PWvS9IziR/wbkhNfJaP+9zdESxNDgOR+U5W71/woYXh7vi/7WrKK9UdaWu2wIOtDVIZoci JmCiZAabZbXjb+O6WEahRIExwTjpkvBq96ffLflqjC1XZ3TSS0WB+mimOWnzymsiBl/NBa f/6GS51lMMP0LlceEtQZEgPFED+ds1XHvvEO1Qe82tRJVDZtZMZntavTuUwbgtXWGFqIxv wblKqxzAxQ2U86bVzVPT0A2ucy0OQgpZDKSIHg48mTauHgJVXJJbdf4sUSlC1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aqb5C4fxeqyMFTNu3Fb5Ndu6SxoppcABebz5GkqQPEs=; b=ZRiTY2FrRDWfGv7tBMSCfJDyEz+6MROmJyayNKEgqlre0e0o00RyBcqEw8OCYpicpjtzMI dyAjkj6KRnBoqjuhIkPZ6O0y6XpsNfcneCwgzu1PiwIvVo/5v+hg17s0fC6YYD+FRb1BVN yqhPrAOYhSRR8S8eYjRMUdUR1Xw/+2uBsMtqbgvanxeHjKKaiuyWEfevuZC7RIeHnT8jmG Z6xQ5RIuJfAv5Xg4G2HvOyYjoSiyXVAINa1tuOkPTKpGItWnGWHvcjiF/qMR6DU+g+T7Qa oqWwvSlQfce6DkUqYANz3C+OXZ2UbqLuctGqUvE5VB+SRqw31kAwZWlLJoSztA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821753; a=rsa-sha256; cv=none; b=jK9cdup6/zsJzgDS0sSAtZ/wAjfz31stoENTlx3cykxiPjTA3l4zOhPTAv5UEbeKmY5HCw jcnRIdpdSAPCtr6y0gJwrwjX/ak87CIWXJDzrLI+8BB6JT+mLm7sMwWEbEjNZ5iIiQcBTR kym9GavX23raZzTWVWO4NRUeXXiDEl6LBhXQo48ZACQ5v0rbFYmYJtjuSyjpe5iRqbxCJG vgfpbyjKE/OSdu2mEL36GjFKal2PfMs3gJq95yOi6NF2CNJEQO9vq1SlSA7LrGxbKBveA1 nG3FVRWK+SdR592S6bDvy2Lbp8QtOmkl+p03CzLVkivlzDOivuTyo791SmzNtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jj1XDvz191t; Sat, 12 Aug 2023 06:29: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 37C6TDnE025055; Sat, 12 Aug 2023 06:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TD7b025052; Sat, 12 Aug 2023 06:29:13 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:13 GMT Message-Id: <202308120629.37C6TD7b025052@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: 90049eabcfad - main - vm_map_protect(): add VM_MAP_PROTECT_GROWSDOWN flag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90049eabcfadf229e3983f04310a8ea28fe3d2b1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=90049eabcfadf229e3983f04310a8ea28fe3d2b1 commit 90049eabcfadf229e3983f04310a8ea28fe3d2b1 Author: Konstantin Belousov AuthorDate: 2023-07-28 00:40:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:14 +0000 vm_map_protect(): add VM_MAP_PROTECT_GROWSDOWN flag which requests to propagate lowest stack segment protection to the grow gap. This seems to be required for Linux emulation. Reported by: dchagin Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/vm/vm_map.c | 19 +++++++++++++++++++ sys/vm/vm_map.h | 1 + 2 files changed, 20 insertions(+) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 1c806d6cae34..8d98af7709cd 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2758,6 +2758,7 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_map_entry_t entry, first_entry, in_tran, prev_entry; vm_object_t obj; struct ucred *cred; + vm_offset_t orig_start; vm_prot_t check_prot, max_prot, old_prot; int rv; @@ -2769,8 +2770,10 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, !CONTAINS_BITS(new_maxprot, new_prot)) return (KERN_OUT_OF_BOUNDS); + orig_start = start; again: in_tran = NULL; + start = orig_start; vm_map_lock(map); if ((map->flags & MAP_WXORX) != 0 && @@ -2793,6 +2796,22 @@ again: if (!vm_map_lookup_entry(map, start, &first_entry)) first_entry = vm_map_entry_succ(first_entry); + if ((flags & VM_MAP_PROTECT_GROWSDOWN) != 0 && + (first_entry->eflags & MAP_ENTRY_GROWS_DOWN) != 0) { + /* + * Handle Linux's PROT_GROWSDOWN flag. + * It means that protection is applied down to the + * whole stack, including the specified range of the + * mapped region, and the grow down region (AKA + * guard). + */ + while (!CONTAINS_BITS(first_entry->eflags, + MAP_ENTRY_GUARD | MAP_ENTRY_STACK_GAP_DN) && + first_entry != vm_map_entry_first(map)) + first_entry = vm_map_entry_pred(first_entry); + start = first_entry->start; + } + /* * Make a first pass to check for protection violations. */ diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 08bc6532b8b8..e41516477af4 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -522,6 +522,7 @@ vm_map_entry_succ(vm_map_entry_t entry) #define VM_MAP_PROTECT_SET_PROT 0x0001 #define VM_MAP_PROTECT_SET_MAXPROT 0x0002 +#define VM_MAP_PROTECT_GROWSDOWN 0x0004 int vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end, vm_prot_t new_prot, vm_prot_t new_maxprot, int flags); From nobody Sat Aug 12 06:29:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RN9jk5T5Zz4TvdM; Sat, 12 Aug 2023 06:29: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 4RN9jk3Lh3z3Y7s; Sat, 12 Aug 2023 06:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sYlSVw7dDCBP7M6HGv1PYEciSfqt7lkZUeq4tdEozJM=; b=PcE2vJIFw/HB0jKF+id4k2vTcS9zTXDZo+20Rc++BQoiDR0F5lX0XmUBaiI/5SvU7TfMDd mXfg2p0r4bQty60kcVvIBi2tHjtjNAAl0H0z50vtcAPURrdU1PfKNhoXBiVkD/QAWVuO+w beFGg3Un+KOZROHgI5AEVOsqu8OF6Wduo4ylDJZxJOTrwAdMZ4k8teX+wMlYFrokbsAWSr RSiyZvCevnMYoQM2pW/WAHhdLGNDYlHWee2wrzJk18exS+8HpANBn1loS9D6Wr52lcPAiZ Nt+mRIPi1EcvKVpW2JNQtoTaKRgZTNjY55oak5z1PrAyxUj+q4yktXLUtE4A4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691821754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sYlSVw7dDCBP7M6HGv1PYEciSfqt7lkZUeq4tdEozJM=; b=ELKMaBZ6JA1A3v5pkkgjfyztCwblQyOVmVP16BMutog8SVH7aSF5JfzlAHX+N1e4PG6ykY n4TOP4r9qLU8Jys+S2mbEgjmuhcsIeGAgW46Tz6ceQC0yKO9ILRm5B2JPuCHqqoxs6YDxp RitQD2zo3PK2FPbFcWTDyXMhIMqUfCbPopy9MU1JfXkjwhr3y6rGz3j6oxkVYLltBSV1Nk sLrzi/obaR3kW9mOENd41mdceoTdjG3w3RANDn0eOTSKXh9zNBP2Lah2mcY7KKJF7qIazN 42BxLS90zds7Jp/aqXEld731pCfYAj/hnU3eQ6C4yWkSLJDLhsjbvbzpZ2gOFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691821754; a=rsa-sha256; cv=none; b=MkEjeu3IrZ8YX9w95Zq2LM2syRo2psA62JaQYDLAwbIkk22BQzWuVgqAoFH++DtEPrc2W/ Acm3QWq/BmAc8FQPwKB5e8Qff5c8+UbFhkrwThfEsd4qa+qCU4OZdVuG6oN6djQyJW+/KY UBBDNIQEONBYKP+p7j9JYBWKekQaNwXCLK0WN+h7F+11O9cH3PIzzRaMLZAYboPbz1ZKko LU9M2HnjyeRCOtSn8jjcJwEz49QEtbzbkMx9lBgyFU2/Za7DvUy0r4FwmfDDLORAk1Ic8Z QweaGmVBD7e2aPfSaE/dxkV0Tk1rRkYJrObbQ/w+n42in+JK7ARSlcHkgWhKuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RN9jk2SWRz192j; Sat, 12 Aug 2023 06:29: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 37C6TEZ1025094; Sat, 12 Aug 2023 06:29:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C6TECs025091; Sat, 12 Aug 2023 06:29:14 GMT (envelope-from git) Date: Sat, 12 Aug 2023 06:29:14 GMT Message-Id: <202308120629.37C6TECs025091@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: 9b65fa694078 - main - linuxolator: implement Linux' PROT_GROWSDOWN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b65fa69407808e710748875b0af98902110f128 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9b65fa69407808e710748875b0af98902110f128 commit 9b65fa69407808e710748875b0af98902110f128 Author: Konstantin Belousov AuthorDate: 2023-07-29 21:00:51 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 06:28:14 +0000 linuxolator: implement Linux' PROT_GROWSDOWN From the Linux man page for mprotect(2): PROT_GROWSDOWN Apply the protection mode down to the beginning of a mapping that grows downward (which should be a stack segment or a segment mapped with the MAP_GROWSDOWN flag set). Reported by: dchagin Reviewed by: alc, markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41099 --- sys/compat/freebsd32/freebsd32_misc.c | 2 +- sys/compat/linux/linux_mmap.c | 14 ++++++++++---- sys/sys/syscallsubr.h | 3 ++- sys/vm/vm_mmap.c | 9 +++++---- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index b7ad379df6e0..07ad68d56037 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -512,7 +512,7 @@ freebsd32_mprotect(struct thread *td, struct freebsd32_mprotect_args *uap) prot |= PROT_EXEC; #endif return (kern_mprotect(td, (uintptr_t)PTRIN(uap->addr), uap->len, - prot)); + prot, 0)); } int diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 07df6f5fd43d..580f15379e31 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -229,16 +229,22 @@ out: int linux_mprotect_common(struct thread *td, uintptr_t addr, size_t len, int prot) { + int flags = 0; - /* XXX Ignore PROT_GROWSDOWN and PROT_GROWSUP for now. */ - prot &= ~(LINUX_PROT_GROWSDOWN | LINUX_PROT_GROWSUP); - if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) + /* XXX Ignore PROT_GROWSUP for now. */ + prot &= ~LINUX_PROT_GROWSUP; + if ((prot & ~(LINUX_PROT_GROWSDOWN | PROT_READ | PROT_WRITE | + PROT_EXEC)) != 0) return (EINVAL); + if ((prot & LINUX_PROT_GROWSDOWN) != 0) { + prot &= ~LINUX_PROT_GROWSDOWN; + flags |= VM_MAP_PROTECT_GROWSDOWN; + } #if defined(__amd64__) linux_fixup_prot(td, &prot); #endif - return (kern_mprotect(td, addr, len, prot)); + return (kern_mprotect(td, addr, len, prot, flags)); } /* diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 64f1b16f92b9..660b70136714 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -216,7 +216,8 @@ int kern_mmap(struct thread *td, const struct mmap_req *mrp); int kern_mmap_racct_check(struct thread *td, struct vm_map *map, vm_size_t size); int kern_mmap_maxprot(struct proc *p, int prot); -int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, int prot); +int kern_mprotect(struct thread *td, uintptr_t addr, size_t size, + int prot, int flags); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 328fef007b1e..7876a055ca91 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -658,16 +658,17 @@ int sys_mprotect(struct thread *td, struct mprotect_args *uap) { - return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, uap->prot)); + return (kern_mprotect(td, (uintptr_t)uap->addr, uap->len, + uap->prot, 0)); } int -kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) +kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot, + int flags) { vm_offset_t addr; vm_size_t pageoff; int vm_error, max_prot; - int flags; addr = addr0; if ((prot & ~(_PROT_ALL | PROT_MAX(_PROT_ALL))) != 0) @@ -687,7 +688,7 @@ kern_mprotect(struct thread *td, uintptr_t addr0, size_t size, int prot) if (addr + size < addr) return (EINVAL); - flags = VM_MAP_PROTECT_SET_PROT; + flags |= VM_MAP_PROTECT_SET_PROT; if (max_prot != 0) flags |= VM_MAP_PROTECT_SET_MAXPROT; vm_error = vm_map_protect(&td->td_proc->p_vmspace->vm_map, From nobody Sat Aug 12 07:56:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNCfm6P4Gz4m6p8; Sat, 12 Aug 2023 07:56: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 4RNCfm5mYkz4FqT; Sat, 12 Aug 2023 07:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYSR+Y/JtQ9SQalFtKYH/fKna+EK1oqqqg55yfF9lZE=; b=vl22v8vioh6RdkjXLnScGfQnLjDGNL3Pj3baSWShL66/b/wAJHLYZNKbbO1oOokNA4alHt D9cbAXyiSGRl8XEHVvs/NdhCIyBtI9775ghkJf8u0bPJc37zrX+8MGRRm6Citg/wirPFuk 1NLyv4nLkxOltlit1NysTMLcJx2I8X/yd+7ceknZMN0la5D4iSPBscC3dJhML8pCftS2fu n9KrlqfzmZqrWvJ7Aw8NWHdggFX6cUYHelS45R/7j4bAqi6o5MHhYj+Ay0o6tB1bBSOxIg ZCsBm3SD/USzHpBg0VRhmFqDAkmvC2kfld/7bLhLKY51EVtpbVZcWRr8zCrPYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYSR+Y/JtQ9SQalFtKYH/fKna+EK1oqqqg55yfF9lZE=; b=QifJEsm+v3oU9mXZMl/1tSA7vBNdYPo3rwgrO2HL2OzF7DSVZkBHOuNH4osCksz4ntFQGf g5VyQ67pbtmPZUhZEweiXjNBxEzdISYdZJVe6uuFqMgqm3qcgUBJXATpK7GnHnDOBSsgmv QSBildqjyuokhKC8GNBvYhKmHp/WgY6DTGkZsY6yRG4ZG2XTMSXV1DF5iqMyBE+aAtU3hL +2o45oj0PNwtul9e/irX08rra16HKtBIgXKTedgZW6duuMa78NGDxv1hGEAtuXk+s/8x/U oR6mWHwKcTS8tyjs4KCQOCabQT2vHHUd3gOOIefsF+41uCejQuIwroNEpmHTIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691827008; a=rsa-sha256; cv=none; b=IXmaR8iDLl1rza9sXsMLQFl6OKx1x8OAMD62Hat/BwiM6+U2K9nbKTA+IaGOebaMRBvtwt uW/mfigs+fX1LR8uZID0PwMrN+0xmSRBNK34C87q26tH83m6TGsdMJcG2TQNYjt2G88Aea jxsE6uGEAGZBXihQy8wslZ+Heagkv2Joia3EoRG84k8Bcp21weYshM8dCgdWodiadmZaE9 EHAdl4+AalVqkzaOBtHRv2W4KaJekmvJo2FOB3fDFLSzKKs4d0NLfbYnIHCRU9nykdT6lo n3OP5Iin1AK2x9Zw71tRooGHkK6fFA+tVUhKEmYVTqI+T7cD6uEgD8iJTs6uMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNCfm4r1mz1C8T; Sat, 12 Aug 2023 07:56: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 37C7um83075087; Sat, 12 Aug 2023 07:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C7umYi075084; Sat, 12 Aug 2023 07:56:48 GMT (envelope-from git) Date: Sat, 12 Aug 2023 07:56:48 GMT Message-Id: <202308120756.37C7umYi075084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 37e5d49e1e5e - main - vm: Fix address hints of 0 with MAP_32BIT List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37e5d49e1e5e750bf2a200ef2e117d14c4e9a578 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=37e5d49e1e5e750bf2a200ef2e117d14c4e9a578 commit 37e5d49e1e5e750bf2a200ef2e117d14c4e9a578 Author: Alan Cox AuthorDate: 2023-08-03 07:07:14 +0000 Commit: Alan Cox CommitDate: 2023-08-12 07:35:21 +0000 vm: Fix address hints of 0 with MAP_32BIT Also, rename min_addr to default_addr, which better reflects what it represents. The min_addr is not a minimum address in the same way that max_addr is actually a maximum address that can be allocated. For example, a non-zero hint can be less than min_addr and be allocated. Reported by: dchagin Reviewed by: dchagin, kib, markj Fixes: d8e6f4946cec0 "vm: Fix anonymous memory clustering under ASLR" Differential Revision: https://reviews.freebsd.org/D41397 --- sys/vm/vm_map.c | 16 ++++++++-------- sys/vm/vm_mmap.c | 14 ++++++++++---- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 8d98af7709cd..c77c00b8b5c6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2255,19 +2255,19 @@ done: /* * vm_map_find_min() is a variant of vm_map_find() that takes an - * additional parameter (min_addr) and treats the given address - * (*addr) differently. Specifically, it treats *addr as a hint + * additional parameter ("default_addr") and treats the given address + * ("*addr") differently. Specifically, it treats "*addr" as a hint * and not as the minimum address where the mapping is created. * * This function works in two phases. First, it tries to * allocate above the hint. If that fails and the hint is - * greater than min_addr, it performs a second pass, replacing - * the hint with min_addr as the minimum address for the + * greater than "default_addr", it performs a second pass, replacing + * the hint with "default_addr" as the minimum address for the * allocation. */ int vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, - vm_offset_t *addr, vm_size_t length, vm_offset_t min_addr, + vm_offset_t *addr, vm_size_t length, vm_offset_t default_addr, vm_offset_t max_addr, int find_space, vm_prot_t prot, vm_prot_t max, int cow) { @@ -2277,14 +2277,14 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_ooffset_t offset, hint = *addr; if (hint == 0) { cow |= MAP_NO_HINT; - *addr = hint = min_addr; + *addr = hint = default_addr; } for (;;) { rv = vm_map_find(map, object, offset, addr, length, max_addr, find_space, prot, max, cow); - if (rv == KERN_SUCCESS || min_addr >= hint) + if (rv == KERN_SUCCESS || default_addr >= hint) return (rv); - *addr = hint = min_addr; + *addr = hint = default_addr; } } diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 7876a055ca91..d904c4f38e40 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -1555,7 +1555,7 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, vm_prot_t maxprot, int flags, vm_object_t object, vm_ooffset_t foff, boolean_t writecounted, struct thread *td) { - vm_offset_t max_addr; + vm_offset_t default_addr, max_addr; int docow, error, findspace, rv; bool curmap, fitit; @@ -1630,10 +1630,16 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, max_addr = MAP_32BIT_MAX_ADDR; #endif if (curmap) { - rv = vm_map_find_min(map, object, foff, addr, size, + default_addr = round_page((vm_offset_t)td->td_proc->p_vmspace-> - vm_daddr + lim_max(td, RLIMIT_DATA)), max_addr, - findspace, prot, maxprot, docow); + vm_daddr + lim_max(td, RLIMIT_DATA)); +#ifdef MAP_32BIT + if ((flags & MAP_32BIT) != 0) + default_addr = 0; +#endif + rv = vm_map_find_min(map, object, foff, addr, size, + default_addr, max_addr, findspace, prot, maxprot, + docow); } else { rv = vm_map_find(map, object, foff, addr, size, max_addr, findspace, prot, maxprot, docow); From nobody Sat Aug 12 08:02:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNCmm2YgPz4m764; Sat, 12 Aug 2023 08:02: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 4RNCmm1rZtz4Gw4; Sat, 12 Aug 2023 08:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPp8buyL4rEL2kBq1cF4wHR5ABeZCBiyVTXfTU2JfoY=; b=AuQRHUcxm6WPSbW0ZUsvjYGRByIXGrn9VWuRN7zC4fBRnYg79WopJ6w/zRWU7T+Mu2jeFD kMP5yDjNAeWTY8dfrwA1TYjyu/bbsuHhDO04FQWSb2gusYM/7sWnqVzblcModhJ1qUPXQ5 5O73ik0kj5chnjRI0TBS+wU40iK4olhYi4x2IzWfBtxII4rWB41cQBRwirBNNUx2lCtBUA 0ld48IJeWpxPBOSQUQ4vUG+OJxnPRSMzzJnEtX88L9KQnUpWArIYeUF91P2lAZkUcAAbVq QaSXwuuoF0omPa2Ow3cefYoQKVqOVS5P3rzA6ieJQljXJdZ+cam8TsqfP1JsNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691827320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GPp8buyL4rEL2kBq1cF4wHR5ABeZCBiyVTXfTU2JfoY=; b=DF2ZIC/bmG+qEj7jQ8Cm3wnYQJJJLw94vTJ/W6428iz/RoWC0nxMiZ5B9yqQDTLtW0FnF3 Rg6vLzmGcj1zIIiu0/hAhl66eYclgaIJmOKQzSnW+GerDiigwgjUZUSTgs/8Q52sSKW6kf 2DJZiZfsC9mpsI8ETjxM28kyvmQtYFXNMmpOozbaV6B3R7E5IoF7svHfJAeJF6/d1fVtjg 9JKAbxa9wmwm8D89OgYparSFsYTHnubKC/8C+p+4h9p2vim8sXqQzX6qJJ8o7eUBRP1vN4 IkB3/r4kTeIdV2ytRCrSyRnVM/SGBjcdi8G4FywBJ28VmckohVsdxiWlptV9eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691827320; a=rsa-sha256; cv=none; b=NRMoT5hIIAiJQFcqz+UQLW0roU5xaajasgJMidUnEmfBwxZKA8zJ8ehKLRNIqz+tT/yRs+ kviCMdymA4Ag4j2eP5w2K4TkAq8/BxFujf+YU9LMKdZ7oihS0mKz6rzKfjNh1wmdf9CCXQ qZgnfqidQeoAfXjbEaRXkxTkO9NWWii7wIdf/JCF/Shl6VQwGdg8/KK3BZOsOcEtaHoZue z6hVDXjanvqQe11w6DqapkcSiqWkJWhPvmwStlapJhxCY3KfsW85uvNn6/P5DdmBflCpew WN64mbxmMJU5kFelu2Tyn/FsZCzFzTroSlaigvaj6AfcFodTE5+21u5J3prpiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNCmm0wR2z1CLg; Sat, 12 Aug 2023 08:02: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 37C820U9091109; Sat, 12 Aug 2023 08:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37C820uA091106; Sat, 12 Aug 2023 08:02:00 GMT (envelope-from git) Date: Sat, 12 Aug 2023 08:02:00 GMT Message-Id: <202308120802.37C820uA091106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 543cf924bcdc - main - gve: Simplify tx loop over buffer ring List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 543cf924bcdcf064fed417ec3d66000ef66194d2 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=543cf924bcdcf064fed417ec3d66000ef66194d2 commit 543cf924bcdcf064fed417ec3d66000ef66194d2 Author: Shailend Chand AuthorDate: 2023-08-12 07:59:26 +0000 Commit: Xin LI CommitDate: 2023-08-12 08:01:53 +0000 gve: Simplify tx loop over buffer ring Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41281 --- sys/dev/gve/gve_tx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index db3f7415f412..1e62e1226be1 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -696,10 +696,9 @@ gve_xmit_br(struct gve_tx_ring *tx) struct ifnet *ifp = priv->ifp; struct mbuf *mbuf; - while (!drbr_empty(ifp, tx->br) && - (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { + while ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0 && + (mbuf = drbr_peek(ifp, tx->br)) != NULL) { - mbuf = drbr_peek(ifp, tx->br); if (__predict_false(gve_xmit(tx, mbuf) != 0)) { drbr_putback(ifp, tx->br, mbuf); taskqueue_enqueue(tx->xmit_tq, &tx->xmit_task); From nobody Sat Aug 12 08:05:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNCrk1FF8z4m7gC; Sat, 12 Aug 2023 08:05:26 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from www541.your-server.de (www541.your-server.de [213.133.107.7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNCrj0dJTz4HmM; Sat, 12 Aug 2023 08:05:25 +0000 (UTC) (envelope-from mm@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 213.133.107.7 is neither permitted nor denied by domain of mm@FreeBSD.org) smtp.mailfrom=mm@FreeBSD.org; dmarc=none Received: from sslproxy02.your-server.de ([78.47.166.47]) by www541.your-server.de with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qUjcb-0006db-Gi; Sat, 12 Aug 2023 10:05:17 +0200 Received: from [88.207.13.9] (helo=[192.168.1.112]) by sslproxy02.your-server.de with esmtpsa (TLSv1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qUjcb-000IqM-7N; Sat, 12 Aug 2023 10:05:17 +0200 Message-ID: <99e9a56b-2a1f-19c6-6433-e4953eda9359@FreeBSD.org> Date: Sat, 12 Aug 2023 10:05:14 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: cd25b0f740f8 - main - zfs: cherry-pick fix from openzfs From: Martin Matuska To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202308100835.37A8ZFgc042543@gitrepo.freebsd.org> <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> Content-Language: en-US In-Reply-To: <7e4d1dc2-4583-4161-3201-1d6e95f0a6d2@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Authenticated-Sender: martin@matuska.de X-Virus-Scanned: Clear (ClamAV 0.103.8/26998/Sat Aug 12 09:37:12 2023) X-Spamd-Result: default: False [-2.67 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-0.99)[-0.990]; NEURAL_HAM_SHORT(-0.58)[-0.583]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; BLOCKLISTDE_FAIL(0.00)[213.133.107.7:server fail,78.47.166.47:server fail]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org,dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:24940, ipnet:213.133.96.0/19, country:DE]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[mm]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; HAS_X_AS(0.00)[] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RNCrj0dJTz4HmM If there are any cherry-pick candidates from OpenZFS that have been already merged to zfs-2.2-release and fix serious bugs please report them to me so I can include them before stable/14 gets branched. Thanks, mm On 10. 8. 2023 17:55, Martin Matuska wrote: > Hi Mateusz, > > I am very sorry but we have to wait with full merges until 14-stable > is branched. > > After branching: > main will continue to receive updates from OpenZFS master branch > stable/14 will be updated from OpenZFS zfs-2.2-release branch > > Until then everything we can do is cherry-pick commits that fix > serious issues > everything else will make the merge management unnecessarily complicated. > > Cheers, > mm > > On 10. 8. 2023 16:23, Mateusz Guzik wrote: >> On 8/10/23, Martin Matuska wrote: >>> The branch main has been updated by mm: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=cd25b0f740f8c846562fd66e7380437eb898c875 >>> >>> >>> commit cd25b0f740f8c846562fd66e7380437eb898c875 >>> Author:     Martin Matuska >>> AuthorDate: 2023-08-10 07:55:42 +0000 >>> Commit:     Martin Matuska >>> CommitDate: 2023-08-10 07:56:53 +0000 >>> >>>      zfs: cherry-pick fix from openzfs >>> >>>      Vendor PR: >>>        #15080 ZIL: Fix config lock deadlock >>> >>>      Obtained from:  OpenZFS >>>      OpenZFS commit: 2cb992a99ccadb78d97049b40bd442eb4fdc549d >>> >>>      Note: full vendor imports will continue when stable/14 has been >>> branched >> First a stylistic issue: >> Can you please use upstream one-liner, maybe prefixed with zfs:. For >> this commit it would be: >> zfs: ZIL: Fix config lock deadlock. >> >> then copy their commit message >> >> For example see >> https://cgit.freebsd.org/src/commit/?id=d09a955a605d03471c5ab7bd17b8a6186fdc148c >> >> >> A not stylistic issue is the delay between upstream fixes and them >> getting merged into FreeBSD. For example the commit at hand is over 2 >> weeks old and I presume this merge got only prompted by des@ running a >> zfs-related deadlock. >> >> We really should be getting timely updates without local people >> running into them. >> From nobody Sat Aug 12 08:45:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNDl70M0Hz4mBQh; Sat, 12 Aug 2023 08:45:39 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 4RNDl66vqWz4LnZ; Sat, 12 Aug 2023 08:45:38 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691829939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kA8SaqJHzcBr+QQ7j3biGTUzsYpAJiWlWw6L/pYhSjo=; b=Qa/pufdDgo2VwyjTf3wH8lxMv2YLf/5wuYBUGfaMbXxyqmHB8L4E56z7vr95/SAT/eh99J J8+ICfwFc9va8YJt39qBHvF7A4vef3F6nsU5oF+n/lhCrikoCgf4baN8uG3fQaDDKsZPyA sIfsV1bJs3uKlyursNtqM+bOFiBRKU9Xv4ajiuEhmbwsRKhcjjW4m6r70MwHEvt87VapFk eluKRoKn7raScjkpuGK1oBFQoallUHAVsaLMDhJiYpLk39XXPKI59iUcAIJ+nz6vnNNXFM AWfJsLrpnAeBwe5nhSZQLU++au/2avu4NK+tFAyorAR91eYAwkjst808meQ4tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691829939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kA8SaqJHzcBr+QQ7j3biGTUzsYpAJiWlWw6L/pYhSjo=; b=shy8LXPR/aPuTAG3ITNW4HuVte6UZ2Nx1S1GexXPYdvZquPa/Xu3LIox+D1/m+BlPpukCY RkD2hv4R5eJhUng1QY2MOjEnDnekUCcSoZxDnEdDK/+GOdd/MkESOUu0cZyfJC5YkTvray AEhEaHar0wZjNksHA6nkr+50ONIWuypL5jXIJYnMA3LJFad0csRnvcghI/LonORwysbRV6 /0yFlldXY6oB9hCXKerGkFjt2TJACcbNBXedgKj9cSZI58WYFVfUjMyfbqIFv7OYQ5VBWP 76vZbipu3GdlD/f5r6IOPs8RwSe9Iu+8S3tpS+7Ar4sMiGUsNQw3pDVdnDhXFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691829939; a=rsa-sha256; cv=none; b=nKOwVY0VChaVtsXv9kStyuTJbhACg32ZeF403+IRVdWFXStbjI2PfHzptz5s+Jgwyy6YU/ GzhBLgrBIIAdWW2DPyQtOMsT5702l5iApTQqJaO/3rXPIkaLCYvYqIlBk2oe5l6XxOswsW uRZ0G4OpNCT6A8H/e2wRZKoERfJ5qRQlJUl5WWejV7I4x4CJutSg77w7j6P/iMdD/eU/i9 2ZHGDPtRv4eFwRNf+Lw+B2ICzhYhxIQgMaDRAFyzxV/aviJmqav9OjGlfqaWcPy3gj4XYS 68muKUQYaW+CIBBG0eWeFnQ26jBwhTR4ySl9FA/tVbSJX91PzilFIFre00aKQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher 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 "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RNDl64XXcz1MGM; Sat, 12 Aug 2023 08:45:38 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 949C81C508; Sat, 12 Aug 2023 10:45:36 +0200 (CEST) From: Kristof Provost To: Kevin Bowling Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces Date: Sat, 12 Aug 2023 10:45:35 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: In-Reply-To: References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable I also don=E2=80=99t have a setup to reproduce the issues Paul reported. Given the discussion in the PR I assumed everyone was happy with the fix = he posted. Best regards, Kristof On 12 Aug 2023, at 3:28, Kevin Bowling wrote: > I think this may be a better fix, currently untested > > diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c > index 6aa872a19364..51f0bc63ebda 100644 > --- a/sys/net/if_vlan.c > +++ b/sys/net/if_vlan.c > @@ -2074,7 +2074,7 @@ vlan_capabilities(struct ifvlan *ifv) > if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > cap |=3D p->if_capabilities & IFCAP_LRO; > if (p->if_capenable & IFCAP_VLAN_HWCSUM) > - ena |=3D p->if_capenable & IFCAP_LRO; > + ena |=3D mena & IFCAP_LRO; > > /* > * If the parent interface can offload TCP connections over VLAN= s then > > On Fri, Aug 11, 2023 at 5:07=E2=80=AFPM Kevin Bowling wrote: >> >> I am wondering what is going on with this patch, it doesn't seem like >> a full fix. At the very least we should clean up the "can't disable >> some capabilities" message. >> >> I've been looking at this for a couple hours and am wondering what is >> going on in if_bridge.. it looks like it correctly loops over the >> interfaces and masks ifcaps it doesn't like using the interface's >> ioctl SIOCSIFCAP. A similar pattern is used in if_lagg. I don't see >> any issue there so far. I also don't see the SIOCSICAP ioctl failing >> nor did vixie's message report that. >> >> I checked on a cxgbe(9) bridged vlan setup I have and see this message= >> "bridge0: can't disable some capabilities on vlan0: 0x400" >> >> So I am wondering if the bug is that if_vlan SIOCSIFCAP is >> disregarding the ioctl's request mask.. it is just blindly calling >> vlan_capabilities. >> >> Regards, >> Kevin >> >> >> On Fri, Aug 11, 2023 at 3:51=E2=80=AFPM Kristof Provost wrote: >>> >>> The branch main has been updated by kp: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D5f11a33ceeb385477cb22d= 9ad5941061c5a26be9 >>> >>> commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9 >>> Author: Paul Vixie >>> AuthorDate: 2023-08-11 18:17:16 +0000 >>> Commit: Kristof Provost >>> CommitDate: 2023-08-11 22:50:37 +0000 >>> >>> if_vlan: do not enable LRO for bridge interaces >>> >>> If the parent interface is not a bridge and can do LRO and >>> checksum offloading on VLANs, then guess it may do LRO on VLANs. >>> False positive here cost nothing, while false negative may lead >>> to some confusions. According to Wikipedia: >>> >>> "LRO should not operate on machines acting as routers, as it brea= ks >>> the end-to-end principle and can significantly impact performance= =2E" >>> >>> The same reasoning applies to machines acting as bridges. >>> >>> PR: 254596 >>> MFC after: 3 weeks >>> --- >>> sys/net/if_vlan.c | 22 +++++++++++++++------- >>> 1 file changed, 15 insertions(+), 7 deletions(-) >>> >>> diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c >>> index 6aa872a19364..92e4e4247e3d 100644 >>> --- a/sys/net/if_vlan.c >>> +++ b/sys/net/if_vlan.c >>> @@ -2067,14 +2067,22 @@ vlan_capabilities(struct ifvlan *ifv) >>> } >>> >>> /* >>> - * If the parent interface can do LRO and checksum offloading= on >>> - * VLANs, then guess it may do LRO on VLANs. False positive = here >>> - * cost nothing, while false negative may lead to some confus= ions. >>> + * If the parent interface is not a bridge and can do LRO and >>> + * checksum offloading on VLANs, then guess it may do LRO on V= LANs. >>> + * False positive here cost nothing, while false negative may = lead >>> + * to some confusions. According to Wikipedia: >>> + * >>> + * "LRO should not operate on machines acting as routers, as i= t breaks >>> + * the end-to-end principle and can significantly impact perfo= rmance." >>> + * >>> + * The same reasoning applies to machines acting as bridges. >>> */ >>> - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) >>> - cap |=3D p->if_capabilities & IFCAP_LRO; >>> - if (p->if_capenable & IFCAP_VLAN_HWCSUM) >>> - ena |=3D p->if_capenable & IFCAP_LRO; >>> + if (ifp->if_bridge =3D=3D NULL) { >>> + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) >>> + cap |=3D p->if_capabilities & IFCAP_LRO; >>> + if (p->if_capenable & IFCAP_VLAN_HWCSUM) >>> + ena |=3D p->if_capenable & IFCAP_LRO; >>> + } >>> >>> /* >>> * If the parent interface can offload TCP connections over V= LANs then >>> From nobody Sat Aug 12 15:42:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNQ0C0WPDz4qBwk for ; Sat, 12 Aug 2023 15:42:35 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNQ0B4mMRz3Fp8 for ; Sat, 12 Aug 2023 15:42:34 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1bdb7b0c8afso8254565ad.3 for ; Sat, 12 Aug 2023 08:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1691854953; x=1692459753; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=4fuxRkQ25YJ6NvIH+gDbi/p/xLibvyOMTkv+hqWDWhU=; b=fMoUYmjIo4KZjaVDvOXb50liFuA9ZL3fJtaKcI2y917EiHvCukCErpao50egXpy7qM MlAcEvBrE1w8I+DKOR+RCkN2VZT7484ITMrUxsiURkc3l4doHO+AyD5jE9VIt2j3oTrW tscqfOK4il82p2X4v4kfqQwJ1XdWrjJFjaDNI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691854953; x=1692459753; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4fuxRkQ25YJ6NvIH+gDbi/p/xLibvyOMTkv+hqWDWhU=; b=kAaG/blXOhSZXyypWR88pntLyFOrgXqF7trZSAQQ+ponGxf3L9pJM5gMsmOmoQkf4e u3af/kZWV1EdWyomg5tcr+I+ELcIuB7Nphl9XgAnEwBr4GcN8W6SSkdZrL1nJ7DyYGAn unCKU2SclZH5qrr9lMR3YzQ1ZsoM/RC3e5b6mCERJ1iayzGWHuFfqY35ZXnF47WR63qD oOYEhziswovdKq5yrVQuPmWRTeE8FTSK2c/vAs25g4s5Y1MBggwU9SG/E9Vt2lKoRKFZ hELjzvFeOderrwCn6BOwjEE7kbLQY+mOd4+ZgwItSY8QP2SfGJh0z9iBzW7iKnPX9MQi MpyQ== X-Gm-Message-State: AOJu0Ywc/PBBCU4169NdYACzLXGGYqpdawiv2U1g3xceZU8Qkond8kYg spsfkaaYc93hy+k7SadfvqKwzcH9WPK6Qejve2pqXcvix0l1QVb7xNY= X-Google-Smtp-Source: AGHT+IE3qR9BDjsbXXv9G3cs8Jnr/3Cmpqmk/iNIc7ElHFX0d2eVU07SaiI3mC3ZTlfgehYCpT04Eb+Hmvnm5eHm/9Q= X-Received: by 2002:a17:902:db05:b0:1bb:c971:ef92 with SMTP id m5-20020a170902db0500b001bbc971ef92mr4006139plx.59.1691854952830; Sat, 12 Aug 2023 08:42:32 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> In-Reply-To: From: Kevin Bowling Date: Sat, 12 Aug 2023 08:42:21 -0700 Message-ID: Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RNQ0B4mMRz3Fp8 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] On Sat, Aug 12, 2023 at 1:45=E2=80=AFAM Kristof Provost wr= ote: > > I also don=E2=80=99t have a setup to reproduce the issues Paul reported. > Given the discussion in the PR I assumed everyone was happy with the fix = he posted. Ok, I happened to be looking into it when the commit went in. Please revert, it's not the right fix. I have tested my patch as such: ifconfig bridge0 create ifconfig em3.11 create ifconfig bridge0 addm em3.11 You will see the em3.11 automagically has LRO removed and the "can't disable some capabilities" message is not present. ifconfig bridge0 deletem em3.11 LRO is restored to em3.11. My patch has the correct functionality intended by the masking code in if_bridge and my patch also fixes the case of disjoint interface capabilities in a bridge. The subtle bug was that vlan_capabilities() in if_vlan was not obeying the requested mask from its IFCAP ioctl. > Best regards, > Kristof Cheers, Kevin > On 12 Aug 2023, at 3:28, Kevin Bowling wrote: > > I think this may be a better fix, currently untested > > > > diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c > > index 6aa872a19364..51f0bc63ebda 100644 > > --- a/sys/net/if_vlan.c > > +++ b/sys/net/if_vlan.c > > @@ -2074,7 +2074,7 @@ vlan_capabilities(struct ifvlan *ifv) > > if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > > cap |=3D p->if_capabilities & IFCAP_LRO; > > if (p->if_capenable & IFCAP_VLAN_HWCSUM) > > - ena |=3D p->if_capenable & IFCAP_LRO; > > + ena |=3D mena & IFCAP_LRO; > > > > /* > > * If the parent interface can offload TCP connections over VLAN= s then > > > > On Fri, Aug 11, 2023 at 5:07=E2=80=AFPM Kevin Bowling wrote: > >> > >> I am wondering what is going on with this patch, it doesn't seem like > >> a full fix. At the very least we should clean up the "can't disable > >> some capabilities" message. > >> > >> I've been looking at this for a couple hours and am wondering what is > >> going on in if_bridge.. it looks like it correctly loops over the > >> interfaces and masks ifcaps it doesn't like using the interface's > >> ioctl SIOCSIFCAP. A similar pattern is used in if_lagg. I don't see > >> any issue there so far. I also don't see the SIOCSICAP ioctl failing > >> nor did vixie's message report that. > >> > >> I checked on a cxgbe(9) bridged vlan setup I have and see this message > >> "bridge0: can't disable some capabilities on vlan0: 0x400" > >> > >> So I am wondering if the bug is that if_vlan SIOCSIFCAP is > >> disregarding the ioctl's request mask.. it is just blindly calling > >> vlan_capabilities. > >> > >> Regards, > >> Kevin > >> > >> > >> On Fri, Aug 11, 2023 at 3:51=E2=80=AFPM Kristof Provost wrote: > >>> > >>> The branch main has been updated by kp: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D5f11a33ceeb385477cb22d= 9ad5941061c5a26be9 > >>> > >>> commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9 > >>> Author: Paul Vixie > >>> AuthorDate: 2023-08-11 18:17:16 +0000 > >>> Commit: Kristof Provost > >>> CommitDate: 2023-08-11 22:50:37 +0000 > >>> > >>> if_vlan: do not enable LRO for bridge interaces > >>> > >>> If the parent interface is not a bridge and can do LRO and > >>> checksum offloading on VLANs, then guess it may do LRO on VLANs. > >>> False positive here cost nothing, while false negative may lead > >>> to some confusions. According to Wikipedia: > >>> > >>> "LRO should not operate on machines acting as routers, as it brea= ks > >>> the end-to-end principle and can significantly impact performance= ." > >>> > >>> The same reasoning applies to machines acting as bridges. > >>> > >>> PR: 254596 > >>> MFC after: 3 weeks > >>> --- > >>> sys/net/if_vlan.c | 22 +++++++++++++++------- > >>> 1 file changed, 15 insertions(+), 7 deletions(-) > >>> > >>> diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c > >>> index 6aa872a19364..92e4e4247e3d 100644 > >>> --- a/sys/net/if_vlan.c > >>> +++ b/sys/net/if_vlan.c > >>> @@ -2067,14 +2067,22 @@ vlan_capabilities(struct ifvlan *ifv) > >>> } > >>> > >>> /* > >>> - * If the parent interface can do LRO and checksum offloading= on > >>> - * VLANs, then guess it may do LRO on VLANs. False positive = here > >>> - * cost nothing, while false negative may lead to some confus= ions. > >>> + * If the parent interface is not a bridge and can do LRO and > >>> + * checksum offloading on VLANs, then guess it may do LRO on V= LANs. > >>> + * False positive here cost nothing, while false negative may = lead > >>> + * to some confusions. According to Wikipedia: > >>> + * > >>> + * "LRO should not operate on machines acting as routers, as i= t breaks > >>> + * the end-to-end principle and can significantly impact perfo= rmance." > >>> + * > >>> + * The same reasoning applies to machines acting as bridges. > >>> */ > >>> - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > >>> - cap |=3D p->if_capabilities & IFCAP_LRO; > >>> - if (p->if_capenable & IFCAP_VLAN_HWCSUM) > >>> - ena |=3D p->if_capenable & IFCAP_LRO; > >>> + if (ifp->if_bridge =3D=3D NULL) { > >>> + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) > >>> + cap |=3D p->if_capabilities & IFCAP_LRO; > >>> + if (p->if_capenable & IFCAP_VLAN_HWCSUM) > >>> + ena |=3D p->if_capenable & IFCAP_LRO; > >>> + } > >>> > >>> /* > >>> * If the parent interface can offload TCP connections over V= LANs then > >>> From nobody Sat Aug 12 16:01:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNQPx4qzMz4qCwK; Sat, 12 Aug 2023 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNQPx4LZSz3HkJ; Sat, 12 Aug 2023 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=en+ofypNgWzsxNzCHY93U0mbm0L4q+pbPrPZ2p8ood4=; b=mqMwY6so5RzqVCcCavnOjqiXvMQAlclOcMr8Uqs1CHc93SxfN1lD61/C23MTDspDIfwldL NkpJi61DLOetmv6VpehVZWpW+nA+rDCWXHcJfIZS6mDNzmJX/yb7Khd1+UgDq1noZ0OFHg Bar3wECeFTp5VqRGjZv+O0jjQlftEbTGa+PM6mUQ/8F2DPvUwegwFopectzPpNQd2wDZ6X J73XZkJtVmuOX58yHURQFtD295lvxNzfVIY2QT+4IqZ/SFzMLZg/aBoDNz102fK0YgFAQu aC7RywyFFJnn3m3WFc8xMUgbLrvdmHkkwmBB8oCc+dENWyELC4HX/0vD988jcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856085; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=en+ofypNgWzsxNzCHY93U0mbm0L4q+pbPrPZ2p8ood4=; b=UJfh4nQ4knjWCDFM3o5ZtXnzIYPkdnabc3IRDQhPvTeQkDMV1fE4+1zd7YJlcPNPZ2tCZI LwvpLSn2vB6F1zsXnXU5S2IdckLdCHVXLppivSg0KeWBwAsMsyLvWUQGuRfilcO/efu6Dk Kso3mSasSrpLVrtLJQUnZ/a8phC/79vOaxoY5PyPdtEyfolat1UqrdAg4DSiDJ0d/wbAGk IIYoW6gKNuMF0sZ3P6g9Th3AQ/JxYflr1JWCY/QtwECPWzgQUWZDZOLleR0T2WqhZMGLjP OuyTCAQIhSrggpCVvoAghZaiL6QOWqjiQKiwxxQwZV/yzoBR8HMeGuc04KppUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691856085; a=rsa-sha256; cv=none; b=G4CkhqL+sApEtOgRtFBPhiFokaw2y+mYAFswYZElXmS6y++EG5QC9SdDRXmPXb7M33FrTZ VmpmbSZUAYN/rSs3hC1TTDhDA/TF06SPG1Y84TFJ601JGmJKWQRFKziBHTf+Q/Mor/CRqh 65gDMtzRXURMYyuTn4qadgYjC5g8emKtW+x6q4hflfvPBwex6nPymtG/ZjaAa1yzVVm2oX 09msTy6vlrngnRj6sEx8cVoZ/sIU2aPrbS/kVgd6zIbLrDlpN8GaA/HI/7xZWNuxMj2Fsg srZXBE7/dUiljhSfM7aJ6S1LrMUJn0OF/mRdDuCxdS4K5DR3ongNR5zuYSviaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNQPx3QB7zBkN; Sat, 12 Aug 2023 16:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CG1Pfe083215; Sat, 12 Aug 2023 16:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CG1Pb9083212; Sat, 12 Aug 2023 16:01:25 GMT (envelope-from git) Date: Sat, 12 Aug 2023 16:01:25 GMT Message-Id: <202308121601.37CG1Pb9083212@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: fb69ed397e4f - main - Revert "if_vlan: do not enable LRO for bridge interaces" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb69ed397e4f455d4c338edcfa210d763bb87189 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb69ed397e4f455d4c338edcfa210d763bb87189 commit fb69ed397e4f455d4c338edcfa210d763bb87189 Author: Kristof Provost AuthorDate: 2023-08-12 13:56:21 +0000 Commit: Kristof Provost CommitDate: 2023-08-12 13:56:21 +0000 Revert "if_vlan: do not enable LRO for bridge interaces" This reverts commit 5f11a33ceeb385477cb22d9ad5941061c5a26be9. As requested by Kevin Bowling. He explains: > The subtle bug was that vlan_capabilities() in if_vlan was not obeying > the requested mask from its IFCAP ioctl. --- sys/net/if_vlan.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 92e4e4247e3d..6aa872a19364 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2067,22 +2067,14 @@ vlan_capabilities(struct ifvlan *ifv) } /* - * If the parent interface is not a bridge and can do LRO and - * checksum offloading on VLANs, then guess it may do LRO on VLANs. - * False positive here cost nothing, while false negative may lead - * to some confusions. According to Wikipedia: - * - * "LRO should not operate on machines acting as routers, as it breaks - * the end-to-end principle and can significantly impact performance." - * - * The same reasoning applies to machines acting as bridges. + * If the parent interface can do LRO and checksum offloading on + * VLANs, then guess it may do LRO on VLANs. False positive here + * cost nothing, while false negative may lead to some confusions. */ - if (ifp->if_bridge == NULL) { - if (p->if_capabilities & IFCAP_VLAN_HWCSUM) - cap |= p->if_capabilities & IFCAP_LRO; - if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; - } + if (p->if_capabilities & IFCAP_VLAN_HWCSUM) + cap |= p->if_capabilities & IFCAP_LRO; + if (p->if_capenable & IFCAP_VLAN_HWCSUM) + ena |= p->if_capenable & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then From nobody Sat Aug 12 16:01:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNQQS3MQlz4qDBW; Sat, 12 Aug 2023 16:01:52 +0000 (UTC) (envelope-from kp@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 4RNQQS2v63z3HxK; Sat, 12 Aug 2023 16:01:52 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O7j2nQm0EuWjZLh73rCoAc0mXMceC+Q+RCZm4nsYMXY=; b=nHaA60TuAPQl/Wag0hERRnhxyZh7IcKwvirt0pSwOMxv6f9MxfTw7zQ0bPc5I24owBTHYQ HBvPnkZ8ADVYJQf5EwStoAXsaz0IOUkG/n/Xf714FIBpJac5xhTC3ViQrqCBBntXOSi8Vb e07sgrLIgHBSeJRuvUSruIj5Qix57DqgXaiO/Uhl9FuPeGEfFB5sWH63JkkBi3a9j8+wCd QGuyYwHxJX8VU4zem0+5VSB1mzJOQ/00MQGZHiWucCOGoD+zchcpzXZ+c99NUz6qo7yEzs XBLnAk7iPITcDUpt/Ok29qjB0Y8/Hsp5JgsLn8UaPWGrsEvDXck5vUr5bdmtwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691856112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O7j2nQm0EuWjZLh73rCoAc0mXMceC+Q+RCZm4nsYMXY=; b=SjrRJMA8QgW8nmQiprktajAtk9AzqtPQT9C7+F8RRigZ6y5hxrVpsbNvMJu/grBHs7G5uU l+xR5Ywps/P/7OIzHip0DDl6r5sI6oGSUUePQnjh8Z2W78CzEx47vkD2I0HA1poZ2JbRBq tQMmzSQgnzu31tdo1d6Eu/vUWksQ7O/Kb5BAfSef6ITw0qBkqye+uHOv9lTUUnkUHXkIuP k6pibikujZNZgtgD9s43Ucc0rL/4/an+vZ+y7x0swdHWVTzKj6n9cjbQz5cu19kyAAZvau SzfqIIb5tti5Va60ZqvmH74fHruyd4Xnuea98Nr4nLOVJM9hwIP4tCc+XY5tVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691856112; a=rsa-sha256; cv=none; b=eknT89Vd6uXlEMBIYyZ7+sQzAjXevV8AnE413iey4CGIx2eHaMQL2njIAVQoGuM2yKxZne iXYuiLK5EhlbaeKmUu6BiM0NnkLeOyruh92pqdljQitS07qF5a/xszqkkrptpA1GRdnfrs QCyNshCZQggdmIiflF2maWOXrY0Ka0bDvf8UAbQZymWx7nAPB4yC4jIrHcq/MuIaKmVGGk vcyqRoE8NdtNf/oHV6qFoRPCDRrxJl+iROxJQ+d9EYOfbTy4VU19PstOdfAesTXwK4+NEa H92UNQr0ybe/Auuayq3ZJV8EiFt4ccL8iZuf3xllWpApEHRZ7bqbClp84HH1+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.3 with cipher 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 "mx1.codepro.be", Issuer "R3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RNQQS1LhTz21g; Sat, 12 Aug 2023 16:01:52 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id AF5311C91B; Sat, 12 Aug 2023 18:01:49 +0200 (CEST) From: Kristof Provost To: Kevin Bowling Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces Date: Sat, 12 Aug 2023 18:01:48 +0200 X-Mailer: MailMate (1.14r5937) Message-ID: <1BB6FB9E-A4FC-4463-8777-FF291970C9D9@FreeBSD.org> In-Reply-To: References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 12 Aug 2023, at 17:42, Kevin Bowling wrote: > On Sat, Aug 12, 2023 at 1:45 AM Kristof Provost wrote: >> >> I also don’t have a setup to reproduce the issues Paul reported. >> Given the discussion in the PR I assumed everyone was happy with the fix he posted. > > Ok, I happened to be looking into it when the commit went in. > > Please revert, it's not the right fix. > Done in fb69ed397e4f455d4c338edcfa210d763bb87189 Best regards, Kristof From nobody Sat Aug 12 16:39:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNRG34sgfz4qGhT; Sat, 12 Aug 2023 16:39: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 4RNRG34DsLz3MGP; Sat, 12 Aug 2023 16:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691858379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjanUs7ymizYCIGrHV2g/Ilq33mYUnE377S0+SbmRTk=; b=oIQVZ9aPK+EGQXkqVWYRbd/VlSOkc/5Vmd0EIiLidoaCTbecYuXtO7oe++rSZpTX5ZCFnk rYfO8+UTKCYULLUgNHJTMiWu0nKlNIbtwHIZdbqTqtE0QkAXH1IdFzYJOS6bULS58duPRb W3BPNmrX98LYnQyfQyb+lBK3cppbqg8IfrBHESQn4E7UD11IIv3BxtensZ89kVH9C0t9j+ 7QRVV/XrnEZzBO9VsG1MZ1Xil8TqmxzjrwSYGSvc1GDFb0RdO8JJy5ufrqOqI1L7ir4E6S GHlHlKv/uHE3jXrz+uO464ndX9g1GZAjYlpbitDgkJBQD9toIHASBQ5hniFNKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691858379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjanUs7ymizYCIGrHV2g/Ilq33mYUnE377S0+SbmRTk=; b=T5jjjp2pzAe8zp7kO4XTjKc3TXRdDVmSXQfUTvmvGbt1B3MxzCZcdn8Ei8LEP6AjUi6Snf kw/n4GMZ6U+GK2hBinPJlqfP5s/xscKKyGiu9pezrsn++YRKrO7OBmsH2WP1t4BxllDsW2 CFxiqWJtnLPEzdPcfEir/pybV7LP5W+mcunhuwCGVQ0rIap6qiNLVqMym3HapOuiEGvKIC fzpIExgv37c81FgA4qBplLjpmmrfv/+GO0lWuZxF+OegbU7ig3uqzz5XCrRlSUXp5kb8us wnYQMhjjQp6J5gu1JyQ88OCwpRzJtUYHqB8PiMizpY5elGfRtkwZYKUt8+x4jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691858379; a=rsa-sha256; cv=none; b=SnIDZyMPNqOdvqLQMP241sOcV3kEfEkytIwr1gIYyJcJK9BTzQZmaDAXryt+rLBx4Euqi4 yVfWT60lxgjLC9ip0isNB/T6OTn0ktkWQvxrOUK17bUtY8Xlm5OXt/tQs/+V8QJee2AjAd MBzky65ykGZagyhlEUFwImZ7W3ajEtJ2jWynwPRUuuzQNtuPcZVKXgWm5eFbYEWY/8EUQC HqOd8GrReqO2Ri1Yw1MoiM8E4HyJcUGMsvRtBAomgShNxPuqcjgpQWLi9FLcVDjwCyvUWB DGoXhzwqMpfRaQFEzDh+rWugCTj1vw8Av4r01UAmxKraNy+gZeWzRQMfJmvvaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNRG33FmDzCrJ; Sat, 12 Aug 2023 16:39: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 37CGdd2C039832; Sat, 12 Aug 2023 16:39:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CGddWi039829; Sat, 12 Aug 2023 16:39:39 GMT (envelope-from git) Date: Sat, 12 Aug 2023 16:39:39 GMT Message-Id: <202308121639.37CGddWi039829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: b1a39c31a356 - main - vlan: Respect IFCAP_LRO mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1a39c31a3569bd045a0f40057c3773fc8166f6d Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b1a39c31a3569bd045a0f40057c3773fc8166f6d commit b1a39c31a3569bd045a0f40057c3773fc8166f6d Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-12 16:39:23 +0000 vlan: Respect IFCAP_LRO mask vlan_capabilities(), used by the IFCAP ioctl, was not respecting the IFCAP_LRO bit if it was masked by the requestor. This prevented if_bridge(4) from automasking LRO with a message like: bridge0: can't disable some capabilities on em3.11: 0x400 This also prevented manually disabling LRO from any vlan interface. PR: 254596 Reported by: Paul Vixie MFC after: 1 week --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 6aa872a19364..51f0bc63ebda 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2074,7 +2074,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_HWCSUM) cap |= p->if_capabilities & IFCAP_LRO; if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; + ena |= mena & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then From nobody Sat Aug 12 16:42:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNRKB0bmSz4qGXX for ; Sat, 12 Aug 2023 16:42:22 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNRKB09kzz3NSv for ; Sat, 12 Aug 2023 16:42:22 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-1bdca7cc28dso5003175ad.1 for ; Sat, 12 Aug 2023 09:42:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1691858541; x=1692463341; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=vhWaO1A2Dyv87RAOFpVCarA11FYRmrm2DgQv+tRmHBg=; b=IB5HW+OXiWa3LhWSvDRNzshiGmBBCaPH1APdMPdh+LxfQSZ9JRvy6FT5tJh6tb6e3k Em1hSE/lOotkH6aUjLR2lKZ8CnhlXNWkPs/rtBFBiDkXE8sbYmnIUgC5bHVqCP2tmiRN jeIMpZ9e15b07X76vt4iT2751I4fxDTPhR93k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691858541; x=1692463341; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vhWaO1A2Dyv87RAOFpVCarA11FYRmrm2DgQv+tRmHBg=; b=O4djHAl4QxDdt6MYGXWpAhhKPq8NUOnrKVJDOf1ay3kHRlfTSfqK3sGL3g1ljStPjp AqY1Xl6d4ZPwVBNSnETH7wSs8SkTTsiXrGv7QmFUgpqx5Nh4EcxA2Nv4yEfg5zEHHEGM stZBNdgoQSlhPj5yIFqYtqh65pb9kp/SXtU9K5MJ/+Z4GYFCyCPCRLRwlui7DyqdranJ uH5/TOyRQ1d7zOW1NAB8JNyu+iljaLIAKEdN9pGCwvR0tMmJWy5CN0RHCsCXdmZqSzsM e6Ca5w/Daeq9m1xeeCn86rx3aAW3NXmijbuUzv6LyC1Bgc5DALOB/MwJveClLn7M17vr 30ZA== X-Gm-Message-State: AOJu0YzmGNs73xJUnFxWwr6+RNjZ7jY9g2TWg1ZvMsgUD3dGU/kjDMHg kunjj+AjRwE3GruqXNnf4dgdTCpCdmtq95ZfQaz4Dw== X-Google-Smtp-Source: AGHT+IHPNWOEXOzCOgPMccRK7CsS4uzgCq3uRn94jj6MHcTfT4CDwbuAUISszvuCW8PVo4XJGYtO8XRdl0PcwBdJyqE= X-Received: by 2002:a17:902:7488:b0:1bd:d663:45ad with SMTP id h8-20020a170902748800b001bdd66345admr143721pll.68.1691858540933; Sat, 12 Aug 2023 09:42:20 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308112251.37BMpOnC064624@gitrepo.freebsd.org> <1BB6FB9E-A4FC-4463-8777-FF291970C9D9@FreeBSD.org> In-Reply-To: <1BB6FB9E-A4FC-4463-8777-FF291970C9D9@FreeBSD.org> From: Kevin Bowling Date: Sat, 12 Aug 2023 09:42:09 -0700 Message-ID: Subject: Re: git: 5f11a33ceeb3 - main - if_vlan: do not enable LRO for bridge interaces To: Kristof Provost Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RNRKB09kzz3NSv 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] On Sat, Aug 12, 2023 at 9:01=E2=80=AFAM Kristof Provost wr= ote: > > On 12 Aug 2023, at 17:42, Kevin Bowling wrote: > > On Sat, Aug 12, 2023 at 1:45=E2=80=AFAM Kristof Provost wrote: > >> > >> I also don=E2=80=99t have a setup to reproduce the issues Paul reporte= d. > >> Given the discussion in the PR I assumed everyone was happy with the f= ix he posted. > > > > Ok, I happened to be looking into it when the commit went in. > > > > Please revert, it's not the right fix. > > > Done in fb69ed397e4f455d4c338edcfa210d763bb87189 Thanks, committed the masking fix as b1a39c31a3569bd045a0f40057c3773fc8166f6d > Best regards, > Kristof From nobody Sat Aug 12 18:21:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNTW20cNGz4qN7w; Sat, 12 Aug 2023 18:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNTW2060Gz3bPP; Sat, 12 Aug 2023 18:21:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691864462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vYqlw7pVG0B4CagbxjCGJcibEObaa2F6Fexj1FgQYAo=; b=OZMTrf5fTbJ+8PXDeDvDSAPEa0+mWrKJ6rZ1vu4WRmeHISRkz3ANAVszZnxcJAV4oqWDb1 oTcc7KP2n/DDnJ4vyooMWKKYw4O7pPwlrqbBeRJPtW7il5stKyWjG2y4G4vhhloRc/Qb3v kuI34Dbf8CRRz51XZsl1unoXKXMx4R3bZD0z+dgFCeWiG3uoQTmUU+YYYXaAjuoOAC6Sfi AsP3d5uzIvqUg3HC+zoxwU1QnOeNI/+1niM2UqAd9yl2F3WXkXf9SZoVW8Fl8nrCTDbws0 kLLaZ2CQcWPHbOb0KBheJqhSq5Jvc1XhNwNAEHotxoPHTgn1Sx/z+YVSUv1eSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691864462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vYqlw7pVG0B4CagbxjCGJcibEObaa2F6Fexj1FgQYAo=; b=sxUBb3ph6fyChcPHkWFVXvvKygYwfRnbTLgiccpgAyMjJZGgKjV9mRpPDksEJADCr6hvsp DbZtrNe5O5l9q3DTAXZjWbsudVqpche9aG8M7JVhLTzk4NugBFYQ8Dk7gS6K5UuC/llEHP zQbteOZUQTtgE/c88rTDEGSIKMZRPNhzP+wTcPdg3876tGs1Y8O6BFJ0Hdqs8Kbo2pQrLQ svD9CpEnnr6W4NznHwRGBZjBSCNoVZogLPuKqF1UvlUqeFiKWEhxk655fQX3ns91Iv7gx4 PJT1cOTAd6kJOZSNOF2zqsUyekhG20ObGa5aZujSq04/MDNIUpnFcIgjv85VQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691864462; a=rsa-sha256; cv=none; b=B+TGR4hr9EKNoPqJQgeKuIyGH7GWQcTiFGVmX7Q/hnTPk1FGDw6SGHbggxqZNOJZdG5r6A qkSQi/koxCeAHnvW9N89j/Bh2rS6R9Rnnv7dpw5KJaG6xBxtIlPB5qO4zXHBSbh8weAMDu jmzC59OcPVrApsFQhDxpma0HH3yo5Wv/WLtcmMggDcTV5DeqrFswui4TcpZAtaC/tri2FT 11fjEzWfOvDU0wnwY83bIa3etHwuPPrVgY95AjOaXIHK/G2QhC/U27z1hzcRT6n22ocgx1 qtsi9/Y7yykONwUeFFnNAClplNKSJyeQbawXVzaZxfjq3K6aj/ORyqaUxizH0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNTW16GhlzWHD; Sat, 12 Aug 2023 18:21:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37CIL1Il016575; Sat, 12 Aug 2023 18:21:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CIL1ja016572; Sat, 12 Aug 2023 18:21:01 GMT (envelope-from git) Date: Sat, 12 Aug 2023 18:21:01 GMT Message-Id: <202308121821.37CIL1ja016572@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: 220427da0e9b - main - Set UFS/FFS file type to snapshot before changing its block pointers. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 220427da0e9b2c1d8e964120becc17eb7524e46f Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=220427da0e9b2c1d8e964120becc17eb7524e46f commit 220427da0e9b2c1d8e964120becc17eb7524e46f Author: Kirk McKusick AuthorDate: 2023-08-12 18:20:08 +0000 Commit: Kirk McKusick CommitDate: 2023-08-12 18:20:40 +0000 Set UFS/FFS file type to snapshot before changing its block pointers. A UFS/FFS snapshot file is identified with the SF_SNAPSHOT flag to identify it as a snapshot. This flag needs to be set before setting some of its block pointers to the special values BLK_SNAP and BLK_NOCOPY. If the snapshot creation fails and we call VOP_REMOVE(), the SF_SNAPSHOT flag will let the remove routine know that the special block pointer values need to be rolled back before attempting deletion of the file. Also ensure that an fsck is required after setting superblock values in the ffs_checkcgintegrity() routine. Reported-by: Peter Holm Tested-by: Peter Holm MFC-after: 1 week Sponsored-by: The FreeBSD Foundation --- sys/ufs/ffs/ffs_alloc.c | 1 + sys/ufs/ffs/ffs_snapshot.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index d2627647360a..a1da0b05678a 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -3130,6 +3130,7 @@ ffs_checkcgintegrity(struct fs *fs, fs->fs_cstotal.cs_nifree -= fs->fs_cs(fs, cg).cs_nifree; fs->fs_cs(fs, cg).cs_nifree = 0; fs->fs_maxcluster[cg] = 0; + fs->fs_flags |= FS_NEEDSFSCK; fs->fs_fmod = 1; } diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index 6a3329078817..9cfd56472a78 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -368,6 +368,15 @@ restart: goto out; } } + /* + * Change inode to snapshot type file. Before setting its block + * pointers to BLK_SNAP and BLK_NOCOPY in cgaccount, we have to + * set its type to SF_SNAPSHOT so that VOP_REMOVE will know that + * they need to be rolled back before attempting deletion. + */ + ip->i_flags |= SF_SNAPSHOT; + DIP_SET(ip, i_flags, ip->i_flags); + UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); /* * Copy all the cylinder group maps. Although the * filesystem is still active, we hope that only a few @@ -393,12 +402,6 @@ restart: if (error) goto out; } - /* - * Change inode to snapshot type file. - */ - ip->i_flags |= SF_SNAPSHOT; - DIP_SET(ip, i_flags, ip->i_flags); - UFS_INODE_SET_FLAG(ip, IN_CHANGE | IN_UPDATE); /* * Ensure that the snapshot is completely on disk. * Since we have marked it as a snapshot it is safe to From nobody Sat Aug 12 19:11:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNVdj47TDz4qR7R; Sat, 12 Aug 2023 19:11: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 4RNVdj3Yf0z3fj4; Sat, 12 Aug 2023 19:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691867513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6uyt9fLXGEjA74pZBFpDO/o/9EyicYxTFSwn1oIfXM=; b=HQfT7d0cVGR1v3ltWxyKKWnUKzHrJ9+npwlve7XjcpynbeUoK+wa4YOJkAVm9PIrxbN7+A kJUFQqoIalguUGvPN5VHzc473qovxSAy4J4OT8pA832Gaw8RRHG8cmzkbwNte5qD9+n/1k 183ZbTLiqTajkNRjh9WWuBGNJ0XcJ3SYR/AadyFHpqBTNZQiNvX0rWNya0Bmp3Wk8Q98lk 5o8hIyL0pgzWMKx9k8QU90CBmijFNnQrbRjelqAwy8gzRxztdaYbAJ8wvEcUM5Xg4ZMtGK Lbo2WMji/s44cMQB7q0C0jP3M8dbrmsHAVb8jgABLHATSKbRhpBxF/sGNw2WCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691867513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6uyt9fLXGEjA74pZBFpDO/o/9EyicYxTFSwn1oIfXM=; b=mgInKbY6mKx9T5ER9S6MGuGosBK7/BPiruaVxiLPcPO8wFmD8ywgM8ZnIgIPISXgBdb10E mkqKEe8XXvKt54cfevSMbHgVYvt7v1pFXWI59ndH8nwpe9wAyjWzgOFX3ILvF+ePKwufi5 VA4+qnfgzIMo6RbVNPL0krg98rKF8dmkjbeGhcY4qoQV7DkifDcfD+STuMBI6NeTyWSvD8 SZlEKIYre+1wtNdzLuc5KeRhlIWoDhYgiisDHmgJOMqI9W4PBANHEoX7pB+0NQwfgKWrwN XFnPFgZMfpQDBdR/ge3PK/Itmz4SyGeB7Xn9oVzx4DNq9SgWSLZJR2FhxAvAIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691867513; a=rsa-sha256; cv=none; b=xECIPgkoUSDb6guJQl7CspK4lazaLNb1vpYgcGuwDZobihGu47NJkCVABafN8FvKyyG8bJ 0wrm+GWZrAdqgMZ/7lBcS267F01OHNeOhhLZPtRn7qbZClDD+cEDg04T9rCzRCWVf7X6OU o7AFgJZqeHweC6mb45yhMXaTrpvpLdWYyXeW9UZOBSO8iAnyjGn7dNa0W1QMTjZEpHMJ76 fo47s8URmqRhbB9M1/uKqrzCVSc32OQEieFjAgLdrLmrd0Zp+HGoWWwmS7rWS9O+8ZwOx6 fWnCLil+VIpI9nlvx9Zsfs24tG2KvkpwiMS0IJDzitQ0ZL5BAiLzZ9h7IsB4OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNVdj2KhdzXtg; Sat, 12 Aug 2023 19:11: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 37CJBrZI001501; Sat, 12 Aug 2023 19:11:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CJBrah001498; Sat, 12 Aug 2023 19:11:53 GMT (envelope-from git) Date: Sat, 12 Aug 2023 19:11:53 GMT Message-Id: <202308121911.37CJBrah001498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: db25f7b14097 - stable/13 - Improve dumpfs(8) error messages when a cylinder group read fails. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db25f7b14097522eb0177cace29a38c1abe4c7dc Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=db25f7b14097522eb0177cace29a38c1abe4c7dc commit db25f7b14097522eb0177cace29a38c1abe4c7dc Author: Kirk McKusick AuthorDate: 2023-08-06 06:09:18 +0000 Commit: Kirk McKusick CommitDate: 2023-08-12 19:11:42 +0000 Improve dumpfs(8) error messages when a cylinder group read fails. Sponsored-by: The FreeBSD Foundation (cherry picked from commit 02b7bf07c5d2ec578fc044b60229c6e951f26087) --- sbin/dumpfs/dumpfs.c | 61 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c index f93047b8803f..7f3e7bb3e910 100644 --- a/sbin/dumpfs/dumpfs.c +++ b/sbin/dumpfs/dumpfs.c @@ -74,6 +74,7 @@ static const char rcsid[] = #include #include #include +#include #include #define afs disk.d_fs @@ -89,7 +90,7 @@ static void dumpfreespacecg(int); static int marshal(const char *); static void pbits(void *, int); static void pblklist(void *, int, off_t, int); -static void ufserr(const char *); +static const char *ufserr(void); static void usage(void) __dead2; int @@ -131,7 +132,7 @@ main(int argc, char *argv[]) while ((name = *argv++) != NULL) { if (ufs_disk_fillout(&disk, name) == -1) { - ufserr(name); + printf("\n%s: %s\n", name, ufserr()); eval |= 1; continue; } @@ -162,7 +163,7 @@ dumpfs(const char *name, int dosb) time_t fstime, fsmtime; int64_t fssize; int32_t fsflags; - int i; + int i, ret; switch (disk.d_ufs) { case 2: @@ -187,7 +188,8 @@ dumpfs(const char *name, int dosb) afs.fs_ncg, (intmax_t)fssize, (intmax_t)afs.fs_dsize); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("bsize\t%d\tshift\t%d\tmask\t0x%08x\n", afs.fs_bsize, afs.fs_bshift, afs.fs_bmask); @@ -242,7 +244,8 @@ dumpfs(const char *name, int dosb) afs.fs_old_nsect, afs.fs_old_npsect, afs.fs_old_spc); break; default: - goto err; + printf("Unknown filesystem type %d\n", disk.d_ufs); + return (1); } printf("old_cpg\t%d\tsize_cg\t%zu\tCGSIZE\t%zu\n", afs.fs_old_cpg, sizeof(struct cg), CGSIZE(&afs)); @@ -310,9 +313,6 @@ dumpfs(const char *name, int dosb) afs.fs_volname, (uintmax_t)afs.fs_swuid, (uintmax_t)afs.fs_providersize); printf("\ncs[].cs_(nbfree,ndir,nifree,nffree):\n\t"); - afs.fs_csp = calloc(1, afs.fs_cssize); - if (bread(&disk, fsbtodb(&afs, afs.fs_csaddr), afs.fs_csp, afs.fs_cssize) == -1) - goto err; for (i = 0; i < afs.fs_ncg; i++) { struct csum *cs = &afs.fs_cs(&afs, i); if (i && i % 4 == 0) @@ -331,14 +331,15 @@ dumpfs(const char *name, int dosb) } if (dosb) return (0); + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1 || dumpcg()) - goto err; + if (i == -1) { + ret = 1; + printf("\ncg %d: %s\n", disk.d_lcg, ufserr()); + } else if (dumpcg()) + ret = 1; } - return (0); - -err: ufserr(name); - return (1); + return (ret); } static int @@ -404,17 +405,22 @@ dumpcg(void) static int dumpfreespace(const char *name, int fflag) { - int i; + intmax_t startblkno; + int i, ret; + ret = 0; while ((i = cgread(&disk)) != 0) { - if (i == -1) - goto err; - dumpfreespacecg(fflag); + if (i != -1) { + dumpfreespacecg(fflag); + } else { + startblkno = disk.d_lcg * afs.fs_fpg; + printf("\nBlocks %jd-%jd of cg %d skipped: %s\n", + startblkno, startblkno + afs.fs_fpg - 1, + disk.d_lcg, ufserr()); + ret = 1; + } } - return (0); -err: - ufserr(name); - return (1); + return (ret); } static void @@ -523,13 +529,14 @@ pblklist(void *vp, int max, off_t offset, int fflag) } } -static void -ufserr(const char *name) +static const char * +ufserr(void) { if (disk.d_error != NULL) - warnx("%s: %s", name, disk.d_error); - else if (errno) - warn("%s", name); + return(disk.d_error); + if (errno) + return (strerror(errno)); + return ("unknown error"); } static void From nobody Sat Aug 12 22:34:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNb7D031xz4TtvW; Sat, 12 Aug 2023 22:34: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 4RNb7C6Pg6z4YY3; Sat, 12 Aug 2023 22:34:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691879655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q18/nDlJte+93jptWgNPgpmAzi08XC29udHclJgtKVA=; b=ixf3wHLjst4H9QArrmekWoEsHCtQouFN0hFrhTSF77dHI3oeTZP8a4zgxu+UKG3BrRxWh0 3aGGUFqnmIIaRe31HIHZP3cnk3HyzF59BiRckUVZ8J6GmgW0HelvEctBQCIWfzFwjSCCHv mFp867kJ6n1P+5itxLmu9yYhS1H8BtzLMnufJ4Muv1ge0xs72JPYzrbGDJhv62umFIUyes /bOZ2JMrzAt4+nsVV8dkHDCSLpyycW7N/MQZVxmKLItAdyminftacejZSYJH85M/7D5/FA fN4tiBP9Fc32mhDEuxAnFa+lyBZtciimSfStkGFRQoMmrh8E+JAn4X0gPqV8Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691879655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q18/nDlJte+93jptWgNPgpmAzi08XC29udHclJgtKVA=; b=Bn2TsybwyIzD1QzeC3nj3cLvawEGpJHfv/OcsMbzVa9S6GnaXR+tbMQMlY3vWO5W+Ob4tZ TCp+a4kL0zNPw6S2hkXAHBRWgN7myhSQFtwCKM32AgmC5JFUylfgeBXMwKxBag0aH+ufU/ sxXbBa9rlNpkFmP/AH2STq6ZLSmClwB/YzmPyT/3y1/VDUseHbwHomceLQNsb61Df2vVkT Wrh57XzjbFoxlDgRwSOizwHU9Nrp1UQShlVwtCgni411+y2Yb0say52k6TB3PH2KeQNCGK b8cJO5LyqloLGNayOQ5gTbTf/eu9GyGxzynJpfmJC2FY1IDnG7ou56c+n9MhKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691879655; a=rsa-sha256; cv=none; b=ZO+eaZQswXO7DPRwk5ALunCTyvX0I2EKKvt8e0s5BRZIDjFJrgKXJlNOB2JcaEiyt71bLH uh9S/byLExFthgV1cmgiQLxIixykKRcC2E8EWkWx/mkF+YIc1hoepgeUupSAuJHkVGOnK3 ouVK8uzOt6T/QA4+nmF+mtsN/zmIM94PKlDW+9gPrR9rMyn6t0BCBC+EnguttdxdEtAfe5 cdgUwjZVjzMzkbl3HtvFo/eMU+z2WMLHpICa7ruHt0sQS+j5eAvRR0l0yMiDXa4Tn+VCkW 5bLPPXXfovanfoDguSGLvd6E2tFokxt3ICf+sVqphcqfub5NPkrUDbAEVo+Xwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNb7C5T40zdh1; Sat, 12 Aug 2023 22:34: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 37CMYFoC037100; Sat, 12 Aug 2023 22:34:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CMYFgQ037097; Sat, 12 Aug 2023 22:34:15 GMT (envelope-from git) Date: Sat, 12 Aug 2023 22:34:15 GMT Message-Id: <202308122234.37CMYFgQ037097@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: 41acfee690da - main - libc vdso time functions: correctly convert errors into errnos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41acfee690da6289d570338e6365c1d7ef61dad5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=41acfee690da6289d570338e6365c1d7ef61dad5 commit 41acfee690da6289d570338e6365c1d7ef61dad5 Author: Konstantin Belousov AuthorDate: 2023-08-12 15:45:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 22:34:08 +0000 libc vdso time functions: correctly convert errors into errnos Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/sys/clock_gettime.c | 6 +++++- lib/libc/sys/gettimeofday.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c index ec8ec13a754d..b2a414455245 100644 --- a/lib/libc/sys/clock_gettime.c +++ b/lib/libc/sys/clock_gettime.c @@ -48,7 +48,11 @@ __clock_gettime(clockid_t clock_id, struct timespec *ts) error = __vdso_clock_gettime(clock_id, ts); else error = ENOSYS; - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_clock_gettime(clock_id, ts); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); } diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c index 22177b15a5c7..d955aaa907e2 100644 --- a/lib/libc/sys/gettimeofday.c +++ b/lib/libc/sys/gettimeofday.c @@ -44,7 +44,11 @@ __gettimeofday(struct timeval *tv, struct timezone *tz) int error; error = __vdso_gettimeofday(tv, tz); - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_gettimeofday(tv, tz); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); } From nobody Sat Aug 12 22:34:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNb7F35pCz4TvFJ; Sat, 12 Aug 2023 22:34: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 4RNb7F0087z4Ymc; Sat, 12 Aug 2023 22:34:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691879657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UoF5QEypwPuwJ19VCfctIcRkkVV5X4Hvq6OWoHHbZw=; b=Z75E0Vl1zUTvw51weWLt92pvpkA7NGiOWJmTfJBrL1guhV8g+dObu2uusXMW/vp5gzOpAq XKxOY+jPo3wjU0TomhvgzdzoVPocw07lTaXxYWax6ObhWpFjWNhze+4VJesgLJ0QkLPWif ccnagX3ew3rX0JD7aOkEL8qpA8L2obGXmqEcdH09XOYSOT6W8C6pGexWPERu5W0VxmZ2QK QFkWfh2QZsq9jwoQhu/VHZgGWDkTVPR5uf6KTbmsatnTsTpLfFDJ/MjT7FH0E2/N7hEZdi hORsKZrMLg9KHF07F3fO5d4GuyHGksTfT877lXOtqfq4atO6bIpyQWbyBpFelQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691879657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UoF5QEypwPuwJ19VCfctIcRkkVV5X4Hvq6OWoHHbZw=; b=lssSX8o70mM7XKjZUvZ93Eez7j5UmliH2DghwCFh6NY2cP64kyxDsJ91wFOxPfuKX2JXBv bnTAM8bWBU6L5uv+ImKCMGmN/MBve9Knsq1amZ5vBWZc0iAbt7vp6vBLNufqhtj96k0ERs PpyiwCboeqGpOTeZFzz8OIi6JqWdHg20263yqBm94EHRjCcgpsP7WJ7Y2ulEkiehtHTnzV H2eJ3WCzatSYrzW9WB0I+R5H72jdeivn97rHp0LfMRxoogca+qR+07WMhTteZ0X5WQlcdV yr4gzXvwKH5hf+IsTLUbJ7Ox9kb8uCO+B0pOSFpte4Nt+EME8pluDp6iXiUtqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691879657; a=rsa-sha256; cv=none; b=CgjZoHuaIR7rBD9hRHoqAxU9itWx0SbV9X9RfRidu5tCtgcrxdieQqVh+113ylv3m9B633 hUE3JuXM4ozfRRHcZi9sUTp5VrWQBUR6DZIRF6J28WsxojFIGPores25h6FcopkJ2XWKKv HzTfC3qMslDr99VJGgKTMA/spIbKrTI2vVzQRo30g2lgOOxDMp5WbZlrYTsJuhHZsv4JvS h28Llwao/i4WabH+fmu8y6uOOFT5XRj46paDNYnugE757el5s3mkPpOPlTbP2VhrX7bxO+ Rq49D5peyh+IT/6zEajAdN4Hx3LqNFlJEjJC9jfYrLij/iuC4qN000f/3oYDCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNb7D682Czdj4; Sat, 12 Aug 2023 22:34: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 37CMYG5j037136; Sat, 12 Aug 2023 22:34:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37CMYGDj037133; Sat, 12 Aug 2023 22:34:16 GMT (envelope-from git) Date: Sat, 12 Aug 2023 22:34:16 GMT Message-Id: <202308122234.37CMYGDj037133@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: 93626d543702 - main - tc_fill_vdso_timehands32(): fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93626d54370292b09cd0ca604b144737109e9071 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=93626d54370292b09cd0ca604b144737109e9071 commit 93626d54370292b09cd0ca604b144737109e9071 Author: Konstantin Belousov AuthorDate: 2023-08-12 19:51:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-12 22:34:08 +0000 tc_fill_vdso_timehands32(): fix On 64bit, there is a 4-byte hole in struct vdso_timekeep32 after tk_current, if the structure is not packed. This is due to the MD th_x86_pvc_last_systime being 64bit. Change amd64 VDSO_TIMEHANDS_MD32 to not use uint64_t, replace it with pair of uint32_t, as it is done for all other members. PR: 273085 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/acpica/acpi_hpet.c | 3 ++- sys/x86/include/vdso.h | 7 ++++++- sys/x86/x86/pvclock.c | 2 +- sys/x86/x86/tsc.c | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index 9ed7c5a47b35..a1171027ddf7 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -171,7 +171,8 @@ hpet_vdso_timehands32(struct vdso_timehands32 *vdso_th32, vdso_th32->th_algo = VDSO_TH_ALGO_X86_HPET; vdso_th32->th_x86_shift = 0; vdso_th32->th_x86_hpet_idx = device_get_unit(sc->dev); - vdso_th32->th_x86_pvc_last_systime = 0; + vdso_th32->th_x86_pvc_last_systime[0] = 0; + vdso_th32->th_x86_pvc_last_systime[1] = 0; vdso_th32->th_x86_pvc_stable_mask = 0; bzero(vdso_th32->th_res, sizeof(vdso_th32->th_res)); return (sc->mmap_allow != 0); diff --git a/sys/x86/include/vdso.h b/sys/x86/include/vdso.h index 546a92a47301..be90e26702f7 100644 --- a/sys/x86/include/vdso.h +++ b/sys/x86/include/vdso.h @@ -49,7 +49,12 @@ #ifdef _KERNEL #ifdef COMPAT_FREEBSD32 -#define VDSO_TIMEHANDS_MD32 VDSO_TIMEHANDS_MD +#define VDSO_TIMEHANDS_MD32 \ + uint32_t th_x86_shift; \ + uint32_t th_x86_hpet_idx; \ + uint32_t th_x86_pvc_last_systime[2];\ + uint8_t th_x86_pvc_stable_mask; \ + uint8_t th_res[15]; #endif #endif diff --git a/sys/x86/x86/pvclock.c b/sys/x86/x86/pvclock.c index 3da3373bb2ee..9d8ac99f5a8a 100644 --- a/sys/x86/x86/pvclock.c +++ b/sys/x86/x86/pvclock.c @@ -253,7 +253,7 @@ pvclock_tc_vdso_timehands32(struct vdso_timehands32 *vdso_th, vdso_th->th_algo = VDSO_TH_ALGO_X86_PVCLK; vdso_th->th_x86_shift = 0; vdso_th->th_x86_hpet_idx = 0; - vdso_th->th_x86_pvc_last_systime = + *(uint64_t *)&vdso_th->th_x86_pvc_last_systime[0] = atomic_load_acq_64(&pvclock_last_systime); vdso_th->th_x86_pvc_stable_mask = !pvc->vdso_force_unstable && pvc->stable_flag_supported ? PVCLOCK_FLAG_TSC_STABLE : 0; diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index a9e44307dd83..fc72dee176e9 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -990,7 +990,8 @@ x86_tsc_vdso_timehands32(struct vdso_timehands32 *vdso_th32, vdso_th32->th_algo = VDSO_TH_ALGO_X86_TSC; vdso_th32->th_x86_shift = (int)(intptr_t)tc->tc_priv; vdso_th32->th_x86_hpet_idx = 0xffffffff; - vdso_th32->th_x86_pvc_last_systime = 0; + vdso_th32->th_x86_pvc_last_systime[0] = 0; + vdso_th32->th_x86_pvc_last_systime[1] = 0; vdso_th32->th_x86_pvc_stable_mask = 0; bzero(vdso_th32->th_res, sizeof(vdso_th32->th_res)); return (1);