Subject: Re: [PATCH bpf-next] bpftool: recognize BPF_PROG_TYPE_CGROUP_DEVICE
 programs
To: Roman Gushchin <guro@fb.com>,
        Quentin Monnet <quentin.monnet@netronome.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-team@fb.com, Jakub Kicinski <jakub.kicinski@netronome.com>,
        Alexei Starovoitov <ast@kernel.org>
References: <20180115191615.13911-1-guro@fb.com>
 <34c43a17-7832-413e-fea8-4ad0f80f1585@netronome.com>
 <20180115194952.GA14131@castle.DHCP.thefacebook.com>
From: Daniel Borkmann <daniel@iogearbox.net>
Message-ID: <e336b4fc-85f3-f59e-7034-a20406bde17f@iogearbox.net>
Date: Tue, 16 Jan 2018 02:52:51 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.3.0
MIME-Version: 1.0
In-Reply-To: <20180115194952.GA14131@castle.DHCP.thefacebook.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

On 01/15/2018 08:49 PM, Roman Gushchin wrote:
> On Mon, Jan 15, 2018 at 07:32:01PM +0000, Quentin Monnet wrote:
>> 2018-01-15 19:16 UTC+0000 ~ Roman Gushchin <guro@fb.com>
>>> Bpftool doesn't recognize BPF_PROG_TYPE_CGROUP_DEVICE programs,
>>> so the prog show command prints the numeric type value:
>>>
>>> $ bpftool prog show
>>> 1: type 15  name bpf_prog1  tag ac9f93dbfd6d9b74
>>> 	loaded_at Jan 15/07:58  uid 0
>>> 	xlated 96B  jited 105B  memlock 4096B
>>>
>>> This patch defines the corresponding textual representation:
>>>
>>> $ bpftool prog show
>>> 1: cgroup_device  name bpf_prog1  tag ac9f93dbfd6d9b74
>>> 	loaded_at Jan 15/07:58  uid 0
>>> 	xlated 96B  jited 105B  memlock 4096B
>>>
>>> Signed-off-by: Roman Gushchin <guro@fb.com>
>>> Cc: Jakub Kicinski <jakub.kicinski@netronome.com>
>>> Cc: Quentin Monnet <quentin.monnet@netronome.com>
>>> Cc: Daniel Borkmann <daniel@iogearbox.net>
>>> Cc: Alexei Starovoitov <ast@kernel.org>
>>> ---
>>>  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 c6a28be4665c..099e21cf1b5c 100644
>>> --- a/tools/bpf/bpftool/prog.c
>>> +++ b/tools/bpf/bpftool/prog.c
>>> @@ -66,6 +66,7 @@ static const char * const prog_type_name[] = {
>>>  	[BPF_PROG_TYPE_LWT_XMIT]	= "lwt_xmit",
>>>  	[BPF_PROG_TYPE_SOCK_OPS]	= "sock_ops",
>>>  	[BPF_PROG_TYPE_SK_SKB]		= "sk_skb",
>>> +	[BPF_PROG_TYPE_CGROUP_DEVICE]	= "cgroup_device",
>>>  };
>>>  
>>>  static void print_boot_time(__u64 nsecs, char *buf, unsigned int size)
>>
>> Looks good, thanks Roman!
>> Would you mind updating the map names as well? It seems the
>> BPF_MAP_TYPE_CPUMAP is missing from the list in map.c.
> 
> Hello, Quentin!
> 
> Sure, I'll take a look.

Ok, I presume this comes in as a separate one anyway, so I've applied
this one into bpf-next already, thanks Roman!