D32036.1778504729.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32036.1778504729.diff
View Options

	diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
	--- a/sys/vm/vm_fault.c
	+++ b/sys/vm/vm_fault.c
	@@ -1113,7 +1113,6 @@
	vm_fault_allocate(struct faultstate *fs)
	{
	struct domainset *dset;
	- int alloc_req;
	int rv;

	if ((fs->object->flags & OBJ_SIZEVNLOCK) != 0) {
	@@ -1150,9 +1149,14 @@
	/*
	* Allocate a new page for this object/offset pair.
	*
	- * Unlocked read of the p_flag is harmless. At worst, the P_KILLED
	- * might be not observed there, and allocation can fail, causing
	- * restart and new reading of the p_flag.
	+ * If the process has a fatal signal pending, prioritize the allocation
	+ * with the expectation that the process will exit shortly and free some
	+ * pages. In particular, the signal may have been posted by the page
	+ * daemon in an attempt to resolve an out-of-memory condition.
	+ *
	+ * The unlocked read of the p_flag is harmless. At worst, the P_KILLED
	+ * might be not observed here, and allocation fails, causing a restart
	+ * and new reading of the p_flag.
	*/
	dset = fs->object->domain.dr_policy;
	if (dset == NULL)
	@@ -1161,12 +1165,8 @@
	#if VM_NRESERVLEVEL > 0
	vm_object_color(fs->object, atop(fs->vaddr) - fs->pindex);
	#endif
	- alloc_req = P_KILLED(curproc) ?
	- VM_ALLOC_SYSTEM : VM_ALLOC_NORMAL;
	- if (fs->object->type != OBJT_VNODE &&
	- fs->object->backing_object == NULL)
	- alloc_req \|= VM_ALLOC_ZERO;
	- fs->m = vm_page_alloc(fs->object, fs->pindex, alloc_req);
	+ fs->m = vm_page_alloc(fs->object, fs->pindex,
	+ P_KILLED(curproc) ? VM_ALLOC_SYSTEM : 0);
	}
	if (fs->m == NULL) {
	if (vm_fault_allocate_oom(fs))