From owner-freebsd-current@FreeBSD.ORG Sun Apr 2 20:48:57 2006 Return-Path: X-Original-To: current@freebsd.org Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 75BA916A401; Sun, 2 Apr 2006 20:48:57 +0000 (UTC) (envelope-from Tor.Egge@cvsup.no.freebsd.org) Received: from pil.idi.ntnu.no (pil.idi.ntnu.no [129.241.107.93]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40A7343D53; Sun, 2 Apr 2006 20:48:54 +0000 (GMT) (envelope-from Tor.Egge@cvsup.no.freebsd.org) Received: from cvsup.no.freebsd.org (c2h5oh.idi.ntnu.no [129.241.103.69]) by pil.idi.ntnu.no (8.13.6/8.13.1) with ESMTP id k32KmqGU029007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sun, 2 Apr 2006 22:48:53 +0200 (MEST) Received: from localhost (localhost [127.0.0.1]) by cvsup.no.freebsd.org (8.13.4/8.13.4) with ESMTP id k32KmqtG098988; Sun, 2 Apr 2006 20:48:52 GMT (envelope-from Tor.Egge@cvsup.no.freebsd.org) Date: Sun, 02 Apr 2006 20:48:51 +0000 (UTC) Message-Id: <20060402.204851.78799557.Tor.Egge@cvsup.no.freebsd.org> To: peter@holm.cc From: Tor Egge In-Reply-To: <20060402190910.GA12759@peter.osted.lan> References: <20060402094431.GA81954@peter.osted.lan> <20060402.180153.74658240.Tor.Egge@cvsup.no.freebsd.org> <20060402190910.GA12759@peter.osted.lan> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Sun_Apr__2_20:48:51_2006_162)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned-By: mimedefang.idi.ntnu.no, using CLAMD X-SMTP-From: Sender=, Relay/Client=c2h5oh.idi.ntnu.no [129.241.103.69], EHLO=cvsup.no.freebsd.org X-Scanned-By: MIMEDefang 2.48 on 129.241.107.38 X-Scanned-By: mimedefang.idi.ntnu.no, using MIMEDefang 2.48 with local filter 16.42-idi X-Filter-Time: 0 seconds Cc: truckman@freebsd.org, current@freebsd.org Subject: Re: Livelock / softdep_flush "loop" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2006 20:48:57 -0000 ----Next_Part(Sun_Apr__2_20:48:51_2006_162)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit > > The enclosed patch might help. > > > > I'm testing it right now. Similarly to the softdepflush process looping in softdep_flush(), the process creating a snapshot might loop in ffs_sync(). - Tor Egge ----Next_Part(Sun_Apr__2_20:48:51_2006_162)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="softdep2.diff2" Index: sys/ufs/ffs/ffs_softdep.c =================================================================== RCS file: /home/ncvs/src/sys/ufs/ffs/ffs_softdep.c,v retrieving revision 1.193 diff -u -r1.193 ffs_softdep.c --- sys/ufs/ffs/ffs_softdep.c 12 Mar 2006 05:25:16 -0000 1.193 +++ sys/ufs/ffs/ffs_softdep.c 2 Apr 2006 20:20:15 -0000 @@ -718,6 +718,7 @@ { struct mount *nmp; struct mount *mp; + struct ufsmount *ump; struct thread *td; int remaining; int vfslocked; @@ -752,7 +753,9 @@ continue; vfslocked = VFS_LOCK_GIANT(mp); softdep_process_worklist(mp, 0); - remaining += VFSTOUFS(mp)->softdep_on_worklist; + ump = VFSTOUFS(mp); + remaining += ump->softdep_on_worklist - + ump->softdep_on_worklist_inprogress; VFS_UNLOCK_GIANT(vfslocked); mtx_lock(&mountlist_mtx); nmp = TAILQ_NEXT(mp, mnt_list); @@ -914,11 +917,17 @@ if ((flags & LK_NOWAIT) == 0 || wk->wk_type != D_DIRREM) break; wk->wk_state |= INPROGRESS; + ump->softdep_on_worklist_inprogress++; FREE_LOCK(&lk); ffs_vget(mp, WK_DIRREM(wk)->dm_oldinum, LK_NOWAIT | LK_EXCLUSIVE, &vp); ACQUIRE_LOCK(&lk); wk->wk_state &= ~INPROGRESS; + if (--ump->softdep_on_worklist_inprogress == 0 && + ump->softdep_on_worklist_inprogress_req != 0) { + ump->softdep_on_worklist_inprogress_req = 0; + wakeup(&ump->softdep_on_worklist_inprogress); + } if (vp != NULL) break; } @@ -6099,6 +6108,17 @@ VI_LOCK(devvp); continue; } + if (ump->softdep_on_worklist_inprogress != 0) { + VI_UNLOCK(devvp); + ump->softdep_on_worklist_inprogress_req = 1; + msleep(&ump->softdep_on_worklist_inprogress, + &lk, + (PUSER - 1) | PDROP, + "sdipdr" /* soft dep in progress drain */, + 0); + VI_LOCK(devvp); + continue; + } if (!MNT_ITRYLOCK(mp)) { FREE_LOCK(&lk); VI_UNLOCK(devvp); Index: sys/ufs/ufs/ufsmount.h =================================================================== RCS file: /home/ncvs/src/sys/ufs/ufs/ufsmount.h,v retrieving revision 1.36 diff -u -r1.36 ufsmount.h --- sys/ufs/ufs/ufsmount.h 8 Mar 2006 23:43:39 -0000 1.36 +++ sys/ufs/ufs/ufsmount.h 2 Apr 2006 20:20:15 -0000 @@ -76,6 +76,8 @@ struct workhead softdep_workitem_pending; /* softdep work queue */ struct worklist *softdep_worklist_tail; /* Tail pointer for above */ int softdep_on_worklist; /* Items on the worklist */ + int softdep_on_worklist_inprogress; /* Busy items on worklist */ + int softdep_on_worklist_inprogress_req;/* Wakeup when not busy */ int softdep_deps; /* Total dependency count */ int softdep_accdeps; /* accumulated dep count */ int softdep_req; /* Wakeup when deps hits 0. */ ----Next_Part(Sun_Apr__2_20:48:51_2006_162)----