!440 add loongarch64 support for lxc
Merge pull request !440 from zhangwenlong01/master
This commit is contained in:
haozi007
Gitee
commit
28af9a1d79
238
0027-add-loongarch64-support-for-lxc.patch
Normal file
238
0027-add-loongarch64-support-for-lxc.patch
Normal file
@ -0,0 +1,238 @@
|
||||
From 477ecc390bf4d62e8e02b98699b377b848b043de Mon Sep 17 00:00:00 2001
|
||||
From: Wenlong Zhang <zhangwenlong@loongson.cn>
|
||||
Date: Thu, 9 Feb 2023 08:18:35 +0000
|
||||
Subject: [PATCH] add loongarch64 support for lxc
|
||||
|
||||
---
|
||||
src/lxc/seccomp.c | 51 +++++++++++++++++++++++++++++++++++++++
|
||||
src/lxc/syscall_numbers.h | 26 ++++++++++++++++++++
|
||||
2 files changed, 77 insertions(+)
|
||||
|
||||
diff --git a/src/lxc/seccomp.c b/src/lxc/seccomp.c
|
||||
index ebbba80..94dc23a 100644
|
||||
--- a/src/lxc/seccomp.c
|
||||
+++ b/src/lxc/seccomp.c
|
||||
@@ -310,6 +310,7 @@ enum lxc_hostarch_t {
|
||||
lxc_seccomp_arch_ppc64,
|
||||
lxc_seccomp_arch_ppc64le,
|
||||
lxc_seccomp_arch_ppc,
|
||||
+ lxc_seccomp_arch_loongarch64,
|
||||
lxc_seccomp_arch_mips,
|
||||
lxc_seccomp_arch_mips64,
|
||||
lxc_seccomp_arch_mips64n32,
|
||||
@@ -344,6 +345,8 @@ int get_hostarch(void)
|
||||
return lxc_seccomp_arch_ppc64;
|
||||
else if (strncmp(uts.machine, "ppc", 3) == 0)
|
||||
return lxc_seccomp_arch_ppc;
|
||||
+ else if (strncmp(uts.machine, "loongarch64", 11) == 0)
|
||||
+ return lxc_seccomp_arch_loongarch64;
|
||||
else if (strncmp(uts.machine, "mips64", 6) == 0)
|
||||
return MIPS_ARCH_N64;
|
||||
else if (strncmp(uts.machine, "mips", 4) == 0)
|
||||
@@ -400,6 +403,11 @@ scmp_filter_ctx get_new_ctx(enum lxc_hostarch_t n_arch,
|
||||
arch = SCMP_ARCH_PPC;
|
||||
break;
|
||||
#endif
|
||||
+#ifdef SCMP_ARCH_LOONGARCH64
|
||||
+ case lxc_seccomp_arch_loongarch64:
|
||||
+ arch = SCMP_ARCH_LOONGARCH64;
|
||||
+ break;
|
||||
+#endif
|
||||
#ifdef SCMP_ARCH_MIPS
|
||||
case lxc_seccomp_arch_mips:
|
||||
arch = SCMP_ARCH_MIPS;
|
||||
@@ -738,6 +746,16 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
|
||||
goto bad;
|
||||
#endif
|
||||
#endif
|
||||
+#ifdef SCMP_ARCH_LOONGARCH64
|
||||
+ } else if (native_arch == lxc_seccomp_arch_loongarch64) {
|
||||
+ cur_rule_arch = lxc_seccomp_arch_all;
|
||||
+
|
||||
+ ctx.lxc_arch[0] = lxc_seccomp_arch_loongarch64;
|
||||
+ ctx.contexts[0] = get_new_ctx(lxc_seccomp_arch_loongarch64,
|
||||
+ default_policy_action, &ctx.architectures[0]);
|
||||
+ if (!ctx.contexts[0])
|
||||
+ goto bad;
|
||||
+#endif
|
||||
#ifdef SCMP_ARCH_MIPS
|
||||
} else if (native_arch == lxc_seccomp_arch_mips64) {
|
||||
cur_rule_arch = lxc_seccomp_arch_all;
|
||||
@@ -906,6 +924,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
|
||||
cur_rule_arch = lxc_seccomp_arch_ppc;
|
||||
}
|
||||
#endif
|
||||
+#ifdef SCMP_ARCH_LOONGARCH64
|
||||
+ else if (strcmp(line, "[loongarch64]") == 0 ||
|
||||
+ strcmp(line, "[LOONGARCH64]") == 0) {
|
||||
+ if (native_arch != lxc_seccomp_arch_loongarch64) {
|
||||
+ cur_rule_arch = lxc_seccomp_arch_unknown;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ cur_rule_arch = lxc_seccomp_arch_loongarch64;
|
||||
+ }
|
||||
+#endif
|
||||
#ifdef SCMP_ARCH_MIPS
|
||||
else if (strcmp(line, "[mips64]") == 0 ||
|
||||
strcmp(line, "[MIPS64]") == 0) {
|
||||
@@ -1263,6 +1292,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
|
||||
goto bad;
|
||||
#endif
|
||||
#endif
|
||||
+#ifdef SCMP_ARCH_LOONGARCH64
|
||||
+ } else if (native_arch == lxc_seccomp_arch_loongarch64) {
|
||||
+ cur_rule_arch = lxc_seccomp_arch_all;
|
||||
+
|
||||
+ ctx.architectures[0] = SCMP_ARCH_LOONGARCH64;
|
||||
+ ctx.contexts[0] = get_new_ctx(lxc_seccomp_arch_loongarch64,
|
||||
+ default_policy_action,
|
||||
+ &ctx.needs_merge[0]);
|
||||
+ if (!ctx.contexts[0])
|
||||
+ goto bad;
|
||||
+#endif
|
||||
#ifdef SCMP_ARCH_MIPS
|
||||
} else if (native_arch == lxc_seccomp_arch_mips64) {
|
||||
cur_rule_arch = lxc_seccomp_arch_all;
|
||||
@@ -1434,6 +1474,17 @@ static int parse_config_v2(FILE *f, char *line, size_t *line_bufsz, struct lxc_c
|
||||
cur_rule_arch = lxc_seccomp_arch_ppc;
|
||||
}
|
||||
#endif
|
||||
+#ifdef SCMP_ARCH_LOONGRCH64
|
||||
+ else if (strcmp(line, "[loongarch64]") == 0 ||
|
||||
+ strcmp(line, "[LOONGARCH64]") == 0) {
|
||||
+ if (native_arch != lxc_seccomp_arch_loongarch64) {
|
||||
+ cur_rule_arch = lxc_seccomp_arch_unknown;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ cur_rule_arch = lxc_seccomp_arch_loongarch64;
|
||||
+ }
|
||||
+#endif
|
||||
#ifdef SCMP_ARCH_MIPS
|
||||
else if (strcmp(line, "[mips64]") == 0 ||
|
||||
strcmp(line, "[MIPS64]") == 0) {
|
||||
diff --git a/src/lxc/syscall_numbers.h b/src/lxc/syscall_numbers.h
|
||||
index c68cf24..01aa68d 100644
|
||||
--- a/src/lxc/syscall_numbers.h
|
||||
+++ b/src/lxc/syscall_numbers.h
|
||||
@@ -49,6 +49,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_keyctl 5241
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_keyctl 219
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_keyctl not defined for your architecture"
|
||||
@@ -84,6 +86,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64
|
||||
#define __NR_memfd_create 5314
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_memfd_create 279
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_memfd_create not defined for your architecture"
|
||||
@@ -117,6 +121,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_pivot_root 5151
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_pivot_root 41
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_pivot_root not defined for your architecture"
|
||||
@@ -150,6 +156,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_setns 5303
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_setns 268
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_setns not defined for your architecture"
|
||||
@@ -183,6 +191,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_sethostname 5165
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_sethostname 161
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_sethostname not defined for your architecture"
|
||||
@@ -216,6 +226,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_signalfd 5276
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_signalfd -1 /* doesn't exist in loongarch64 */
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_signalfd not defined for your architecture"
|
||||
@@ -249,6 +261,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_signalfd4 5283
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_signalfd4 74
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_signalfd4 not defined for your architecture"
|
||||
@@ -282,6 +296,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_unshare 5262
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_unshare 97
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_unshare not defined for your architecture"
|
||||
@@ -315,6 +331,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_bpf 5315
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_bpf 280
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_bpf not defined for your architecture"
|
||||
@@ -348,6 +366,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_faccessat 5259
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_faccessat 48
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_faccessat not defined for your architecture"
|
||||
@@ -401,6 +421,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_seccomp 5312
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_seccomp 277
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_seccomp not defined for your architecture"
|
||||
@@ -434,6 +456,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_gettid 5178
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_gettid 178
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_gettid not defined for your architecture"
|
||||
@@ -471,6 +495,8 @@
|
||||
#if _MIPS_SIM == _MIPS_SIM_ABI64 /* n64 */
|
||||
#define __NR_execveat 5316
|
||||
#endif
|
||||
+ #elif defined __loongarch64
|
||||
+ #define __NR_execveat 281
|
||||
#else
|
||||
#define -1
|
||||
#warning "__NR_execveat not defined for your architecture"
|
||||
--
|
||||
2.33.0
|
||||
|
||||
9
lxc.spec
9
lxc.spec
@ -1,4 +1,4 @@
|
||||
%global _release 2022102413
|
||||
%global _release 2022102414
|
||||
|
||||
Name: lxc
|
||||
Version: 4.0.3
|
||||
@ -34,6 +34,7 @@ Patch0023: 0023-fix-lxc-write-error-message.patch
|
||||
Patch0024: 0024-remove-process-inheritable-capability.patch
|
||||
Patch0025: 0025-fix-ops-hierarchies-cause-coredump.patch
|
||||
Patch0026: 0026-meminfo-cri-1.25.patch
|
||||
Patch0027: 0027-add-loongarch64-support-for-lxc.patch
|
||||
|
||||
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
@ -220,6 +221,12 @@ rm -rf %{buildroot}%{_sysconfdir}/default/%{name}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat Mar 2023 Wenlong Zhang<zhangwenlong@loongson.cn> - 4.0.3-2022102414
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: add loongarch64 support for lxc
|
||||
|
||||
* Mon Feb 27 2023 Ilya.kuksenok<ilya.kuksenok@huawei.com> - 4.0.3-2022102413
|
||||
- Type:enhancement
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user