2021-03-31 07:14:57

by He Fengqing

Subject: [Patch bpf-next] bpf: remove unused parameter from ___bpf_prog_run

'stack' parameter is not used in ___bpf_prog_run,
the base address have been set to FP reg. So consequently remove it.

Signed-off-by: He Fengqing <[email protected]>
---
kernel/bpf/core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index f5423251c118..5e31ee9f7512 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -1363,11 +1363,10 @@ u64 __weak bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr)
* __bpf_prog_run - run eBPF program on a given context
* @regs: is the array of MAX_BPF_EXT_REG eBPF pseudo-registers
* @insn: is the array of eBPF instructions
- * @stack: is the eBPF storage stack
*
* Decode and execute eBPF instructions.
*/
-static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack)
+static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn)
{
#define BPF_INSN_2_LBL(x, y) [BPF_##x | BPF_##y] = &&x##_##y
#define BPF_INSN_3_LBL(x, y, z) [BPF_##x | BPF_##y | BPF_##z] = &&x##_##y##_##z
@@ -1701,7 +1700,7 @@ static unsigned int PROG_NAME(stack_size)(const void *ctx, const struct bpf_insn
\
FP = (u64) (unsigned long) &stack[ARRAY_SIZE(stack)]; \
ARG1 = (u64) (unsigned long) ctx; \
- return ___bpf_prog_run(regs, insn, stack); \
+ return ___bpf_prog_run(regs, insn); \
}

#define PROG_NAME_ARGS(stack_size) __bpf_prog_run_args##stack_size
@@ -1718,7 +1717,7 @@ static u64 PROG_NAME_ARGS(stack_size)(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5, \
BPF_R3 = r3; \
BPF_R4 = r4; \
BPF_R5 = r5; \
- return ___bpf_prog_run(regs, insn, stack); \
+ return ___bpf_prog_run(regs, insn); \
}

#define EVAL1(FN, X) FN(X)
--
2.25.1

2021-03-31 16:18:08

by Song Liu

Subject: Re: [Patch bpf-next] bpf: remove unused parameter from ___bpf_prog_run

On Wed, Mar 31, 2021 at 12:14 AM He Fengqing <[email protected]> wrote:
>
> 'stack' parameter is not used in ___bpf_prog_run,
> the base address have been set to FP reg. So consequently remove it.
>
> Signed-off-by: He Fengqing <[email protected]>

Acked-by: Song Liu <[email protected]>

2021-04-02 23:52:55

by patchwork-bot+netdevbpf

Subject: Re: [Patch bpf-next] bpf: remove unused parameter from ___bpf_prog_run

Hello:

This patch was applied to bpf/bpf-next.git (refs/heads/master):

On Wed, 31 Mar 2021 07:51:35 +0000 you wrote:
> 'stack' parameter is not used in ___bpf_prog_run,
> the base address have been set to FP reg. So consequently remove it.
>
> Signed-off-by: He Fengqing <[email protected]>
> ---
> kernel/bpf/core.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)

Here is the summary with links:
- [bpf-next] bpf: remove unused parameter from ___bpf_prog_run
https://git.kernel.org/bpf/bpf-next/c/2ec9898e9c70

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html