From owner-svn-src-user@FreeBSD.ORG Mon Mar 11 17:05:59 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 76BDCE80; Mon, 11 Mar 2013 17:05:59 +0000 (UTC) (envelope-from alc@rice.edu) Received: from pp2.rice.edu (proofpoint2.mail.rice.edu [128.42.201.101]) by mx1.freebsd.org (Postfix) with ESMTP id 41D08F8; Mon, 11 Mar 2013 17:05:58 +0000 (UTC) Received: from pps.filterd (pp2.rice.edu [127.0.0.1]) by pp2.rice.edu (8.14.5/8.14.5) with SMTP id r2BB44Nx018991; Mon, 11 Mar 2013 12:05:58 -0500 Received: from mh2.mail.rice.edu (mh2.mail.rice.edu [128.42.201.21]) by pp2.rice.edu with ESMTP id 1ayt5drtxx-1; Mon, 11 Mar 2013 12:05:57 -0500 X-Virus-Scanned: by amavis-2.7.0 at mh2.mail.rice.edu, auth channel Received: from adsl-216-63-78-18.dsl.hstntx.swbell.net (adsl-216-63-78-18.dsl.hstntx.swbell.net [216.63.78.18]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (Authenticated sender: alc) by mh2.mail.rice.edu (Postfix) with ESMTPSA id 90235500116; Mon, 11 Mar 2013 12:05:57 -0500 (CDT) Message-ID: <513E0EF4.4050304@rice.edu> Date: Mon, 11 Mar 2013 12:05:56 -0500 From: Alan Cox User-Agent: Mozilla/5.0 (X11; FreeBSD i386; rv:17.0) Gecko/20130127 Thunderbird/17.0.2 MIME-Version: 1.0 To: Attilio Rao Subject: Re: svn commit: r248162 - user/attilio/vmobj-readlock/sys/vm References: <201303111350.r2BDoeRI054744@svn.freebsd.org> In-Reply-To: <201303111350.r2BDoeRI054744@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5400 definitions=5800 signatures=585085 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 suspectscore=13 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1111160001 definitions=main-1101130121 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Mar 2013 17:05:59 -0000 On 03/11/2013 08:50, Attilio Rao wrote: > Author: attilio > Date: Mon Mar 11 13:50:40 2013 > New Revision: 248162 > URL: http://svnweb.freebsd.org/changeset/base/248162 > > Log: > The VM_ALLOC_IFCACHED case does not require any object locking as > it will only go through the object page cache and return. > Lookups in the object's page cache are correctly handled by > the vm_page_queue_free_mtx, which will be acquired correctly in this > case. > Relax the locking assertion. > Umm, no. The page is moving from the cache to the rtree. Insertion into the latter requires the object to be write locked. > Sponsored by: EMC / Isilon storage division > > Modified: > user/attilio/vmobj-readlock/sys/vm/vm_page.c > > Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.c > ============================================================================== > --- user/attilio/vmobj-readlock/sys/vm/vm_page.c Mon Mar 11 13:37:18 2013 (r248161) > +++ user/attilio/vmobj-readlock/sys/vm/vm_page.c Mon Mar 11 13:50:40 2013 (r248162) > @@ -1184,7 +1184,7 @@ vm_page_alloc(vm_object_t object, vm_pin > > KASSERT((object != NULL) == ((req & VM_ALLOC_NOOBJ) == 0), > ("vm_page_alloc: inconsistent object/req")); > - if (object != NULL) > + if (object != NULL && (req & VM_ALLOC_IFCACHED) == 0) > VM_OBJECT_ASSERT_WLOCKED(object); > > req_class = req & VM_ALLOC_CLASS_MASK; >