Module Name: src
Committed By: simonb
Date: Wed Oct 27 05:33:59 UTC 2021
Modified Files:
src/sys/uvm/pmap: pmap_tlb.c
Log Message:
When adjusting the max ASID count, check if ti->ti_asid_max == 0 as
well. This defaults to 0 for the non-PMAP_TLB_NUM_PIDS case, so would
skip the updated test.
Fix for port-pmax/56466 (which affects all MIPS).
ok srkll@
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/uvm/pmap/pmap_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/uvm/pmap/pmap_tlb.c
diff -u src/sys/uvm/pmap/pmap_tlb.c:1.47 src/sys/uvm/pmap/pmap_tlb.c:1.48
--- src/sys/uvm/pmap/pmap_tlb.c:1.47 Fri Oct 8 07:17:32 2021
+++ src/sys/uvm/pmap/pmap_tlb.c Wed Oct 27 05:33:59 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_tlb.c,v 1.47 2021/10/08 07:17:32 skrll Exp $ */
+/* $NetBSD: pmap_tlb.c,v 1.48 2021/10/27 05:33:59 simonb Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.47 2021/10/08 07:17:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_tlb.c,v 1.48 2021/10/27 05:33:59 simonb Exp $");
/*
* Manages address spaces in a TLB.
@@ -379,7 +379,7 @@ pmap_tlb_info_init(struct pmap_tlb_info
#endif
const tlb_asid_t asid_max = pmap_md_tlb_asid_max();
- if (asid_max < ti->ti_asid_max) {
+ if (ti->ti_asid_max == 0 || asid_max < ti->ti_asid_max) {
ti->ti_asid_max = asid_max;
ti->ti_asids_free = TLBINFO_ASID_INITIAL_FREE(ti->ti_asid_max);
}
