D50601.1789076132.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50601.1789076132.diff
View Options

	Index: sys/vm/vm_page.c
	===================================================================
	--- sys/vm/vm_page.c
	+++ sys/vm/vm_page.c
	@@ -4882,7 +4882,7 @@
	{
	vm_page_t m;
	vm_page_t ma[VM_INITIAL_PAGEIN];
	- int after, i, pflags, rv;
	+ int after, ahead, i, pflags, rv;

	KASSERT((allocflags & VM_ALLOC_SBUSY) == 0 \|\|
	(allocflags & VM_ALLOC_IGN_SBUSY) != 0,
	@@ -4942,13 +4942,16 @@
	ma[0] = m;
	pctrie_iter_reset(pages);
	for (i = 1; i < after; i++) {
	- m = vm_radix_iter_lookup(pages, pindex + i);
	- if (m == NULL) {
	- m = vm_page_alloc_iter(object, pindex + i,
	- VM_ALLOC_NORMAL, pages);
	- if (m == NULL)
	+ m = vm_radix_iter_lookup_ge(pages, pindex + i);
	+ for (ahead = (m == NULL) ? after : m->pindex - pindex;
	+ i < ahead; i++) {
	+ ma[i] = vm_page_alloc_iter(object, pindex + i,
	+ VM_ALLOC_NORMAL,pages);
	+ if (ma[i] == NULL)
	break;
	- } else if (vm_page_any_valid(m) \|\| !vm_page_tryxbusy(m))
	+ }
	+ if (i < ahead \|\| m == NULL \|\|
	+ vm_page_any_valid(m) \|\| !vm_page_tryxbusy(m))
	break;
	ma[i] = m;
	}