In vm_page_alloc(), honor VM_ALLOC_ZERO for system and interrupt class

requests when the number of free pages is below the reserved threshold.
Previously, VM_ALLOC_ZERO was only honored when the number of free pages
was above the reserved threshold.  Honoring it in all cases generally
makes sense, does no harm, and simplifies the code.

1 files changed, 5 insertions, 12 deletions

diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index bc34dc64281a..5bd612a325b5 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -785,23 +785,16 @@ vm_page_alloc(vm_object_t object, vm_pindex_t pindex, int req)
 	s = splvm();
 loop:
 	mtx_lock_spin(&vm_page_queue_free_mtx);
-	if (cnt.v_free_count > cnt.v_free_reserved) {
-		/*
-		 * Allocate from the free queue if there are plenty of pages
-		 * in it.
-		 */
-		m = vm_page_select_free(color, (req & VM_ALLOC_ZERO) != 0);
-					
-	} else if (
+	if (cnt.v_free_count > cnt.v_free_reserved ||
 	    (page_req == VM_ALLOC_SYSTEM && 
 	     cnt.v_cache_count == 0 && 
 	     cnt.v_free_count > cnt.v_interrupt_free_min) ||
-	    (page_req == VM_ALLOC_INTERRUPT && cnt.v_free_count > 0)
-	) {
+	    (page_req == VM_ALLOC_INTERRUPT && cnt.v_free_count > 0)) {
 		/*
-		 * Interrupt or system, dig deeper into the free list.
+		 * Allocate from the free queue if the number of free pages
+		 * exceeds the minimum for the request class.
 		 */
-		m = vm_page_select_free(color, FALSE);
+		m = vm_page_select_free(color, (req & VM_ALLOC_ZERO) != 0);
 	} else if (page_req != VM_ALLOC_INTERRUPT) {
 		mtx_unlock_spin(&vm_page_queue_free_mtx);
 		/*