From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 66-220-155-179.mail-mxout.facebook.com (66-220-155-179.mail-mxout.facebook.com [66.220.155.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C1B83B6364 for ; Thu, 8 Oct 2026 07:50:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=66.220.155.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791445834; cv=none; b=lDWZwu7o0roRovcFI6Uvmc+KgywYcfj8ZLmODxwH8EIhcsdwvQqEmsIgiggyH79857Ll+Ik/FIhY0P8bag4lOj0HMKwkf87/GcWWa7xeAEgZ+S+M0oYjcBj1Y0Dls4H0FuoMxrZ+yqy3aqdrSjfspztBiVXItO2QtLMDmfEu4RM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791445834; c=relaxed/simple; bh=3FFvYt9Jd2ox2ijk32URhvbfBkQj8q2NLSBWP0m/m4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uCQv7M4rkAQ/GKnI3RCJbm5y8QmkFYmM8dKsgbts+8BZw7HyMWIYHlVQhCNP9yajzbfSYI0BB2qRHoyyGk5WEYTcoHiSgYZ9mLj/bPrO3rtmr+pB3qSI1/gdO/y/akPFI9YDgxDtaIUa9UtfFmvn26HEa2JfAuGAj4IRLKf9ta4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.dev; spf=fail smtp.mailfrom=linux.dev; arc=none smtp.client-ip=66.220.155.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=linux.dev Received: by devvm16039.vll0.facebook.com (Postfix, from userid 128203) id 26C002FDA0BDA4; Thu, 8 Oct 2026 00:50:20 -0700 (PDT) From: Yonghong Song To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Eduard Zingerman , kernel-team@fb.com Subject: [PATCH bpf-next v9 04/23] bpf: Keep a call site's landing pad in insn_aux_data, add lookups Date: Thu, 8 Oct 2026 00:50:20 -0700 Message-ID: <20261008075020.2996443-1-yonghong.song@linux.dev> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261008074959.2993751-1-yonghong.song@linux.dev> References: <20261008074959.2993751-1-yonghong.song@linux.dev> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable A call site's landing pad, if any, is kept in insn_aux_data as cleanup_pad, so the three places that move instructions -- bpf_patch_insn_data(), verifier_remove_insns() and bpf_opt_remove_nops() -- keep it in step. Add lookups for it and for calls to bpf_unwind() and bpf_unwind_resume(); their users come in later patches. Signed-off-by: Yonghong Song --- include/linux/bpf_verifier.h | 5 +++++ kernel/bpf/exception.c | 24 ++++++++++++++++++++++++ kernel/bpf/exception.h | 4 ++++ kernel/bpf/fixups.c | 26 +++++++++++++++++++++++++- 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/include/linux/bpf_verifier.h b/include/linux/bpf_verifier.h index a5f493876993..e6bde421ab3b 100644 --- a/include/linux/bpf_verifier.h +++ b/include/linux/bpf_verifier.h @@ -701,6 +701,11 @@ struct bpf_insn_aux_data { u64 jump_target:1; =20 unsigned int orig_idx; /* original instruction index, initialized once = */ + /* + * 1 + the instruction index of the exception cleanup landing pad + * this call site unwinds to, or 0 for none. + */ + u32 cleanup_pad; /* * CFG strongly connected component this instruction belongs to, * zero if it is a singleton SCC. diff --git a/kernel/bpf/exception.c b/kernel/bpf/exception.c index d6b8ca98e71c..3ea1bff5cc90 100644 --- a/kernel/bpf/exception.c +++ b/kernel/bpf/exception.c @@ -2,6 +2,8 @@ /* Copyright (c) 2026 Meta Platforms, Inc. and affiliates. */ #include #include +#include +#include #include #include "exception.h" =20 @@ -135,3 +137,25 @@ int bpf_exc_check_info(struct bpf_verifier_env *env,= const union bpf_attr *attr, kvfree(krecord); return ret; } + +BTF_ID_LIST_SINGLE(bpf_unwind_id, func, bpf_unwind) +BTF_ID_LIST_SINGLE(bpf_unwind_resume_id, func, bpf_unwind_resume) + +bool bpf_is_unwind_kfunc(const struct bpf_insn *insn) +{ + return bpf_pseudo_kfunc_call(insn) && insn->off =3D=3D 0 && + insn->imm =3D=3D bpf_unwind_id[0]; +} + +bool bpf_is_unwind_resume_kfunc(const struct bpf_insn *insn) +{ + return bpf_pseudo_kfunc_call(insn) && insn->off =3D=3D 0 && + insn->imm =3D=3D bpf_unwind_resume_id[0]; +} + +int bpf_exc_pad_of_call(struct bpf_verifier_env *env, u32 idx) +{ + u32 pad =3D env->insn_aux_data[idx].cleanup_pad; + + return pad ? (int)pad - 1 : -1; +} diff --git a/kernel/bpf/exception.h b/kernel/bpf/exception.h index cf099dcc5b74..d5c6ac459870 100644 --- a/kernel/bpf/exception.h +++ b/kernel/bpf/exception.h @@ -8,8 +8,12 @@ =20 union bpf_attr; struct bpf_verifier_env; +struct bpf_insn; =20 int bpf_exc_check_info(struct bpf_verifier_env *env, const union bpf_att= r *attr, bpfptr_t uattr); +int bpf_exc_pad_of_call(struct bpf_verifier_env *env, u32 idx); +bool bpf_is_unwind_kfunc(const struct bpf_insn *insn); +bool bpf_is_unwind_resume_kfunc(const struct bpf_insn *insn); =20 #endif /* __BPF_EXCEPTION_H */ diff --git a/kernel/bpf/fixups.c b/kernel/bpf/fixups.c index 206cc9a614a9..64baee1a37e6 100644 --- a/kernel/bpf/fixups.c +++ b/kernel/bpf/fixups.c @@ -244,11 +244,18 @@ static void adjust_insn_aux_data(struct bpf_verifie= r_env *env, data[i].non_stack_access =3D data[off + cnt - 1].non_stack_access; data[off + cnt - 1].non_stack_access =3D false; + data[i].cleanup_pad =3D data[off + cnt - 1].cleanup_pad; + data[off + cnt - 1].cleanup_pad =3D 0; } else if (bpf_is_mem_insn(insn + i)) { data[i].non_stack_access =3D true; } } =20 + if (env->cleanup_info_cnt) + for (i =3D 0; i < prog_len; i++) + if (data[i].cleanup_pad > off + 1) + data[i].cleanup_pad +=3D cnt - 1; + /* * Last slot instruction could be a newly generated * BPF_ST/BPF_LDX/BPF_STX, systematically mark it for non-stack access @@ -595,6 +602,7 @@ static int verifier_remove_insns(struct bpf_verifier_= env *env, u32 off, u32 cnt) struct bpf_insn_aux_data *aux_data =3D env->insn_aux_data; unsigned int orig_prog_len =3D env->prog->len; int err; + u32 i; =20 if (bpf_rewrite_must_abort()) return -EINTR; @@ -623,6 +631,17 @@ static int verifier_remove_insns(struct bpf_verifier= _env *env, u32 off, u32 cnt) sizeof(*aux_data) * (orig_prog_len - off - cnt)); env->insn_aux_data_len -=3D cnt; =20 + if (env->cleanup_info_cnt) { + for (i =3D 0; i < env->insn_aux_data_len; i++) { + u32 pad =3D aux_data[i].cleanup_pad; + + if (pad > off + cnt) + aux_data[i].cleanup_pad =3D pad - cnt; + else if (pad > off) + aux_data[i].cleanup_pad =3D 0; + } + } + return 0; } =20 @@ -728,7 +747,7 @@ int bpf_opt_remove_nops(struct bpf_verifier_env *env) struct bpf_insn *insn =3D env->prog->insnsi; int insn_cnt =3D env->prog->len; bool is_may_goto_0, is_ja; - int i, err; + int i, j, err; =20 for (i =3D 0; i < insn_cnt; i++) { is_may_goto_0 =3D !memcmp(&insn[i], &MAY_GOTO_0, sizeof(MAY_GOTO_0)); @@ -739,6 +758,11 @@ int bpf_opt_remove_nops(struct bpf_verifier_env *env= ) if (aux[i].indirect_target) continue; =20 + if (env->cleanup_info_cnt) + for (j =3D 0; j < insn_cnt; j++) + if (env->insn_aux_data[j].cleanup_pad =3D=3D i + 1) + env->insn_aux_data[j].cleanup_pad =3D i + 2; + err =3D verifier_remove_insns(env, i, 1); if (err) return err; --=20 2.53.0-Meta