Module Name: src Committed By: rin Date: Tue Jul 7 00:28:31 UTC 2020
Modified Files: src/sys/arch/powerpc/booke: e500_tlb.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/booke/e500_tlb.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/powerpc/booke/e500_tlb.c diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.21 src/sys/arch/powerpc/booke/e500_tlb.c:1.22 --- src/sys/arch/powerpc/booke/e500_tlb.c:1.21 Mon Jul 6 10:12:04 2020 +++ src/sys/arch/powerpc/booke/e500_tlb.c Tue Jul 7 00:28:30 2020 @@ -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 @@ e500_tlb_invalidate_addr(vaddr_t va, tlb 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;