diff --git a/git-commit b/git-commit index 49d7d01e52a4d170736eca1199ed0258649a3405..e1aa272b5a96fa8c35538f285c4f604ee1db7746 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -1f4c5ce0be8a1bfc8486bbcb7e84e92848366c93 +fcf238f179ee1acc1edc75aae9f5e23c54c9a45a diff --git a/patch/0146-runc-enable-cpuset-preferred-by-proc-sys-kernel-sche.patch b/patch/0146-runc-enable-cpuset-preferred-by-proc-sys-kernel-sche.patch new file mode 100644 index 0000000000000000000000000000000000000000..6f15f452a21eb78795c9f1b0e941ab4812ff9aff --- /dev/null +++ b/patch/0146-runc-enable-cpuset-preferred-by-proc-sys-kernel-sche.patch @@ -0,0 +1,26 @@ +From a85aeb42b93daa85e901cd77e4261961893505e7 Mon Sep 17 00:00:00 2001 +From: zhongjiawei +Date: Mon, 24 Jul 2023 19:52:36 +0800 +Subject: [PATCH] runc:enable cpuset preferred by + /proc/sys/kernel/sched_util_low_pct file state + +--- + libcontainer/cgroups/fs/cpuset.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go +index ce1389d..bc82abc 100644 +--- a/libcontainer/cgroups/fs/cpuset.go ++++ b/libcontainer/cgroups/fs/cpuset.go +@@ -113,7 +113,7 @@ func parseCpuset(cpuset string) (string, string, error) { + } + + func (s *CpusetGroup) setCpuset(path, cpuset string) error { +- if _, err := os.Stat(filepath.Join(path, "cpuset.preferred_cpus")); err != nil { ++ if _, err := os.Stat("/proc/sys/kernel/sched_util_low_pct"); err != nil { + var ret error + if err := writeFile(path, "cpuset.cpus", cpuset); err != nil { + ret = fmt.Errorf("failed to set cpuset.cpus, %v", err) +-- +2.33.0 + diff --git a/runc.spec b/runc.spec index 16dad7a8b61077588c300d050f4bb5f29aafd8e6..077799d2c40bf59c03d928e7ed296f2e631ec5f0 100644 --- a/runc.spec +++ b/runc.spec @@ -4,7 +4,7 @@ Name: docker-runc Version: 1.0.0.rc3 -Release: 310 +Release: 311 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -57,6 +57,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Jul Mon 24 2023 zhongjiawei - 1.0.0.rc3-311 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:enable cpuset preferred by /proc/sys/kernel/sched_util_low_pct file state + * Tue Apr 4 2023 zhongjiawei - 1.0.0.rc3-310 - Type:bugfix - CVE:NA diff --git a/series.conf b/series.conf index 7ae59551c5a726fdf92ed62d7b1e3dd63662409c..ac70d3210eba702fedb579d54520c795ab41386e 100644 --- a/series.conf +++ b/series.conf @@ -138,11 +138,12 @@ patch/0136-runc-add-DT-for-cpuset.preferred_cpus-setting.patch patch/0137-runc-fix-can-t-set-cpuset-cpus-and-cpuset-mems-at-th.patch patch/0138-runc-write-state.json-atomically.patch patch/0139-runc-Make-sure-signalAllProcesses-is-invoked-in-the-.patch -patch/0140-runc-support-specify-umask.patch +#patch/0140-runc-support-specify-umask.patch patch/0001-add-loongarch-support-for-libcontainer.patch -patch/0141-runc-seccomp-prepend-ENOSYS-stub-to-all-filters.patch -patch/0142-runc-fix-seccomp-add-rule-failed.patch -patch/0143-runc-libct-cg-fs-blkio-do-not-set-weight-0.patch -patch/0144-runc-run-resolve-tmpfs-mount-dest-in-container-scope.patch -patch/0145-runc-Prohibit-proc-and-sys-to-be-symlinks.patch +#patch/0141-runc-seccomp-prepend-ENOSYS-stub-to-all-filters.patch +#patch/0142-runc-fix-seccomp-add-rule-failed.patch +#patch/0143-runc-libct-cg-fs-blkio-do-not-set-weight-0.patch +#patch/0144-runc-run-resolve-tmpfs-mount-dest-in-container-scope.patch +#patch/0145-runc-Prohibit-proc-and-sys-to-be-symlinks.patch +patch/0146-runc-enable-cpuset-preferred-by-proc-sys-kernel-sche.patch #end