From 8742bf3d9bc55d41c7e5cab0ae3c5d2c2f5c567c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 1 Mar 2020 22:06:09 +0100 Subject: [PATCH] package/lxc: cgroups: initialize cpuset properly MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The tests.package.test_lxc.TestLxc failure on gitlab is similar to the issue reported by [1] and fixed by [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/454255988 [1] https://github.com/NixOS/nixpkgs/issues/75467#issuecomment-569386159 [2] https://github.com/lxc/lxc/pull/3109 Signed-off-by: Romain Naour Cc: Jérôme Pouiller Cc: Patrick Havelange Signed-off-by: Peter Korsgaard --- ...4-cgroups-initialize-cpuset-properly.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/lxc/0004-cgroups-initialize-cpuset-properly.patch diff --git a/package/lxc/0004-cgroups-initialize-cpuset-properly.patch b/package/lxc/0004-cgroups-initialize-cpuset-properly.patch new file mode 100644 index 0000000000..86aa708d56 --- /dev/null +++ b/package/lxc/0004-cgroups-initialize-cpuset-properly.patch @@ -0,0 +1,38 @@ +From 6a8a510211515824ff20699d45f6d07a84f3c02e Mon Sep 17 00:00:00 2001 +From: Christian Brauner +Date: Sun, 28 Jul 2019 23:13:26 +0200 +Subject: [PATCH] cgroups: initialize cpuset properly + +Closes #3108. +Signed-off-by: Christian Brauner +(cherry picked from commit b31d62b847a3ee013613795094cce4acc12345ef) +Signed-off-by: Romain Naour +--- + src/lxc/cgroups/cgfsng.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index 87e12d2dd..7e691d7cc 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -496,12 +496,12 @@ static bool cg_legacy_filter_and_set_cpus(char *path, bool am_initialized) + } + + if (!flipped_bit) { +- DEBUG("No isolated or offline cpus present in cpuset"); +- return true; ++ cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); ++ TRACE("No isolated or offline cpus present in cpuset"); ++ } else { ++ cpulist = move_ptr(posscpus); ++ TRACE("Removed isolated or offline cpus from cpuset"); + } +- DEBUG("Removed isolated or offline cpus from cpuset"); +- +- cpulist = lxc_cpumask_to_cpulist(possmask, maxposs); + if (!cpulist) { + ERROR("Failed to create cpu list"); + return false; +-- +2.24.1 + -- 2.30.2