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 X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5898BC433E1 for ; Thu, 25 Mar 2021 01:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25ABD619E8 for ; Thu, 25 Mar 2021 01:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236033AbhCYBwX (ORCPT ); Wed, 24 Mar 2021 21:52:23 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:10846 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S236058AbhCYBwO (ORCPT ); Wed, 24 Mar 2021 21:52:14 -0400 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.43/8.16.0.43) with SMTP id 12P1qD1q031964 for ; Wed, 24 Mar 2021 18:52:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=q+f2Y732MnulG3HJWlGblpDfAZ17tK6mJNi86rivi1Q=; b=DMNDj9RGOMq4z2cw+KttUeJ9lBoIULUM4P9dyQK/ZFcl7zs/KOQp2dkct03F39/sZg+b y4BrD8+Sh2QOjlhR4JgcqGvAknOsDYZn3vfMKMpcIm59bNKhLe1X5iWkFRG+4HenFAY5 uIB7w/1Fc0AuNezV1hYnTk5e8X9m4NHu75Y= Received: from maileast.thefacebook.com ([163.114.130.16]) by m0001303.ppops.net with ESMTP id 37g173nu4y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 24 Mar 2021 18:52:13 -0700 Received: from intmgw001.06.ash9.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 24 Mar 2021 18:52:13 -0700 Received: by devbig005.ftw2.facebook.com (Postfix, from userid 6611) id 099F129429D7; Wed, 24 Mar 2021 18:52:08 -0700 (PDT) From: Martin KaFai Lau To: CC: Alexei Starovoitov , Daniel Borkmann , , , Andrii Nakryiko Subject: [PATCH v2 bpf-next 07/14] libbpf: Refactor bpf_object__resolve_ksyms_btf_id Date: Wed, 24 Mar 2021 18:52:07 -0700 Message-ID: <20210325015207.1546749-1-kafai@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210325015124.1543397-1-kafai@fb.com> References: <20210325015124.1543397-1-kafai@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.761 definitions=2021-03-24_14:2021-03-24,2021-03-24 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 priorityscore=1501 mlxscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 phishscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2103250012 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org This patch refactors most of the logic from bpf_object__resolve_ksyms_btf_id() into a new function bpf_object__resolve_ksym_var_btf_id(). It is to get ready for a later patch adding bpf_object__resolve_ksym_func_btf_id() which resolves a kernel function to the running kernel btf_id. Acked-by: Andrii Nakryiko Signed-off-by: Martin KaFai Lau --- tools/lib/bpf/libbpf.c | 124 ++++++++++++++++++++++------------------- 1 file changed, 67 insertions(+), 57 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 058b643cbcb1..57123a2179b4 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -7394,75 +7394,85 @@ static int bpf_object__read_kallsyms_file(struct = bpf_object *obj) return err; } =20 -static int bpf_object__resolve_ksyms_btf_id(struct bpf_object *obj) +static int bpf_object__resolve_ksym_var_btf_id(struct bpf_object *obj, + struct extern_desc *ext) { - struct extern_desc *ext; + const struct btf_type *targ_var, *targ_type; + __u32 targ_type_id, local_type_id; + const char *targ_var_name; + int i, id, btf_fd, err; struct btf *btf; - int i, j, id, btf_fd, err; =20 - for (i =3D 0; i < obj->nr_extern; i++) { - const struct btf_type *targ_var, *targ_type; - __u32 targ_type_id, local_type_id; - const char *targ_var_name; - int ret; + btf =3D obj->btf_vmlinux; + btf_fd =3D 0; + id =3D btf__find_by_name_kind(btf, ext->name, BTF_KIND_VAR); + if (id =3D=3D -ENOENT) { + err =3D load_module_btfs(obj); + if (err) + return err; =20 - ext =3D &obj->externs[i]; - if (ext->type !=3D EXT_KSYM || !ext->ksym.type_id) - continue; + for (i =3D 0; i < obj->btf_module_cnt; i++) { + btf =3D obj->btf_modules[i].btf; + /* we assume module BTF FD is always >0 */ + btf_fd =3D obj->btf_modules[i].fd; + id =3D btf__find_by_name_kind(btf, ext->name, BTF_KIND_VAR); + if (id !=3D -ENOENT) + break; + } + } + if (id <=3D 0) { + pr_warn("extern (var ksym) '%s': failed to find BTF ID in kernel BTF(s= ).\n", + ext->name); + return -ESRCH; + } =20 - btf =3D obj->btf_vmlinux; - btf_fd =3D 0; - id =3D btf__find_by_name_kind(btf, ext->name, BTF_KIND_VAR); - if (id =3D=3D -ENOENT) { - err =3D load_module_btfs(obj); - if (err) - return err; + /* find local type_id */ + local_type_id =3D ext->ksym.type_id; =20 - for (j =3D 0; j < obj->btf_module_cnt; j++) { - btf =3D obj->btf_modules[j].btf; - /* we assume module BTF FD is always >0 */ - btf_fd =3D obj->btf_modules[j].fd; - id =3D btf__find_by_name_kind(btf, ext->name, BTF_KIND_VAR); - if (id !=3D -ENOENT) - break; - } - } - if (id <=3D 0) { - pr_warn("extern (ksym) '%s': failed to find BTF ID in kernel BTF(s).\= n", - ext->name); - return -ESRCH; - } + /* find target type_id */ + targ_var =3D btf__type_by_id(btf, id); + targ_var_name =3D btf__name_by_offset(btf, targ_var->name_off); + targ_type =3D skip_mods_and_typedefs(btf, targ_var->type, &targ_type_id= ); =20 - /* find local type_id */ - local_type_id =3D ext->ksym.type_id; + err =3D bpf_core_types_are_compat(obj->btf, local_type_id, + btf, targ_type_id); + if (err <=3D 0) { + const struct btf_type *local_type; + const char *targ_name, *local_name; =20 - /* find target type_id */ - targ_var =3D btf__type_by_id(btf, id); - targ_var_name =3D btf__name_by_offset(btf, targ_var->name_off); - targ_type =3D skip_mods_and_typedefs(btf, targ_var->type, &targ_type_i= d); + local_type =3D btf__type_by_id(obj->btf, local_type_id); + local_name =3D btf__name_by_offset(obj->btf, local_type->name_off); + targ_name =3D btf__name_by_offset(btf, targ_type->name_off); =20 - ret =3D bpf_core_types_are_compat(obj->btf, local_type_id, - btf, targ_type_id); - if (ret <=3D 0) { - const struct btf_type *local_type; - const char *targ_name, *local_name; + pr_warn("extern (var ksym) '%s': incompatible types, expected [%d] %s = %s, but kernel has [%d] %s %s\n", + ext->name, local_type_id, + btf_kind_str(local_type), local_name, targ_type_id, + btf_kind_str(targ_type), targ_name); + return -EINVAL; + } =20 - local_type =3D btf__type_by_id(obj->btf, local_type_id); - local_name =3D btf__name_by_offset(obj->btf, local_type->name_off); - targ_name =3D btf__name_by_offset(btf, targ_type->name_off); + ext->is_set =3D true; + ext->ksym.kernel_btf_obj_fd =3D btf_fd; + ext->ksym.kernel_btf_id =3D id; + pr_debug("extern (var ksym) '%s': resolved to [%d] %s %s\n", + ext->name, id, btf_kind_str(targ_var), targ_var_name); =20 - pr_warn("extern (ksym) '%s': incompatible types, expected [%d] %s %s,= but kernel has [%d] %s %s\n", - ext->name, local_type_id, - btf_kind_str(local_type), local_name, targ_type_id, - btf_kind_str(targ_type), targ_name); - return -EINVAL; - } + return 0; +} + +static int bpf_object__resolve_ksyms_btf_id(struct bpf_object *obj) +{ + struct extern_desc *ext; + int i, err; + + for (i =3D 0; i < obj->nr_extern; i++) { + ext =3D &obj->externs[i]; + if (ext->type !=3D EXT_KSYM || !ext->ksym.type_id) + continue; =20 - ext->is_set =3D true; - ext->ksym.kernel_btf_obj_fd =3D btf_fd; - ext->ksym.kernel_btf_id =3D id; - pr_debug("extern (ksym) '%s': resolved to [%d] %s %s\n", - ext->name, id, btf_kind_str(targ_var), targ_var_name); + err =3D bpf_object__resolve_ksym_var_btf_id(obj, ext); + if (err) + return err; } return 0; } --=20 2.30.2