From owner-svn-src-all@FreeBSD.ORG  Sun Oct  4 18:53:10 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A619C1065670;
	Sun,  4 Oct 2009 18:53:10 +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 966C78FC1C;
	Sun,  4 Oct 2009 18:53:10 +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 n94IrAdT082341;
	Sun, 4 Oct 2009 18:53:10 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n94IrAf7082338;
	Sun, 4 Oct 2009 18:53:10 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200910041853.n94IrAf7082338@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 4 Oct 2009 18:53:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197750 - head/sys/vm
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Oct 2009 18:53:10 -0000

Author: alc
Date: Sun Oct  4 18:53:10 2009
New Revision: 197750
URL: http://svn.freebsd.org/changeset/base/197750

Log:
  Align and pad the page queue and free page queue locks so that the linker
  can't possibly place them together within the same cache line.
  
  MFC after:	3 weeks

Modified:
  head/sys/vm/vm_page.c
  head/sys/vm/vm_page.h

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sun Oct  4 17:22:51 2009	(r197749)
+++ head/sys/vm/vm_page.c	Sun Oct  4 18:53:10 2009	(r197750)
@@ -135,8 +135,8 @@ __FBSDID("$FreeBSD$");
  */
 
 struct vpgqueues vm_page_queues[PQ_COUNT];
-struct mtx vm_page_queue_mtx;
-struct mtx vm_page_queue_free_mtx;
+struct vpglocks vm_page_queue_lock;
+struct vpglocks vm_page_queue_free_lock;
 
 vm_page_t vm_page_array = 0;
 int vm_page_array_size = 0;

Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h	Sun Oct  4 17:22:51 2009	(r197749)
+++ head/sys/vm/vm_page.h	Sun Oct  4 18:53:10 2009	(r197750)
@@ -170,7 +170,15 @@ struct vpgqueues {
 };
 
 extern struct vpgqueues vm_page_queues[PQ_COUNT];
-extern struct mtx vm_page_queue_free_mtx;
+
+struct vpglocks {
+	struct mtx	data;
+	char		pad[CACHE_LINE_SIZE - sizeof(struct mtx)];
+} __aligned(CACHE_LINE_SIZE);
+
+extern struct vpglocks vm_page_queue_free_lock;
+
+#define	vm_page_queue_free_mtx	vm_page_queue_free_lock.data
 
 /*
  * These are the flags defined for vm_page.
@@ -258,7 +266,9 @@ PHYS_TO_VM_PAGE(vm_paddr_t pa)
 #endif
 }
 
-extern struct mtx vm_page_queue_mtx;
+extern struct vpglocks vm_page_queue_lock;
+
+#define	vm_page_queue_mtx	vm_page_queue_lock.data
 #define vm_page_lock_queues()   mtx_lock(&vm_page_queue_mtx)
 #define vm_page_unlock_queues() mtx_unlock(&vm_page_queue_mtx)