diff mbox series

[bpf] bpf, arm64: Fix bpf trampoline instruction endianness

Message ID 20220808040735.1232002-1-xukuohai@huawei.com (mailing list archive)
State Accepted
Commit aada476655461a9ab491d8298a415430cdd10278
Delegated to: BPF
Headers show
Series [bpf] bpf, arm64: Fix bpf trampoline instruction endianness | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for bpf
netdev/fixes_present success Fixes tag present in non-next series
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers fail 2 blamed authors not CCed: song@kernel.org kpsingh@kernel.org; 14 maintainers not CCed: john.fastabend@gmail.com song@kernel.org sdf@google.com catalin.marinas@arm.com ast@kernel.org martin.lau@linux.dev zlim.lnx@gmail.com will@kernel.org andrii@kernel.org kpsingh@kernel.org jolsa@kernel.org linux-arm-kernel@lists.infradead.org haoluo@google.com yhs@fb.com
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 48 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-3 fail Logs for Kernel LATEST on z15 with gcc
bpf/vmtest-bpf-VM_Test-1 success Logs for Kernel LATEST on ubuntu-latest with gcc
bpf/vmtest-bpf-PR fail PR summary
bpf/vmtest-bpf-VM_Test-2 success Logs for Kernel LATEST on ubuntu-latest with llvm-16

Commit Message

Xu Kuohai Aug. 8, 2022, 4:07 a.m. UTC 
The sparse tool complains as follows:

arch/arm64/net/bpf_jit_comp.c:1684:16:
	warning: incorrect type in assignment (different base types)
arch/arm64/net/bpf_jit_comp.c:1684:16:
	expected unsigned int [usertype] *branch
arch/arm64/net/bpf_jit_comp.c:1684:16:
	got restricted __le32 [usertype] *
arch/arm64/net/bpf_jit_comp.c:1700:52:
	error: subtraction of different types can't work (different base
	types)
arch/arm64/net/bpf_jit_comp.c:1734:29:
	warning: incorrect type in assignment (different base types)
arch/arm64/net/bpf_jit_comp.c:1734:29:
	expected unsigned int [usertype] *
arch/arm64/net/bpf_jit_comp.c:1734:29:
	got restricted __le32 [usertype] *
arch/arm64/net/bpf_jit_comp.c:1918:52:
	error: subtraction of different types can't work (different base
	types)

This is because the variable branch in function invoke_bpf_prog and the
variable branches in function prepare_trampoline are defined as type
u32 *, which conflicts with ctx->image's type __le32 *, so sparse complains
when assignment or arithmetic operation are performed on these two
variables and ctx->image.

Since arm64 instructions are always little-endian, change the type of
these two variables to __le32 * and call cpu_to_le32 to convert
instruction to little-endian before writing it to memory.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: efc9909fdce0 ("bpf, arm64: Add bpf trampoline for arm64")
Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
---
 arch/arm64/net/bpf_jit_comp.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Jean-Philippe Brucker Aug. 9, 2022, 10:33 a.m. UTC | #1 
[+ arm64 maintainers]

