D49928.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49928.diff
View Options

	diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
	--- a/sys/riscv/riscv/pmap.c
	+++ b/sys/riscv/riscv/pmap.c
	@@ -3614,31 +3614,33 @@
	pmap_enter_object(pmap_t pmap, vm_offset_t start, vm_offset_t end,
	vm_page_t m_start, vm_prot_t prot)
	{
	+ struct pctrie_iter pages;
	struct rwlock *lock;
	vm_offset_t va;
	vm_page_t m, mpte;
	- vm_pindex_t diff, psize;
	int rv;

	VM_OBJECT_ASSERT_LOCKED(m_start->object);

	- psize = atop(end - start);
	mpte = NULL;
	- m = m_start;
	+ vm_page_iter_limit_init(&pages, m_start->object,
	+ m_start->pindex + atop(end - start));
	+ m = vm_radix_iter_lookup(&pages, m_start->pindex);
	lock = NULL;
	rw_rlock(&pvh_global_lock);
	PMAP_LOCK(pmap);
	- while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
	- va = start + ptoa(diff);
	+ while (m != NULL) {
	+ va = start + ptoa(m->pindex - m_start->pindex);
	if ((va & L2_OFFSET) == 0 && va + L2_SIZE <= end &&
	m->psind == 1 && pmap_ps_enabled(pmap) &&
	((rv = pmap_enter_2mpage(pmap, va, m, prot, &lock)) ==
	- KERN_SUCCESS \|\| rv == KERN_NO_SPACE))
	- m = &m[L2_SIZE / PAGE_SIZE - 1];
	- else
	+ KERN_SUCCESS \|\| rv == KERN_NO_SPACE)) {
	+ m = vm_radix_iter_jump(&pages, L2_SIZE / PAGE_SIZE);
	+ } else {
	mpte = pmap_enter_quick_locked(pmap, va, m, prot, mpte,
	&lock);
	- m = TAILQ_NEXT(m, listq);
	+ m = vm_radix_iter_step(&pages);
	+ }
	}
	if (lock != NULL)
	rw_wunlock(lock);