hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/19783 -------------------------------- Fix kabi breakage in struct bpf_verifier_state. Add KABI_FILL_HOLE for in_sleepable, as there has 1 byte hole for it. struct bpf_verifier_state { struct bpf_func_state * frame[8]; /* 0 64 */ /* --- cacheline 1 boundary (64 bytes) --- */ struct bpf_verifier_state * parent; /* 64 8 */ u32 branches; /* 72 4 */ u32 insn_idx; /* 76 4 */ u32 curframe; /* 80 4 */ /* XXX 4 bytes hole, try to pack */ struct bpf_active_lock active_lock; /* 88 16 */ /* XXX last struct has 4 bytes of padding */ bool speculative; /* 104 1 */ bool active_rcu_lock; /* 105 1 */ bool used_as_loop_entry; /* 106 1 */ /* XXX 1 byte hole, try to pack */ u32 first_insn_idx; /* 108 4 */ u32 last_insn_idx; /* 112 4 */ Fixes: 0379a79e1a42 ("bpf: Track sleepable state in verifier state for async callbacks") Signed-off-by: Pu Lehui <pulehui@huawei.com> --- include/linux/bpf_verifier.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index d5aa1c4cd87b..ceebb0b9bca5 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -442,7 +442,7 @@ struct bpf_verifier_state { * while they are still in use. */ bool used_as_loop_entry; - bool in_sleepable; + KABI_FILL_HOLE(bool in_sleepable) /* first and last insn idx of this verifier state */ u32 first_insn_idx; -- 2.34.1