On Mon, Aug 08, 2022 at 12:07:35AM -0400, Xu Kuohai wrote:
> The sparse tool complains as follows:
> 
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	warning: incorrect type in assignment (different base types)
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	expected unsigned int [usertype] *branch
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	got restricted __le32 [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1700:52:
> 	error: subtraction of different types can't work (different base
> 	types)
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	warning: incorrect type in assignment (different base types)
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	expected unsigned int [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	got restricted __le32 [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1918:52:
> 	error: subtraction of different types can't work (different base
> 	types)
> 
> This is because the variable branch in function invoke_bpf_prog and the
> variable branches in function prepare_trampoline are defined as type
> u32 *, which conflicts with ctx->image's type __le32 *, so sparse complains
> when assignment or arithmetic operation are performed on these two
> variables and ctx->image.
> 
> Since arm64 instructions are always little-endian, change the type of
> these two variables to __le32 * and call cpu_to_le32 to convert
> instruction to little-endian before writing it to memory.
> 
> Reported-by: kernel test robot <lkp@intel.com>
> Fixes: efc9909fdce0 ("bpf, arm64: Add bpf trampoline for arm64")
> Signed-off-by: Xu Kuohai <xukuohai@huawei.com>

Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

> ---
>  arch/arm64/net/bpf_jit_comp.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
> index 7ca8779ae34f..29dc55da2476 100644
> --- a/arch/arm64/net/bpf_jit_comp.c
> +++ b/arch/arm64/net/bpf_jit_comp.c
> @@ -1643,7 +1643,7 @@ static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
>  			    int args_off, int retval_off, int run_ctx_off,
>  			    bool save_ret)
>  {
> -	u32 *branch;
> +	__le32 *branch;
>  	u64 enter_prog;
>  	u64 exit_prog;
>  	struct bpf_prog *p = l->link.prog;
> @@ -1698,7 +1698,7 @@ static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
>  
>  	if (ctx->image) {
>  		int offset = &ctx->image[ctx->idx] - branch;
> -		*branch = A64_CBZ(1, A64_R(0), offset);
> +		*branch = cpu_to_le32(A64_CBZ(1, A64_R(0), offset));
>  	}
>  
>  	/* arg1: prog */
> @@ -1713,7 +1713,7 @@ static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
>  
>  static void invoke_bpf_mod_ret(struct jit_ctx *ctx, struct bpf_tramp_links *tl,
>  			       int args_off, int retval_off, int run_ctx_off,
> -			       u32 **branches)
> +			       __le32 **branches)
>  {
>  	int i;
>  
> @@ -1784,7 +1784,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
>  	struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT];
>  	struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN];
>  	bool save_ret;
> -	u32 **branches = NULL;
> +	__le32 **branches = NULL;
>  
>  	/* trampoline stack layout:
>  	 *                  [ parent ip         ]
> @@ -1892,7 +1892,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
>  				flags & BPF_TRAMP_F_RET_FENTRY_RET);
>  
>  	if (fmod_ret->nr_links) {
> -		branches = kcalloc(fmod_ret->nr_links, sizeof(u32 *),
> +		branches = kcalloc(fmod_ret->nr_links, sizeof(__le32 *),
>  				   GFP_KERNEL);
>  		if (!branches)
>  			return -ENOMEM;
> @@ -1916,7 +1916,7 @@ static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
>  	/* update the branches saved in invoke_bpf_mod_ret with cbnz */
>  	for (i = 0; i < fmod_ret->nr_links && ctx->image != NULL; i++) {
>  		int offset = &ctx->image[ctx->idx] - branches[i];
> -		*branches[i] = A64_CBNZ(1, A64_R(10), offset);
> +		*branches[i] = cpu_to_le32(A64_CBNZ(1, A64_R(10), offset));
>  	}
>  
>  	for (i = 0; i < fexit->nr_links; i++)
> -- 
> 2.30.2
>
Daniel Borkmann Aug. 10, 2022, 2:53 p.m. UTC | #2 
On 8/9/22 12:33 PM, Jean-Philippe Brucker wrote:
> [+ arm64 maintainers]
> 
> On Mon, Aug 08, 2022 at 12:07:35AM -0400, Xu Kuohai wrote:
>> The sparse tool complains as follows:
>>
>> arch/arm64/net/bpf_jit_comp.c:1684:16:
>> 	warning: incorrect type in assignment (different base types)
>> arch/arm64/net/bpf_jit_comp.c:1684:16:
>> 	expected unsigned int [usertype] *branch
>> arch/arm64/net/bpf_jit_comp.c:1684:16:
>> 	got restricted __le32 [usertype] *
>> arch/arm64/net/bpf_jit_comp.c:1700:52:
>> 	error: subtraction of different types can't work (different base
>> 	types)
>> arch/arm64/net/bpf_jit_comp.c:1734:29:
>> 	warning: incorrect type in assignment (different base types)
>> arch/arm64/net/bpf_jit_comp.c:1734:29:
>> 	expected unsigned int [usertype] *
>> arch/arm64/net/bpf_jit_comp.c:1734:29:
>> 	got restricted __le32 [usertype] *
>> arch/arm64/net/bpf_jit_comp.c:1918:52:
>> 	error: subtraction of different types can't work (different base
>> 	types)
>>
>> This is because the variable branch in function invoke_bpf_prog and the
>> variable branches in function prepare_trampoline are defined as type
>> u32 *, which conflicts with ctx->image's type __le32 *, so sparse complains
>> when assignment or arithmetic operation are performed on these two
>> variables and ctx->image.
>>
>> Since arm64 instructions are always little-endian, change the type of
>> these two variables to __le32 * and call cpu_to_le32 to convert
>> instruction to little-endian before writing it to memory.
>>
>> Reported-by: kernel test robot <lkp@intel.com>
>> Fixes: efc9909fdce0 ("bpf, arm64: Add bpf trampoline for arm64")
>> Signed-off-by: Xu Kuohai <xukuohai@huawei.com>
> 
> Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

