[PATCH] powerpc32/bpf: fix loading fsession func metadata using PPC_LI32

[PATCH] powerpc32/bpf: fix loading fsession func metadata using PPC_LI32

[adubey]

From: Abhishek Dubey <adubey@linux.ibm.com>

PPC_RAW_LI32 is not a valid macro in the PowerPC BPF JIT. Use PPC_LI32,
which correctly handles immediate loads for large values.
Fixes the build error introduced when adding fsession support on ppc32.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202604040212.jIxEd2DW-lkp@intel.com/
Fixes: 92258b5bf1ec ("powerpc32/bpf: Add fsession support")
Signed-off-by: Abhishek Dubey <adubey@linux.ibm.com>
---
Need to apply on tp of powerpc -next, as this fixes a build error reported on that branch

 arch/powerpc/net/bpf_jit_comp32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/net/bpf_jit_comp32.c b/arch/powerpc/net/bpf_jit_comp32.c
index f3ae89e1d1d0..bfdc50740da8 100644
--- a/arch/powerpc/net/bpf_jit_comp32.c
+++ b/arch/powerpc/net/bpf_jit_comp32.c
@@ -150,11 +150,11 @@ void store_func_meta(u32 *image, struct codegen_context *ctx,
 	 * func_meta := argument count in first byte + cookie value
 	 */
 	/* Store lower word */
-	EMIT(PPC_RAW_LI32(bpf_to_ppc(TMP_REG), (u32)func_meta));
+	PPC_LI32(bpf_to_ppc(TMP_REG), (u32)func_meta);
 	EMIT(PPC_RAW_STW(bpf_to_ppc(TMP_REG), _R1, func_meta_off));
 
 	/* Store upper word */
-	EMIT(PPC_RAW_LI32(bpf_to_ppc(TMP_REG), (u32)(func_meta >> 32)));
+	PPC_LI32(bpf_to_ppc(TMP_REG), (u32)(func_meta >> 32));
 	EMIT(PPC_RAW_STW(bpf_to_ppc(TMP_REG), _R1, func_meta_off + 4));
 }
 
-- 
2.52.0

Re: [PATCH] powerpc32/bpf: fix loading fsession func metadata using PPC_LI32

[Hari Bathini]

On 08/04/26 11:23 am, adubey@linux.ibm.com wrote:
> From: Abhishek Dubey <adubey@linux.ibm.com>
> 
> PPC_RAW_LI32 is not a valid macro in the PowerPC BPF JIT. Use PPC_LI32,
> which correctly handles immediate loads for large values.
> Fixes the build error introduced when adding fsession support on ppc32.
> 

Thanks for the fix.

Reviewed-by: Hari Bathini <hbathini@linux.ibm.com>

> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202604040212.jIxEd2DW-lkp@intel.com/
> Fixes: 92258b5bf1ec ("powerpc32/bpf: Add fsession support")
> Signed-off-by: Abhishek Dubey <adubey@linux.ibm.com>
> ---
> Need to apply on tp of powerpc -next, as this fixes a build error reported on that branch
> 
>   arch/powerpc/net/bpf_jit_comp32.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/net/bpf_jit_comp32.c b/arch/powerpc/net/bpf_jit_comp32.c
> index f3ae89e1d1d0..bfdc50740da8 100644
> --- a/arch/powerpc/net/bpf_jit_comp32.c
> +++ b/arch/powerpc/net/bpf_jit_comp32.c
> @@ -150,11 +150,11 @@ void store_func_meta(u32 *image, struct codegen_context *ctx,
>   	 * func_meta := argument count in first byte + cookie value
>   	 */
>   	/* Store lower word */
> -	EMIT(PPC_RAW_LI32(bpf_to_ppc(TMP_REG), (u32)func_meta));
> +	PPC_LI32(bpf_to_ppc(TMP_REG), (u32)func_meta);
>   	EMIT(PPC_RAW_STW(bpf_to_ppc(TMP_REG), _R1, func_meta_off));
>   
>   	/* Store upper word */
> -	EMIT(PPC_RAW_LI32(bpf_to_ppc(TMP_REG), (u32)(func_meta >> 32)));
> +	PPC_LI32(bpf_to_ppc(TMP_REG), (u32)(func_meta >> 32));
>   	EMIT(PPC_RAW_STW(bpf_to_ppc(TMP_REG), _R1, func_meta_off + 4));
>   }
>