Skip to contentSkip to conversation

libbpf: add ARC support to bpf_tracing.h

PATCH Applied Sergey Matyukevich 4 participants 5 messages Apr 8, 2022

Subsystems (2)

v1 of 2 Applied 1/1 Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libbpf: add ARC support to bpf_tracing.h

From: Vladimir Isaev <[email protected]>

Add PT_REGS macros suitable for ARCompact and ARCv2.

---
 tools/include/uapi/asm/bpf_perf_event.h |  2 ++
 tools/lib/bpf/bpf_tracing.h             | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
tools/include/uapi/asm/bpf_perf_event.h +2 -0
index 39acc149d843..d7dfeab0d71a 100644
@@ -1,5 +1,7 @@
 #if defined(__aarch64__)
 #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
+#elif defined(__arc__)
+#include "../../arch/arc/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__s390__)
 #include "../../arch/s390/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__riscv)
tools/lib/bpf/bpf_tracing.h +23 -0
index e3a8c947e89f..01ce121c302d 100644
@@ -27,6 +27,9 @@
 #elif defined(__TARGET_ARCH_riscv)
 	#define bpf_target_riscv
 	#define bpf_target_defined
+#elif defined(__TARGET_ARCH_arc)
+	#define bpf_target_arc
+	#define bpf_target_defined
 #else
 
 /* Fall back to what the compiler says */
@@ -54,6 +57,9 @@
 #elif defined(__riscv) && __riscv_xlen == 64
 	#define bpf_target_riscv
 	#define bpf_target_defined
+#elif defined(__arc__)
+	#define bpf_target_arc
+	#define bpf_target_defined
 #endif /* no compiler target */
 
 #endif
@@ -233,6 +239,23 @@ struct pt_regs___arm64 {
 /* riscv does not select ARCH_HAS_SYSCALL_WRAPPER. */
 #define PT_REGS_SYSCALL_REGS(ctx) ctx
 
+#elif defined(bpf_target_arc)
+
+/* arc provides struct user_pt_regs instead of struct pt_regs to userspace */
+#define __PT_REGS_CAST(x) ((const struct user_regs_struct *)(x))
+#define __PT_PARM1_REG scratch.r0
+#define __PT_PARM2_REG scratch.r1
+#define __PT_PARM3_REG scratch.r2
+#define __PT_PARM4_REG scratch.r3
+#define __PT_PARM5_REG scratch.r4
+#define __PT_RET_REG scratch.blink
+#define __PT_FP_REG __unsupported__
+#define __PT_RC_REG scratch.r0
+#define __PT_SP_REG scratch.sp
+#define __PT_IP_REG scratch.ret
+/* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */
+#define PT_REGS_SYSCALL_REGS(ctx) ctx
+
 #endif
 
 #if defined(bpf_target_defined)
Signature · 1 line
2.35.1
reviewer
#1 lore raw
Quoted 6 lines · Sergey Matyukevich

From: Vladimir Isaev <[email protected]>

Add PT_REGS macros suitable for ARCompact and ARCv2.

Hi Sergey,

The patch looks good to me. However, since you are sending the patch for Vladimir Isaev, we also need your Signed-off-by tag.

Song

Quoted 68 lines
---
 tools/include/uapi/asm/bpf_perf_event.h |  2 ++
 tools/lib/bpf/bpf_tracing.h             | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
tools/include/uapi/asm/bpf_perf_event.h +2 -0
index 39acc149d843..d7dfeab0d71a 100644
@@ -1,5 +1,7 @@
 #if defined(__aarch64__)
 #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
+#elif defined(__arc__)
+#include "../../arch/arc/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__s390__)
 #include "../../arch/s390/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__riscv)
tools/lib/bpf/bpf_tracing.h +23 -1
index e3a8c947e89f..01ce121c302d 100644
@@ -27,6 +27,9 @@
 #elif defined(__TARGET_ARCH_riscv)
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__TARGET_ARCH_arc)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #else
 
 /* Fall back to what the compiler says */
@@ -54,6 +57,9 @@
 #elif defined(__riscv) && __riscv_xlen == 64
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__arc__)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #endif /* no compiler target */
 
 #endif
@@ -233,6 +239,23 @@ struct pt_regs___arm64 {
 /* riscv does not select ARCH_HAS_SYSCALL_WRAPPER. */
 #define PT_REGS_SYSCALL_REGS(ctx) ctx
 
+#elif defined(bpf_target_arc)
+
+/* arc provides struct user_pt_regs instead of struct pt_regs to userspace */
+#define __PT_REGS_CAST(x) ((const struct user_regs_struct *)(x))
+#define __PT_PARM1_REG scratch.r0
+#define __PT_PARM2_REG scratch.r1
+#define __PT_PARM3_REG scratch.r2
+#define __PT_PARM4_REG scratch.r3
+#define __PT_PARM5_REG scratch.r4
+#define __PT_RET_REG scratch.blink
+#define __PT_FP_REG __unsupported__
+#define __PT_RC_REG scratch.r0
+#define __PT_SP_REG scratch.sp
+#define __PT_IP_REG scratch.ret
+/* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */
+#define PT_REGS_SYSCALL_REGS(ctx) ctx
+
 #endif
 
 #if defined(bpf_target_defined)
--

2.35.1

#2 lore raw
In reply to Sergey Matyukevich
Quoted 7 lines · Sergey Matyukevich

From: Vladimir Isaev <[email protected]>

Add PT_REGS macros suitable for ARCompact and ARCv2.

---

I have no way to test this unfortunately. Please be available to help with ARC-specific issues if those come up. Thanks. Applied to bpf-next.

Quoted 67 lines
 tools/include/uapi/asm/bpf_perf_event.h |  2 ++
 tools/lib/bpf/bpf_tracing.h             | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
tools/include/uapi/asm/bpf_perf_event.h +2 -0
index 39acc149d843..d7dfeab0d71a 100644
@@ -1,5 +1,7 @@
 #if defined(__aarch64__)
 #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
+#elif defined(__arc__)
+#include "../../arch/arc/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__s390__)
 #include "../../arch/s390/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__riscv)
tools/lib/bpf/bpf_tracing.h +23 -1
index e3a8c947e89f..01ce121c302d 100644
@@ -27,6 +27,9 @@
 #elif defined(__TARGET_ARCH_riscv)
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__TARGET_ARCH_arc)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #else
 
 /* Fall back to what the compiler says */
