Module Name: src
Committed By: christos
Date: Tue Nov 8 03:05:36 UTC 2016
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c vm_machdep.c
Log Message:
PR/49691: KAMADA Ken'ichi: free deferred ptp mappings if present.
XXX: pullup-7
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.222 -r1.223 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x86/x86/vm_machdep.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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.60 src/sys/arch/x86/include/pmap.h:1.61
--- src/sys/arch/x86/include/pmap.h:1.60 Mon Sep 19 16:46:55 2016
+++ src/sys/arch/x86/include/pmap.h Mon Nov 7 22:05:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.60 2016/09/19 20:46:55 maya Exp $ */
+/* $NetBSD: pmap.h,v 1.61 2016/11/08 03:05:36 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -482,6 +482,7 @@ void pmap_kenter_ma(vaddr_t, paddr_t, vm
int pmap_enter_ma(struct pmap *, vaddr_t, paddr_t, paddr_t,
vm_prot_t, u_int, int);
bool pmap_extract_ma(pmap_t, vaddr_t, paddr_t *);
+void pmap_free_ptps(struct vm_page *);
/*
* Hooks for the pool allocator.
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.222 src/sys/arch/x86/x86/pmap.c:1.223
--- src/sys/arch/x86/x86/pmap.c:1.222 Sat Sep 24 17:13:44 2016
+++ src/sys/arch/x86/x86/pmap.c Mon Nov 7 22:05:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.222 2016/09/24 21:13:44 dholland Exp $ */
+/* $NetBSD: pmap.c,v 1.223 2016/11/08 03:05:36 christos Exp $ */
/*-
* Copyright (c) 2008, 2010, 2016 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.222 2016/09/24 21:13:44 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.223 2016/11/08 03:05:36 christos Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2277,7 +2277,7 @@ pmap_create(void)
* pmap_free_ptps: put a list of ptps back to the freelist.
*/
-static void
+void
pmap_free_ptps(struct vm_page *empty_ptps)
{
struct vm_page *ptp;
Index: src/sys/arch/x86/x86/vm_machdep.c
diff -u src/sys/arch/x86/x86/vm_machdep.c:1.25 src/sys/arch/x86/x86/vm_machdep.c:1.26
--- src/sys/arch/x86/x86/vm_machdep.c:1.25 Tue Mar 11 16:55:19 2014
+++ src/sys/arch/x86/x86/vm_machdep.c Mon Nov 7 22:05:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.26 2016/11/08 03:05:36 christos Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.25 2014/03/11 20:55:19 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.26 2016/11/08 03:05:36 christos Exp $");
#include "opt_mtrr.h"
@@ -249,6 +249,12 @@ cpu_lwp_free(struct lwp *l, int proc)
if (proc && l->l_proc->p_md.md_flags & MDP_USEDMTRR)
mtrr_clean(l->l_proc);
#endif
+ /*
+ * Free deferred mappings if any.
+ */
+ struct vm_page *empty_ptps = l->l_md.md_gc_ptp;
+ l->l_md.md_gc_ptp = NULL;
+ pmap_free_ptps(empty_ptps);
}
/*
