diff mbox series

ARC: bpf_jit_arcv2: Remove redundant condition check

Message ID 20241111142028.67708-1-hardevsinh.palaniya@siliconsignals.io (mailing list archive)
State Changes Requested
Delegated to: BPF
Headers show
Series ARC: bpf_jit_arcv2: Remove redundant condition check | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-14 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-5 success Logs for aarch64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-4 success Logs for aarch64-gcc / build / build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for aarch64-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-9 success Logs for aarch64-gcc / test (test_verifier, false, 360) / test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-15 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-12 success Logs for s390x-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-13 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-6 success Logs for aarch64-gcc / test (test_maps, false, 360) / test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-8 success Logs for aarch64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for aarch64-gcc / test (test_progs, false, 360) / test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for set-matrix
bpf/vmtest-bpf-next-VM_Test-11 success Logs for s390x-gcc / build / build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-19 success Logs for x86_64-gcc / build-release
bpf/vmtest-bpf-next-VM_Test-16 success Logs for s390x-gcc / veristat
bpf/vmtest-bpf-next-VM_Test-18 success Logs for x86_64-gcc / build / build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-34 success Logs for x86_64-llvm-18 / build / build for x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-27 success Logs for x86_64-llvm-17 / build / build for x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-33 success Logs for x86_64-llvm-17 / veristat
bpf/vmtest-bpf-next-VM_Test-28 success Logs for x86_64-llvm-17 / build-release / build for x86_64 with llvm-17-O2
bpf/vmtest-bpf-next-VM_Test-35 success Logs for x86_64-llvm-18 / build-release / build for x86_64 with llvm-18-O2
bpf/vmtest-bpf-next-VM_Test-41 success Logs for x86_64-llvm-18 / veristat
bpf/vmtest-bpf-next-VM_Test-20 success Logs for x86_64-gcc / test (test_maps, false, 360) / test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-25 success Logs for x86_64-gcc / test (test_verifier, false, 360) / test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-32 success Logs for x86_64-llvm-17 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-22 success Logs for x86_64-gcc / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for x86_64-gcc / test (test_progs, false, 360) / test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for x86_64-gcc / test (test_progs_no_alu32_parallel, true, 30) / test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-26 success Logs for x86_64-gcc / veristat / veristat on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-30 success Logs for x86_64-llvm-17 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-24 success Logs for x86_64-gcc / test (test_progs_parallel, true, 30) / test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-29 success Logs for x86_64-llvm-17 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-31 success Logs for x86_64-llvm-17 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-17
bpf/vmtest-bpf-next-VM_Test-36 success Logs for x86_64-llvm-18 / test (test_maps, false, 360) / test_maps on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-37 success Logs for x86_64-llvm-18 / test (test_progs, false, 360) / test_progs on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-39 success Logs for x86_64-llvm-18 / test (test_progs_no_alu32, false, 360) / test_progs_no_alu32 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-38 success Logs for x86_64-llvm-18 / test (test_progs_cpuv4, false, 360) / test_progs_cpuv4 on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-40 success Logs for x86_64-llvm-18 / test (test_verifier, false, 360) / test_verifier on x86_64 with llvm-18
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-0 success Logs for Lint
bpf/vmtest-bpf-next-VM_Test-2 success Logs for Unittests
bpf/vmtest-bpf-next-VM_Test-3 success Logs for Validate matrix.py

Commit Message

Hardevsinh Palaniya Nov. 11, 2024, 2:19 p.m. UTC 
The condition 'if (ARC_CC_AL)' is always true, as ARC_CC_AL is a constant 
integer. This makes the check redundant, so it is safe to remove.

Signed-off-by: Hardevsinh Palaniya <hardevsinh.palaniya@siliconsignals.io>
---
 arch/arc/net/bpf_jit_arcv2.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Vadim Fedorenko Nov. 11, 2024, 4:21 p.m. UTC | #1 
