Merge branch 'scale-amd64' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

6db7f437 · Silas Boyd-Wickizer · 1d02096e · 9999dcb5 · 6db7f437
--- a/kernel/vm.cc
+++ b/kernel/vm.cc
@@ -18,6 +18,7 @@
 #include "kmtrace.hh"
 enum { vm_debug = 0 };
+enum { tlb_shootdown = 1 };
 enum { tlb_lazy = 1 };
 /*
@@ -320,8 +321,14 @@ vmap::copy(int share)
 #endif
  }
-  if (share)
+  if (share) {
-    tlbflush();  // Reload hardware page table
+    // Reload hardware page table
+    if (tlb_shootdown) {
+      tlbflush();
+    } else {
+      lcr3(rcr3());
+    }
+  }
  nm->brk_ = brk_;
@@ -434,11 +441,13 @@ again:
          }
        }
      });
-  if (needtlb && dotlb)
+  if (tlb_shootdown) {
-    tlbflush();
+    if (needtlb && dotlb)
-  else
+      tlbflush();
-    if (tlb_lazy)
+    else
-      tlbflush(myproc()->unmap_tlbreq_);
+      if (tlb_lazy)
+        tlbflush(myproc()->unmap_tlbreq_);
+  }
  return vma_start;
 }
@@ -488,7 +497,7 @@ vmap::remove(uptr vma_start, uptr len)
        }
      }
    });
-  if (needtlb) {
+  if (tlb_shootdown && needtlb) {
    if (tlb_lazy) {
      myproc()->unmap_tlbreq_ = tlbflush_req++;
    } else {
@@ -578,7 +587,11 @@ vmap::pagefault(uptr va, u32 err)
    if (pagefault_wcow(m) < 0)
      return -1;
-    tlbflush();
+    if (tlb_shootdown) {
+      tlbflush();
+    } else {
+      lcr3(rcr3());
+    }
    goto retry;
  }