2023-06-14 06:33:36

by xuanzhenggang001

Subject: [PATCH] bpf: Remove unneeded variable

Fix the following coccicheck warning:

arch/x86/net/bpf_jit_comp32.c:1274:5-8: Unneeded variable: "cnt".

Signed-off-by: Zhenggang Xuan <[email protected]>
---
arch/x86/net/bpf_jit_comp32.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/net/bpf_jit_comp32.c
b/arch/x86/net/bpf_jit_comp32.c
index 429a89c5468b..bc71329ac5ed 100644
--- a/arch/x86/net/bpf_jit_comp32.c
+++ b/arch/x86/net/bpf_jit_comp32.c
@@ -1271,7 +1271,6 @@ static void emit_epilogue(u8 **pprog, u32
stack_depth)
static int emit_jmp_edx(u8 **pprog, u8 *ip)
{
u8 *prog = *pprog;
- int cnt = 0;

#ifdef CONFIG_RETPOLINE
EMIT1_off32(0xE9, (u8 *)__x86_indirect_thunk_edx - (ip + 5));
@@ -1280,7 +1279,7 @@ static int emit_jmp_edx(u8 **pprog, u8 *ip)
#endif
*pprog = prog;

- return cnt;
+ return 0;
}

/*

2023-06-16 16:36:36

by Andrii Nakryiko

Subject: Re: [PATCH] bpf: Remove unneeded variable

On Tue, Jun 13, 2023 at 11:29 PM <[email protected]> wrote:
>
> Fix the following coccicheck warning:
>
> arch/x86/net/bpf_jit_comp32.c:1274:5-8: Unneeded variable: "cnt".
>
> Signed-off-by: Zhenggang Xuan <[email protected]>
> ---
> arch/x86/net/bpf_jit_comp32.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/x86/net/bpf_jit_comp32.c
> b/arch/x86/net/bpf_jit_comp32.c
> index 429a89c5468b..bc71329ac5ed 100644
> --- a/arch/x86/net/bpf_jit_comp32.c
> +++ b/arch/x86/net/bpf_jit_comp32.c
> @@ -1271,7 +1271,6 @@ static void emit_epilogue(u8 **pprog, u32
> stack_depth)
> static int emit_jmp_edx(u8 **pprog, u8 *ip)
> {
> u8 *prog = *pprog;
> - int cnt = 0;
>
> #ifdef CONFIG_RETPOLINE
> EMIT1_off32(0xE9, (u8 *)__x86_indirect_thunk_edx - (ip + 5));

EMIT macroses are updating this cnt. Have you tested this patch by any chance?

> @@ -1280,7 +1279,7 @@ static int emit_jmp_edx(u8 **pprog, u8 *ip)
> #endif
> *pprog = prog;
>
> - return cnt;
> + return 0;
> }
>
> /*
>