aboutsummaryrefslogtreecommitdiff
path: root/package/lxc
diff options
context:
space:
mode:
authorGravatar Romain Naour <romain.naour@smile.fr>2020-03-01 22:06:09 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-03-02 23:00:22 +0100
commit8742bf3d9bc55d41c7e5cab0ae3c5d2c2f5c567c (patch)
tree6120802e720f6e2fa6dd1bb37cfacdcc8ceb22d1 /package/lxc
parent447b648e536a74df8dd4b334e44b2388ba477c7c (diff)
downloadbuildroot-8742bf3d9bc55d41c7e5cab0ae3c5d2c2f5c567c.tar.gz
buildroot-8742bf3d9bc55d41c7e5cab0ae3c5d2c2f5c567c.tar.bz2
package/lxc: cgroups: initialize cpuset properly
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 <romain.naour@smile.fr> Cc: Jérôme Pouiller <jezz@sysmic.org> Cc: Patrick Havelange <patrick.havelange@essensium.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/lxc')
-rw-r--r--package/lxc/0004-cgroups-initialize-cpuset-properly.patch38
1 files changed, 38 insertions, 0 deletions
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 <christian.brauner@ubuntu.com>
+Date: Sun, 28 Jul 2019 23:13:26 +0200
+Subject: [PATCH] cgroups: initialize cpuset properly
+
+Closes #3108.
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+(cherry picked from commit b31d62b847a3ee013613795094cce4acc12345ef)
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+---
+ 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
+