D55943.id175105.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D55943.id175105.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
	@@ -8271,11 +8271,13 @@
	pmap_change_props_locked(vm_offset_t va, vm_size_t size, vm_prot_t prot,
	int mode, bool skip_unmapped)
	{
	+ struct pcpu *pc;
	vm_offset_t base, offset, tmpva;
	vm_size_t pte_size;
	vm_paddr_t pa;
	pt_entry_t pte, ptep, newpte;
	pt_entry_t bits, mask;
	+ char *tmpptep;
	int lvl, rv;

	PMAP_LOCK_ASSERT(kernel_pmap, MA_OWNED);
	@@ -8405,6 +8407,25 @@
	break;
	}

	+ tmpptep = 0;
	+ if (tmpva <= (vm_offset_t)ptep &&
	+ tmpva + pte_size > (vm_offset_t)ptep) {
	+ vm_paddr_t pte_pa;
	+
	+ pc = get_pcpu();
	+ mtx_lock(&pc->pc_cmap_lock);
	+ tmpptep = pc->pc_cmap1_addr;
	+ pte_pa = DMAP_TO_PHYS((vm_offset_t)ptep);
	+ pmap_store(pc->pc_cmap1_pte, ATTR_AF \|
	+ pmap_sh_attr \| ATTR_S1_AP(ATTR_S1_AP_RW) \|
	+ ATTR_S1_XN \| ATTR_KERN_GP \|
	+ ATTR_S1_IDX(VM_MEMATTR_WRITE_BACK) \|
	+ PHYS_TO_PTE(pte_pa &~L3_OFFSET) \| L3_PAGE);
	+ dsb(ishst);
	+ ptep = (pt_entry_t *)(tmpptep +
	+ ((vm_offset_t)ptep & PAGE_MASK));
	+ }
	+
	/* Update the entry */
	pte = pmap_load(ptep);
	pte &= ~mask;
	@@ -8431,6 +8452,13 @@
	break;
	}

	+ if (tmpptep != 0) {
	+ pmap_clear(pc->pc_cmap1_pte);
	+ pmap_s1_invalidate_page(kernel_pmap,
	+ (vm_offset_t)tmpptep, true);
	+ mtx_unlock(&pc->pc_cmap_lock);
	+ }
	+
	pa = PTE_TO_PHYS(pte);
	if (!VIRT_IN_DMAP(tmpva) && PHYS_IN_DMAP(pa)) {
	/*