diff --git a/containerd.spec b/containerd.spec index f1404185a43d74c2b661a8b5b3025d0b87559aa3..e2d753237d2d2bde13b6dcf004467fedfd720250 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 8 +Release: 9 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Thu Mar 14 2024 laokz - 1.6.22-9 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:add riscv64 to THP patch + * Mon Mar 11 2024 duyiwei7w - 1.6.22-8 - Type:bugfix - ID:NA diff --git a/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch b/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch index 7c56f58fd7d34f91472d8b24502c0830a26b5bdb..786c0b586f9abbb6b55daabab818f82831b55e40 100644 --- a/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch +++ b/patch/0034-containerd-disable-Transparent-HugePage-for-shim-pro.patch @@ -10,11 +10,13 @@ Subject: [PATCH] containerd:disable Transparent HugePage for shim process if sys/thp.go | 34 ++++++++++++ sys/thp_amd64.go | 3 ++ sys/thp_arm64.go | 3 ++ + sys/thp_riscv64.go | 3 ++ .../github.com/containerd/go-runc/monitor.go | 54 ++++++++++++------- - 6 files changed, 101 insertions(+), 20 deletions(-) + 7 files changed, 104 insertions(+), 20 deletions(-) create mode 100644 sys/thp.go create mode 100644 sys/thp_amd64.go create mode 100644 sys/thp_arm64.go + create mode 100644 sys/thp_riscv64.go diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go index 965a5cf..af4917c 100644 @@ -136,6 +138,15 @@ index 0000000..a6db8d6 +package sys + +const PRCTL_SYSCALL = 167 +diff --git a/sys/thp_riscv64.go b/sys/thp_riscv64.go +new file mode 100644 +index 0000000..a6db8d6 +--- /dev/null ++++ b/sys/thp_riscv64.go +@@ -0,0 +1,3 @@ ++package sys ++ ++const PRCTL_SYSCALL = 167 diff --git a/vendor/github.com/containerd/go-runc/monitor.go b/vendor/github.com/containerd/go-runc/monitor.go index 73c8ac1..c7b4451 100644 --- a/vendor/github.com/containerd/go-runc/monitor.go