Attention is currently required from: Matt Sinclair.
Hello kokoro, Matt Sinclair,
I'd like you to do a code review.
Please visit
https://gem5-review.googlesource.com/c/public/gem5/+/48806
to review the following change.
Change subject: sim-se: Properly handle a clone with the VFORK flag
......................................................................
sim-se: Properly handle a clone with the VFORK flag
When clone is called with the VFORK flag, the calling process is
suspended until the child process either exits, or calls execve.
This patch adds in a new variable to Process, which is used to store the
context of the calling process if this process is created through a
clone with VFORK set.
This patch also adds the required support in clone to suspend the
calling thread, and in exitImpl and execveFunc to wake up the calling
thread when the child thread calls either of those functions
Change-Id: I85af67544ea1d5df7102dcff1331b5a6f6f4fa7c
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48346
Tested-by: kokoro <[email protected]>
Reviewed-by: Bobby R. Bruce <[email protected]>
Reviewed-by: Matt Sinclair <[email protected]>
Maintainer: Matt Sinclair <[email protected]>
---
M src/sim/process.cc
M src/sim/process.hh
M src/sim/syscall_emul.cc
M src/sim/syscall_emul.hh
4 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 5b3ab29..8d0a2af 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -175,6 +175,9 @@
#ifndef CLONE_THREAD
#define CLONE_THREAD 0
#endif
+#ifndef CLONE_VFORK
+#define CLONE_VFORK 0
+#endif
if (CLONE_VM & flags) {
/**
* Share the process memory address space between the new process
@@ -249,6 +252,10 @@
np->exitGroup = exitGroup;
}
+ if (CLONE_VFORK & flags) {
+ np->vforkContexts.push_back(otc->contextId());
+ }
+
np->argv.insert(np->argv.end(), argv.begin(), argv.end());
np->envp.insert(np->envp.end(), envp.begin(), envp.end());
}
diff --git a/src/sim/process.hh b/src/sim/process.hh
index 632ba90..34768a0 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -284,6 +284,9 @@
// Process was forked with SIGCHLD set.
bool *sigchld;
+ // Contexts to wake up when this thread exits or calls execve
+ std::vector<ContextID> vforkContexts;
+
// Track how many system calls are executed
statistics::Scalar numSyscalls;
};
diff --git a/src/sim/syscall_emul.cc b/src/sim/syscall_emul.cc
index baeaca2..a8b1221 100644
--- a/src/sim/syscall_emul.cc
+++ b/src/sim/syscall_emul.cc
@@ -194,6 +194,16 @@
}
}
+ /**
+ * If we were a thread created by a clone with vfork set, wake up
+ * the thread that created us
+ */
+ if (!p->vforkContexts.empty()) {
+ ThreadContext *vtc = sys->threads[p->vforkContexts.front()];
+ assert(vtc->status() == ThreadContext::Suspended);
+ vtc->activate();
+ }
+
tc->halt();
/**
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index c450cad..8929f90 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1522,6 +1522,10 @@
ctc->pcState(cpc);
ctc->activate();
+ if (flags & OS::TGT_CLONE_VFORK) {
+ tc->suspend();
+ }
+
return cp->pid();
}
@@ -1999,6 +2003,16 @@
};
/**
+ * If we were a thread created by a clone with vfork set, wake up
+ * the thread that created us
+ */
+ if (!p->vforkContexts.empty()) {
+ ThreadContext *vtc = p->system->threads[p->vforkContexts.front()];
+ assert(vtc->status() == ThreadContext::Suspended);
+ vtc->activate();
+ }
+
+ /**
* Note that ProcessParams is generated by swig and there are no other
* examples of how to create anything but this default constructor. The
* fields are manually initialized instead of passing parameters to the
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48806
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I85af67544ea1d5df7102dcff1331b5a6f6f4fa7c
Gerrit-Change-Number: 48806
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Kyle Roarty <[email protected]>
Gerrit-Attention: Matt Sinclair <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
