Date: Sat, 1 Jul 2017 22:54:52 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320559 - releng/11.1/sys/vm Message-ID: <201707012254.v61MsquI059365@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Jul 1 22:54:52 2017 New Revision: 320559 URL: https://svnweb.freebsd.org/changeset/base/320559 Log: MFC r320316: Do not try to unmark MAP_ENTRY_IN_TRANSITION marked by other thread. Approved by: re (gjb) Modified: releng/11.1/sys/vm/vm_map.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/vm/vm_map.c ============================================================================== --- releng/11.1/sys/vm/vm_map.c Sat Jul 1 22:52:17 2017 (r320558) +++ releng/11.1/sys/vm/vm_map.c Sat Jul 1 22:54:52 2017 (r320559) @@ -2712,9 +2712,6 @@ done: } for (entry = first_entry; entry != &map->header && entry->start < end; entry = entry->next) { - if ((entry->eflags & MAP_ENTRY_WIRE_SKIPPED) != 0) - goto next_entry_done; - /* * If VM_MAP_WIRE_HOLESOK was specified, an empty * space in the unwired region could have been mapped @@ -2722,7 +2719,7 @@ done: * pages or draining MAP_ENTRY_IN_TRANSITION. * Moreover, another thread could be simultaneously * wiring this new mapping entry. Detect these cases - * and skip any entries marked as in transition by us. + * and skip any entries marked as in transition not by us. */ if ((entry->eflags & MAP_ENTRY_IN_TRANSITION) == 0 || entry->wiring_thread != curthread) { @@ -2730,6 +2727,9 @@ done: ("vm_map_wire: !HOLESOK and new/changed entry")); continue; } + + if ((entry->eflags & MAP_ENTRY_WIRE_SKIPPED) != 0) + goto next_entry_done; if (rv == KERN_SUCCESS) { if (user_wire)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707012254.v61MsquI059365>