Fri Jan 1 12:54:08 2021 UTC ()

Pull up following revision(s) (requested by rin in ticket #1171):

	sys/arch/aarch64/aarch64/pmap.c: revision 1.82
	sys/arch/aarch64/aarch64/pmap.c: revision 1.83

pmap_procwr(): sync icache even if p != curproc. This fixes applications
like GDB for arm32, that rewrite text of other process.

Thanks to ryo@ for discussion.

Use tlen for temporary length variable instead of l, which is usually
used for struct lwp *.
No binary changes.


(martin)

diff -r1.41.2.7 -r1.41.2.8 src/sys/arch/aarch64/aarch64/pmap.c

--- src/sys/arch/aarch64/aarch64/pmap.c 2021/01/01 12:38:49	1.41.2.7
+++ src/sys/arch/aarch64/aarch64/pmap.c 2021/01/01 12:54:07	1.41.2.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.41.2.7 2021/01/01 12:38:49 martin Exp $	*/
+/*	$NetBSD: pmap.c,v 1.41.2.8 2021/01/01 12:54:07 martin Exp $	*/
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.7 2021/01/01 12:38:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.8 2021/01/01 12:54:07 martin Exp $");
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
 #include "opt_kasan.h"
 #include "opt_multiprocessor.h"
 #include "opt_pmap.h"
 #include "opt_uvmhist.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/kmem.h>
 #include <sys/vmem.h>
 #include <sys/atomic.h>
 @@ -869,32 +869,46 @@ pmap_icache_sync_range(pmap_t pm, vaddr_
+	}
 	pm_unlock(pm);
+}
 /*
  * Routine:	pmap_procwr
+ *
  * Function:
  *	Synchronize caches corresponding to [addr, addr+len) in p.
+ *
  */
 void
-pmap_procwr(struct proc *p, vaddr_t va, int len)
+pmap_procwr(struct proc *p, vaddr_t sva, int len)
+{
-	/* We only need to do anything if it is the current process. */
+	if (__predict_true(p == curproc))
-	if (p == curproc)
+		cpu_icache_sync_range(sva, len);
-		cpu_icache_sync_range(va, len);
+	else {
 		struct pmap *pm = p->p_vmspace->vm_map.pmap;
 		paddr_t pa;
 		vaddr_t va, eva;
 		int tlen;
 		for (va = sva; len > 0; va = eva, len -= tlen) {
 			eva = uimin(va + len, trunc_page(va + PAGE_SIZE));
 			tlen = eva - va;
 			if (!pmap_extract(pm, va, &pa))
 				continue;
 			va = AARCH64_PA_TO_KVA(pa);
 			cpu_icache_sync_range(va, tlen);
+		}
+	}
+}
 static pt_entry_t
 _pmap_pte_adjust_prot(pt_entry_t pte, vm_prot_t prot, vm_prot_t protmask,
     bool user)
+{
 	vm_prot_t masked;
 	pt_entry_t xn;
 	masked = prot & protmask;
 	pte &= ~(LX_BLKPAG_OS_RWMASK|LX_BLKPAG_AF|LX_BLKPAG_AP);
 	/* keep prot for ref/mod emulation */