CVS commit: src/sys/arch/xen/x86

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Wed May  6 19:47:05 UTC 2020

Modified Files:
        src/sys/arch/xen/x86: x86_xpmap.c xenfunc.c

Log Message:
xpq_queue_* use per-cpu queue; splvm() is enough to protect them.
remove the XXX SMP comments.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/xen/x86/x86_xpmap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/xen/x86/xenfunc.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/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.87 src/sys/arch/xen/x86/x86_xpmap.c:1.88
--- src/sys/arch/xen/x86/x86_xpmap.c:1.87	Wed May  6 17:28:26 2020
+++ src/sys/arch/xen/x86/x86_xpmap.c	Wed May  6 19:47:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_xpmap.c,v 1.87 2020/05/06 17:28:26 bouyer Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.88 2020/05/06 19:47:05 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.87 2020/05/06 17:28:26 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_xpmap.c,v 1.88 2020/05/06 19:47:05 bouyer Exp $");
 
 #include "opt_xen.h"
 #include "opt_ddb.h"
@@ -182,7 +182,7 @@ xen_set_ldt(vaddr_t base, uint32_t entri
 		ptp = kvtopte(va);
 		pmap_pte_clearbits(ptp, PTE_W);
 	}
-	s = splvm(); /* XXXSMP */
+	s = splvm();
 	xpq_queue_set_ldt(base, entries);
 	splx(s);
 }
@@ -938,14 +938,14 @@ void
 xen_set_user_pgd(paddr_t page)
 {
 	struct mmuext_op op;
-	int s = splvm(); /* XXXSMP */
 
+	int s = splvm();
 	xpq_flush_queue();
+	splx(s);
 	op.cmd = MMUEXT_NEW_USER_BASEPTR;
 	op.arg1.mfn = xpmap_ptom_masked(page) >> PAGE_SHIFT;
 	if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0)
 		panic("xen_set_user_pgd: failed to install new user page"
 			" directory %#" PRIxPADDR, page);
-	splx(s);
 }
 #endif /* __x86_64__ */

Index: src/sys/arch/xen/x86/xenfunc.c
diff -u src/sys/arch/xen/x86/xenfunc.c:1.27 src/sys/arch/xen/x86/xenfunc.c:1.28
--- src/sys/arch/xen/x86/xenfunc.c:1.27	Sat Apr 25 15:26:17 2020
+++ src/sys/arch/xen/x86/xenfunc.c	Wed May  6 19:47:05 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenfunc.c,v 1.27 2020/04/25 15:26:17 bouyer Exp $	*/
+/*	$NetBSD: xenfunc.c,v 1.28 2020/05/06 19:47:05 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2004 Christian Limpach.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.27 2020/04/25 15:26:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenfunc.c,v 1.28 2020/05/06 19:47:05 bouyer Exp $");
 
 #include <sys/param.h>
 
@@ -144,7 +144,7 @@ rcr0(void)
 void
 lcr3(register_t val)
 {
-	int s = splvm(); /* XXXSMP */
+	int s = splvm();
 	xpq_queue_pt_switch(xpmap_ptom_masked(val));
 	splx(s);
 }
@@ -153,7 +153,7 @@ lcr3(register_t val)
 void
 tlbflush(void)
 {
-	int s = splvm(); /* XXXSMP */
+	int s = splvm();
 	xpq_queue_tlb_flush();
 	splx(s);
 }