nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-17 14:31:06 +01:00
Code Activity

Merge pull request #13923 from NixOS/fix-multithreaded-chroot-hang

Browse source 
Fix hang in enterChroot() draining userNamespaceSync
This commit is contained in:
Eelco Dolstra 2025-09-07 09:13:54 +02:00 • committed by GitHub
commit a7c6a42344
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libstore/unix/build/linux-derivation-builder.cc
View file

@ -362,9 +362,21 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
userNamespaceSync.readSide = -1; userNamespaceSync.readSide = -1;
/* Close the write side to prevent runChild() from hanging /* Make sure that we write *something* to the child in case of
reading from this. */ an exception. Note that merely closing
Finally cleanup([&]() { userNamespaceSync.writeSide = -1; }); `userNamespaceSync.writeSide` doesn't work in
multi-threaded Nix, since several child processes may have
inherited `writeSide` (and O_CLOEXEC doesn't help because
the children may not do an execve). */
bool userNamespaceSyncDone = false;
Finally cleanup([&]() {
try {
if (!userNamespaceSyncDone)
writeFull(userNamespaceSync.writeSide.get(), "0\n");
} catch (...) {
}
userNamespaceSync.writeSide = -1;
});
auto ss = tokenizeString<std::vector<std::string>>(readLine(sendPid.readSide.get())); auto ss = tokenizeString<std::vector<std::string>>(readLine(sendPid.readSide.get()));
assert(ss.size() == 1); assert(ss.size() == 1);
@ -419,14 +431,15 @@ struct ChrootLinuxDerivationBuilder : ChrootDerivationBuilder, LinuxDerivationBu
writeFile(*cgroup + "/cgroup.procs", fmt("%d", (pid_t) pid)); writeFile(*cgroup + "/cgroup.procs", fmt("%d", (pid_t) pid));
/* Signal the builder that we've updated its user namespace. */ /* Signal the builder that we've updated its user namespace. */
writeFull(userNamespaceSync.writeSide.get(), "1"); writeFull(userNamespaceSync.writeSide.get(), "1\n");
userNamespaceSyncDone = true;
} }
void enterChroot() override void enterChroot() override
{ {
userNamespaceSync.writeSide = -1; userNamespaceSync.writeSide = -1;
if (drainFD(userNamespaceSync.readSide.get()) != "1") if (readLine(userNamespaceSync.readSide.get()) != "1")
throw Error("user namespace initialisation failed"); throw Error("user namespace initialisation failed");
userNamespaceSync.readSide = -1; userNamespaceSync.readSide = -1;