!175 手工同步PR172

From: @laokz 
Reviewed-by: @zhangsong234 
Signed-off-by: @zhangsong234
This commit is contained in:
openeuler-ci-bot 2024-03-18 09:15:34 +00:00 committed by Gitee
commit d7d2ba8e4b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 19 additions and 2 deletions

View File

@ -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<zhangkai@iscas.ac.cn> - 1.6.22-9
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:add riscv64 to THP patch
* Mon Mar 11 2024 duyiwei7w<duyiwei@kylinos.cn> - 1.6.22-8
- Type:bugfix
- ID:NA

View File

@ -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