From owner-svn-src-all@FreeBSD.ORG Sun Sep 22 20:19:22 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 32C5868B; Sun, 22 Sep 2013 20:19:22 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A047D2435; Sun, 22 Sep 2013 20:19:21 +0000 (UTC) Received: from tom.home (kostik@localhost [127.0.0.1]) by kib.kiev.ua (8.14.7/8.14.7) with ESMTP id r8MKJGSo085622; Sun, 22 Sep 2013 23:19:16 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.8.3 kib.kiev.ua r8MKJGSo085622 Received: (from kostik@localhost) by tom.home (8.14.7/8.14.7/Submit) id r8MKJGF7085621; Sun, 22 Sep 2013 23:19:16 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 22 Sep 2013 23:19:16 +0300 From: Konstantin Belousov To: Matthew Fleming Subject: Re: svn commit: r255797 - head/sys/kern Message-ID: <20130922201916.GL41229@kib.kiev.ua> References: <201309221923.r8MJNm3u021657@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="UZ6ltp17Ke3Obxch" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on tom.home Cc: "svn-src-head@freebsd.org" , Attilio Rao , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Sep 2013 20:19:22 -0000 --UZ6ltp17Ke3Obxch Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Sep 22, 2013 at 01:14:21PM -0700, Matthew Fleming wrote: > On Sun, Sep 22, 2013 at 12:23 PM, Konstantin Belousov wr= ote: >=20 > > Author: kib > > Date: Sun Sep 22 19:23:48 2013 > > New Revision: 255797 > > URL: http://svnweb.freebsd.org/changeset/base/255797 > > > > Log: > > Increase the chance of the buffer write from the bufdaemon helper > > context to succeed. If the locked vnode which owns the buffer to be > > written is shared locked, try the non-blocking upgrade of the lock to > > exclusive. > > > > PR: kern/178997 > > Reported and tested by: Klaus Weber < > > fbsd-bugs-2013-1@unix-admin.de> > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > Approved by: re (marius) > > > > Modified: > > head/sys/kern/vfs_bio.c > > > > Modified: head/sys/kern/vfs_bio.c > > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/kern/vfs_bio.c Sun Sep 22 19:15:24 2013 (r25579= 6) > > +++ head/sys/kern/vfs_bio.c Sun Sep 22 19:23:48 2013 (r25579= 7) > > @@ -2624,6 +2624,8 @@ flushbufqueues(struct vnode *lvp, int ta > > int hasdeps; > > int flushed; > > int queue; > > + int error; > > + bool unlock; > > > > flushed =3D 0; > > queue =3D QUEUE_DIRTY; > > @@ -2699,7 +2701,16 @@ flushbufqueues(struct vnode *lvp, int ta > > BUF_UNLOCK(bp); > > continue; > > } > > - if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_CANRECURS= E) > > =3D=3D 0) { > > + if (lvp =3D=3D NULL) { > > + unlock =3D true; > > + error =3D vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT); > > + } else { > > + ASSERT_VOP_LOCKED(vp, "getbuf"); > > + unlock =3D false; > > + error =3D VOP_ISLOCKED(vp) =3D=3D LK_EXCLUSIVE = ? 0 : > > + vn_lock(vp, LK_UPGRADE | LK_NOWAIT); > > >=20 > I don't think this is quite right. >=20 > When the lock is held shared, and VOP_LOCK is implemented by lockmgr(9), > (i.e. all in-tree filesystems?), LK_UPGRADE may drop the lock, and not > reacquire it. This would happen when the vnode is locked shared, the > upgrade fails (2 shared owners), then lockmgr(9) will try to lock EX, whi= ch > will also fail (still one shared owner). The caller's lock is no longer > held. >=20 > Doesn't that scenario (LK_UPGRADE failing) cause problems both for the > caller (unexpected unlock) and for flushbufqueues(), which expects the > vnode lock to be held since lvp is non-NULL? Does it ? If the lock is dropped, the code is indeed in trouble. Please note that LK_NOWAIT is specified for upgrade, and I believe that this causes lockmgr to return with EBUSY without dropping the lock. --UZ6ltp17Ke3Obxch Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (FreeBSD) iQIcBAEBAgAGBQJSP1DDAAoJEJDCuSvBvK1BvdEQAKNEXVW1leB8fpsX8NIbAn4x CGspvlWPta2+UQdnAxh7Z9+Uy2peE9lEHBfC+Hq+OHNH5VcstfACs44/fILxVr0t U7GWX/+XOYWawlP3Y8ui9oYeZ5XlWpMqjrXk60eDNBhw15n/7RS20yfOGZ0SfzCW 5aZ8QljGReSHrUIlL2VaO7dRH28hiB3OUsGMtQCl3wPGM6OlHBWV3IWbsIMXyN3b vJBQAo9HjOj4e9fA3HSrFzTFpsC3O/PSiNB+qsqxnirgzTg0jylWYS5DqyropDc6 gN8LfkV1bZTBM8pfzYaJnMMgpWMTrTdXmyJ8WALD0aGkurlbSvaQ6csgMt3NdL8G 6HOwbZKQIhhhOmIL12WnskLRMTgvqcrlYnRN5TnUHlDV5/99UU0DSuSMFWj978uU IA55I3TTbeVfb4ASvpRcowGY/qWdnM15H2uUNPzZlE2PdbB0runi9tbrk6g79GNV Yd0HOkdeKPpcvvNkqsqYrh8YF5AcXif94UJJmLwRxDV8rWSC3ccp/MU9IfedWaBo BTsQF9EXtbhGrOD6+8cvE03LsPoTGjRvse69/YkaMamw84ktvv6dtPYnmHinrGfV LMgh245v8O0EntVlB76NHrAGaVd+sKLzToHFGByZOOejby+lYAlLMr9fCqgQkCrt oYnPmDosY9C0EKgMrt0f =dfwX -----END PGP SIGNATURE----- --UZ6ltp17Ke3Obxch--