From nobody Wed Jun 15 14:23:51 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9142C8420AD; Wed, 15 Jun 2022 14:24:00 +0000 (UTC) (envelope-from ambrisko@ambrisko.com) Received: from mail2.ambrisko.com (mail2.ambrisko.com [70.91.206.91]) by mx1.freebsd.org (Postfix) with ESMTP id 4LNSGl2k2vz4cf4; Wed, 15 Jun 2022 14:23:59 +0000 (UTC) (envelope-from ambrisko@ambrisko.com) IronPort-SDR: 5sf1UoGx1OAujPIRDVOhBc1stzwJXOvmLESqT+M3Z40TvXd+pXCTCAZMqg4rbuX/ZB0bdddvJb ZT8kK/HUBd7v84chK26MZswgAIKXhJKmQ= X-Ambrisko-Me: Yes IronPort-Data: A9a23:HtcM6aPTPVfdEZLvrR0hl8FynXyQoLVcMsEvi/4bfWQNrUp2hjEOz jAfUWGHOa6NZzOmKtB+a4jn/UoH6MfTn9A1QFdlrnsFo1CmCSbm6XV1Cm+qYkt+FiBPJa5ex 512huPodajYc1eHzvuTGum4xZVD/fHQLlbMILas1hFZHWeIeg944f5Qs7JRbrpTvDSMK1jlV eUeAyHoEATNNzZcagr44k8Ywf9llKyaVDgw5jTSaR3X1bN3eqR8MX4RGU2xByOQroh8H+imS vzFxbX/92bT5RY2CdTjmbH+GqEIaueDZ07X1CoQAu746vRBjnRaPqITPf8Wc0ZMiDKhltV70 tRWtpv2QgAsVkHJsLlGCkIESUmSOoUDotcrO0OXqtaYikbBdn7t3+ljFloeM5cV9+xsDSdJ7 /NwADUPYQ2RhuGez7eyS+0qjcMmROHiOYkFu2pjyhnXF/srS4vPBaLQ6rdwxjI5jcNKEPP2e s0WdDdrdBSGaBQnElsaFtc1m+Kth2XkNiZCoxecoa4f7XLewQZq3P7qKtW9UtCHW4BemUOdp 37dun/jCVQfPd2Z4TSf/3+mneOJmjn0MKo5BfuD/f53ilCJ2kQYExYWSFG2u+X/gUm7M++zg WR8FjEGtqUo6kGxFJ/0WheioWWHuVgXXN84LgHz0ynVooK83upTLjFsoudpZIN0uckoayYt0 1PVzdrlCSY16e+cTHiH96yXqhu7PCIPLHQBYmkPSg5cu4vvp4Q6jxTuSNd/Ef7o1oSkRWmom z3a/jIjg7gzjNIQ0/np917wnD/x9IPCSRQ451uLUzv9vB95foOse6eh9UPfsaRbNI+cQ1TY5 CoElsGS4fogF5aIkCDREuwBEKvzvqSMNTfGgEVsGLEo8j63+mWgesZb5zQnfBVlNcMNeDnIZ k7PuFMMvMYCYCPyNaIuOtC/EcUny6TkBO/JbPGMY4oceIV1eS+G4DpqORya0VfynRV+iqo4I 5qaL5qhVC5IFaR9wTOqbO4Byrt3lDsmzGbeSJ2nnRSq1b2SOCycRbsfagLcb+Yl4bmCqQGT+ tNVLcqRyBIZW+r7O3GF/YkWJFEMDH46GZGm9pQOJ7LbelJrSDM7Fvvc4bI9YIg0za1am9DB8 my5RkIFmkH0gmfKKFnSZ30/OqnjW41z8SAyMSA2Zw76wHU5f4u1tuEWcpEtfKIk86poyvstF 6sJfMCJA/JuTDXb+mRANcCs8NQ6LBn71xiTOyeFYSQke88yTgPEzdboYw/z+XRcFSGwr8Y// +Wt2w6zrUDvnOi+4BI6sM6S8m4= IronPort-HdrOrdr: A9a23:4Rxk/6iWRb4rmelelT4AQTNygXBQXtoji2hC6mlwRA09TyVXra GTddAgpHjJYVcqKRUdcL+7VJVoLUmyyXcx2/h2AV7AZniChILLFvAA0WKK+VSJcEDDH6xmpM VdmsNFaOEYY2IVsS7LijPTL+od Received: from server2.ambrisko.com (HELO internal.ambrisko.com) ([192.168.1.2]) by ironport2.ambrisko.com with ESMTP; 15 Jun 2022 06:17:19 -0700 Received: from ambrisko.com (localhost [127.0.0.1]) by internal.ambrisko.com (8.17.1/8.17.1) with ESMTPS id 25FENpSa063631 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Wed, 15 Jun 2022 07:23:51 -0700 (PDT) (envelope-from ambrisko@ambrisko.com) X-Authentication-Warning: internal.ambrisko.com: Host localhost [127.0.0.1] claimed to be ambrisko.com Received: (from ambrisko@localhost) by ambrisko.com (8.17.1/8.17.1/Submit) id 25FENpwL063630; Wed, 15 Jun 2022 07:23:51 -0700 (PDT) (envelope-from ambrisko) Date: Wed, 15 Jun 2022 07:23:51 -0700 From: Doug Ambrisko To: Cy Schubert Cc: Mateusz Guzik , Doug Ambrisko , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Rick Macklem Subject: Re: git: 6468cd8e0ef9 - main - mount: add vnode usage per file system with mount -v Message-ID: References: <202206131457.25DEvJDU044469@gitrepo.freebsd.org> <20220615030833.79F9A9B@slippy.cwsent.com> <20220615140514.77BEDD7@slippy.cwsent.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220615140514.77BEDD7@slippy.cwsent.com> X-Rspamd-Queue-Id: 4LNSGl2k2vz4cf4 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of ambrisko@ambrisko.com has no SPF policy when checking 70.91.206.91) smtp.mailfrom=ambrisko@ambrisko.com X-Spamd-Result: default: False [-0.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[ambrisko]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_SPAM_SHORT(0.88)[0.877]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; HAS_XAW(0.00)[]; DMARC_NA(0.00)[ambrisko.com]; AUTH_NA(1.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; MLMMJ_DEST(0.00)[dev-commits-src-all,dev-commits-src-main]; R_SPF_NA(0.00)[no SPF record]; RCVD_NO_TLS_LAST(0.10)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:7922, ipnet:70.88.0.0/14, country:US]; FREEMAIL_CC(0.00)[gmail.com,freebsd.org,uoguelph.ca]; MID_RHS_MATCH_FROM(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On Wed, Jun 15, 2022 at 07:05:14AM -0700, Cy Schubert wrote: | Can we revert this, please. It breaks NFSv4. It would be nice if you could try the proposed partial revert. I'm planning to commit that shortly. Doug A. | | In message <20220615030833.79F9A9B@slippy.cwsent.com>, Cy Schubert writes: | > In message om> | > , Mateusz Guzik writes: | > > On 6/13/22, Doug Ambrisko wrote: | > > > On Mon, Jun 13, 2022 at 06:43:31PM +0200, Mateusz Guzik wrote: | > > > | On 6/13/22, Doug Ambrisko wrote: | > > > | > The branch main has been updated by ambrisko: | > > > | > | > > > | > URL: | > > > | > | > > > https://cgit.FreeBSD.org/src/commit/?id=6468cd8e0ef9d1d3331e9de26cd2be59b | > c7 | > > 78494 | > > > | > | > > > | > commit 6468cd8e0ef9d1d3331e9de26cd2be59bc778494 | > > > | > Author: Doug Ambrisko | > > > | > AuthorDate: 2022-06-13 14:56:38 +0000 | > > > | > Commit: Doug Ambrisko | > > > | > CommitDate: 2022-06-13 14:56:38 +0000 | > > > | > | > > > | > mount: add vnode usage per file system with mount -v | > > > | > | > > > | > This avoids the need to drop into the ddb to figure out vnode | > > > | > usage per file system. It helps to see if they are or are not | > > > | > being freed. Suggestion to report active vnode count was from | > > > | > kib@ | > > > | > | > > > | > Reviewed by: kib | > > > | > Differential Revision: https://reviews.freebsd.org/D35436 | > > > | > --- | > > > | > sbin/mount/mount.c | 7 +++++++ | > > > | > sys/kern/vfs_mount.c | 12 ++++++++++++ | > > > | > sys/sys/mount.h | 4 +++- | > > > | > 3 files changed, 22 insertions(+), 1 deletion(-) | > > > | > | > > > | > diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c | > > > | > index 79d9d6cb0caf..bd3d0073c474 100644 | > > > | > --- a/sbin/mount/mount.c | > > > | > +++ b/sbin/mount/mount.c | > > > | > @@ -692,6 +692,13 @@ prmount(struct statfs *sfp) | > > > | > xo_emit("{D:, }{Lw:fsid}{:fsid}", fsidbuf); | > > > | > free(fsidbuf); | > > > | > } | > > > | > + if (sfp->f_nvnodelistsize != 0 || sfp->f_avnodecount != | > > 0) { | > > > | > + xo_open_container("vnodes"); | > > > | > + xo_emit("{D:, | > > > | > }{Lwc:vnodes}{Lw:count}{w:count/%ju}{Lw:active}{:active/%ju}", | > > > | > + (uintmax_t)sfp->f_nvnodelistsize, | > > > | > + (uintmax_t)sfp->f_avnodecount); | > > > | > + xo_close_container("vnodes"); | > > > | > + } | > > > | > } | > > > | > xo_emit("{D:)}\n"); | > > > | > } | > > > | > diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c | > > > | > index 71a40fd97a9c..e3818b67e841 100644 | > > > | > --- a/sys/kern/vfs_mount.c | > > > | > +++ b/sys/kern/vfs_mount.c | > > > | > @@ -2610,6 +2610,8 @@ vfs_copyopt(struct vfsoptlist *opts, const char | > > > *name, | > > > | > void *dest, int len) | > > > | > int | > > > | > __vfs_statfs(struct mount *mp, struct statfs *sbp) | > > > | > { | > > > | > + struct vnode *vp; | > > > | > + uint32_t count; | > > > | > | > > > | > /* | > > > | > * Filesystems only fill in part of the structure for updates, | > > we | > > > | > @@ -2624,6 +2626,16 @@ __vfs_statfs(struct mount *mp, struct statfs | > > > *sbp) | > > > | > sbp->f_version = STATFS_VERSION; | > > > | > sbp->f_namemax = NAME_MAX; | > > > | > sbp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK; | > > > | > + sbp->f_nvnodelistsize = mp->mnt_nvnodelistsize; | > > > | > + | > > > | > + count = 0; | > > > | > + MNT_ILOCK(mp); | > > > | > + TAILQ_FOREACH(vp, &mp->mnt_nvnodelist, v_nmntvnodes) { | > > > | > + if (vrefcnt(vp) > 0) /* racy but does not matter */ | > > > | > + count++; | > > > | > + } | > > > | > + MNT_IUNLOCK(mp); | > > > | > + sbp->f_avnodecount = count; | > > > | > | > > > | | > > > | libc uses statfs for dir walk (see gen/fts.c), most notably find | > > > | immediately runs into it. As such the linear scan by default is a | > > > | non-starter. | > > > | | > > > | I don't know if mount is the right place to dump this kind of info to | > > > | begin with, but even so, it should only happen with a dedicated flag. | > > > | | > > > | As statfs does not take any flags on its own, there is no way to | > > > | prevent it from doing the above walk. Perhaps a dedicated sysctl which | > > > | takes mount point id could do the walk instead, when asked. | > > > | | > > > | Short of making the walk optional I'm afraid this will have to be | > > > reverted. | > > > | > > > Just to be clear, this isn't breaking things but is not optimal for | > > > things that don't need this extra info. | > > > | > > | > > It's not "not optimal", it's a significant overhead which taxes | > > frequent users which don't benefit from it. | > | > Indeed this is not optimal. Since this revision NFSv4 performance has | > tanked. An installworld over NFSv4 which used to take approximately 15 | > minutes took all night, not even finishing by morning. The NFS server, a 4 | > core machine, had a load average of 18 with three NFS clients attempting | > installworld with nfsd using over 90% of the cycles on the machine. I was | > able to reproduce the problem by running a series of tar cf /dev/null | > /usr/obj in parallel, on a single NFSv4 client to essentially DoS the NFSv4 | > server. | > | > The workaround was to fall back to NFSv3, which was unaffected by this | > revision. | > | > I reached out to our resident NFS person (rmacklem@) who suggested | > reverting this revision, restoring the network to pre-regression state. | > | > > | > > For more data I plugged dtrace -n 'fbt::__vfs_statfs:entry { | > > @[execname] = count(); }' while package building, then i got tons of | > > hits: | > > [snip] | > > expr 13992 | > > install 14090 | > > dirname 14921 | > > mv 17404 | > > ghc-stage1 17577 | > > grep 18998 | > > xgcc 23832 | > > cpp 29282 | > > cc1 36961 | > > sh 70575 | > > rm 73904 | > > ld.lld 87784 | > > sed 88803 | > > c++ 98175 | > > cat 115811 | > > cc 449725 | > > | > [...] | > > -- | > > Mateusz Guzik | > > | > | > | > -- | > Cheers, | > Cy Schubert | > FreeBSD UNIX: Web: http://www.FreeBSD.org | > NTP: Web: https://nwtime.org | > | > e**(i*pi)+1=0 | > | > |