mtcp_restart.c: Check if end2 > vvar_area.endAddr

Author: gc00

restart_plugin/dmtcp_restart_plugin.cpp

@@ -53,6 +53,9 @@ void dmtcp_restart_plugin(const string &restartDir,
   mtcpArgs.push_back((char*) "--minHighMemStart");
   mtcpArgs.push_back((char*) kvmap.at("MANA_MinHighMemStart").c_str());
 
+  mtcpArgs.push_back((char*) "--maxHighMemEnd");
+  mtcpArgs.push_back((char*) kvmap.at("MANA_MaxHighMemEnd").c_str());
+
   if (!restartDir.empty()) {
     mtcpArgs.push_back((char *)"--restartdir");
     mtcpArgs.push_back((char *)restartDir.c_str());
@@ -65,4 +68,4 @@ void dmtcp_restart_plugin(const string &restartDir,
   mtcpArgs.push_back(NULL);
   execvp(mtcpArgs[0], &mtcpArgs[0]);
   JASSERT(false)(mtcpArgs[0]).Text("execvp failed!");
-}
+}

restart_plugin/mtcp_restart_plugin.c

@@ -563,6 +563,12 @@ mtcp_plugin_hook(RestoreInfo *rinfo)
       end2 = 0;
     }
 
+    Area vvar_area;
+    MTCP_ASSERT(getMappedArea(&vvar_area, "[vvar]") == 1);
+    // if (end2 > vvar_area.addr) {
+    //   end2 = vvar_area.addr;
+    // }
+
     // ADJUST THE [start2, end2] AROUND THE LOWER-HALF STACK:
     // The lower-half stack is present.  We will restore the upper-half
     // stack later, while restoring the upper half.  We may have an
@@ -643,7 +649,14 @@ mtcp_plugin_hook(RestoreInfo *rinfo)
       end2 = 0;
     }
   }
-  // FIXME:  End of '#if 1'; Remove '# else' branch when the code is stable.
+
+  Area vvar_area;
+  MTCP_ASSERT(getMappedArea(&vvar_area, "[vvar]") == 1);
+  if (end2 > vvar_area.addr) {
+    end2 = vvar_area.addr;
+  }
+
+  // FIXME:  End of '#if 1'; Remove this '# else' branch when the code is stable
 # endif
 
   reserveUpperHalfMemoryRegionsForCkptImgs(start1, end1, start2, end2);
@@ -783,6 +796,12 @@ mtcp_plugin_hook(RestoreInfo *rinfo)
       end2 = 0;
     }
 
+    Area vvar_area;
+    MTCP_ASSERT(getMappedArea(&vvar_area, "[vvar]") == 1);
+    // if (end2 > vvar_area.addr) {
+    //   end2 = vvar_area.addr;
+    // }
+
     // ADJUST THE [start2, end2] AROUND THE LOWER-HALF STACK:
     // The lower-half stack is present.  We will restore the upper-half
     // stack later, while restoring the upper half.  We may have an
@@ -853,6 +872,7 @@ mtcp_plugin_hook(RestoreInfo *rinfo)
     Area stack_area;
     MTCP_ASSERT(getMappedArea(&stack_area, "[stack]") == 1);
     end1 = MIN(stack_area.endAddr - 4 * GB, rinfo->minHighMemStart - 4 * GB);
+    MTCP_ASSERT(getMappedArea(&vvar_area, "[vvar]") == 1);
     // maxHighMemEnd reserves 8MB above min high memory region.
     // That should include space for stack, argv, env, auxvec.
     start2 = rinfo->minHighMemStart;
@@ -863,7 +883,14 @@ mtcp_plugin_hook(RestoreInfo *rinfo)
       end2 = 0;
     }
   }
-  // FIXME:  End of '#if 1'; Remove '# else' branch when the code is stable.
+
+  Area vvar_area;
+  MTCP_ASSERT(getMappedArea(&vvar_area, "[vvar]") == 1);
+  if (end2 > vvar_area.addr) {
+    end2 = vvar_area.addr;
+  }
+
+  // FIXME:  End of '#if 1'; Remove this '# else' branch when the code is stable
 # endif
 
   char full_filename[PATH_MAX];