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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 C0787C83006 for ; Tue, 28 Apr 2020 05:50:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CAF9206A5 for ; Tue, 28 Apr 2020 05:50:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="TVmHmMUd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726381AbgD1FuS (ORCPT ); Tue, 28 Apr 2020 01:50:18 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:30038 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726366AbgD1FuP (ORCPT ); Tue, 28 Apr 2020 01:50:15 -0400 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03S5feiZ029894 for ; Mon, 27 Apr 2020 22:50:15 -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=KJK1CKr85a31w743EnipqFV7J8H7DBeygRjttiuzSxw=; b=TVmHmMUdyBnPJpcwjHtlOQymk92dNkqARH/andIlUCCnjv1Gfa4Bq9GFDAFpIelfu4gM jRkBf8R3DSqGK9AILLlqIqmJVatGtoxLc0s1KTwH/D5AeDgXhFafyfawmpfVCbIfDoDd rYq+f6BGXItNX05YI9fW4X88l2ILRSBROxI= Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com with ESMTP id 30n5bx4tw2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 27 Apr 2020 22:50:15 -0700 Received: from intmgw004.08.frc2.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1847.3; Mon, 27 Apr 2020 22:50:13 -0700 Received: by devbig012.ftw2.facebook.com (Postfix, from userid 137359) id C9BCD2EC3228; Mon, 27 Apr 2020 22:50:03 -0700 (PDT) Smtp-Origin-Hostprefix: devbig From: Andrii Nakryiko Smtp-Origin-Hostname: devbig012.ftw2.facebook.com To: , , , CC: , , Andrii Nakryiko , Quentin Monnet Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v2 bpf-next 07/10] bpftool: expose attach_type-to-string array to non-cgroup code Date: Mon, 27 Apr 2020 22:49:41 -0700 Message-ID: <20200428054944.4015462-8-andriin@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200428054944.4015462-1-andriin@fb.com> References: <20200428054944.4015462-1-andriin@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.138,18.0.676 definitions=2020-04-28_02:2020-04-27,2020-04-28 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 mlxscore=0 malwarescore=0 mlxlogscore=999 suspectscore=9 bulkscore=0 clxscore=1015 impostorscore=0 adultscore=0 priorityscore=1501 spamscore=0 phishscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004280048 X-FB-Internal: deliver Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Move attach_type_strings into main.h for access in non-cgroup code. bpf_attach_type is used for non-cgroup attach types quite widely now. So = also complete missing string translations for non-cgroup attach types. Cc: Quentin Monnet Signed-off-by: Andrii Nakryiko --- tools/bpf/bpftool/cgroup.c | 48 ++++++++++++-------------------------- tools/bpf/bpftool/main.h | 32 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/tools/bpf/bpftool/cgroup.c b/tools/bpf/bpftool/cgroup.c index 62c6a1d7cd18..1693c802bb20 100644 --- a/tools/bpf/bpftool/cgroup.c +++ b/tools/bpf/bpftool/cgroup.c @@ -31,42 +31,20 @@ =20 static unsigned int query_flags; =20 -static const char * const attach_type_strings[] =3D { - [BPF_CGROUP_INET_INGRESS] =3D "ingress", - [BPF_CGROUP_INET_EGRESS] =3D "egress", - [BPF_CGROUP_INET_SOCK_CREATE] =3D "sock_create", - [BPF_CGROUP_SOCK_OPS] =3D "sock_ops", - [BPF_CGROUP_DEVICE] =3D "device", - [BPF_CGROUP_INET4_BIND] =3D "bind4", - [BPF_CGROUP_INET6_BIND] =3D "bind6", - [BPF_CGROUP_INET4_CONNECT] =3D "connect4", - [BPF_CGROUP_INET6_CONNECT] =3D "connect6", - [BPF_CGROUP_INET4_POST_BIND] =3D "post_bind4", - [BPF_CGROUP_INET6_POST_BIND] =3D "post_bind6", - [BPF_CGROUP_UDP4_SENDMSG] =3D "sendmsg4", - [BPF_CGROUP_UDP6_SENDMSG] =3D "sendmsg6", - [BPF_CGROUP_SYSCTL] =3D "sysctl", - [BPF_CGROUP_UDP4_RECVMSG] =3D "recvmsg4", - [BPF_CGROUP_UDP6_RECVMSG] =3D "recvmsg6", - [BPF_CGROUP_GETSOCKOPT] =3D "getsockopt", - [BPF_CGROUP_SETSOCKOPT] =3D "setsockopt", - [__MAX_BPF_ATTACH_TYPE] =3D NULL, -}; - static enum bpf_attach_type parse_attach_type(const char *str) { enum bpf_attach_type type; =20 for (type =3D 0; type < __MAX_BPF_ATTACH_TYPE; type++) { - if (attach_type_strings[type] && - is_prefix(str, attach_type_strings[type])) + if (attach_type_name[type] && + is_prefix(str, attach_type_name[type])) return type; } =20 return __MAX_BPF_ATTACH_TYPE; } =20 -static int show_bpf_prog(int id, const char *attach_type_str, +static int show_bpf_prog(int id, enum bpf_attach_type attach_type, const char *attach_flags_str, int level) { @@ -86,18 +64,22 @@ static int show_bpf_prog(int id, const char *attach_t= ype_str, if (json_output) { jsonw_start_object(json_wtr); jsonw_uint_field(json_wtr, "id", info.id); - jsonw_string_field(json_wtr, "attach_type", - attach_type_str); + if (attach_type < ARRAY_SIZE(attach_type_name)) + jsonw_string_field(json_wtr, "attach_type", + attach_type_name[attach_type]); + else + jsonw_uint_field(json_wtr, "attach_type", attach_type); jsonw_string_field(json_wtr, "attach_flags", attach_flags_str); jsonw_string_field(json_wtr, "name", info.name); jsonw_end_object(json_wtr); } else { - printf("%s%-8u %-15s %-15s %-15s\n", level ? " " : "", - info.id, - attach_type_str, - attach_flags_str, - info.name); + printf("%s%-8u ", level ? " " : "", info.id); + if (attach_type < ARRAY_SIZE(attach_type_name)) + printf("%-15s", attach_type_name[attach_type]); + else + printf("type %-10u", attach_type); + printf(" %-15s %-15s\n", attach_flags_str, info.name); } =20 close(prog_fd); @@ -171,7 +153,7 @@ static int show_attached_bpf_progs(int cgroup_fd, enu= m bpf_attach_type type, } =20 for (iter =3D 0; iter < prog_cnt; iter++) - show_bpf_prog(prog_ids[iter], attach_type_strings[type], + show_bpf_prog(prog_ids[iter], type, attach_flags_str, level); =20 return 0; diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h index 86f14ce26fd7..99d84bd1d5b2 100644 --- a/tools/bpf/bpftool/main.h +++ b/tools/bpf/bpftool/main.h @@ -83,6 +83,38 @@ static const char * const prog_type_name[] =3D { [BPF_PROG_TYPE_EXT] =3D "ext", }; =20 +static const char * const attach_type_name[__MAX_BPF_ATTACH_TYPE] =3D { + [BPF_CGROUP_INET_INGRESS] =3D "ingress", + [BPF_CGROUP_INET_EGRESS] =3D "egress", + [BPF_CGROUP_INET_SOCK_CREATE] =3D "sock_create", + [BPF_CGROUP_SOCK_OPS] =3D "sock_ops", + [BPF_CGROUP_DEVICE] =3D "device", + [BPF_CGROUP_INET4_BIND] =3D "bind4", + [BPF_CGROUP_INET6_BIND] =3D "bind6", + [BPF_CGROUP_INET4_CONNECT] =3D "connect4", + [BPF_CGROUP_INET6_CONNECT] =3D "connect6", + [BPF_CGROUP_INET4_POST_BIND] =3D "post_bind4", + [BPF_CGROUP_INET6_POST_BIND] =3D "post_bind6", + [BPF_CGROUP_UDP4_SENDMSG] =3D "sendmsg4", + [BPF_CGROUP_UDP6_SENDMSG] =3D "sendmsg6", + [BPF_CGROUP_SYSCTL] =3D "sysctl", + [BPF_CGROUP_UDP4_RECVMSG] =3D "recvmsg4", + [BPF_CGROUP_UDP6_RECVMSG] =3D "recvmsg6", + [BPF_CGROUP_GETSOCKOPT] =3D "getsockopt", + [BPF_CGROUP_SETSOCKOPT] =3D "setsockopt", + + [BPF_SK_SKB_STREAM_PARSER] =3D "sk_skb_stream_parser", + [BPF_SK_SKB_STREAM_VERDICT] =3D "sk_skb_stream_verdict", + [BPF_SK_MSG_VERDICT] =3D "sk_msg_verdict", + [BPF_LIRC_MODE2] =3D "lirc_mode2", + [BPF_FLOW_DISSECTOR] =3D "flow_dissector", + [BPF_TRACE_RAW_TP] =3D "raw_tp", + [BPF_TRACE_FENTRY] =3D "fentry", + [BPF_TRACE_FEXIT] =3D "fexit", + [BPF_MODIFY_RETURN] =3D "mod_ret", + [BPF_LSM_MAC] =3D "lsm_mac", +}; + extern const char * const map_type_name[]; extern const size_t map_type_name_size; =20 --=20 2.24.1