From nobody Sat Sep 17 20:26:56 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 4MVMtK6g6hz4cLr9; Sat, 17 Sep 2022 20:27: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 4MVMtK0T2dz3x22; Sat, 17 Sep 2022 20:27:04 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 28HKQum8012497 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 17 Sep 2022 23:26:59 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 28HKQu13012496; Sat, 17 Sep 2022 23:26:56 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 17 Sep 2022 23:26:56 +0300 From: Konstantin Belousov To: Mateusz Guzik Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9e4f35ac2553 - main - vfs: deperl msleep flag calculation in vn_start_*write Message-ID: References: <202209171542.28HFgcWG076519@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202209171542.28HFgcWG076519@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=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on tom.home X-Rspamd-Queue-Id: 4MVMtK0T2dz3x22 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com X-Spamd-Result: default: False [-2.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.995]; NEURAL_HAM_SHORT(-0.99)[-0.993]; NEURAL_HAM_LONG(-0.99)[-0.989]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; 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)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCPT_COUNT_THREE(0.00)[4]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FREEMAIL_FROM(0.00)[gmail.com]; HAS_XAW(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-ThisMailContainsUnwantedMimeParts: N On Sat, Sep 17, 2022 at 03:42:38PM +0000, Mateusz Guzik wrote: > The branch main has been updated by mjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=9e4f35ac25538fb426c459400f0c36e085546ffa > > commit 9e4f35ac25538fb426c459400f0c36e085546ffa > Author: Mateusz Guzik > AuthorDate: 2022-09-17 15:17:20 +0000 > Commit: Mateusz Guzik > CommitDate: 2022-09-17 15:17:20 +0000 > > vfs: deperl msleep flag calculation in vn_start_*write > --- > sys/kern/vfs_vnops.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c > index 2e39d8a9e4d2..a7ca547f571f 100644 > --- a/sys/kern/vfs_vnops.c > +++ b/sys/kern/vfs_vnops.c > @@ -1875,8 +1875,12 @@ vn_start_write_refed(struct mount *mp, int flags, bool mplocked) > */ > if ((curthread->td_pflags & TDP_IGNSUSP) == 0 || > mp->mnt_susp_owner != curthread) { > - mflags = ((mp->mnt_vfc->vfc_flags & VFCF_SBDRY) != 0 ? > - (flags & PCATCH) : 0) | (PUSER - 1); Original expression is much more concise and in fact easier to read. > + mflags = 0; > + if ((mp->mnt_vfc->vfc_flags & VFCF_SBDRY) != 0) { > + if (flags & PCATCH) if ((flags & PCATCH) != 0) > + mflags |= PCATCH; > + } > + mflags |= (PUSER - 1); Extra () > while ((mp->mnt_kern_flag & MNTK_SUSPEND) != 0) { > if (flags & V_NOWAIT) { > error = EWOULDBLOCK; > @@ -1944,7 +1948,7 @@ int > vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) > { > struct mount *mp; > - int error; > + int error, mflags; > > retry: > if (vp != NULL) { > @@ -1986,9 +1990,13 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) > /* > * Wait for the suspension to finish. > */ > - error = msleep(&mp->mnt_flag, MNT_MTX(mp), (PUSER - 1) | PDROP | > - ((mp->mnt_vfc->vfc_flags & VFCF_SBDRY) != 0 ? (flags & PCATCH) : 0), > - "suspfs", 0); > + mflags = 0; > + if ((mp->mnt_vfc->vfc_flags & VFCF_SBDRY) != 0) { > + if (flags & PCATCH) != 0 > + mflags |= PCATCH; > + } > + mflags |= (PUSER - 1) | PDROP; > + error = msleep(&mp->mnt_flag, MNT_MTX(mp), mflags, "suspfs", 0); > vfs_rel(mp); > if (error == 0) > goto retry;