From owner-svn-src-all@freebsd.org Sat Jan 9 21:21:15 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9EE8FA6A911 for ; Sat, 9 Jan 2016 21:21:15 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com [IPv6:2a00:1450:400c:c09::22b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 37A45106C for ; Sat, 9 Jan 2016 21:21:15 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-wm0-x22b.google.com with SMTP id l65so171055919wmf.1 for ; Sat, 09 Jan 2016 13:21:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=y8yy+FcAdQmHbi6DkCXtAv22IYTP76uj0BORp7VRJcQ=; b=aPCa1QMRX5i5YkLdnqHoSz9ibERGnXdD86kwWSFTPXiKR+BK5vX3bc57g+teS6Ou5r /c34MH6uKh44j/nfT+PLyPzjpkFjJYARcZSDHE1gPPfKJ2vM7RcXvNC9bDqhdaR/BzT/ IBjPcj8zFwa8gW4KWWDpnFb9I0AlnMBqPTBUJ1KpR6I7ULvUbY3ZNeLa8tpHA2HXKlLs f0dvErz8amCzt62t/YSI/WYjoTF3a3DDzmThRs0EcuUVHr6V5GzlcoyAUgF29+bPBIFe vD32dkMWfsTbiLVMW6Wea7cGYBnTOg/YB+yjt5FtBo42InUjHvwWOjlmBgrhqasTa1/f yWLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=y8yy+FcAdQmHbi6DkCXtAv22IYTP76uj0BORp7VRJcQ=; b=LGXpCYTqqPIIHp2UpAi+BkV0moGBj2GSMxbjRt4z80MBs8NjU9fO37CsRxc3TUyOMH xBFz9iJameEH0RU4eOEtm96LmhEiAJSLhmzZWpHr/HJAJwYI1Djv5zidRzZpqWHZGyYF avV36sBbydvY9rq1VbCYyKNyMW5Zffe9f4+JCBCAEgAEh7cEwhBjyw6odeppAs6MRLiA 5EwVawgm5tRuZdGHfqc0PAzQ5telDnAY1FLC67zzukAr7lIsnScBTaHV1MhWOgs8OR/3 4UGEfM3LiZv09cU7gDaX6BioYoxawxZtxtnCIbgLcRe6uuGlo1Hr3jsE3MqIre3CtWc7 EW4g== X-Gm-Message-State: ALoCoQkYl79WitTmJ0HBhsf8lfL1V4cIWutaxd9o4Uu6cqKq6VeUTYUatqQuOLN/+Veww23HMok/J/WgFW/fn5P3h615w76zntdF1QN6yToB5sIrhwa8gZY= MIME-Version: 1.0 X-Received: by 10.28.176.133 with SMTP id z127mr5826264wme.22.1452374472839; Sat, 09 Jan 2016 13:21:12 -0800 (PST) Received: by 10.194.85.167 with HTTP; Sat, 9 Jan 2016 13:21:12 -0800 (PST) In-Reply-To: <201601051448.u05Eme83057405@repo.freebsd.org> References: <201601051448.u05Eme83057405@repo.freebsd.org> Date: Sat, 9 Jan 2016 22:21:12 +0100 Message-ID: Subject: Re: svn commit: r293197 - head/sys/kern From: Oliver Pinter To: Konstantin Belousov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 09 Jan 2016 21:21:15 -0000 On 1/5/16, Konstantin Belousov wrote: > Author: kib > Date: Tue Jan 5 14:48:40 2016 > New Revision: 293197 > URL: https://svnweb.freebsd.org/changeset/base/293197 > > Log: > Two fixes for excessive iterations after r292326. > > Advance the logical block number to the lblkno of the found block plus > one, instead of incrementing the block number which was used for > lookup. This change skips sparcely populated buffer ranges, similar > to r292325, instead of doing useless lookups. > > Do not restart the bnoreuselist() from the start of the range if > buffer lock cannot be obtained without sleep. Only retry lookup and > lock for the same queue and same logical block number. > > Reported by: benno > Tested by: pho > Sponsored by: The FreeBSD Foundation > MFC after: 3 days Hi Konstantin! How do you plan to MFC this commit? Only by itself or together with r293059? > > Modified: > head/sys/kern/vfs_default.c > head/sys/kern/vfs_subr.c > > Modified: head/sys/kern/vfs_default.c > ============================================================================== > --- head/sys/kern/vfs_default.c Tue Jan 5 14:21:02 2016 (r293196) > +++ head/sys/kern/vfs_default.c Tue Jan 5 14:48:40 2016 (r293197) > @@ -1080,15 +1080,9 @@ vop_stdadvise(struct vop_advise_args *ap > bsize = vp->v_bufobj.bo_bsize; > startn = ap->a_start / bsize; > endn = ap->a_end / bsize; > - for (;;) { > - error = bnoreuselist(&bo->bo_clean, bo, startn, endn); > - if (error == EAGAIN) > - continue; > + error = bnoreuselist(&bo->bo_clean, bo, startn, endn); > + if (error == 0) > error = bnoreuselist(&bo->bo_dirty, bo, startn, endn); > - if (error == EAGAIN) > - continue; > - break; > - } > BO_RUNLOCK(bo); > VOP_UNLOCK(vp, 0); > break; > > Modified: head/sys/kern/vfs_subr.c > ============================================================================== > --- head/sys/kern/vfs_subr.c Tue Jan 5 14:21:02 2016 (r293196) > +++ head/sys/kern/vfs_subr.c Tue Jan 5 14:48:40 2016 (r293197) > @@ -1669,7 +1669,8 @@ bnoreuselist(struct bufv *bufv, struct b > > ASSERT_BO_LOCKED(bo); > > - for (lblkno = startn;; lblkno++) { > + for (lblkno = startn;;) { > +again: > bp = BUF_PCTRIE_LOOKUP_GE(&bufv->bv_root, lblkno); > if (bp == NULL || bp->b_lblkno >= endn) > break; > @@ -1677,11 +1678,14 @@ bnoreuselist(struct bufv *bufv, struct b > LK_INTERLOCK, BO_LOCKPTR(bo), "brlsfl", 0, 0); > if (error != 0) { > BO_RLOCK(bo); > - return (error != ENOLCK ? error : EAGAIN); > + if (error == ENOLCK) > + goto again; > + return (error); > } > KASSERT(bp->b_bufobj == bo, > ("bp %p wrong b_bufobj %p should be %p", > bp, bp->b_bufobj, bo)); > + lblkno = bp->b_lblkno + 1; > if ((bp->b_flags & B_MANAGED) == 0) > bremfree(bp); > bp->b_flags |= B_RELBUF; > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >