From owner-svn-src-head@FreeBSD.ORG  Fri Dec 31 17:39:31 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BAEAB106567A;
	Fri, 31 Dec 2010 17:39:31 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AA1058FC08;
	Fri, 31 Dec 2010 17:39:31 +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 oBVHdVUU083482;
	Fri, 31 Dec 2010 17:39:31 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBVHdVvo083480;
	Fri, 31 Dec 2010 17:39:31 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <201012311739.oBVHdVvo083480@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 31 Dec 2010 17:39:31 +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: r216843 - head/sys/i386/xen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Dec 2010 17:39:31 -0000

Author: cperciva
Date: Fri Dec 31 17:39:31 2010
New Revision: 216843
URL: http://svn.freebsd.org/changeset/base/216843

Log:
  Make i386_set_ldt work on i386/XEN, step 1/5.
  
  Lock the vm page queue mutex around calls to pte_store.  As with many other
  uses of the vm page queue mutex in i386/xen/pmap.c, this is bogus and needs
  to be replaced at some future date by a spin lock dedicated to protecting
  the queue of pending xen page mapping hypervisor calls.  (But for now, bogus
  locking is better than a panic.)
  
  MFC after:	3 days

Modified:
  head/sys/i386/xen/pmap.c

Modified: head/sys/i386/xen/pmap.c
==============================================================================
--- head/sys/i386/xen/pmap.c	Fri Dec 31 15:16:18 2010	(r216842)
+++ head/sys/i386/xen/pmap.c	Fri Dec 31 17:39:31 2010	(r216843)
@@ -3647,7 +3647,9 @@ pmap_map_readonly(pmap_t pmap, vm_offset
 	for (i = 0; i < npages; i++) {
 		pt_entry_t *pte;
 		pte = pmap_pte(pmap, (vm_offset_t)(va + i*PAGE_SIZE));
+		vm_page_lock_queues();
 		pte_store(pte, xpmap_mtop(*pte & ~(PG_RW|PG_M)));
+		vm_page_unlock_queues();
 		PMAP_MARK_PRIV(xpmap_mtop(*pte));
 		pmap_pte_release(pte);
 	}
@@ -3661,7 +3663,9 @@ pmap_map_readwrite(pmap_t pmap, vm_offse
 		pt_entry_t *pte;
 		pte = pmap_pte(pmap, (vm_offset_t)(va + i*PAGE_SIZE));
 		PMAP_MARK_UNPRIV(xpmap_mtop(*pte));
+		vm_page_lock_queues();
 		pte_store(pte, xpmap_mtop(*pte) | (PG_RW|PG_M));
+		vm_page_unlock_queues();
 		pmap_pte_release(pte);
 	}
 }