Date: Thu, 13 May 2010 18:17:02 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r208041 - stable/8/sys/vm Message-ID: <201005131817.o4DIH2OH011294@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Thu May 13 18:17:01 2010 New Revision: 208041 URL: http://svn.freebsd.org/changeset/base/208041 Log: MFC r207365: When doing kstack swapin, read as much pages in one run as possible. Modified: stable/8/sys/vm/vm_glue.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/geom/sched/ (props changed) Modified: stable/8/sys/vm/vm_glue.c ============================================================================== --- stable/8/sys/vm/vm_glue.c Thu May 13 18:12:44 2010 (r208040) +++ stable/8/sys/vm/vm_glue.c Thu May 13 18:17:01 2010 (r208041) @@ -532,23 +532,37 @@ void vm_thread_swapin(struct thread *td) { vm_object_t ksobj; - vm_page_t m, ma[KSTACK_MAX_PAGES]; - int i, pages, rv; + vm_page_t ma[KSTACK_MAX_PAGES]; + int i, j, k, pages, rv; pages = td->td_kstack_pages; ksobj = td->td_kstack_obj; VM_OBJECT_LOCK(ksobj); - for (i = 0; i < pages; i++) { - m = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | + for (i = 0; i < pages; i++) + ma[i] = vm_page_grab(ksobj, i, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); - if (m->valid != VM_PAGE_BITS_ALL) { - rv = vm_pager_get_pages(ksobj, &m, 1, 0); + for (i = 0; i < pages; i++) { + if (ma[i]->valid != VM_PAGE_BITS_ALL) { + KASSERT(ma[i]->oflags & VPO_BUSY, + ("lost busy 1")); + vm_object_pip_add(ksobj, 1); + for (j = i + 1; j < pages; j++) { + KASSERT(ma[j]->valid == VM_PAGE_BITS_ALL || + (ma[j]->oflags & VPO_BUSY), + ("lost busy 2")); + if (ma[j]->valid == VM_PAGE_BITS_ALL) + break; + } + rv = vm_pager_get_pages(ksobj, ma + i, j - i, 0); if (rv != VM_PAGER_OK) - panic("vm_thread_swapin: cannot get kstack for proc: %d", td->td_proc->p_pid); - m = vm_page_lookup(ksobj, i); - } - ma[i] = m; - vm_page_wakeup(m); + panic("vm_thread_swapin: cannot get kstack for proc: %d", + td->td_proc->p_pid); + vm_object_pip_wakeup(ksobj); + for (k = i; k < j; k++) + ma[k] = vm_page_lookup(ksobj, k); + vm_page_wakeup(ma[i]); + } else if (ma[i]->oflags & VPO_BUSY) + vm_page_wakeup(ma[i]); } VM_OBJECT_UNLOCK(ksobj); pmap_qenter(td->td_kstack, ma, pages);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005131817.o4DIH2OH011294>