On 11/11/2024 14:19, Hardevsinh Palaniya wrote:
> The condition 'if (ARC_CC_AL)' is always true, as ARC_CC_AL is a constant
> integer. This makes the check redundant, so it is safe to remove.
> 
> Signed-off-by: Hardevsinh Palaniya <hardevsinh.palaniya@siliconsignals.io>
> ---
>   arch/arc/net/bpf_jit_arcv2.c | 5 +----
>   1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/arch/arc/net/bpf_jit_arcv2.c b/arch/arc/net/bpf_jit_arcv2.c
> index 4458e409ca0a..19792ce952be 100644
> --- a/arch/arc/net/bpf_jit_arcv2.c
> +++ b/arch/arc/net/bpf_jit_arcv2.c
> @@ -2916,10 +2916,7 @@ bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
>   	addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
>   	disp = get_displacement(curr_off + addendum, targ_off);
>   
> -	if (ARC_CC_AL)
> -		return is_valid_far_disp(disp);
> -	else
> -		return is_valid_near_disp(disp);
> +	return is_valid_far_disp(disp);
>   }
>   
>   /*

The original code is obviously optimized out, but the intention, I
believe, was to check if the jump is conditional or not.

So the proper fix should change the code to check cond:

-	if (ARC_CC_AL)
+	if (cond == ARC_CC_AL)
Shahab Vahedi Nov. 13, 2024, 2:11 a.m. UTC | #2 
Vadim Fedorenko wrote:
 
> The original code is obviously optimized out, but the intention, I
> believe, was to check if the jump is conditional or not.
> So the proper fix should change the code to check cond:
> 
> - if (ARC_CC_AL)
> + if (cond == ARC_CC_AL)

That is absolutely correct. If a new patch is not submitted soon
I'll try to fix it myself.

Cheers,
Shahab
Hardevsinh Palaniya Nov. 13, 2024, 5:13 a.m. UTC | #3 
Hi Vadim , Shahab

Thanks for the feedback 

> > The original code is obviously optimized out, but the intention, I
> > believe, was to check if the jump is conditional or not.
> > So the proper fix should change the code to check cond:
> >
> > - if (ARC_CC_AL)
> > + if (cond == ARC_CC_AL)

Okay 

> That is absolutely correct. If a new patch is not submitted soon
> I'll try to fix it myself.

if you are okay with that then I can proceed by submitting version 2
of the patch with the proposed changes included 

Best Regards,
Hardev
Shahab Vahedi Nov. 13, 2024, 8:03 a.m. UTC | #4 
Hardev wrote:

> Shahab wrote: 
> >  
> > Vadim wrote:
> > > 
> > > 
> > > The original code is obviously optimized out, but the intention, I
> > > believe, was to check if the jump is conditional or not.
> > > So the proper fix should change the code to check cond:
> > >
> > >   - if (ARC_CC_AL)
> > >   + if (cond == ARC_CC_AL)
> >
> > 
> > That is absolutely correct. If a new patch is not submitted soon
> > I'll try to fix it myself.
>
> if you are okay with that then I can proceed by submitting version 2
> of the patch with the proposed changes included

Of course. Please go ahead. To be clear, What I meant by "soon" was
something around a week time.


Cheers,
Shahab
diff mbox series

Patch

diff --git a/arch/arc/net/bpf_jit_arcv2.c b/arch/arc/net/bpf_jit_arcv2.c
index 4458e409ca0a..19792ce952be 100644
--- a/arch/arc/net/bpf_jit_arcv2.c
+++ b/arch/arc/net/bpf_jit_arcv2.c
@@ -2916,10 +2916,7 @@  bool check_jmp_32(u32 curr_off, u32 targ_off, u8 cond)
 	addendum = (cond == ARC_CC_AL) ? 0 : INSN_len_normal;
 	disp = get_displacement(curr_off + addendum, targ_off);
 
-	if (ARC_CC_AL)
-		return is_valid_far_disp(disp);
-	else
-		return is_valid_near_disp(disp);
+	return is_valid_far_disp(disp);
 }
 
 /*