Skip to content

RDKEMW-24270:Avoid race condition between memcr and stop cont #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
B-Larsen merged 4 commits into from
Oct 2, 2026
Merged

RDKEMW-24270:Avoid race condition between memcr and stop cont #478

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5db0d29
hibernating fix
Sonajeya31 Sep 24, 2026
805ef04
copilot suggestion
Sonajeya31 Sep 28, 2026
aea895d
release mlock
Sonajeya31 Sep 28, 2026
1917cf0
Revert "release mlock"
Sonajeya31 Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions daemon/lib/source/DobbyManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,11 +1389,16 @@ bool DobbyManager::stopContainer(int32_t cd, bool withPrejudice)
container->state == DobbyContainer::State::Hibernated ||
container->state == DobbyContainer::State::Awakening)
{
// If a hibernation is in progress, abort it in a blocking manner before
// killing the container. This ensures memcr_worker fully unseizes any
// in-flight PID before it is killed, preventing an assert crash in
// memcr_worker when it tries to operate on a terminated PID.
if (container->state == DobbyContainer::State::Hibernating)
// If a hibernation is in progress or has entered the abort path, stop
// it in a blocking manner before killing the container. This ensures
// memcr_worker has fully unseized any in-flight PID before it is killed.
// Awakening alone is not enough to identify an in-flight hibernation
// abort: wakeupContainer() also sets Awakening before issuing WakeupProcess
// for a container that is already hibernated. Only treat Awakening as a
// hibernation abort when there is still a live in-flight PID associated
// with the active HibernateProcess() call.
if (container->state == DobbyContainer::State::Hibernating ||
(container->state == DobbyContainer::State::Awakening && container->hibernatingPid != 0))
Comment thread
Sonajeya31 marked this conversation as resolved.
Comment thread
Sonajeya31 marked this conversation as resolved.
Comment thread
Sonajeya31 marked this conversation as resolved.
{
if (!abortContainerHibernationIfNeeded(cd))
{
Expand Down Expand Up @@ -1847,7 +1852,14 @@ bool DobbyManager::abortContainerHibernationIfNeeded(int32_t cd)

const ContainerId id = it->first;

if (it->second->state != DobbyContainer::State::Hibernating)
// Awakening + hibernatingPid != 0 means wakeupContainer() raced ahead of the
// hibernate thread finishing its current PID: the state was already flipped
// but the in-flight PID hasn't been unseized yet, so it still needs an abort.
const bool inFlightAbortNeeded =
(it->second->state == DobbyContainer::State::Hibernating) ||
(it->second->state == DobbyContainer::State::Awakening && it->second->hibernatingPid != 0);
Comment thread
Sonajeya31 marked this conversation as resolved.

if (!inFlightAbortNeeded)
{
AI_LOG_INFO("Container '%s' is not hibernating, abort not needed", id.c_str());
AI_LOG_FN_EXIT();
Expand Down Expand Up @@ -3732,3 +3744,4 @@ bool DobbyManager::shouldEnableSTrace(const std::shared_ptr<DobbyConfig> &config
return std::find(apps.begin(), apps.end(), hostName) != apps.end();
}


Loading