From owner-svn-src-stable-7@FreeBSD.ORG Tue Nov 29 19:49:12 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B7F0106566B; Tue, 29 Nov 2011 19:49:12 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 097E78FC0A; Tue, 29 Nov 2011 19:49:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pATJnBdK064309; Tue, 29 Nov 2011 19:49:11 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pATJnBsS064307; Tue, 29 Nov 2011 19:49:11 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201111291949.pATJnBsS064307@svn.freebsd.org> From: Marius Strobl Date: Tue, 29 Nov 2011 19:49:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228146 - stable/7/sys/sparc64/pci X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Nov 2011 19:49:12 -0000 Author: marius Date: Tue Nov 29 19:49:11 2011 New Revision: 228146 URL: http://svn.freebsd.org/changeset/base/228146 Log: MFC: r227960 Increase the CDMA sync timeout for Schizo bridges to 15 seconds as used by OpenSolaris. One second turned out to be not enough for certain loads while 10 seconds were sufficient. Reported by: Peter Jeremy Modified: stable/7/sys/sparc64/pci/schizo.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/sparc64/pci/schizo.c ============================================================================== --- stable/7/sys/sparc64/pci/schizo.c Tue Nov 29 19:49:09 2011 (r228145) +++ stable/7/sys/sparc64/pci/schizo.c Tue Nov 29 19:49:11 2011 (r228146) @@ -1171,7 +1171,7 @@ schizo_dmamap_sync(bus_dma_tag_t dt, bus ; SCHIZO_PCI_WRITE_8(sc, sc->sc_cdma_clr, INTCLR_RECEIVED); microuptime(&cur); - end.tv_sec = 1; + end.tv_sec = 15; end.tv_usec = 0; timevaladd(&end, &cur); for (; (res = atomic_cmpset_rel_32(&sc->sc_cdma_state, From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 30 17:11:00 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EFE2106566B; Wed, 30 Nov 2011 17:11:00 +0000 (UTC) (envelope-from nonesuch@longcount.org) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id 283C38FC15; Wed, 30 Nov 2011 17:10:59 +0000 (UTC) Received: by eaai12 with SMTP id i12so1363471eaa.13 for ; Wed, 30 Nov 2011 09:10:58 -0800 (PST) MIME-Version: 1.0 Received: by 10.213.14.203 with SMTP id h11mr533967eba.139.1322671705249; Wed, 30 Nov 2011 08:48:25 -0800 (PST) Received: by 10.14.37.136 with HTTP; Wed, 30 Nov 2011 08:48:25 -0800 (PST) X-Originating-IP: [209.66.78.50] In-Reply-To: <20111117183642.GY1455@elvis.mu.org> References: <20111117040109.GU1455@elvis.mu.org> <462306074.1954190.1321506994004.JavaMail.root@erie.cs.uoguelph.ca> <20111117183642.GY1455@elvis.mu.org> Date: Wed, 30 Nov 2011 11:48:25 -0500 Message-ID: From: Mark Saad To: Alfred Perlstein Content-Type: text/plain; charset=UTF-8 Cc: svn-src-stable-7@freebsd.org, src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Rick Macklem , Rick Macklem Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 17:11:00 -0000 On Thu, Nov 17, 2011 at 1:36 PM, Alfred Perlstein wrote: > * Rick Macklem [111116 21:16] wrote: >> Alfred Perlstein wrote: >> > Rick, I have a question, what will happen if the nfs_freesillyrename() >> > call happens when the mount is down? Will it block the >> > taskqueue_thread? >> > >> > If so, it might make more sense to make a taskqueue per mount point. >> > >> > If not, excuse me. :-) >> > >> Well, all nfs_freesillyrename() does is a vrele() on the parent >> directory when the file node's use count has gone to 0. >> I can't think why that would do any RPC, so I don't see a problem? >> If you do see a problem with vrele() on the directory, please let me >> know. >> >> The problem this fixes is a LOR that would occur when the vrele() on >> the directory was done by the thread doing VOP_INACTIVE(), since it >> already has the file vnode lock and the vrele() was locking the parent >> directory. This could cause a fairly rare deadlock. > > Yes, I understand the VFS deadlock. > > I see, I didn't realize the call was against the directory, > thank you for explaining. > > -Alfred Rick Any chance this will make it back into 7.3-RELEASE and 7.4-RELEASE ? -- mark saad | nonesuch@longcount.org From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 30 22:53:48 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FDCE106564A; Wed, 30 Nov 2011 22:53:48 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca [131.104.91.44]) by mx1.freebsd.org (Postfix) with ESMTP id CF0218FC15; Wed, 30 Nov 2011 22:53:46 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap4EAPmy1k6DaFvO/2dsb2JhbABEhQOnFIFyAQEFI1YbDgoCAg0ZAlkGE68BkU+BMII9hh2BFgSIKIwvki4 X-IronPort-AV: E=Sophos;i="4.71,273,1320642000"; d="scan'208";a="147739852" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-jnhn-pri.mail.uoguelph.ca with ESMTP; 30 Nov 2011 17:52:21 -0500 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id C7C15B3F10; Wed, 30 Nov 2011 17:52:21 -0500 (EST) Date: Wed, 30 Nov 2011 17:52:21 -0500 (EST) From: Rick Macklem To: Mark Saad Message-ID: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [172.17.91.201] X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0 (Win)/6.0.10_GA_2692) Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Alfred Perlstein , svn-src-stable-7@freebsd.org, Rick Macklem Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 22:53:48 -0000 Mark Saad wrote: > On Thu, Nov 17, 2011 at 1:36 PM, Alfred Perlstein > wrote: > > * Rick Macklem [111116 21:16] wrote: > >> Alfred Perlstein wrote: > >> > Rick, I have a question, what will happen if the > >> > nfs_freesillyrename() > >> > call happens when the mount is down? Will it block the > >> > taskqueue_thread? > >> > > >> > If so, it might make more sense to make a taskqueue per mount > >> > point. > >> > > >> > If not, excuse me. :-) > >> > > >> Well, all nfs_freesillyrename() does is a vrele() on the parent > >> directory when the file node's use count has gone to 0. > >> I can't think why that would do any RPC, so I don't see a problem? > >> If you do see a problem with vrele() on the directory, please let > >> me > >> know. > >> > >> The problem this fixes is a LOR that would occur when the vrele() > >> on > >> the directory was done by the thread doing VOP_INACTIVE(), since it > >> already has the file vnode lock and the vrele() was locking the > >> parent > >> directory. This could cause a fairly rare deadlock. > > > > Yes, I understand the VFS deadlock. > > > > I see, I didn't realize the call was against the directory, > > thank you for explaining. > > > > -Alfred > Rick > Any chance this will make it back into 7.3-RELEASE and 7.4-RELEASE ? > I'm relatively new to FreeBSD, but I've never heard of an MFC to a Release branch. (As far as I know, if it ever happens, it's for a serious errata or security issue.) Unless I'm incorrect (someone please correct me if I'm wrong), the answer would be no, rick. > > -- > mark saad | nonesuch@longcount.org From owner-svn-src-stable-7@FreeBSD.ORG Wed Nov 30 23:10:03 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 4A7531065676; Wed, 30 Nov 2011 23:10:03 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 90D2314E6AB; Wed, 30 Nov 2011 23:10:02 +0000 (UTC) Message-ID: <4ED6B7CA.7050108@FreeBSD.org> Date: Wed, 30 Nov 2011 15:10:02 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:8.0) Gecko/20111110 Thunderbird/8.0 MIME-Version: 1.0 To: Rick Macklem References: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> X-Enigmail-Version: undefined OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: src-committers@freebsd.org, svn-src-stable@freebsd.org, Mark Saad , Alfred Perlstein , svn-src-stable-7@freebsd.org, Rick Macklem , svn-src-all@freebsd.org Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2011 23:10:03 -0000 On 11/30/2011 14:52, Rick Macklem wrote: > I'm relatively new to FreeBSD, but I've never heard of an MFC to a > Release branch. (As far as I know, if it ever happens, it's for a > serious errata or security issue.) You are correct sir. :) -- "We could put the whole Internet into a book." "Too practical." Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 1 05:49:38 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 026901065679; Thu, 1 Dec 2011 05:49:38 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CBE5B8FC13; Thu, 1 Dec 2011 05:49:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB15nbN4030431; Thu, 1 Dec 2011 05:49:37 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB15nbMA030429; Thu, 1 Dec 2011 05:49:37 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201112010549.pB15nbMA030429@svn.freebsd.org> From: Doug Barton Date: Thu, 1 Dec 2011 05:49:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228168 - stable/7/etc/periodic/daily X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 05:49:38 -0000 Author: dougb Date: Thu Dec 1 05:49:37 2011 New Revision: 228168 URL: http://svn.freebsd.org/changeset/base/228168 Log: MFC r227482: The default setting, daily_accounting_compress="NO", was causing only 1 old file to be saved, so fix this. While I'm here, fix a very old off-by-one error causing 1 more file than specified in daily_accounting_save to be saved because acct.0 was not taken into account (pun intended). Change that, and use a more thorough method of finding old files to delete. Partly just because this is the right thing to do, but also to silently fix the extra log that would have been left behind forever with the previous method. Modified: stable/7/etc/periodic/daily/310.accounting Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/periodic/daily/310.accounting ============================================================================== --- stable/7/etc/periodic/daily/310.accounting Thu Dec 1 05:48:50 2011 (r228167) +++ stable/7/etc/periodic/daily/310.accounting Thu Dec 1 05:49:37 2011 (r228168) @@ -30,8 +30,13 @@ case "$daily_accounting_enable" in cd /var/account rc=0 - n=$daily_accounting_save - rm -f acct.$n.gz acct.$n || rc=3 + n=$(( $daily_accounting_save - 1 )) + for f in acct.*; do + case "$f" in acct.\*) continue ;; esac # No files match + m=${f%.gz} ; m=${m#acct.} + [ $m -ge $n ] && { rm $f || rc=3; } + done + m=$n n=$(($n - 1)) while [ $n -ge 0 ] @@ -44,13 +49,14 @@ case "$daily_accounting_enable" in /etc/rc.d/accounting rotate_log || rc=3 + rm -f acct.merge && cp acct.0 acct.merge || rc=3 + sa -s $daily_accounting_flags /var/account/acct.merge || rc=3 + rm acct.merge + case "$daily_accounting_compress" in [Yy][Ee][Ss]) - gzip --keep -f acct.0 || rc=3;; + gzip -f acct.0 || rc=3;; esac - - sa -s $daily_accounting_flags /var/account/acct.0 && - unlink acct.0 || rc=3 fi;; *) rc=0;; From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 1 05:54:22 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF08710657E3; Thu, 1 Dec 2011 05:54:22 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9DB408FC1C; Thu, 1 Dec 2011 05:54:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB15sMrY030792; Thu, 1 Dec 2011 05:54:22 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB15sMK2030790; Thu, 1 Dec 2011 05:54:22 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201112010554.pB15sMK2030790@svn.freebsd.org> From: Doug Barton Date: Thu, 1 Dec 2011 05:54:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228172 - stable/7/usr.sbin/mergemaster X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 05:54:22 -0000 Author: dougb Date: Thu Dec 1 05:54:22 2011 New Revision: 228172 URL: http://svn.freebsd.org/changeset/base/228172 Log: MFC r228122: If using DESTDIR we need to be sure to create a ${DESTDIR}/var/db/zoneinfo Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/7/usr.sbin/mergemaster/ (props changed) Modified: stable/7/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/7/usr.sbin/mergemaster/mergemaster.sh Thu Dec 1 05:53:30 2011 (r228171) +++ stable/7/usr.sbin/mergemaster/mergemaster.sh Thu Dec 1 05:54:22 2011 (r228172) @@ -1324,14 +1324,14 @@ esac if [ -e "${DESTDIR}/etc/localtime" ]; then # Ignore if TZ == UTC echo '' + [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" if [ -f "${DESTDIR}/var/db/zoneinfo" ]; then echo "*** Reinstalling `cat ${DESTDIR}/var/db/zoneinfo` as ${DESTDIR}/etc/localtime" - [ -n "${DESTDIR}" ] && tzs_args="-C ${DESTDIR}" tzsetup $tzs_args -r else echo "*** There is no ${DESTDIR}/var/db/zoneinfo file to update ${DESTDIR}/etc/localtime." echo ' You should run tzsetup' - run_it_now tzsetup + run_it_now "tzsetup $tzs_args" fi fi From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 1 15:59:57 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FCF41065670; Thu, 1 Dec 2011 15:59:57 +0000 (UTC) (envelope-from nonesuch@longcount.org) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id CF5D18FC08; Thu, 1 Dec 2011 15:59:55 +0000 (UTC) Received: by faak28 with SMTP id k28so2021914faa.13 for ; Thu, 01 Dec 2011 07:59:54 -0800 (PST) MIME-Version: 1.0 Received: by 10.204.128.77 with SMTP id j13mr8118911bks.124.1322755194655; Thu, 01 Dec 2011 07:59:54 -0800 (PST) Received: by 10.223.111.75 with HTTP; Thu, 1 Dec 2011 07:59:54 -0800 (PST) X-Originating-IP: [209.66.78.50] In-Reply-To: <4ED6B7CA.7050108@FreeBSD.org> References: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> <4ED6B7CA.7050108@FreeBSD.org> Date: Thu, 1 Dec 2011 10:59:54 -0500 Message-ID: From: Mark Saad To: Doug Barton Content-Type: text/plain; charset=UTF-8 Cc: svn-src-stable-7@freebsd.org, src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Alfred Perlstein , Rick Macklem , Rick Macklem Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 15:59:57 -0000 On Wed, Nov 30, 2011 at 6:10 PM, Doug Barton wrote: > On 11/30/2011 14:52, Rick Macklem wrote: >> I'm relatively new to FreeBSD, but I've never heard of an MFC to a >> Release branch. (As far as I know, if it ever happens, it's for a >> serious errata or security issue.) > > You are correct sir. :) > So how would I ever see this in an official release as an errata fix ? -- mark saad | nonesuch@longcount.org From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 1 21:42:55 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E49F106567E; Thu, 1 Dec 2011 21:42:55 +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 401E18FC0A; Thu, 1 Dec 2011 21:42:55 +0000 (UTC) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [96.47.65.170]) by cyrus.watson.org (Postfix) with ESMTPSA id E6C6546B0D; Thu, 1 Dec 2011 16:42:54 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 7A00DB941; Thu, 1 Dec 2011 16:42:54 -0500 (EST) From: John Baldwin To: Mark Saad Date: Thu, 1 Dec 2011 16:42:53 -0500 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p8; KDE/4.5.5; amd64; ; ) References: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> <4ED6B7CA.7050108@FreeBSD.org> In-Reply-To: MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201112011642.53968.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 01 Dec 2011 16:42:54 -0500 (EST) Cc: svn-src-stable-7@freebsd.org, src-committers@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Alfred Perlstein , Doug Barton , Rick Macklem , Rick Macklem Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 21:42:55 -0000 On Thursday, December 01, 2011 10:59:54 am Mark Saad wrote: > On Wed, Nov 30, 2011 at 6:10 PM, Doug Barton wrote: > > On 11/30/2011 14:52, Rick Macklem wrote: > >> I'm relatively new to FreeBSD, but I've never heard of an MFC to a > >> Release branch. (As far as I know, if it ever happens, it's for a > >> serious errata or security issue.) > > > > You are correct sir. :) > > > So how would I ever see this in an official release as an errata fix ? At this point you likely won't. The vast majority of patches to releases are only for security advisories. Very few errata are merged back to releases currently. It may be that we are too hesitant to do so, but the manpower overhead of actually getting the changes merged back and getting appropriate folks to sign off on everything is extremely high (and the exact process for getting an EN approved is not very clear or really even documented to my knowledge). -- John Baldwin From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 1 22:33:50 2011 Return-Path: Delivered-To: svn-src-stable-7@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BB6B106567A; Thu, 1 Dec 2011 22:33:50 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 05FC78FC15; Thu, 1 Dec 2011 22:33:48 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id AAA19456; Fri, 02 Dec 2011 00:23:33 +0200 (EET) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1RWF2T-0007nd-E7; Fri, 02 Dec 2011 00:23:33 +0200 Message-ID: <4ED7FE64.9010909@FreeBSD.org> Date: Fri, 02 Dec 2011 00:23:32 +0200 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:8.0) Gecko/20111108 Thunderbird/8.0 MIME-Version: 1.0 To: Mark Saad References: <1769030615.700252.1322693541806.JavaMail.root@erie.cs.uoguelph.ca> <4ED6B7CA.7050108@FreeBSD.org> <201112011642.53968.jhb@freebsd.org> In-Reply-To: <201112011642.53968.jhb@freebsd.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Mailman-Approved-At: Thu, 01 Dec 2011 23:50:26 +0000 Cc: Rick Macklem , John Baldwin , svn-src-stable@FreeBSD.org, svn-src-all@FreeBSD.org, Alfred Perlstein , Doug Barton , src-committers@FreeBSD.org, Rick Macklem , svn-src-stable-7@FreeBSD.org Subject: Re: svn commit: r227549 - stable/7/sys/nfsclient X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Dec 2011 22:33:50 -0000 on 01/12/2011 23:42 John Baldwin said the following: > On Thursday, December 01, 2011 10:59:54 am Mark Saad wrote: >> On Wed, Nov 30, 2011 at 6:10 PM, Doug Barton wrote: >>> On 11/30/2011 14:52, Rick Macklem wrote: >>>> I'm relatively new to FreeBSD, but I've never heard of an MFC to a >>>> Release branch. (As far as I know, if it ever happens, it's for a >>>> serious errata or security issue.) >>> >>> You are correct sir. :) >>> >> So how would I ever see this in an official release as an errata fix ? > > At this point you likely won't. The vast majority of patches to releases are > only for security advisories. Very few errata are merged back to releases > currently. It may be that we are too hesitant to do so, but the manpower > overhead of actually getting the changes merged back and getting appropriate > folks to sign off on everything is extremely high (and the exact process for > getting an EN approved is not very clear or really even documented to my > knowledge). > Just to clarify - the fix will be in the future (official) releases from 8, 9 and so on branches. -- Andriy Gapon From owner-svn-src-stable-7@FreeBSD.ORG Sat Dec 3 17:29:39 2011 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55A37106564A; Sat, 3 Dec 2011 17:29:39 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3B7E38FC15; Sat, 3 Dec 2011 17:29:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pB3HTdGZ049592; Sat, 3 Dec 2011 17:29:39 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB3HTdiN049590; Sat, 3 Dec 2011 17:29:39 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201112031729.pB3HTdiN049590@svn.freebsd.org> From: Alan Cox Date: Sat, 3 Dec 2011 17:29:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228242 - stable/7/sys/vm X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Dec 2011 17:29:39 -0000 Author: alc Date: Sat Dec 3 17:29:38 2011 New Revision: 228242 URL: http://svn.freebsd.org/changeset/base/228242 Log: MFC r226740 Speed up vm_page_cache() and vm_page_remove() by checking for a few common cases that can be handled in constant time. Modified: stable/7/sys/vm/vm_page.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/vm/vm_page.c ============================================================================== --- stable/7/sys/vm/vm_page.c Sat Dec 3 17:17:32 2011 (r228241) +++ stable/7/sys/vm/vm_page.c Sat Dec 3 17:29:38 2011 (r228242) @@ -708,7 +708,7 @@ void vm_page_remove(vm_page_t m) { vm_object_t object; - vm_page_t root; + vm_page_t next, prev, root; if ((object = m->object) == NULL) return; @@ -722,15 +722,42 @@ vm_page_remove(vm_page_t m) /* * Now remove from the object's list of backed pages. */ - if (m != object->root) - vm_page_splay(m->pindex, object->root); - if (m->left == NULL) - root = m->right; - else { - root = vm_page_splay(m->pindex, m->left); - root->right = m->right; + if ((next = TAILQ_NEXT(m, listq)) != NULL && next->left == m) { + /* + * Since the page's successor in the list is also its parent + * in the tree, its right subtree must be empty. + */ + next->left = m->left; + KASSERT(m->right == NULL, + ("vm_page_remove: page %p has right child", m)); + } else if ((prev = TAILQ_PREV(m, pglist, listq)) != NULL && + prev->right == m) { + /* + * Since the page's predecessor in the list is also its parent + * in the tree, its left subtree must be empty. + */ + KASSERT(m->left == NULL, + ("vm_page_remove: page %p has left child", m)); + prev->right = m->right; + } else { + if (m != object->root) + vm_page_splay(m->pindex, object->root); + if (m->left == NULL) + root = m->right; + else if (m->right == NULL) + root = m->left; + else { + /* + * Move the page's successor to the root, because + * pages are usually removed in ascending order. + */ + if (m->right != next) + vm_page_splay(m->pindex, m->right); + next->left = m->left; + root = next; + } + object->root = root; } - object->root = root; TAILQ_REMOVE(&object->memq, m, listq); /* @@ -1664,7 +1691,7 @@ void vm_page_cache(vm_page_t m) { vm_object_t object; - vm_page_t root; + vm_page_t next, prev, root; mtx_assert(&vm_page_queue_mtx, MA_OWNED); object = m->object; @@ -1700,15 +1727,42 @@ vm_page_cache(vm_page_t m) * Remove the page from the object's collection of resident * pages. */ - if (m != object->root) - vm_page_splay(m->pindex, object->root); - if (m->left == NULL) - root = m->right; - else { - root = vm_page_splay(m->pindex, m->left); - root->right = m->right; + if ((next = TAILQ_NEXT(m, listq)) != NULL && next->left == m) { + /* + * Since the page's successor in the list is also its parent + * in the tree, its right subtree must be empty. + */ + next->left = m->left; + KASSERT(m->right == NULL, + ("vm_page_cache: page %p has right child", m)); + } else if ((prev = TAILQ_PREV(m, pglist, listq)) != NULL && + prev->right == m) { + /* + * Since the page's predecessor in the list is also its parent + * in the tree, its left subtree must be empty. + */ + KASSERT(m->left == NULL, + ("vm_page_cache: page %p has left child", m)); + prev->right = m->right; + } else { + if (m != object->root) + vm_page_splay(m->pindex, object->root); + if (m->left == NULL) + root = m->right; + else if (m->right == NULL) + root = m->left; + else { + /* + * Move the page's successor to the root, because + * pages are usually removed in ascending order. + */ + if (m->right != next) + vm_page_splay(m->pindex, m->right); + next->left = m->left; + root = next; + } + object->root = root; } - object->root = root; TAILQ_REMOVE(&object->memq, m, listq); object->resident_page_count--; object->generation++;