[src/netbsd-7-0]: src/sys/arch/x86 Pull up following revision(s) (requested b...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0bfb649e6f30
branches:  netbsd-7-0
changeset: 801258:0bfb649e6f30
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Dec 18 07:02:59 2016 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1316):
        sys/arch/x86/x86/pmap.c: revision 1.223
        sys/arch/x86/x86/vm_machdep.c: revision 1.26
        sys/arch/x86/include/pmap.h: revision 1.61
PR/49691: KAMADA Ken'ichi: free deferred ptp mappings if present.
XXX: pullup-7

diffstat:

 sys/arch/x86/include/pmap.h   |   3 ++-
 sys/arch/x86/x86/pmap.c       |   6 +++---
 sys/arch/x86/x86/vm_machdep.c |  10 ++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (75 lines):

diff -r 935f4994c712 -r 0bfb649e6f30 sys/arch/x86/include/pmap.h
--- a/sys/arch/x86/include/pmap.h       Wed Dec 14 08:22:33 2016 +0000
+++ b/sys/arch/x86/include/pmap.h       Sun Dec 18 07:02:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.55.4.1 2015/04/23 07:31:16 snj Exp $        */
+/*     $NetBSD: pmap.h,v 1.55.4.1.2.1 2016/12/18 07:02:59 snj Exp $    */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -479,6 +479,7 @@
 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.
diff -r 935f4994c712 -r 0bfb649e6f30 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed Dec 14 08:22:33 2016 +0000
+++ b/sys/arch/x86/x86/pmap.c   Sun Dec 18 07:02:59 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.183.2.2.2.1 2016/02/26 21:51:54 snj Exp $   */
+/*     $NetBSD: pmap.c,v 1.183.2.2.2.2 2016/12/18 07:02:59 snj Exp $   */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.2.2.1 2016/02/26 21:51:54 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.2.2.2 2016/12/18 07:02:59 snj Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -2399,7 +2399,7 @@
  * 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;
diff -r 935f4994c712 -r 0bfb649e6f30 sys/arch/x86/x86/vm_machdep.c
--- a/sys/arch/x86/x86/vm_machdep.c     Wed Dec 14 08:22:33 2016 +0000
+++ b/sys/arch/x86/x86/vm_machdep.c     Sun Dec 18 07:02:59 2016 +0000
@@ -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.25.8.1 2016/12/18 07:02:59 snj 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.25.8.1 2016/12/18 07:02:59 snj Exp $");
 
 #include "opt_mtrr.h"
 
@@ -249,6 +249,12 @@
        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);
 }
 
 /*