Applied, thanks! Also added small note that this is in line with emit() as well.
patchwork-bot+netdevbpf@kernel.org Aug. 10, 2022, 3 p.m. UTC | #3 
Hello:

This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:

On Mon, 8 Aug 2022 00:07:35 -0400 you wrote:
> The sparse tool complains as follows:
> 
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	warning: incorrect type in assignment (different base types)
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	expected unsigned int [usertype] *branch
> arch/arm64/net/bpf_jit_comp.c:1684:16:
> 	got restricted __le32 [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1700:52:
> 	error: subtraction of different types can't work (different base
> 	types)
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	warning: incorrect type in assignment (different base types)
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	expected unsigned int [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1734:29:
> 	got restricted __le32 [usertype] *
> arch/arm64/net/bpf_jit_comp.c:1918:52:
> 	error: subtraction of different types can't work (different base
> 	types)
> 
> [...]

Here is the summary with links:
  - [bpf] bpf, arm64: Fix bpf trampoline instruction endianness
    https://git.kernel.org/bpf/bpf/c/aada47665546

You are awesome, thank you!
diff mbox series

Patch

diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index 7ca8779ae34f..29dc55da2476 100644
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -1643,7 +1643,7 @@  static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
 			    int args_off, int retval_off, int run_ctx_off,
 			    bool save_ret)
 {
-	u32 *branch;
+	__le32 *branch;
 	u64 enter_prog;
 	u64 exit_prog;
 	struct bpf_prog *p = l->link.prog;
@@ -1698,7 +1698,7 @@  static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
 
 	if (ctx->image) {
 		int offset = &ctx->image[ctx->idx] - branch;
-		*branch = A64_CBZ(1, A64_R(0), offset);
+		*branch = cpu_to_le32(A64_CBZ(1, A64_R(0), offset));
 	}
 
 	/* arg1: prog */
@@ -1713,7 +1713,7 @@  static void invoke_bpf_prog(struct jit_ctx *ctx, struct bpf_tramp_link *l,
 
 static void invoke_bpf_mod_ret(struct jit_ctx *ctx, struct bpf_tramp_links *tl,
 			       int args_off, int retval_off, int run_ctx_off,
-			       u32 **branches)
+			       __le32 **branches)
 {
 	int i;
 
@@ -1784,7 +1784,7 @@  static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
 	struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT];
 	struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN];
 	bool save_ret;
-	u32 **branches = NULL;
+	__le32 **branches = NULL;
 
 	/* trampoline stack layout:
 	 *                  [ parent ip         ]
@@ -1892,7 +1892,7 @@  static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
 				flags & BPF_TRAMP_F_RET_FENTRY_RET);
 
 	if (fmod_ret->nr_links) {
-		branches = kcalloc(fmod_ret->nr_links, sizeof(u32 *),
+		branches = kcalloc(fmod_ret->nr_links, sizeof(__le32 *),
 				   GFP_KERNEL);
 		if (!branches)
 			return -ENOMEM;
@@ -1916,7 +1916,7 @@  static int prepare_trampoline(struct jit_ctx *ctx, struct bpf_tramp_image *im,
 	/* update the branches saved in invoke_bpf_mod_ret with cbnz */
 	for (i = 0; i < fmod_ret->nr_links && ctx->image != NULL; i++) {
 		int offset = &ctx->image[ctx->idx] - branches[i];
-		*branches[i] = A64_CBNZ(1, A64_R(10), offset);
+		*branches[i] = cpu_to_le32(A64_CBNZ(1, A64_R(10), offset));
 	}
 
 	for (i = 0; i < fexit->nr_links; i++)