From 30a8a5f7a6648c5dd6042677c11e9d5d9a671476 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Tue, 24 May 2016 10:21:39 +0000 Subject: [PATCH] In vm_page_alloc_contig(), on vm_page_insert() failure, mark each freed page as VPO_UNMANAGED. Otherwise vm_pge_free_toq() insists on owning the page lock. Previously, VPO_UNMANAGED was only set up to the last processed page. Reviewed by: alc Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_page.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 0ea8d863a35..de08bcedba1 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -1944,8 +1944,10 @@ retry: m < &m_ret[npages]; m++) { if ((req & VM_ALLOC_WIRED) != 0) m->wire_count = 0; - if (m >= m_tmp) + if (m >= m_tmp) { m->object = NULL; + m->oflags |= VPO_UNMANAGED; + } vm_page_free(m); } return (NULL);