From owner-svn-src-user@FreeBSD.ORG Thu May 23 14:31:43 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 5D262F2A; Thu, 23 May 2013 14:31:43 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4FFA6790; Thu, 23 May 2013 14:31:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4NEVhJP037565; Thu, 23 May 2013 14:31:43 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4NEVhMw037564; Thu, 23 May 2013 14:31:43 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201305231431.r4NEVhMw037564@svn.freebsd.org> From: Attilio Rao Date: Thu, 23 May 2013 14:31:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r250932 - user/attilio/vmobj-readlock/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Thu, 23 May 2013 14:31:43 -0000 Author: attilio Date: Thu May 23 14:31:42 2013 New Revision: 250932 URL: http://svnweb.freebsd.org/changeset/base/250932 Log: Bring back vm_page_sleep_if_busy() to a single hard-call. 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 Thu May 23 12:24:46 2013 (r250931) +++ user/attilio/vmobj-readlock/sys/vm/vm_page.c Thu May 23 14:31:42 2013 (r250932) @@ -764,6 +764,22 @@ vm_page_readahead_finish(vm_page_t m) } /* + * _vm_page_sleep_onpage: + * + * Sleep and release the page lock, using the page pointer as wchan. + * + * The given page must be locked. + */ +static inline int +_vm_page_sleep_onpage(vm_page_t m, int pri, const char *wmesg, int timo) +{ + + vm_page_lock_assert(m, MA_OWNED); + m->flags |= PG_WANTED; + return (msleep(m, vm_page_lockptr(m), pri | PDROP, wmesg, timo)); +} + +/* * vm_page_sleep_if_busy: * * Sleep and release the page queues lock if VPO_BUSY is set or, @@ -789,7 +805,7 @@ vm_page_sleep_if_busy(vm_page_t m, int a */ obj = m->object; VM_OBJECT_WUNLOCK(obj); - vm_page_sleep(m, msg); + _vm_page_sleep_onpage(m, PVM, msg, 0); VM_OBJECT_WLOCK(obj); return (TRUE); } @@ -799,17 +815,15 @@ vm_page_sleep_if_busy(vm_page_t m, int a /* * vm_page_sleep_onpage: * - * Sleep and release the page lock, using the page pointer as wchan. + * External version of _vm_page_sleep_onpage(). * - * The given page must be locked. + * Check the inline version for comments. */ int vm_page_sleep_onpage(vm_page_t m, int pri, const char *wmesg, int timo) { - vm_page_lock_assert(m, MA_OWNED); - m->flags |= PG_WANTED; - return (msleep(m, vm_page_lockptr(m), pri | PDROP, wmesg, timo)); + return (_vm_page_sleep_onpage(m, pri, wmesg, timo)); } /*