From owner-svn-src-user@FreeBSD.ORG Thu Mar 11 23:27:17 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B476106566B; Thu, 11 Mar 2010 23:27:17 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E443F8FC0C; Thu, 11 Mar 2010 23:27:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2BNRGtT059799; Thu, 11 Mar 2010 23:27:16 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2BNRGtr059796; Thu, 11 Mar 2010 23:27:16 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201003112327.o2BNRGtr059796@svn.freebsd.org> From: Kip Macy Date: Thu, 11 Mar 2010 23:27:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205053 - in user/kmacy/head_page_lock/sys: amd64/include vm X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 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, 11 Mar 2010 23:27:17 -0000 Author: kmacy Date: Thu Mar 11 23:27:16 2010 New Revision: 205053 URL: http://svn.freebsd.org/changeset/base/205053 Log: alias page lock to page queue lock for architectures with pmaps without page lock Modified: user/kmacy/head_page_lock/sys/amd64/include/vmparam.h user/kmacy/head_page_lock/sys/vm/vm_page.h Modified: user/kmacy/head_page_lock/sys/amd64/include/vmparam.h ============================================================================== --- user/kmacy/head_page_lock/sys/amd64/include/vmparam.h Thu Mar 11 23:05:13 2010 (r205052) +++ user/kmacy/head_page_lock/sys/amd64/include/vmparam.h Thu Mar 11 23:27:16 2010 (r205053) @@ -88,6 +88,12 @@ #define UMA_MD_SMALL_ALLOC /* + * We support hashing pages to an entry in array of locks on amd64 + */ + +#define VM_PAGE_LOCK + +/* * The physical address space is densely populated. */ #define VM_PHYSSEG_DENSE Modified: user/kmacy/head_page_lock/sys/vm/vm_page.h ============================================================================== --- user/kmacy/head_page_lock/sys/vm/vm_page.h Thu Mar 11 23:05:13 2010 (r205052) +++ user/kmacy/head_page_lock/sys/vm/vm_page.h Thu Mar 11 23:27:16 2010 (r205053) @@ -273,11 +273,20 @@ extern struct vpglocks vm_page_queue_loc #define vm_page_unlock_queues() mtx_unlock(&vm_page_queue_mtx) #define vm_page_trylock_queues() mtx_trylock(&vm_page_queue_mtx) +#ifdef VM_PAGE_LOCK #define vm_page_lockptr(m) pmap_page_lockptr(m) #define vm_page_lock(m) mtx_lock(vm_page_lockptr((m))) #define vm_page_unlock(m) mtx_unlock(vm_page_lockptr((m))) #define vm_page_trylock(m) mtx_trylock(vm_page_lockptr((m))) #define vm_page_lock_assert(m, a) mtx_assert(vm_page_lockptr((m)), (a)) +#else +#define vm_page_lockptr(m) (&vm_page_queue_mtx) +#define vm_page_lock(m) mtx_lock(vm_page_lockptr((m))) +#define vm_page_unlock(m) mtx_unlock(vm_page_lockptr((m))) +#define vm_page_trylock(m) mtx_trylock(vm_page_lockptr((m))) +#define vm_page_lock_assert(m, a) mtx_assert(vm_page_lockptr((m)), (a)) +#endif + #if PAGE_SIZE == 4096 #define VM_PAGE_BITS_ALL 0xffu