| Message ID | 20241113134142.14970-1-hardevsinh.palaniya@siliconsignals.io |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] ARC: bpf: Correct conditional check in 'check_jmp_32' | expand |
On 13/11/2024 13:41, Hardevsinh Palaniya wrote: > The original code checks 'if (ARC_CC_AL)', which is always true since > ARC_CC_AL is a constant. This makes the check redundant and likely > obscures the intention of verifying whether the jump is conditional. > > Updates the code to check cond == ARC_CC_AL instead, reflecting the intent > to differentiate conditional from unconditional jumps. > > Suggested-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> > Signed-off-by: Hardevsinh Palaniya <hardevsinh.palaniya@siliconsignals.io> > --- > > Changelog in V2: > > - Changed subject line > - Updated condition check to 'if (cond == ARC_CC_AL)' instead of removing it > > Link for v1: https://lore.kernel.org/bpf/e6d27adb-151c-46c1-9668-1cd2b492321b@linux.dev/T/#t > --- Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
> The original code checks 'if (ARC_CC_AL)', which is always true since > ARC_CC_AL is a constant. This makes the check redundant and likely > obscures the intention of verifying whether the jump is conditional. > > Updates the code to check cond == ARC_CC_AL instead, reflecting the intent > to differentiate conditional from unconditional jumps. > > Suggested-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> > Signed-off-by: Hardevsinh Palaniya <hardevsinh.palaniya@siliconsignals.io> > --- > > Changelog in V2: > > - Changed subject line > - Updated condition check to 'if (cond == ARC_CC_AL)' instead of removing it > > Link for v1: https://lore.kernel.org/bpf/e6d27adb-151c-46c1-9668-1cd2b492321b@linux.dev/T/#t > --- > arch/arc/net/bpf_jit_arcv2.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arc/net/bpf_jit_arcv2.c b/arch/arc/net/bpf_jit_arcv2.c > index 4458e409ca0a..6d989b6d88c6 100644 > --- a/arch/arc/net/bpf_jit_arcv2.c > +++ b/arch/arc/net/bpf_jit_arcv2.c > @@ -2916,7 +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) > + if (cond == ARC_CC_AL) > return is_valid_far_disp(disp); > else > return is_valid_near_disp(disp); > -- > 2.43.0 Thank you for your contribution! Acked-by: Shahab Vahedi <list+bpf@vahedi.org>
Hi Vineet, Could you pick up this patch [1] in your "next"? Thanks, Shahab [1] https://lore.kernel.org/bpf/920e71ab-2375-4722-bcf3-d6aaf8e68b3a@vahedi.org/T/#t
On 11/15/24 07:55, Shahab Vahedi wrote: > Hi Vineet, > > Could you pick up this patch [1] in your "next"? > > Thanks, > Shahab > > [1] > https://lore.kernel.org/bpf/920e71ab-2375-4722-bcf3-d6aaf8e68b3a@vahedi.org/T/#t Done. Given We are in the last week this all will land in 6.13 cycle. -Vineet
diff --git a/arch/arc/net/bpf_jit_arcv2.c b/arch/arc/net/bpf_jit_arcv2.c index 4458e409ca0a..6d989b6d88c6 100644 --- a/arch/arc/net/bpf_jit_arcv2.c +++ b/arch/arc/net/bpf_jit_arcv2.c @@ -2916,7 +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) + if (cond == ARC_CC_AL) return is_valid_far_disp(disp); else return is_valid_near_disp(disp);
The original code checks 'if (ARC_CC_AL)', which is always true since ARC_CC_AL is a constant. This makes the check redundant and likely obscures the intention of verifying whether the jump is conditional. Updates the code to check cond == ARC_CC_AL instead, reflecting the intent to differentiate conditional from unconditional jumps. Suggested-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> Signed-off-by: Hardevsinh Palaniya <hardevsinh.palaniya@siliconsignals.io> --- Changelog in V2: - Changed subject line - Updated condition check to 'if (cond == ARC_CC_AL)' instead of removing it Link for v1: https://lore.kernel.org/bpf/e6d27adb-151c-46c1-9668-1cd2b492321b@linux.dev/T/#t --- arch/arc/net/bpf_jit_arcv2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)