Author: kib
Date: Sat Jul  1 03:39:38 2017
New Revision: 320526
URL: https://svnweb.freebsd.org/changeset/base/320526

Log:
  MFC r320316:
  Do not try to unmark MAP_ENTRY_IN_TRANSITION marked by other thread.

Modified:
  stable/10/sys/vm/vm_map.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/vm/vm_map.c
==============================================================================
--- stable/10/sys/vm/vm_map.c   Sat Jul  1 03:38:12 2017        (r320525)
+++ stable/10/sys/vm/vm_map.c   Sat Jul  1 03:39:38 2017        (r320526)
@@ -2658,9 +2658,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
@@ -2668,7 +2665,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) {
@@ -2676,6 +2673,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)
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to