!172 [sync] PR-171: sync from openEuler-24.03-LTS-SP1
From: @openeuler-sync-bot Reviewed-by: @bigclouds99, @supercharge Signed-off-by: @supercharge
This commit is contained in:
openeuler-ci-bot
Gitee
commit
bf0e5f163b
72
add-sw_64-support.patch
Normal file
72
add-sw_64-support.patch
Normal file
@ -0,0 +1,72 @@
|
||||
From 93391a6f90774d4e6ee3d21972ef937eb183067c Mon Sep 17 00:00:00 2001
|
||||
From: Super User <root@localhost.localdomain>
|
||||
Date: Fri, 14 Mar 2025 17:31:35 +0800
|
||||
Subject: [PATCH] add sw_64 support
|
||||
|
||||
---
|
||||
src/bpf_tracing.h | 35 +++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 35 insertions(+)
|
||||
|
||||
diff --git a/src/bpf_tracing.h b/src/bpf_tracing.h
|
||||
index 6fb3d0f..ba30c3f 100644
|
||||
--- a/src/bpf_tracing.h
|
||||
+++ b/src/bpf_tracing.h
|
||||
@@ -35,6 +35,9 @@
|
||||
#elif defined(__TARGET_ARCH_loongarch)
|
||||
#define bpf_target_loongarch
|
||||
#define bpf_target_defined
|
||||
+#elif defined(__TARGET_ARCH_sw_64)
|
||||
+ #define bpf_target_sw64
|
||||
+ #define bpf_target_defined
|
||||
#else
|
||||
|
||||
/* Fall back to what the compiler says */
|
||||
@@ -68,6 +71,9 @@
|
||||
#elif defined(__loongarch__)
|
||||
#define bpf_target_loongarch
|
||||
#define bpf_target_defined
|
||||
+#elif defined(__sw_64__)
|
||||
+ #define bpf_target_sw64
|
||||
+ #define bpf_target_defined
|
||||
#endif /* no compiler target */
|
||||
|
||||
#endif
|
||||
@@ -442,6 +448,35 @@ struct pt_regs___arm64 {
|
||||
#define __PT_SP_REG regs[3]
|
||||
#define __PT_IP_REG csr_era
|
||||
|
||||
+#elif defined(bpf_target_sw64)
|
||||
+
|
||||
+/* sw64 provides struct user_pt_regs instead of struct pt_regs to userspace */
|
||||
+struct pt_regs;
|
||||
+#define PT_REGS_SW64 const volatile struct user_pt_regs
|
||||
+#define PT_REGS_PARM1(x) (((PT_REGS_SW64 *)(x))->regs[16])
|
||||
+#define PT_REGS_PARM2(x) (((PT_REGS_SW64 *)(x))->regs[17])
|
||||
+#define PT_REGS_PARM3(x) (((PT_REGS_SW64 *)(x))->regs[18])
|
||||
+#define PT_REGS_PARM4(x) (((PT_REGS_SW64 *)(x))->regs[19])
|
||||
+#define PT_REGS_PARM5(x) (((PT_REGS_SW64 *)(x))->regs[20])
|
||||
+#define PT_REGS_RET(x) (((PT_REGS_SW64 *)(x))->regs[26])
|
||||
+/* Works only with CONFIG_FRAME_POINTER */
|
||||
+#define PT_REGS_FP(x) (((PT_REGS_SW64 *)(x))->regs[15])
|
||||
+#define PT_REGS_RC(x) (((PT_REGS_SW64 *)(x))->regs[0])
|
||||
+#define PT_REGS_SP(x) (((PT_REGS_SW64 *)(x))->regs[30])
|
||||
+#define PT_REGS_IP(x) (((PT_REGS_SW64 *)(x))->pc)
|
||||
+
|
||||
+#define PT_REGS_PARM1_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[16])
|
||||
+#define PT_REGS_PARM2_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[17])
|
||||
+#define PT_REGS_PARM3_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[18])
|
||||
+#define PT_REGS_PARM4_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[19])
|
||||
+#define PT_REGS_PARM5_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[20])
|
||||
+#define PT_REGS_RET_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[26])
|
||||
+#define PT_REGS_FP_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[15])
|
||||
+#define PT_REGS_RC_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[0])
|
||||
+#define PT_REGS_SP_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), regs[30])
|
||||
+#define PT_REGS_IP_CORE(x) BPF_CORE_READ((PT_REGS_SW64 *)(x), pc)
|
||||
+
|
||||
+
|
||||
#endif
|
||||
|
||||
#if defined(bpf_target_defined)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
21
libbpf.spec
21
libbpf.spec
@ -4,7 +4,7 @@
|
||||
|
||||
Name: %{githubname}
|
||||
Version: %{githubver}
|
||||
Release: 7
|
||||
Release: 8
|
||||
Summary: Libbpf library
|
||||
|
||||
License: LGPLv2 or BSD
|
||||
@ -22,12 +22,14 @@ Patch0005: backport-libbpf-Avoid-uninitialized-value-in-BPF_CORE_READ_BI.pa
|
||||
Patch0006: backport-libbpf-Add-NULL-checks-to-bpf_object__prev_map,next_.patch
|
||||
Patch0007: backport-libbpf-Apply-map_set_def_max_entries-for-inner_maps-.patch
|
||||
Patch0008: backport-libbpf-Dont-take-direct-pointers-into-BTF-data-from-.patch
|
||||
Patch0009: backport-libbpf-Do-not-resolve-size-on-duplicate-FUNCs.patch
|
||||
Patch0010: backport-libbpf-Fix-bpf_object__open_skeleton-s-mishandling-o.patch
|
||||
Patch0011: backport-libbpf-Fix-segfault-due-to-libelf-functions-not-sett.patch
|
||||
Patch0012: backport-libbpf-Fixed-getting-wrong-return-address-on-arm64-a.patch
|
||||
Patch0013: backport-libbpf-fix-sym_is_subprog-logic-for-weak-global-subp.patch
|
||||
Patch0014: backport-libbpf-move-global-data-mmap-ing-into-bpf_object__lo.patch
|
||||
Patch0009: add-sw_64-support.patch
|
||||
Patch0010: backport-libbpf-Do-not-resolve-size-on-duplicate-FUNCs.patch
|
||||
Patch0011: backport-libbpf-Fix-bpf_object__open_skeleton-s-mishandling-o.patch
|
||||
Patch0012: backport-libbpf-Fix-segfault-due-to-libelf-functions-not-sett.patch
|
||||
Patch0013: backport-libbpf-Fixed-getting-wrong-return-address-on-arm64-a.patch
|
||||
Patch0014: backport-libbpf-fix-sym_is_subprog-logic-for-weak-global-subp.patch
|
||||
Patch0015: backport-libbpf-move-global-data-mmap-ing-into-bpf_object__lo.patch
|
||||
|
||||
|
||||
# This package supersedes libbpf from kernel-tools,
|
||||
# which has default Epoch: 0. By having Epoch: 1
|
||||
@ -80,7 +82,7 @@ developing applications that use %{name}
|
||||
%{_libdir}/libbpf.a
|
||||
|
||||
%changelog
|
||||
* Fri Mar 14 2025 zhangmingyi <zhangmingyi5@huawei.com> 2:1.2.2-7
|
||||
* Fri Mar 14 2025 zhangmingyi <zhangmingyi5@huawei.com> 2:1.2.2-8
|
||||
- backport patch from upstream:
|
||||
backport-libbpf-Do-not-resolve-size-on-duplicate-FUNCs.patch
|
||||
backport-libbpf-Fix-bpf_object__open_skeleton-s-mishandling-o.patch
|
||||
@ -89,6 +91,9 @@ developing applications that use %{name}
|
||||
backport-libbpf-fix-sym_is_subprog-logic-for-weak-global-subp.patch
|
||||
backport-libbpf-move-global-data-mmap-ing-into-bpf_object__lo.patch
|
||||
|
||||
* Fri Mar 14 2025 mahailiang <mahailiang@uniontech.com> 2:1.2.2-7
|
||||
- add sw_64 support
|
||||
|
||||
* Mon Dec 23 2024 zhangmingyi <zhangmingyi5@huawei.com> 2:1.2.2-6
|
||||
- backport patch from upstream:
|
||||
backport-libbpf-Dont-take-direct-pointers-into-BTF-data-from-.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user