From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23FECC6FD19 for ; Fri, 10 Mar 2023 04:39:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229628AbjCJEju (ORCPT ); Thu, 9 Mar 2023 23:39:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229659AbjCJEjr (ORCPT ); Thu, 9 Mar 2023 23:39:47 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C072A101120 for ; Thu, 9 Mar 2023 20:39:45 -0800 (PST) Received: from pps.filterd (m0109334.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 329MBLkX011804 for ; Thu, 9 Mar 2023 20:39:45 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=DRpUtyNvLsWhn35GQ+HsDxcO2L/OEn6q1UEctgnOlMc=; b=X01/D3/hnSMRmfAV8LGYd3xtHJf5mwX8IjfVmoWF8AMTThCGUcEnrrIrpPZn7cbGOaaq ZOdpmvue+Wjh6vKend0P8PFNbZbg7IjR57a5qU4th8rQ1nyCwCswU+lINPmq2mX2CD0H aQCAYB7C2jP9NeV5QsHAvPA1OTP4xiK5kOLOBKrASjXMaBAkDIZw9WYbKskXscw63OZI jwar+kkw6jDaJQa6+bLt5mzkVBG6icrS3lOn4VMm0/HQeonuMUmwtwITnugp5bJR0F8J YwtZBCwVjD16NOlQlRyHXxRQdNAZFuYm7/IWBD79AB05XojqY3xMCeJmEa8sxFbV8lq1 2g== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3p7r1dhx9r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 09 Mar 2023 20:39:45 -0800 Received: from twshared16996.15.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Thu, 9 Mar 2023 20:39:44 -0800 Received: by devbig931.frc1.facebook.com (Postfix, from userid 460691) id 002506F6C2D2; Thu, 9 Mar 2023 20:39:26 -0800 (PST) From: Kui-Feng Lee To: , , , , , , CC: Kui-Feng Lee Subject: [PATCH bpf-next v6 7/8] libbpf: Use .struct_ops.link section to indicate a struct_ops with a link. Date: Thu, 9 Mar 2023 20:38:12 -0800 Message-ID: <20230310043812.3087672-8-kuifeng@meta.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230310043812.3087672-1-kuifeng@meta.com> References: <20230310043812.3087672-1-kuifeng@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: oxi-CaYZcQEhdDPhYiqri0QDaAXPYDx3 X-Proofpoint-ORIG-GUID: oxi-CaYZcQEhdDPhYiqri0QDaAXPYDx3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-10_02,2023-03-09_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Flags a struct_ops is to back a bpf_link by putting it to the ".struct_ops.link" section. Once it is flagged, the created struct_ops can be used to create a bpf_link or update a bpf_link that has been backed by another struct_ops. Signed-off-by: Kui-Feng Lee --- tools/lib/bpf/libbpf.c | 60 +++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 63ec1f8fe8a0..e16b5714f998 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -468,6 +468,7 @@ struct bpf_struct_ops { #define KCONFIG_SEC ".kconfig" #define KSYMS_SEC ".ksyms" #define STRUCT_OPS_SEC ".struct_ops" +#define STRUCT_OPS_LINK_SEC ".struct_ops.link" =20 enum libbpf_map_type { LIBBPF_MAP_UNSPEC, @@ -597,6 +598,7 @@ struct elf_state { Elf64_Ehdr *ehdr; Elf_Data *symbols; Elf_Data *st_ops_data; + Elf_Data *st_ops_link_data; size_t shstrndx; /* section index for section name strings */ size_t strtabidx; struct elf_sec_desc *secs; @@ -606,6 +608,7 @@ struct elf_state { int text_shndx; int symbols_shndx; int st_ops_shndx; + int st_ops_link_shndx; }; =20 struct usdt_manager; @@ -1119,7 +1122,8 @@ static int bpf_object__init_kern_struct_ops_maps(st= ruct bpf_object *obj) return 0; } =20 -static int bpf_object__init_struct_ops_maps(struct bpf_object *obj) +static int init_struct_ops_maps(struct bpf_object *obj, const char *sec_= name, + int shndx, Elf_Data *data, __u32 map_flags) { const struct btf_type *type, *datasec; const struct btf_var_secinfo *vsi; @@ -1130,15 +1134,15 @@ static int bpf_object__init_struct_ops_maps(struc= t bpf_object *obj) struct bpf_map *map; __u32 i; =20 - if (obj->efile.st_ops_shndx =3D=3D -1) + if (shndx =3D=3D -1) return 0; =20 btf =3D obj->btf; - datasec_id =3D btf__find_by_name_kind(btf, STRUCT_OPS_SEC, + datasec_id =3D btf__find_by_name_kind(btf, sec_name, BTF_KIND_DATASEC); if (datasec_id < 0) { pr_warn("struct_ops init: DATASEC %s not found\n", - STRUCT_OPS_SEC); + sec_name); return -EINVAL; } =20 @@ -1151,7 +1155,7 @@ static int bpf_object__init_struct_ops_maps(struct = bpf_object *obj) type_id =3D btf__resolve_type(obj->btf, vsi->type); if (type_id < 0) { pr_warn("struct_ops init: Cannot resolve var type_id %u in DATASEC %s= \n", - vsi->type, STRUCT_OPS_SEC); + vsi->type, sec_name); return -EINVAL; } =20 @@ -1170,7 +1174,7 @@ static int bpf_object__init_struct_ops_maps(struct = bpf_object *obj) if (IS_ERR(map)) return PTR_ERR(map); =20 - map->sec_idx =3D obj->efile.st_ops_shndx; + map->sec_idx =3D shndx; map->sec_offset =3D vsi->offset; map->name =3D strdup(var_name); if (!map->name) @@ -1180,6 +1184,7 @@ static int bpf_object__init_struct_ops_maps(struct = bpf_object *obj) map->def.key_size =3D sizeof(int); map->def.value_size =3D type->size; map->def.max_entries =3D 1; + map->def.map_flags =3D map_flags; =20 map->st_ops =3D calloc(1, sizeof(*map->st_ops)); if (!map->st_ops) @@ -1192,14 +1197,14 @@ static int bpf_object__init_struct_ops_maps(struc= t bpf_object *obj) if (!st_ops->data || !st_ops->progs || !st_ops->kern_func_off) return -ENOMEM; =20 - if (vsi->offset + type->size > obj->efile.st_ops_data->d_size) { + if (vsi->offset + type->size > data->d_size) { pr_warn("struct_ops init: var %s is beyond the end of DATASEC %s\n", - var_name, STRUCT_OPS_SEC); + var_name, sec_name); return -EINVAL; } =20 memcpy(st_ops->data, - obj->efile.st_ops_data->d_buf + vsi->offset, + data->d_buf + vsi->offset, type->size); st_ops->tname =3D tname; st_ops->type =3D type; @@ -1212,6 +1217,19 @@ static int bpf_object__init_struct_ops_maps(struct= bpf_object *obj) return 0; } =20 +static int bpf_object_init_struct_ops(struct bpf_object *obj) +{ + int err; + + err =3D init_struct_ops_maps(obj, STRUCT_OPS_SEC, obj->efile.st_ops_shn= dx, + obj->efile.st_ops_data, 0); + err =3D err ?: init_struct_ops_maps(obj, STRUCT_OPS_LINK_SEC, + obj->efile.st_ops_link_shndx, + obj->efile.st_ops_link_data, + BPF_F_LINK); + return err; +} + static struct bpf_object *bpf_object__new(const char *path, const void *obj_buf, size_t obj_buf_sz, @@ -1248,6 +1266,7 @@ static struct bpf_object *bpf_object__new(const cha= r *path, obj->efile.obj_buf_sz =3D obj_buf_sz; obj->efile.btf_maps_shndx =3D -1; obj->efile.st_ops_shndx =3D -1; + obj->efile.st_ops_link_shndx =3D -1; obj->kconfig_map_idx =3D -1; =20 obj->kern_version =3D get_kernel_version(); @@ -1265,6 +1284,7 @@ static void bpf_object__elf_finish(struct bpf_objec= t *obj) obj->efile.elf =3D NULL; obj->efile.symbols =3D NULL; obj->efile.st_ops_data =3D NULL; + obj->efile.st_ops_link_data =3D NULL; =20 zfree(&obj->efile.secs); obj->efile.sec_cnt =3D 0; @@ -2619,7 +2639,7 @@ static int bpf_object__init_maps(struct bpf_object = *obj, err =3D bpf_object__init_user_btf_maps(obj, strict, pin_root_path); err =3D err ?: bpf_object__init_global_data_maps(obj); err =3D err ?: bpf_object__init_kconfig_map(obj); - err =3D err ?: bpf_object__init_struct_ops_maps(obj); + err =3D err ?: bpf_object_init_struct_ops(obj); =20 return err; } @@ -2753,12 +2773,13 @@ static bool libbpf_needs_btf(const struct bpf_obj= ect *obj) { return obj->efile.btf_maps_shndx >=3D 0 || obj->efile.st_ops_shndx >=3D 0 || + obj->efile.st_ops_link_shndx >=3D 0 || obj->nr_extern > 0; } =20 static bool kernel_needs_btf(const struct bpf_object *obj) { - return obj->efile.st_ops_shndx >=3D 0; + return obj->efile.st_ops_shndx >=3D 0 || obj->efile.st_ops_link_shndx >= =3D 0; } =20 static int bpf_object__init_btf(struct bpf_object *obj, @@ -3451,6 +3472,9 @@ static int bpf_object__elf_collect(struct bpf_objec= t *obj) } else if (strcmp(name, STRUCT_OPS_SEC) =3D=3D 0) { obj->efile.st_ops_data =3D data; obj->efile.st_ops_shndx =3D idx; + } else if (strcmp(name, STRUCT_OPS_LINK_SEC) =3D=3D 0) { + obj->efile.st_ops_link_data =3D data; + obj->efile.st_ops_link_shndx =3D idx; } else { pr_info("elf: skipping unrecognized data section(%d) %s\n", idx, name); @@ -3465,6 +3489,7 @@ static int bpf_object__elf_collect(struct bpf_objec= t *obj) /* Only do relo for section with exec instructions */ if (!section_have_execinstr(obj, targ_sec_idx) && strcmp(name, ".rel" STRUCT_OPS_SEC) && + strcmp(name, ".rel" STRUCT_OPS_LINK_SEC) && strcmp(name, ".rel" MAPS_ELF_SEC)) { pr_info("elf: skipping relo section(%d) %s for section(%d) %s\n", idx, name, targ_sec_idx, @@ -6611,7 +6636,7 @@ static int bpf_object__collect_relos(struct bpf_obj= ect *obj) return -LIBBPF_ERRNO__INTERNAL; } =20 - if (idx =3D=3D obj->efile.st_ops_shndx) + if (idx =3D=3D obj->efile.st_ops_shndx || idx =3D=3D obj->efile.st_ops= _link_shndx) err =3D bpf_object__collect_st_ops_relos(obj, shdr, data); else if (idx =3D=3D obj->efile.btf_maps_shndx) err =3D bpf_object__collect_map_relos(obj, shdr, data); @@ -8844,6 +8869,7 @@ const char *libbpf_bpf_prog_type_str(enum bpf_prog_= type t) } =20 static struct bpf_map *find_struct_ops_map_by_offset(struct bpf_object *= obj, + int sec_idx, size_t offset) { struct bpf_map *map; @@ -8853,7 +8879,8 @@ static struct bpf_map *find_struct_ops_map_by_offse= t(struct bpf_object *obj, map =3D &obj->maps[i]; if (!bpf_map__is_struct_ops(map)) continue; - if (map->sec_offset <=3D offset && + if (map->sec_idx =3D=3D sec_idx && + map->sec_offset <=3D offset && offset - map->sec_offset < map->def.value_size) return map; } @@ -8895,7 +8922,7 @@ static int bpf_object__collect_st_ops_relos(struct = bpf_object *obj, } =20 name =3D elf_sym_str(obj, sym->st_name) ?: ""; - map =3D find_struct_ops_map_by_offset(obj, rel->r_offset); + map =3D find_struct_ops_map_by_offset(obj, shdr->sh_info, rel->r_offse= t); if (!map) { pr_warn("struct_ops reloc: cannot find map at rel->r_offset %zu\n", (size_t)rel->r_offset); @@ -8962,8 +8989,9 @@ static int bpf_object__collect_st_ops_relos(struct = bpf_object *obj, } =20 /* struct_ops BPF prog can be re-used between multiple - * .struct_ops as long as it's the same struct_ops struct - * definition and the same function pointer field + * .struct_ops & .struct_ops.link as long as it's the + * same struct_ops struct definition and the same + * function pointer field */ if (prog->attach_btf_id !=3D st_ops->type_id || prog->expected_attach_type !=3D member_idx) { --=20 2.34.1