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 B03D2C433F5 for ; Fri, 1 Apr 2022 16:32:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345066AbiDAQeR (ORCPT ); Fri, 1 Apr 2022 12:34:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346718AbiDAQcw (ORCPT ); Fri, 1 Apr 2022 12:32:52 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85B3B2A03C5 for ; Fri, 1 Apr 2022 09:05:30 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id w21so4951400wra.2 for ; Fri, 01 Apr 2022 09:05:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=QYAmnc7x668b3Mtc5NMdeiZF/b7YzgDGFiavTzqx5m8=; b=gKgXzErmNosOcaf1AGPsGzv8GmZd6HqtgCK4ZUfUw8idZ7blI8Y7WQjH2J3mF5HmwL ODGyazxm7Rj8HWemehlqco3IRPreGlqO7R6WWncb9FrAotpOEalfsaX5nTAt1gJTn51i +C+8R4/oktnlOXMq5xwmEmczUlfW5WJdQjoPrMPpsHrwXz/Thnp/pQDyJp+nMwhr24KE 6MiMO4RULfoMTY3L7ghFpPsysV6kRiWXAL5hOCbkobJ+OBLjV7aLCohQp6d6M6kQJSv2 U3LoM5V7Ah6xWefm4RBglFaBXWIwhg8NsPs8yKrEu4Qp+fHxT+SqLhoEEuJQ48/VDOzL 8Mlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=QYAmnc7x668b3Mtc5NMdeiZF/b7YzgDGFiavTzqx5m8=; b=t1jEVBKKihUkTkt/ZmvPCjJthMWWVxn09rnX/L/vs/tmgSUFi5j6cniBvzYH95YkpU I5XHSXF2Rf07atQSXVlQaurEf7k0rIcur8RkTRzhNYD6MpkTDFy9FUwSVQ/YBfQxfUPp laxa5jmO5+o72vvZsPtQFeNK2WvriRFe3kkooaMA81t1XdMIHZhFug7r6XtTFP6Jp8Mh Pvhlio5frziQ5smhei8MfWw1UdVzyG8XvBl1wM+Ig58sXFPmaCi49PfJ9pIbfZT88oLW tep2r/mZAiWEG0CPcMqP68X3tQXrf7YbQLRccAGaWegIndjqpnFrEFKNK46Leg3fitJZ Z/cQ== X-Gm-Message-State: AOAM532wUeHWh/HyI92a26umkYzEAQEzBCtcZH7IK5w4JHZ5mC/+k8cj Amt4zBOzuCSjFPcX8kQn1hm4eQ== X-Google-Smtp-Source: ABdhPJwVjjkeC6kliJrcb4WvZDn88XBkkBVGgIRYvygMlC4cdKLtHAUut12LgOOv0NPmpfJp/NdnZg== X-Received: by 2002:a5d:6849:0:b0:204:975:acf1 with SMTP id o9-20020a5d6849000000b002040975acf1mr8253511wrw.557.1648829094934; Fri, 01 Apr 2022 09:04:54 -0700 (PDT) Received: from [192.168.178.8] ([51.155.200.13]) by smtp.gmail.com with ESMTPSA id h3-20020adffd43000000b00205dc8459e5sm2397843wrs.7.2022.04.01.09.04.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Apr 2022 09:04:54 -0700 (PDT) Message-ID: Date: Fri, 1 Apr 2022 17:04:53 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH bpf-next 1/3] bpf/bpftool: add syscall prog type Content-Language: en-GB To: Milan Landaverde , bpf@vger.kernel.org Cc: 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, davemarchevsky@fb.com, sdf@google.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20220331154555.422506-1-milan@mdaverde.com> <20220331154555.422506-2-milan@mdaverde.com> From: Quentin Monnet In-Reply-To: <20220331154555.422506-2-milan@mdaverde.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2022-03-31 11:45 UTC-0400 ~ Milan Landaverde > 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 > --- > 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[] = { > [BPF_PROG_TYPE_EXT] = "ext", > [BPF_PROG_TYPE_LSM] = "lsm", > [BPF_PROG_TYPE_SK_LOOKUP] = "sk_lookup", > + [BPF_PROG_TYPE_SYSCALL] = "syscall", > }; > > const size_t prog_type_name_size = ARRAY_SIZE(prog_type_name); Reviewed-by: Quentin Monnet Thanks! This one should have been caught by CI :/. Instead it complains when you add it. This is because BPF_PROG_TYPE_SYSCALL in the UAPI header has a comment next to it, and the regex used in tools/testing/selftests/bpf/test_bpftool_synctypes.py to extract the program types does not account for it. The fix should be: ------ diff --git a/tools/testing/selftests/bpf/test_bpftool_synctypes.py b/tools/testing/selftests/bpf/test_bpftool_synctypes.py index 6bf21e47882a..cd239cbfd80c 100755 --- a/tools/testing/selftests/bpf/test_bpftool_synctypes.py +++ b/tools/testing/selftests/bpf/test_bpftool_synctypes.py @@ -180,7 +180,7 @@ class FileExtractor(object): @enum_name: name of the enum to parse """ start_marker = re.compile(f'enum {enum_name} {{\n') - pattern = re.compile('^\s*(BPF_\w+),?$') + pattern = re.compile('^\s*(BPF_\w+),?( /\* .* \*/)?$') end_marker = re.compile('^};') parser = BlockParser(self.reader) parser.search_block(start_marker) ------ I can submit this separately as a patch. Quentin