D31958.id95189.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31958.id95189.diff
View Options

	diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
	--- a/sys/vm/vm_page.c
	+++ b/sys/vm/vm_page.c
	@@ -556,7 +556,7 @@
	char list, listend;
	vm_paddr_t end, high_avail, low_avail, new_end, size;
	vm_paddr_t page_range __unused;
	- vm_paddr_t last_pa, pa;
	+ vm_paddr_t last_pa, pa, startp, endp;
	u_long pagecount;
	#if MINIDUMP_PAGE_TRACKING
	u_long vm_page_dump_size;
	@@ -770,21 +770,22 @@
	vm_page_init_page(m, pa, segind);

	/*
	- * Add the segment to the free lists only if it is covered by
	- * one of the ranges in phys_avail. Because we've added the
	- * ranges to the vm_phys_segs array, we can assume that each
	- * segment is either entirely contained in one of the ranges,
	- * or doesn't overlap any of them.
	+ * Add the segment's pages that are covered by one of
	+ * phys_avail's ranges to the free lists.
	*/
	for (i = 0; phys_avail[i + 1] != 0; i += 2) {
	struct vm_domain *vmd;

	if (seg->start < phys_avail[i] \|\|
	- seg->end > phys_avail[i + 1])
	+ seg->start >= phys_avail[i + 1])
	continue;

	- m = seg->first_page;
	- pagecount = (u_long)atop(seg->end - seg->start);
	+ startp = MAX(seg->start, phys_avail[i]);
	+ m = seg->first_page + atop(seg->start - startp);
	+ endp = MIN(seg->end, phys_avail[i + 1]);
	+ pagecount = (u_long)atop(endp - startp);
	+ if (pagecount == 0)
	+ continue;

	vmd = VM_DOMAIN(seg->domain);
	vm_domain_free_lock(vmd);