[PATCH bpf-next] bpf: Remove unnecessary err < 0 check in bpf_struct_ops_map_update_elem

[PATCH bpf-next] bpf: Remove unnecessary err < 0 check in bpf_struct_ops_map_update_elem

[Martin KaFai Lau]

From: Martin KaFai Lau <martin.lau@kernel.org>

There is a "if (err)" check earlier, so the "if (err < 0)"
check that this patch removing is unnecessary. It was my overlook
when making adjustments to the bpf_struct_ops_prepare_trampoline()
such that the caller does not have to worry about the new page when
the function returns error.

Cc: Kui-Feng Lee <thinker.li@gmail.com>
Fixes: 187e2af05abe ("bpf: struct_ops supports more than one page for trampolines.")
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
---
 kernel/bpf/bpf_struct_ops.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kernel/bpf/bpf_struct_ops.c b/kernel/bpf/bpf_struct_ops.c
index 43356faaa057..3fcd35314ce5 100644
--- a/kernel/bpf/bpf_struct_ops.c
+++ b/kernel/bpf/bpf_struct_ops.c
@@ -728,8 +728,6 @@ static long bpf_struct_ops_map_update_elem(struct bpf_map *map, void *key,
 			cur_image = image;
 			trampoline_start = 0;
 		}
-		if (err < 0)
-			goto reset_unlock;
 
 		*(void **)(kdata + moff) = image + trampoline_start + cfi_get_offset();
 
-- 
2.43.0

Re: [PATCH bpf-next] bpf: Remove unnecessary err < 0 check in bpf_struct_ops_map_update_elem

[Stanislav Fomichev]

On 03/15, Martin KaFai Lau wrote:
> From: Martin KaFai Lau <martin.lau@kernel.org>
> 
> There is a "if (err)" check earlier, so the "if (err < 0)"
> check that this patch removing is unnecessary. It was my overlook
> when making adjustments to the bpf_struct_ops_prepare_trampoline()
> such that the caller does not have to worry about the new page when
> the function returns error.
> 
> Cc: Kui-Feng Lee <thinker.li@gmail.com>
> Fixes: 187e2af05abe ("bpf: struct_ops supports more than one page for trampolines.")
> Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

Acked-by: Stanislav Fomichev <sdf@google.com>

Re: [PATCH bpf-next] bpf: Remove unnecessary err < 0 check in bpf_struct_ops_map_update_elem

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Andrii Nakryiko <andrii@kernel.org>:

On Fri, 15 Mar 2024 12:21:12 -0700 you wrote:
> From: Martin KaFai Lau <martin.lau@kernel.org>
> 
> There is a "if (err)" check earlier, so the "if (err < 0)"
> check that this patch removing is unnecessary. It was my overlook
> when making adjustments to the bpf_struct_ops_prepare_trampoline()
> such that the caller does not have to worry about the new page when
> the function returns error.
> 
> [...]

Here is the summary with links:
  - [bpf-next] bpf: Remove unnecessary err < 0 check in bpf_struct_ops_map_update_elem
    https://git.kernel.org/bpf/bpf-next/c/7f3edd0c72c3

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html