From owner-freebsd-fs@FreeBSD.ORG Wed Feb 23 19:32:40 2011 Return-Path: Delivered-To: fs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3E06106566B for ; Wed, 23 Feb 2011 19:32:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 8617B8FC1D for ; Wed, 23 Feb 2011 19:32:40 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 3EE7846B06; Wed, 23 Feb 2011 14:32:40 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.10]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 618DC8A009; Wed, 23 Feb 2011 14:32:39 -0500 (EST) From: John Baldwin To: gnehzuil gnehzuil Date: Wed, 23 Feb 2011 14:32:38 -0500 User-Agent: KMail/1.13.5 (FreeBSD/7.4-CBSD-20110107; KDE/4.4.5; amd64; ; ) References: <201102230811.32864.jhb@freebsd.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201102231432.38902.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Wed, 23 Feb 2011 14:32:39 -0500 (EST) X-Virus-Scanned: clamav-milter 0.96.3 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=0.5 required=4.2 tests=BAYES_00,MAY_BE_FORGED, RDNS_DYNAMIC autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on bigwig.baldwin.cx Cc: "Pedro F. Giffuni" , fs@freebsd.org Subject: Re: Simple ext2fs allocation routine cleanups X-BeenThere: freebsd-fs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Filesystems List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 19:32:40 -0000 On Wednesday, February 23, 2011 11:35:33 am gnehzuil gnehzuil wrote: > Hi John, > > I use dbench program to do some tests for your changes. However, it causes > kernel crash. The error is as follows: > > panic: __lockmgr_args: recursing on non recursive lockmgr ext2fs @ > /usr/src/sys/kern/vfs_subr.c:2124 I wasn't able to reproduce that, but I did have silly off-by-one bugs in the use of ffs() that should be fixed now: Index: ext2_alloc.c =================================================================== --- ext2_alloc.c (revision 218975) +++ ext2_alloc.c (working copy) @@ -815,16 +815,12 @@ ext2_nodealloccg(struct inode *ip, int cg, daddr_t } } i = start + len - loc; - map = ibp[i]; - ipref = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, ipref++) { - if ((map & i) == 0) { - goto gotit; - } + map = ibp[i] ^ 0xff; + if (map == 0) { + printf("fs = %s\n", fs->e2fs_fsmnt); + panic("ext2fs_nodealloccg: block not in map"); } - printf("fs = %s\n", fs->e2fs_fsmnt); - panic("ext2fs_nodealloccg: block not in map"); - /* NOTREACHED */ + ipref = i * NBBY + ffs(map) - 1; gotit: setbit(ibp, ipref); EXT2_LOCK(ump); @@ -952,7 +948,6 @@ ext2_vfree(pvp, ino, mode) static daddr_t ext2_mapsearch(struct m_ext2fs *fs, char *bbp, daddr_t bpref) { - daddr_t bno; int start, len, loc, i, map; /* @@ -977,15 +972,12 @@ ext2_mapsearch(struct m_ext2fs *fs, char *bbp, dad } } i = start + len - loc; - map = bbp[i]; - bno = i * NBBY; - for (i = 1; i < (1 << NBBY); i <<= 1, bno++) { - if ((map & i) == 0) - return (bno); + map = bbp[i] ^ 0xff; + if (map == 0) { + printf("fs = %s\n", fs->e2fs_fsmnt); + panic("ext2fs_mapsearch: block not in map"); } - printf("fs = %s\n", fs->e2fs_fsmnt); - panic("ext2fs_mapsearch: block not in map"); - /* NOTREACHED */ + return (i * NBBY + ffs(map) - 1); } /* -- John Baldwin