CVS commit: [cherry-xenmp] src/sys/arch/xen/xen

[Cherry G. Mathew]

Module Name:    src
Committed By:   cherry
Date:           Sun Aug 21 11:24:11 UTC 2011

Modified Files:
        src/sys/arch/xen/xen [cherry-xenmp]: if_xennet_xenbus.c
            xennetback_xenbus.c

Log Message:
add locking around mmu flush xpq ops


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.2.1 src/sys/arch/xen/xen/if_xennet_xenbus.c
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/arch/xen/xen/xennetback_xenbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.51 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.51.2.1
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.51	Mon May 30 13:03:56 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c	Sun Aug 21 11:24:10 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: if_xennet_xenbus.c,v 1.51 2011/05/30 13:03:56 joerg Exp $      */
+/*      $NetBSD: if_xennet_xenbus.c,v 1.51.2.1 2011/08/21 11:24:10 cherry Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.51 2011/05/30 13:03:56 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.51.2.1 2011/08/21 11:24:10 cherry Exp $");
 
 #include "opt_xen.h"
 #include "opt_nfs_boot.h"
@@ -663,7 +663,9 @@
 		 * those first!
 		 */
 		s2 = splvm();
+		xpq_queue_lock();
 		xpq_flush_queue();
+		xpq_queue_unlock();		
 		splx(s2);
 		/* now decrease reservation */
 		xenguest_handle(reservation.extent_start) = xennet_pages;

Index: src/sys/arch/xen/xen/xennetback_xenbus.c
diff -u src/sys/arch/xen/xen/xennetback_xenbus.c:1.46 src/sys/arch/xen/xen/xennetback_xenbus.c:1.46.2.1
--- src/sys/arch/xen/xen/xennetback_xenbus.c:1.46	Mon May 30 14:34:58 2011
+++ src/sys/arch/xen/xen/xennetback_xenbus.c	Sun Aug 21 11:24:10 2011
@@ -1,4 +1,4 @@
-/*      $NetBSD: xennetback_xenbus.c,v 1.46 2011/05/30 14:34:58 joerg Exp $      */
+/*      $NetBSD: xennetback_xenbus.c,v 1.46.2.1 2011/08/21 11:24:10 cherry Exp $      */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.46 2011/05/30 14:34:58 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xennetback_xenbus.c,v 1.46.2.1 2011/08/21 11:24:10 cherry Exp $");
 
 #include "opt_xen.h"
 
@@ -1077,7 +1077,9 @@
 			 * we flush those first!
 			 */
 			int svm = splvm();
+			xpq_queue_lock();
 			xpq_flush_queue();
+			xpq_queue_unlock();
 			splx(svm);
 			mclp[-1].args[MULTI_UVMFLAGS_INDEX] =
 			    UVMF_TLB_FLUSH|UVMF_ALL;