Tue Apr 21 06:45:16 2020 UTC ()

There is no fast spoon^Wfast path in pmap_clearbit.

PR port-arm/55186: tests crash arm pmap

Tested by martin@


(skrll)

diff -r1.411 -r1.412 src/sys/arch/arm/arm32/pmap.c

--- src/sys/arch/arm/arm32/pmap.c 2020/04/19 21:24:36	1.411
+++ src/sys/arch/arm/arm32/pmap.c 2020/04/21 06:45:16	1.412

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.411 2020/04/19 21:24:36 ad Exp $	*/
+/*	$NetBSD: pmap.c,v 1.412 2020/04/21 06:45:16 skrll Exp $	*/
 /*
  * Copyright 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -182,27 +182,27 @@
 /* Include header files */
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #ifdef MULTIPROCESSOR
 #define _INTR_PRIVATE
 #endif
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.411 2020/04/19 21:24:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.412 2020/04/21 06:45:16 skrll Exp $");
 #include <sys/atomic.h>
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/kernhist.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 @@ -2364,34 +2364,26 @@ pmap_clearbit(struct vm_page_md *md, pad
 		const vaddr_t va = pv->pv_va;
 		const u_int oflags = pv->pv_flags;
 #ifndef ARM_MMU_EXTENDED
 		/*
 		 * Kernel entries are unmanaged and as such not to be changed.
 		 */
 		if (PV_IS_KENTRY_P(oflags)) {
 			pv = SLIST_NEXT(pv, pv_link);
 			continue;
+		}
 #endif
 		/*
 		 * Anything to do?
 		 */
 		if ((oflags & maskbits) == 0 && execbits == 0) {
 			pv = SLIST_NEXT(pv, pv_link);
 			continue;
 		/*
 		 * Try to get a hold on the pmap's lock.  We must do this
 		 * while still holding the page locked, to know that the
 		 * page is still associated with the pmap and the mapping is
 		 * in place.  If a hold can't be had, unlock and wait for
 		 * the pmap's lock to become available and retry.  The pmap
 		 * must be ref'd over this dance to stop it disappearing
 		 * behind us.
 		 */
 		if (!mutex_tryenter(&pm->pm_lock)) {
 			pmap_reference(pm);
 			pmap_release_page_lock(md);
 			pmap_acquire_pmap_lock(pm);
 			/* nothing, just wait for it */