Tue Jul 7 00:28:31 2020 UTC ()
Fix kernel panic due to tmpfs.

pmap for booke assumes that the ``va'' argument for pmap_kenter_pa(9) is
page-aligned. However, by recent changes, tmpfs became to use ``va'' with
page offset via ubc_uiomove(9). So, truncate it to page boundary.


(rin)
diff -r1.21 -r1.22 src/sys/arch/powerpc/booke/e500_tlb.c

cvs diff -r1.21 -r1.22 src/sys/arch/powerpc/booke/e500_tlb.c (expand / switch to context diff)
--- src/sys/arch/powerpc/booke/e500_tlb.c 2020/07/06 10:12:04 1.21
+++ src/sys/arch/powerpc/booke/e500_tlb.c 2020/07/07 00:28:30 1.22
@@ -1,4 +1,4 @@
-/*	$NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $	*/
+/*	$NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -37,7 +37,7 @@
 #define	__PMAP_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
@@ -536,6 +536,13 @@
 static bool
 e500_tlb_update_addr(vaddr_t va, tlb_asid_t asid, pt_entry_t pte, bool insert)
 {
+
+	/*
+	 * In case where pmap_kenter_pa(9) is called for va with page offset.
+	 * Required for tmpfs.
+	 */
+	va &= ~PAGE_MASK;
+
 #if defined(MULTIPROCESSOR)
 	e500_tlb_invalidate_addr(va, asid);
 	return true;