From nobody Fri Jun 19 17:05:17 2026 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 1EC3FC433EF for ; Thu, 31 Mar 2022 15:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238853AbiCaPtH (ORCPT ); Thu, 31 Mar 2022 11:49:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239882AbiCaPsa (ORCPT ); Thu, 31 Mar 2022 11:48:30 -0400 Received: from mail-qt1-x830.google.com (mail-qt1-x830.google.com [IPv6:2607:f8b0:4864:20::830]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 153803A5C9 for ; Thu, 31 Mar 2022 08:46:41 -0700 (PDT) Received: by mail-qt1-x830.google.com with SMTP id s11so21748530qtc.3 for ; Thu, 31 Mar 2022 08:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mdaverde-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ze+TRyAphAeduWuN2skeP9/ZCll4d+wxSL8ZQdiJjAc=; b=3xAXCx0uv7wSxkbnN6yD1JLuifFdUK7R1hVRF0HbxSWcEa6JRqkWbCZNuOwm3wZwXR 9NLXlM3lw3fslVm4jzCt6SQUj+T126Jdpmyg64usIpyVMSR7Q5YRU0IIsOQ39ZZXSg3N 67AgJg5tqaze/M8euxyl9puyx9Y8XK+fk2mzCSIavEfxpAD0sbRCT9c2eb61xYQjhd6v HGfj7vo9v3+3taNdD/5aLo6+0PjpRatgLbeGByUfp0ZSPVfrlMcvgYZfRYN65ZZYaUbK pHru/Tf3DSc18OmWSm5sOaWx6uFTJBJ5v6pE9uYHsWMrO9H89Sh2LMTMmOxZGIGjrYWp 4gKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ze+TRyAphAeduWuN2skeP9/ZCll4d+wxSL8ZQdiJjAc=; b=0qbUmzvyUMqYeDpoK09FJ4wNB62vNUMhP+hx2SV7z1lurE1Ibc2S289dwWghSBEG60 9qM727RKsglLGkjuhPOJHYE0XYWucTi0bOTONwwWMUXbA/6dGNR55MOafIggERdcQW9W PjQF1MNxULBvJJ/N1w1Mgj9XxeIH6pB4FHcDEcpa0jziyDYQ5bVOrSEzB2ulkEVaEC2a qdDfMks0LyGi8yPiD3yyzvwbwSpwocQZd6uCnuWjenkH1WFDq+GnPFcHtcLizsulHOIG hvL72RkRHATLTdA1O+7CTyxsljURByuL297JZbJ9DHZj/lFjpOWVjcp4mDdY1c119egX ktjg== X-Gm-Message-State: AOAM531isGIPx88S79RjNnbZDPpkzy59UBdQMdPvMZ6YJmX0mF8BD5oT hzKpp3Lj3kntvsBX5i+Vu0UPDg== X-Google-Smtp-Source: ABdhPJzVLojvPkerMf3LFpWe07gvD3uWRA5x7n4tr15Hk0dQJ82dzo4aeF55MzjTM/jUKnB/KOCrJw== X-Received: by 2002:a05:622a:345:b0:2e1:c756:6981 with SMTP id r5-20020a05622a034500b002e1c7566981mr4762523qtw.177.1648741600232; Thu, 31 Mar 2022 08:46:40 -0700 (PDT) Received: from pop-os.attlocal.net ([2600:1700:1d10:5830:565c:ffc5:fa04:b353]) by smtp.gmail.com with ESMTPSA id j12-20020ae9c20c000000b0067ec380b320sm13126797qkg.64.2022.03.31.08.46.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 08:46:39 -0700 (PDT) From: Milan Landaverde To: bpf@vger.kernel.org Cc: milan@mdaverde.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, quentin@isovalent.com, davemarchevsky@fb.com, sdf@google.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 1/3] bpf/bpftool: add syscall prog type Date: Thu, 31 Mar 2022 11:45:53 -0400 Message-Id: <20220331154555.422506-2-milan@mdaverde.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220331154555.422506-1-milan@mdaverde.com> References: <20220331154555.422506-1-milan@mdaverde.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In addition to displaying the program type in bpftool prog show this enables us to be able to query bpf_prog_type_syscall availability through feature probe as well as see which helpers are available in those programs (such as bpf_sys_bpf and bpf_sys_close) Signed-off-by: Milan Landaverde Reviewed-by: Quentin Monnet --- tools/bpf/bpftool/prog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index bc4e05542c2b..8643b37d4e43 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -68,6 +68,7 @@ const char * const prog_type_name[] =3D { [BPF_PROG_TYPE_EXT] =3D "ext", [BPF_PROG_TYPE_LSM] =3D "lsm", [BPF_PROG_TYPE_SK_LOOKUP] =3D "sk_lookup", + [BPF_PROG_TYPE_SYSCALL] =3D "syscall", }; =20 const size_t prog_type_name_size =3D ARRAY_SIZE(prog_type_name); --=20 2.32.0 From nobody Fri Jun 19 17:05:17 2026 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 5A9FAC433EF for ; Thu, 31 Mar 2022 15:47:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238712AbiCaPtC (ORCPT ); Thu, 31 Mar 2022 11:49:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239890AbiCaPsb (ORCPT ); Thu, 31 Mar 2022 11:48:31 -0400 Received: from mail-qv1-xf32.google.com (mail-qv1-xf32.google.com [IPv6:2607:f8b0:4864:20::f32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1061F3CA6B for ; Thu, 31 Mar 2022 08:46:43 -0700 (PDT) Received: by mail-qv1-xf32.google.com with SMTP id ke15so20003550qvb.11 for ; Thu, 31 Mar 2022 08:46:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mdaverde-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DPr3sahcikMBYCgbodWmTPoTIB3Qvaf2KIRlwCildB0=; b=H+/zy8k0pWiPzlGfpwInObaRAb4BkZ2FQfVGxnE9hLNRytx+WTOGb9SLXZX+8vOrxw 0PPIGvf9/q/LGySex3jjWnmJRELPdmigntMFJCz8IZCYIAgV51o+20uGHkWTsvGZV5gG tnLfwcfiXsJaR7axze+hwi49PkIm9HO+gV1WGeRMKo9E6vg3o6CkUxaTaS6tn1mM74F0 Q2DtZD7+qN3ilHWlr8iL+/HRtUIPEpw6RZU+v2rA0GbqZYPKgJ5rlTdevaojx2lsq6GC 7lzsFzx74GPvBEhwQf+ztzA7S+woGz1yYYfKFvJOYdnqvlxNECNjz+KpNMe6HNmPKqdX 7yQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DPr3sahcikMBYCgbodWmTPoTIB3Qvaf2KIRlwCildB0=; b=oyXNaDOPpPE7Ku/sl6qIFPhmN7JUKXYbjns30xnYTnytjeOJJG+1mGgiLsB7B1QGQW P9rqbQx36H9soOoqmX0bYXovrxFaBMUcxVLfVHUWbmiW8AYOeKfvewwb+s1Lal0KIpU8 foKufXjqn4H8PUxF3NgaB7RecjnaRcnFVhnMrAPSjFXaeUktEGIxPwlA9ewMcXLIaBbt EVZKpKZG3XvroKm87/Y4vSyOeOnoJrGjRr1KNWqEjuVZZXL1CUFgXTaUF5TslgD8it6G FqMTUWPjMy5SP0yYAjJM2af58a0dzYtS/AnACIA0Y3lfAM79j5LkbOxGprNd/09mXsT/ 1fBg== X-Gm-Message-State: AOAM533Q3smzj3VUhRf0kHlQWgynJkrV8JEqA9DQugPfsV6UHZLMgwoc RvtVZWH/QLSDTOSLk7N9yKH8zA== X-Google-Smtp-Source: ABdhPJxb6tDpxzZn+h6SsO2e3oPlENq+kosLbrIIN4a2Ey4qpwD4/tlnnFyAQx3Tf4kE9Ql2huYMag== X-Received: by 2002:a05:6214:2aa4:b0:440:f5fc:f1c4 with SMTP id js4-20020a0562142aa400b00440f5fcf1c4mr36552071qvb.104.1648741602131; Thu, 31 Mar 2022 08:46:42 -0700 (PDT) Received: from pop-os.attlocal.net ([2600:1700:1d10:5830:565c:ffc5:fa04:b353]) by smtp.gmail.com with ESMTPSA id j12-20020ae9c20c000000b0067ec380b320sm13126797qkg.64.2022.03.31.08.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 08:46:41 -0700 (PDT) From: Milan Landaverde To: bpf@vger.kernel.org Cc: milan@mdaverde.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, quentin@isovalent.com, davemarchevsky@fb.com, sdf@google.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 2/3] bpf/bpftool: add missing link types Date: Thu, 31 Mar 2022 11:45:54 -0400 Message-Id: <20220331154555.422506-3-milan@mdaverde.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220331154555.422506-1-milan@mdaverde.com> References: <20220331154555.422506-1-milan@mdaverde.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Will display the link type names in bpftool link show output Signed-off-by: Milan Landaverde --- tools/bpf/bpftool/link.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/bpf/bpftool/link.c b/tools/bpf/bpftool/link.c index 97dec81950e5..9392ef390828 100644 --- a/tools/bpf/bpftool/link.c +++ b/tools/bpf/bpftool/link.c @@ -20,6 +20,8 @@ static const char * const link_type_name[] =3D { [BPF_LINK_TYPE_CGROUP] =3D "cgroup", [BPF_LINK_TYPE_ITER] =3D "iter", [BPF_LINK_TYPE_NETNS] =3D "netns", + [BPF_LINK_TYPE_XDP] =3D "xdp", + [BPF_LINK_TYPE_PERF_EVENT] =3D "perf_event", }; =20 static struct hashmap *link_table; --=20 2.32.0 From nobody Fri Jun 19 17:05:17 2026 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 99B9EC433EF for ; Thu, 31 Mar 2022 15:47:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236444AbiCaPt3 (ORCPT ); Thu, 31 Mar 2022 11:49:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239893AbiCaPsc (ORCPT ); Thu, 31 Mar 2022 11:48:32 -0400 Received: from mail-qv1-xf43.google.com (mail-qv1-xf43.google.com [IPv6:2607:f8b0:4864:20::f43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFA233A9 for ; Thu, 31 Mar 2022 08:46:44 -0700 (PDT) Received: by mail-qv1-xf43.google.com with SMTP id kl29so20033839qvb.2 for ; Thu, 31 Mar 2022 08:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mdaverde-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7ONl/rjPY44Su63M5PgvxVFFtmWipaKmt8kt7MQsENI=; b=mGrwJh3X216JDDAJexHUgbVihbd1M5jxhlvHDrMYkBCOtxLkgPJeLCO5zpWEz8aCPO XNmTn/D89/CuONk1ktJRG3sanpLHfp550pJGgbwx+TZIj1A2TsfPVT3FQtFKUsOzJnF2 QVPHkQshtQdcss9A14aF7LNRAK88E+d1GnDhVAmLTsN4dQzL5y2WN92iKWPy141bwRCr K6+dC2e18C7JXVr6lcHLAmfevotBXZbzHTvJoeAFu0prlJ74+WaGdMgntZIIKb0GRBhb uaFJ1HTKlnkMLbg7tIODHKj8sUGo5USENlketHsqgOlLejvzbGUOYSLcu6DDQqpBgeW/ +ikA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7ONl/rjPY44Su63M5PgvxVFFtmWipaKmt8kt7MQsENI=; b=voqwEkQ9lgpKEPTLlp0rYIZmB8zpreMcM7df9EqlCCTspNR+0RRE0gE+qRLMxVZevC aQPmZTSxCD48RBbTtTSWu0fCxR1Xbsvz70MK5fcNubOEXyPoysLvF89XOYz7jMAcBmJ8 bi4FrqGs4Qr+W7Itgy52BUyNnWuCryF9znlNWj+DhooB5syb0c6W9vja4SzRKt2WI5xb f1zEqJvOkefj//lmjCvuqkzzFL6ShCsJ0wY9ph+VCtU6XwvlBVVKyPiFJ8qcI8tjE3Ip 49mttqd6KihpHCZ6JXwIIp7JebsPqq7NFcfP/M8/zCZN57qoEGDJBec6pO+uXy+60e5K DyZA== X-Gm-Message-State: AOAM531WMLQoad0PgkSoDRr31aGgvTFuvOLl9fZUTzQl+QKE17NqVgxC 34xmhJMQUReUenAfrcgH+1oHZw== X-Google-Smtp-Source: ABdhPJxa13kl0P1optMF0WTHmFCEXJZd83UC4G9/VHnydUdYRdzj6BS2cS1m2i4Zen8bt/Yjr4R1Pg== X-Received: by 2002:ad4:5caf:0:b0:441:5879:5e62 with SMTP id q15-20020ad45caf000000b0044158795e62mr4324894qvh.95.1648741603866; Thu, 31 Mar 2022 08:46:43 -0700 (PDT) Received: from pop-os.attlocal.net ([2600:1700:1d10:5830:565c:ffc5:fa04:b353]) by smtp.gmail.com with ESMTPSA id j12-20020ae9c20c000000b0067ec380b320sm13126797qkg.64.2022.03.31.08.46.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Mar 2022 08:46:43 -0700 (PDT) From: Milan Landaverde To: bpf@vger.kernel.org Cc: milan@mdaverde.com, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, quentin@isovalent.com, davemarchevsky@fb.com, sdf@google.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next 3/3] bpf/bpftool: handle libbpf_probe_prog_type errors Date: Thu, 31 Mar 2022 11:45:55 -0400 Message-Id: <20220331154555.422506-4-milan@mdaverde.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220331154555.422506-1-milan@mdaverde.com> References: <20220331154555.422506-1-milan@mdaverde.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Previously [1], we were using bpf_probe_prog_type which returned a bool, but the new libbpf_probe_bpf_prog_type can return a negative error code on failure. This change decides for bpftool to declare a program type is not available on probe failure. [1] https://lore.kernel.org/bpf/20220202225916.3313522-3-andrii@kernel.org/ Signed-off-by: Milan Landaverde Reviewed-by: Quentin Monnet --- tools/bpf/bpftool/feature.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/feature.c b/tools/bpf/bpftool/feature.c index c2f43a5d38e0..b2fbaa7a6b15 100644 --- a/tools/bpf/bpftool/feature.c +++ b/tools/bpf/bpftool/feature.c @@ -564,7 +564,7 @@ probe_prog_type(enum bpf_prog_type prog_type, bool *sup= ported_types, =20 res =3D probe_prog_type_ifindex(prog_type, ifindex); } else { - res =3D libbpf_probe_bpf_prog_type(prog_type, NULL); + res =3D libbpf_probe_bpf_prog_type(prog_type, NULL) > 0; } =20 #ifdef USE_LIBCAP --=20 2.32.0