Module Name: src
Committed By: ad
Date: Tue Jan 7 13:20:18 UTC 2020
Modified Files:
src/sys/arch/xen/x86: xen_pmap.c
Log Message:
pmap_extract_ma(): don't need to take pm_lock for pmap_kernel().
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/xen/x86/xen_pmap.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/xen_pmap.c
diff -u src/sys/arch/xen/x86/xen_pmap.c:1.35 src/sys/arch/xen/x86/xen_pmap.c:1.36
--- src/sys/arch/xen/x86/xen_pmap.c:1.35 Sat Jan 4 22:49:20 2020
+++ src/sys/arch/xen/x86/xen_pmap.c Tue Jan 7 13:20:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_pmap.c,v 1.35 2020/01/04 22:49:20 ad Exp $ */
+/* $NetBSD: xen_pmap.c,v 1.36 2020/01/07 13:20:18 ad Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.35 2020/01/04 22:49:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_pmap.c,v 1.36 2020/01/07 13:20:18 ad Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -214,7 +214,9 @@ pmap_extract_ma(struct pmap *pmap, vaddr
struct pmap *pmap2;
int lvl;
- mutex_enter(&pmap->pm_lock);
+ if (pmap != pmap_kernel()) {
+ mutex_enter(&pmap->pm_lock);
+ }
pmap_map_ptes(pmap, &pmap2, &ptes, &pdes);
if (!pmap_pdes_valid(va, pdes, &pde, &lvl)) {
pmap_unmap_ptes(pmap, pmap2);
@@ -225,7 +227,9 @@ pmap_extract_ma(struct pmap *pmap, vaddr
KASSERT(lvl == 1);
pte = ptes[pl1_i(va)];
pmap_unmap_ptes(pmap, pmap2);
- mutex_exit(&pmap->pm_lock);
+ if (pmap != pmap_kernel()) {
+ mutex_exit(&pmap->pm_lock);
+ }
if (__predict_true((pte & PTE_P) != 0)) {
if (pap != NULL)
