From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 69-171-232-181.mail-mxout.facebook.com (69-171-232-181.mail-mxout.facebook.com [69.171.232.181]) (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 6BCE54F85DA for ; Mon, 21 Sep 2026 21:01:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=69.171.232.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790024519; cv=none; b=U0wIu26vgjlgVaGFg7kXaWMjC4/f4THSa/gBgbSstDycpBF9q5uz8zaFxXeMfr+ovkMHKXujlRMVqobh5BemxApLRJEgWPptzDM0lpmh2S99rQWpmNoLJp4jKMY0LN0Q9UCf+4j9rN8kPfoQIT5jaaEe7k7oTGT29+70H6lAvrs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790024519; c=relaxed/simple; bh=4WnmWhQowCftbLbp3gjcAz8aM8x9LKuqItIyOlugDqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mwdKUgCE9LwHEVur9kZEHuUm1CXsEVr2cAL90xeB4smRK804BYGER3f70ohuK4IHnoMJSoIg6nriktwSBVnexsxvBe6p4uw8mlr1K1Vs0xV+PlFCsW+KuJnrMfgifIfxukkVex7gkYx2JQMJl1IAQdMiHIhsLLXQl12yBXjpfcU= 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=69.171.232.181 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 24D242C4491215; Mon, 21 Sep 2026 14:01:45 -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 v4 14/20] libbpf: Add cleanup_info to bpf_prog_load_opts Date: Mon, 21 Sep 2026 14:01:45 -0700 Message-ID: <20260921210145.1723165-1-yonghong.song@linux.dev> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260921210033.1715000-1-yonghong.song@linux.dev> References: <20260921210033.1715000-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 Let a caller hand the kernel an exception cleanup table: struct bpf_prog_load_opts grows cleanup_info, cleanup_info_cnt and cleanup_info_rec_size, and bpf_prog_load() passes all three on to BPF_PROG_LOAD. The attr size it computes grows with them, by one field rather than three: cleanup_info_cnt is the last of the three in the BPF_PROG_LOAD attr, so offsetofend() on it already covers cleanup_info and cleanup_info_rec_size. Signed-off-by: Yonghong Song --- tools/lib/bpf/bpf.c | 6 +++++- tools/lib/bpf/bpf.h | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index a9de7f107cf7..03315b3a3a19 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -295,7 +295,7 @@ int bpf_prog_load(enum bpf_prog_type prog_type, const struct bpf_insn *insns, size_t insn_cnt, struct bpf_prog_load_opts *opts) { - const size_t attr_sz =3D offsetofend(union bpf_attr, keyring_id); + const size_t attr_sz =3D offsetofend(union bpf_attr, cleanup_info_cnt); void *finfo =3D NULL, *linfo =3D NULL; const char *func_info, *line_info; __u32 log_size, log_level, attach_prog_fd, attach_btf_obj_fd; @@ -370,6 +370,10 @@ int bpf_prog_load(enum bpf_prog_type prog_type, attr.fd_array =3D ptr_to_u64(OPTS_GET(opts, fd_array, NULL)); attr.fd_array_cnt =3D OPTS_GET(opts, fd_array_cnt, 0); =20 + attr.cleanup_info_rec_size =3D OPTS_GET(opts, cleanup_info_rec_size, 0)= ; + attr.cleanup_info =3D ptr_to_u64(OPTS_GET(opts, cleanup_info, NULL)); + attr.cleanup_info_cnt =3D OPTS_GET(opts, cleanup_info_cnt, 0); + if (log_level) { attr.log_buf =3D ptr_to_u64(log_buf); attr.log_size =3D log_size; diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 490e8cb4ba53..ec542fd68f63 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -128,9 +128,14 @@ struct bpf_prog_load_opts { =20 /* if set, provides the length of fd_array */ __u32 fd_array_cnt; + + /* exception cleanup table, from the .bpf_cleanup section */ + const void *cleanup_info; + __u32 cleanup_info_cnt; + __u32 cleanup_info_rec_size; size_t :0; }; -#define bpf_prog_load_opts__last_field fd_array_cnt +#define bpf_prog_load_opts__last_field cleanup_info_rec_size =20 LIBBPF_API int bpf_prog_load(enum bpf_prog_type prog_type, const char *prog_name, const char *license, --=20 2.53.0-Meta