Page MenuHomeFreeBSD

D61391.1795108191.diff
No OneTemporary

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D61391.1795108191.diff

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -2303,9 +2303,9 @@
*/
static __inline void
pmap_s1_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
- bool final_only)
+ bool final_only, int ttl)
{
- pmap_s1_invalidate_strided(pmap, sva, eva, L3_SIZE, final_only, TLBI_TTL_UNKNOWN);
+ pmap_s1_invalidate_strided(pmap, sva, eva, L3_SIZE, final_only, ttl);
}
static __inline void
@@ -2319,10 +2319,10 @@
static __inline void
pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva,
- bool final_only)
+ bool final_only, int ttl)
{
if (pmap->pm_stage == PM_STAGE1)
- pmap_s1_invalidate_range(pmap, sva, eva, final_only);
+ pmap_s1_invalidate_range(pmap, sva, eva, final_only, ttl);
else
pmap_s2_invalidate_range(pmap, sva, eva, final_only);
}
@@ -2729,7 +2729,8 @@
size -= PAGE_SIZE;
}
if ((old_l3e & ATTR_DESCR_VALID) != 0)
- pmap_s1_invalidate_range(kernel_pmap, sva, va, true);
+ pmap_s1_invalidate_range(kernel_pmap, sva, va, true,
+ TLBI_TTL_L3);
else {
/*
* Because the old entries were invalid and the new mappings
@@ -2792,10 +2793,11 @@
if (va != sva) {
pmap_s1_invalidate_range(kernel_pmap, sva, va,
- true);
+ true, TLBI_TTL_L3);
}
pmap_clear(ptep);
- pmap_s1_invalidate_page(kernel_pmap, va, true, TLBI_TTL_L2);
+ pmap_s1_invalidate_page(kernel_pmap, va, true,
+ TLBI_TTL_L2);
PMAP_LOCK(kernel_pmap);
pmap_remove_kernel_l2(kernel_pmap, ptep, va);
PMAP_UNLOCK(kernel_pmap);
@@ -2830,7 +2832,8 @@
}
}
if (va != sva)
- pmap_s1_invalidate_range(kernel_pmap, sva, va, true);
+ pmap_s1_invalidate_range(kernel_pmap, sva, va, true,
+ TLBI_TTL_L3);
}
/*
@@ -2889,7 +2892,7 @@
}
if ((old_l3e & ATTR_DESCR_VALID) != 0)
pmap_s1_invalidate_range(kernel_pmap, (vm_offset_t)sva, va,
- true);
+ true, TLBI_TTL_L3);
else {
/*
* Because the old entries were invalid and the new mappings
@@ -2923,7 +2926,8 @@
va += PAGE_SIZE;
}
- pmap_s1_invalidate_range(kernel_pmap, (vm_offset_t)sva, va, true);
+ pmap_s1_invalidate_range(kernel_pmap, (vm_offset_t)sva, va, true,
+ TLBI_TTL_L3);
}
/***************************************************
@@ -4407,7 +4411,7 @@
*/
if (*vap != va_next) {
pmap_invalidate_range(pmap, *vap, va,
- true);
+ true, TLBI_TTL_L3);
*vap = va_next;
}
rw_wunlock(*lockp);
@@ -4468,7 +4472,8 @@
old_l3 = pmap_load(l3);
if (!pmap_l3_valid(old_l3)) {
if (va != eva) {
- pmap_invalidate_range(pmap, va, sva, true);
+ pmap_invalidate_range(pmap, va, sva, true,
+ TLBI_TTL_L3);
va = eva;
}
continue;
@@ -4520,7 +4525,7 @@
*/
if (va != eva) {
pmap_invalidate_range(pmap, va,
- sva, true);
+ sva, true, TLBI_TTL_L3);
va = eva;
}
rw_wunlock(*lockp);
@@ -4547,7 +4552,7 @@
va = sva;
}
if (va != eva)
- pmap_invalidate_range(pmap, va, sva, true);
+ pmap_invalidate_range(pmap, va, sva, true, TLBI_TTL_L3);
}
static void
@@ -4954,7 +4959,7 @@
if (va != va_next) {
if (invalidate)
pmap_s1_invalidate_range(pmap,
- va, sva, true);
+ va, sva, true, TLBI_TTL_L3);
va = va_next;
}
if ((l3 & ATTR_CONTIGUOUS) != 0) {
@@ -5018,7 +5023,8 @@
va = sva;
}
if (va != va_next && invalidate)
- pmap_s1_invalidate_range(pmap, va, sva, true);
+ pmap_s1_invalidate_range(pmap, va, sva, true,
+ TLBI_TTL_L3);
}
}
@@ -5157,7 +5163,8 @@
* We always inline pmap_update_entry() so that constant propagation
* and dead code elimination will specialize the following code.
*/
- pmap_s1_invalidate_range(pmap, va, va + size, final_only);
+ pmap_s1_invalidate_range(pmap, va, va + size, final_only,
+ TLBI_TTL_UNKNOWN);
/* Create the new mapping */
pmap_store(ptep, newpte);
@@ -5662,7 +5669,7 @@
if ((origpte & ATTR_DESCR_VALID) != 0 &&
((origpte ^ newpte) & ~ATTR_SW_WIRED) != 0)
pmap_invalidate_range(pmap, va, va + (psind == 1 ?
- L3C_SIZE : PAGE_SIZE), true);
+ L3C_SIZE : PAGE_SIZE), true, TLBI_TTL_UNKNOWN);
else
dsb(ishst);
@@ -8357,12 +8364,14 @@
continue;
maybe_invlrng:
if (va != va_next) {
- pmap_s1_invalidate_range(pmap, va, sva, true);
+ pmap_s1_invalidate_range(pmap, va, sva,
+ true, TLBI_TTL_L3);
va = va_next;
}
}
if (va != va_next)
- pmap_s1_invalidate_range(pmap, va, sva, true);
+ pmap_s1_invalidate_range(pmap, va, sva, true,
+ TLBI_TTL_L3);
}
PMAP_UNLOCK(pmap);
}
@@ -9454,7 +9463,7 @@
}
if ((nbits & ATTR_AF) != 0) {
pmap_invalidate_range(pmap, va & ~L3C_OFFSET, (va + L3C_SIZE) &
- ~L3C_OFFSET, true);
+ ~L3C_OFFSET, true, TLBI_TTL_L3);
}
/*

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 19, 5:09 PM (22 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41847311
Default Alt Text
D61391.1795108191.diff (4 KB)

Event Timeline