2022-03-11 06:44:46

by Yuntao Wang

Subject: [PATCH bpf-next] bpf: Use offsetofend() to simplify macro definition

Use offsetofend() instead of offsetof() + sizeof() to simplify
MIN_BPF_LINEINFO_SIZE macro definition.

Signed-off-by: Yuntao Wang <[email protected]>
---
kernel/bpf/verifier.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index e34264200e09..0db6cd8dcb35 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -10400,8 +10400,7 @@ static void adjust_btf_func(struct bpf_verifier_env *env)
aux->func_info[i].insn_off = env->subprog_info[i].start;
}

-#define MIN_BPF_LINEINFO_SIZE (offsetof(struct bpf_line_info, line_col) + \
- sizeof(((struct bpf_line_info *)(0))->line_col))
+#define MIN_BPF_LINEINFO_SIZE offsetofend(struct bpf_line_info, line_col)
#define MAX_LINEINFO_REC_SIZE MAX_FUNCINFO_REC_SIZE

static int check_btf_line(struct bpf_verifier_env *env,
--
2.35.1

2022-03-11 21:01:44

by Yonghong Song

Subject: Re: [PATCH bpf-next] bpf: Use offsetofend() to simplify macro definition

On 3/10/22 8:15 AM, Yuntao Wang wrote:
> Use offsetofend() instead of offsetof() + sizeof() to simplify
> MIN_BPF_LINEINFO_SIZE macro definition.
>
> Signed-off-by: Yuntao Wang <[email protected]>

Acked-by: Yonghong Song <[email protected]>

2022-03-11 21:46:08

by patchwork-bot+netdevbpf

Subject: Re: [PATCH bpf-next] bpf: Use offsetofend() to simplify macro definition

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Daniel Borkmann <[email protected]>:

On Fri, 11 Mar 2022 00:15:18 +0800 you wrote:
> Use offsetofend() instead of offsetof() + sizeof() to simplify
> MIN_BPF_LINEINFO_SIZE macro definition.
>
> Signed-off-by: Yuntao Wang <[email protected]>
> ---
> kernel/bpf/verifier.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Here is the summary with links:
- [bpf-next] bpf: Use offsetofend() to simplify macro definition
https://git.kernel.org/bpf/bpf-next/c/1b773d0003aa

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