@@ -54,6 +57,9 @@
 #elif defined(__riscv) && __riscv_xlen == 64
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__arc__)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #endif /* no compiler target */
 
 #endif
@@ -233,6 +239,23 @@ struct pt_regs___arm64 {
 /* riscv does not select ARCH_HAS_SYSCALL_WRAPPER. */
 #define PT_REGS_SYSCALL_REGS(ctx) ctx
 
+#elif defined(bpf_target_arc)
+
+/* arc provides struct user_pt_regs instead of struct pt_regs to userspace */
+#define __PT_REGS_CAST(x) ((const struct user_regs_struct *)(x))
+#define __PT_PARM1_REG scratch.r0
+#define __PT_PARM2_REG scratch.r1
+#define __PT_PARM3_REG scratch.r2
+#define __PT_PARM4_REG scratch.r3
+#define __PT_PARM5_REG scratch.r4
+#define __PT_RET_REG scratch.blink
+#define __PT_FP_REG __unsupported__
+#define __PT_RC_REG scratch.r0
+#define __PT_SP_REG scratch.sp
+#define __PT_IP_REG scratch.ret
+/* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */
+#define PT_REGS_SYSCALL_REGS(ctx) ctx
+
 #endif
 
 #if defined(bpf_target_defined)
--

2.35.1

#3 lore raw
Quoted 5 lines · Andrii Nakryiko
Quoted 3 lines · Sergey Matyukevich

From: Vladimir Isaev <[email protected]>

Quoted 9 lines
Quoted 4 lines

Add PT_REGS macros suitable for ARCompact and ARCv2.

---

I have no way to test this unfortunately. Please be available to help with ARC-specific issues if those come up. Thanks. Applied to bpf-next.

Welp, didn't see Song's email before applying and sending. Song is right, we'll need your SoB. Backed out patch for now.

Quoted 67 lines
Quoted 67 lines
 tools/include/uapi/asm/bpf_perf_event.h |  2 ++
 tools/lib/bpf/bpf_tracing.h             | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)
tools/include/uapi/asm/bpf_perf_event.h +2 -0
index 39acc149d843..d7dfeab0d71a 100644
@@ -1,5 +1,7 @@
 #if defined(__aarch64__)
 #include "../../arch/arm64/include/uapi/asm/bpf_perf_event.h"
+#elif defined(__arc__)
+#include "../../arch/arc/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__s390__)
 #include "../../arch/s390/include/uapi/asm/bpf_perf_event.h"
 #elif defined(__riscv)
tools/lib/bpf/bpf_tracing.h +23 -1
index e3a8c947e89f..01ce121c302d 100644
@@ -27,6 +27,9 @@
 #elif defined(__TARGET_ARCH_riscv)
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__TARGET_ARCH_arc)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #else
 
 /* Fall back to what the compiler says */
@@ -54,6 +57,9 @@
 #elif defined(__riscv) && __riscv_xlen == 64
        #define bpf_target_riscv
        #define bpf_target_defined
+#elif defined(__arc__)
+       #define bpf_target_arc
+       #define bpf_target_defined
 #endif /* no compiler target */
 
 #endif
@@ -233,6 +239,23 @@ struct pt_regs___arm64 {
 /* riscv does not select ARCH_HAS_SYSCALL_WRAPPER. */
 #define PT_REGS_SYSCALL_REGS(ctx) ctx
 
+#elif defined(bpf_target_arc)
+
+/* arc provides struct user_pt_regs instead of struct pt_regs to userspace */
+#define __PT_REGS_CAST(x) ((const struct user_regs_struct *)(x))
+#define __PT_PARM1_REG scratch.r0
+#define __PT_PARM2_REG scratch.r1
+#define __PT_PARM3_REG scratch.r2
+#define __PT_PARM4_REG scratch.r3
+#define __PT_PARM5_REG scratch.r4
+#define __PT_RET_REG scratch.blink
+#define __PT_FP_REG __unsupported__
+#define __PT_RC_REG scratch.r0
+#define __PT_SP_REG scratch.sp
+#define __PT_IP_REG scratch.ret
+/* arc does not select ARCH_HAS_SYSCALL_WRAPPER. */
+#define PT_REGS_SYSCALL_REGS(ctx) ctx
+
 #endif
 
 #if defined(bpf_target_defined)
--

2.35.1

#4 lore raw
In reply to Sergey Matyukevich
This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Andrii Nakryiko <[email protected]>:

Quoted 9 lines · On Fri, 8 Apr 2022 18:38:29 +0300 you wrote:

From: Vladimir Isaev <[email protected]>

Add PT_REGS macros suitable for ARCompact and ARCv2.

---
 tools/include/uapi/asm/bpf_perf_event.h |  2 ++
 tools/lib/bpf/bpf_tracing.h             | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

Here is the summary with links:
- libbpf: add ARC support to bpf_tracing.h

    https://git.kernel.org/bpf/bpf-next/c/097caa843fea

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html