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 5287EC433FE for ; Wed, 5 Jan 2022 23:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245231AbiAEXBV (ORCPT ); Wed, 5 Jan 2022 18:01:21 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:34142 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245244AbiAEXBS (ORCPT ); Wed, 5 Jan 2022 18:01:18 -0500 Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 205KKSTg022549 for ; Wed, 5 Jan 2022 15:01:17 -0800 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=WZEw60ZWQad/kWMWGh6Nn9kIVrLEm3RjtbfSrmbf/CE=; b=WQrhTAn0ZkVm0Bpg27ksvkrOL1ck2dLAUAQihaQVEGLm4BFtChak9Cv9NGtQORxlbQb4 NJiCxipQG9xJhkczYqh4Vbya1uII4jUrT1GYWjEZLepw3ttCFGrKUbMIhW0Rwrbe4YJD bkHZIM7fO5/0M/8c+GeUxR5RzqnqFKlTj04= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3ddj9e0xgf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 05 Jan 2022 15:01:17 -0800 Received: from twshared10140.39.prn1.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Wed, 5 Jan 2022 15:01:15 -0800 Received: by devbig921.prn2.facebook.com (Postfix, from userid 132113) id 6549915060B2; Wed, 5 Jan 2022 15:01:10 -0800 (PST) From: Christy Lee To: , CC: , , , , Christy Lee Subject: [PATCH bpf-next 2/5] bpftool: stop using bpf_map__def() API Date: Wed, 5 Jan 2022 15:00:54 -0800 Message-ID: <20220105230057.853163-3-christylee@fb.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220105230057.853163-1-christylee@fb.com> References: <20220105230057.853163-1-christylee@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: _x6S0-11_j6XKnUHGHfrVaSo8kfpDPRM X-Proofpoint-ORIG-GUID: _x6S0-11_j6XKnUHGHfrVaSo8kfpDPRM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.11.62.513 definitions=2022-01-05_08,2022-01-04_01,2021-12-02_01 X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 clxscore=1015 mlxscore=0 adultscore=0 priorityscore=1501 suspectscore=0 impostorscore=0 phishscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2201050146 X-FB-Internal: deliver Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org libbpf bpf_map__def() API is being deprecated, replace bpftool's usage with the appropriate getters and setters. Signed-off-by: Christy Lee --- tools/bpf/bpftool/gen.c | 12 ++++++------ tools/bpf/bpftool/struct_ops.c | 4 +--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tools/bpf/bpftool/gen.c b/tools/bpf/bpftool/gen.c index b4695df2ea3d..0b6f1553db0b 100644 --- a/tools/bpf/bpftool/gen.c +++ b/tools/bpf/bpftool/gen.c @@ -227,7 +227,7 @@ static int codegen_datasecs(struct bpf_object *obj, c= onst char *obj_name) /* only generate definitions for memory-mapped internal maps */ if (!bpf_map__is_internal(map)) continue; - if (!(bpf_map__def(map)->map_flags & BPF_F_MMAPABLE)) + if (!(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) continue; =20 if (!get_map_ident(map, map_ident, sizeof(map_ident))) @@ -468,7 +468,7 @@ static void codegen_destroy(struct bpf_object *obj, c= onst char *obj_name) if (!get_map_ident(map, ident, sizeof(ident))) continue; if (bpf_map__is_internal(map) && - (bpf_map__def(map)->map_flags & BPF_F_MMAPABLE)) + (bpf_map__map_flags(map) & BPF_F_MMAPABLE)) printf("\tmunmap(skel->%1$s, %2$zd);\n", ident, bpf_map_mmap_sz(map)); codegen("\ @@ -536,7 +536,7 @@ static int gen_trace(struct bpf_object *obj, const ch= ar *obj_name, const char *h continue; =20 if (!bpf_map__is_internal(map) || - !(bpf_map__def(map)->map_flags & BPF_F_MMAPABLE)) + !(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) continue; =20 codegen("\ @@ -600,10 +600,10 @@ static int gen_trace(struct bpf_object *obj, const = char *obj_name, const char *h continue; =20 if (!bpf_map__is_internal(map) || - !(bpf_map__def(map)->map_flags & BPF_F_MMAPABLE)) + !(bpf_map__map_flags(map) & BPF_F_MMAPABLE)) continue; =20 - if (bpf_map__def(map)->map_flags & BPF_F_RDONLY_PROG) + if (bpf_map__map_flags(map) & BPF_F_RDONLY_PROG) mmap_flags =3D "PROT_READ"; else mmap_flags =3D "PROT_READ | PROT_WRITE"; @@ -962,7 +962,7 @@ static int do_skeleton(int argc, char **argv) i, bpf_map__name(map), i, ident); /* memory-mapped internal maps */ if (bpf_map__is_internal(map) && - (bpf_map__def(map)->map_flags & BPF_F_MMAPABLE)) { + (bpf_map__map_flags(map) & BPF_F_MMAPABLE)) { printf("\ts->maps[%zu].mmaped =3D (void **)&obj->%s;\n", i, ident); } diff --git a/tools/bpf/bpftool/struct_ops.c b/tools/bpf/bpftool/struct_op= s.c index 2f693b082bdb..e08a6ff2866c 100644 --- a/tools/bpf/bpftool/struct_ops.c +++ b/tools/bpf/bpftool/struct_ops.c @@ -480,7 +480,6 @@ static int do_unregister(int argc, char **argv) static int do_register(int argc, char **argv) { LIBBPF_OPTS(bpf_object_open_opts, open_opts); - const struct bpf_map_def *def; struct bpf_map_info info =3D {}; __u32 info_len =3D sizeof(info); int nr_errs =3D 0, nr_maps =3D 0; @@ -510,8 +509,7 @@ static int do_register(int argc, char **argv) } =20 bpf_object__for_each_map(map, obj) { - def =3D bpf_map__def(map); - if (def->type !=3D BPF_MAP_TYPE_STRUCT_OPS) + if (bpf_map__type(map) !=3D BPF_MAP_TYPE_STRUCT_OPS) continue; =20 link =3D bpf_map__attach_struct_ops(map); --=20 2.30.2