Page MenuHomeFreeBSD
Files F107798424

D47116.id145250.diff
No OneTemporary
Actions

D47116.id145250.diff
View Options

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
@@ -409,7 +409,6 @@
"The current epoch number");
void (*pmap_clean_stage2_tlbi)(void);
-void (*pmap_invalidate_vpipt_icache)(void);
void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t, bool);
void (*pmap_stage2_invalidate_all)(uint64_t);
@@ -9076,20 +9075,16 @@
ptep = pmap_pte(pmap, far, &lvl);
fault_exec:
if (ptep != NULL && (pte = pmap_load(ptep)) != 0) {
- if (icache_vmid) {
- pmap_invalidate_vpipt_icache();
- } else {
- /*
- * If accessing an executable page invalidate
- * the I-cache so it will be valid when we
- * continue execution in the guest. The D-cache
- * is assumed to already be clean to the Point
- * of Coherency.
- */
- if ((pte & ATTR_S2_XN_MASK) !=
- ATTR_S2_XN(ATTR_S2_XN_NONE)) {
- invalidate_icache();
- }
+ /*
+ * If accessing an executable page invalidate
+ * the I-cache so it will be valid when we
+ * continue execution in the guest. The D-cache
+ * is assumed to already be clean to the Point
+ * of Coherency.
+ */
+ if ((pte & ATTR_S2_XN_MASK) !=
+ ATTR_S2_XN(ATTR_S2_XN_NONE)) {
+ invalidate_icache();
}
pmap_set_bits(ptep, ATTR_AF | ATTR_DESCR_VALID);
rv = KERN_SUCCESS;
diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h
--- a/sys/arm64/include/pmap.h
+++ b/sys/arm64/include/pmap.h
@@ -172,7 +172,6 @@
struct pcb *pmap_switch(struct thread *);
extern void (*pmap_clean_stage2_tlbi)(void);
-extern void (*pmap_invalidate_vpipt_icache)(void);
extern void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t,
bool);
extern void (*pmap_stage2_invalidate_all)(uint64_t);

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 19, 6:59 AM (20 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15931208
Default Alt Text
D47116.id145250.diff (1 KB)

Event Timeline