From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B06C824A08 for ; Fri, 3 Nov 2023 19:06:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=none Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D27BFD7A for ; Fri, 3 Nov 2023 12:06:04 -0700 (PDT) Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3A3GGCJA015981 for ; Fri, 3 Nov 2023 12:06:04 -0700 Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3u547ysdc4-11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 03 Nov 2023 12:06:04 -0700 Received: from twshared32169.15.frc2.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:11d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 3 Nov 2023 12:06:00 -0700 Received: by devbig019.vll3.facebook.com (Postfix, from userid 137359) id 0961D3AE384A7; Fri, 3 Nov 2023 12:05:55 -0700 (PDT) From: Andrii Nakryiko To: , , , CC: , , , , Subject: [PATCH v9 bpf-next 15/17] libbpf: add BPF token support to bpf_prog_load() API Date: Fri, 3 Nov 2023 12:05:21 -0700 Message-ID: <20231103190523.6353-16-andrii@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231103190523.6353-1-andrii@kernel.org> References: <20231103190523.6353-1-andrii@kernel.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: uwb1kN-CWIj4QwVlOEwetb92SCwl4sQa X-Proofpoint-GUID: uwb1kN-CWIj4QwVlOEwetb92SCwl4sQa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-03_18,2023-11-02_03,2023-05-22_02 Wire through token_fd into bpf_prog_load(). Signed-off-by: Andrii Nakryiko --- tools/lib/bpf/bpf.c | 3 ++- tools/lib/bpf/bpf.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c index 4b15d20347ac..7d84b3711d62 100644 --- a/tools/lib/bpf/bpf.c +++ b/tools/lib/bpf/bpf.c @@ -234,7 +234,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, log_true_size); + const size_t attr_sz =3D offsetofend(union bpf_attr, prog_token_fd); 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; @@ -263,6 +263,7 @@ int bpf_prog_load(enum bpf_prog_type prog_type, attr.prog_flags =3D OPTS_GET(opts, prog_flags, 0); attr.prog_ifindex =3D OPTS_GET(opts, prog_ifindex, 0); attr.kern_version =3D OPTS_GET(opts, kern_version, 0); + attr.prog_token_fd =3D OPTS_GET(opts, token_fd, 0); =20 if (prog_name && kernel_supports(NULL, FEAT_PROG_NAME)) libbpf_strlcpy(attr.prog_name, prog_name, sizeof(attr.prog_name)); diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h index 323bc04d8082..3ea11eba4a04 100644 --- a/tools/lib/bpf/bpf.h +++ b/tools/lib/bpf/bpf.h @@ -105,9 +105,10 @@ struct bpf_prog_load_opts { * If kernel doesn't support this feature, log_size is left unchanged. */ __u32 log_true_size; + __u32 token_fd; size_t :0; }; -#define bpf_prog_load_opts__last_field log_true_size +#define bpf_prog_load_opts__last_field token_fd =20 LIBBPF_API int bpf_prog_load(enum bpf_prog_type prog_type, const char *prog_name, const char *license, --=20 2.34.1