Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/4286 )
Change subject: cpu, kvm: Fix deadlock issue when resuming a drained system
......................................................................
cpu, kvm: Fix deadlock issue when resuming a drained system
The KVM CPU sometimes needs to access devices when drain() is
called. This typically happens on ARM when synchronizing devices that
use the system register interface. When called from drain(), the event
queue isn't locked since drain is called from the outside when the
simulator isn't servicing any events. In such cases, performing a
migration to the device's queue will unlock a mutex that isn't
locked. This typically results in a deadlock when resuming the system
since the lock will be in an undefined state.
Change-Id: Ibdcc2e034e916a929124f297e72aae306cf66728
Signed-off-by: Andreas Sandberg <andreas.sandb...@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Reviewed-by: Curtis Dunham <curtis.dun...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/4286
Reviewed-by: Jason Lowe-Power <ja...@lowepower.com>
---
M src/cpu/kvm/base.cc
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/src/cpu/kvm/base.cc b/src/cpu/kvm/base.cc
index 250c6a2..6ea99ce 100644
--- a/src/cpu/kvm/base.cc
+++ b/src/cpu/kvm/base.cc
@@ -358,6 +358,13 @@
return DrainState::Drained;
DPRINTF(Drain, "BaseKvmCPU::drain\n");
+
+ // The event queue won't be locked when calling drain since that's
+ // not done from an event. Lock the event queue here to make sure
+ // that scoped migrations continue to work if we need to
+ // synchronize the thread context.
+ std::lock_guard<EventQueue> lock(*this->eventQueue());
+
switch (_status) {
case Running:
// The base KVM code is normally ready when it is in the
--
To view, visit https://gem5-review.googlesource.com/4286
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdcc2e034e916a929124f297e72aae306cf66728
Gerrit-Change-Number: 4286
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Curtis Dunham <curtis.dun...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
