bpf: Use offsetofend() to simplify macro definition

ytcoode · Nobody · commit 8a78f0a18532 · 2022-03-10T08:26:55.000-08:00
Use offsetofend() instead of offsetof() + sizeof() to simplify
MIN_BPF_LINEINFO_SIZE macro definition.

Signed-off-by: Yuntao Wang &lt;ytcoode@gmail.com&gt;
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -10400,8 +10400,7 @@ static void adjust_btf_func(struct bpf_verifier_env *env)`
`10400`	`10400`	`aux->func_info[i].insn_off = env->subprog_info[i].start;`
`10401`	`10401`	`}`
`10402`	`10402`
`10403`		`-#define MIN_BPF_LINEINFO_SIZE (offsetof(struct bpf_line_info, line_col) + \`
`10404`		`- sizeof(((struct bpf_line_info *)(0))->line_col))`
	`10403`	`+#define MIN_BPF_LINEINFO_SIZE offsetofend(struct bpf_line_info, line_col)`
`10405`	`10404`	`#define MAX_LINEINFO_REC_SIZE MAX_FUNCINFO_REC_SIZE`
`10406`	`10405`
`10407`	`10406`	`static int check_btf_line(struct bpf_verifier_env *env,`