diff mbox series

[RFC,4/4] bpf: add BPF_PROG_TYPE_LSM to bpftool name array

Message ID 20200812163305.545447-5-leah.rumancik@gmail.com
State RFC
Delegated to: BPF Maintainers
Headers show
Series block/bpf: add eBPF based block layer IO filtering | expand

Commit Message

Leah Rumancik Aug. 12, 2020, 4:33 p.m. UTC 
Update prog_type_name[] to include missing entry for BPF_PROG_TYPE_LSM

Signed-off-by: Kjetil Ørbekk <orbekk@google.com>
Signed-off-by: Harshad Shirwadkar <harshads@google.com>
Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
---
 tools/bpf/bpftool/main.h | 1 +
 1 file changed, 1 insertion(+)

Comments

Bart Van Assche Aug. 12, 2020, 5 p.m. UTC | #1 
On 2020-08-12 09:33, Leah Rumancik wrote:
> Update prog_type_name[] to include missing entry for BPF_PROG_TYPE_LSM
> 
> Signed-off-by: Kjetil Ørbekk <orbekk@google.com>
> Signed-off-by: Harshad Shirwadkar <harshads@google.com>
> Signed-off-by: Leah Rumancik <leah.rumancik@gmail.com>
> ---
>  tools/bpf/bpftool/main.h | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
> index 0607ae6f6d90..ccc6ac9f82c2 100644
> --- a/tools/bpf/bpftool/main.h
> +++ b/tools/bpf/bpftool/main.h
> @@ -86,6 +86,7 @@ static const char * const prog_type_name[] = {
>  	[BPF_PROG_TYPE_TRACING]			= "tracing",
>  	[BPF_PROG_TYPE_STRUCT_OPS]		= "struct_ops",
>  	[BPF_PROG_TYPE_EXT]			= "ext",
> +	[BPF_PROG_TYPE_LSM]			= "lsm",
>  	[BPF_PROG_TYPE_IO_FILTER]		= "io_filter",
>  };

Is this perhaps intended as a bug fix for commit fc611f47f218
("bpf: Introduce BPF_PROG_TYPE_LSM")? If so, please include a Fixes:
tag, Cc the authors of that patch and move this patch to the start
of this patch series.

Thanks,

Bart.
Tobias Klauser Aug. 12, 2020, 6:17 p.m. UTC | #2 
On 2020-08-12 at 18:33:05 +0200, Leah Rumancik <leah.rumancik@gmail.com> wrote:
> Update prog_type_name[] to include missing entry for BPF_PROG_TYPE_LSM

FWIW, this was already fixed in bpf-next by commit 9a97c9d2af5c ("tools,
bpftool: Add LSM type to array of prog names"), the definition of
prog_type_name also moved to tools/bpf/bpftool/prog.c from
tools/bpf/bpftool/main.h
Leah Rumancik Sept. 1, 2020, 3:18 p.m. UTC | #3 
On Wed, Aug 12, 2020 at 08:17:05PM +0200, Tobias Klauser wrote:
> On 2020-08-12 at 18:33:05 +0200, Leah Rumancik <leah.rumancik@gmail.com> wrote:
> > Update prog_type_name[] to include missing entry for BPF_PROG_TYPE_LSM
> 
> FWIW, this was already fixed in bpf-next by commit 9a97c9d2af5c ("tools,
> bpftool: Add LSM type to array of prog names"), the definition of
> prog_type_name also moved to tools/bpf/bpftool/prog.c from
> tools/bpf/bpftool/main.h

I'll remove this patch and update the location of the change to
prog_type_name in the first patch.

Thanks,
Leah
diff mbox series

Patch

diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index 0607ae6f6d90..ccc6ac9f82c2 100644
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -86,6 +86,7 @@  static const char * const prog_type_name[] = {
 	[BPF_PROG_TYPE_TRACING]			= "tracing",
 	[BPF_PROG_TYPE_STRUCT_OPS]		= "struct_ops",
 	[BPF_PROG_TYPE_EXT]			= "ext",
+	[BPF_PROG_TYPE_LSM]			= "lsm",
 	[BPF_PROG_TYPE_IO_FILTER]		= "io_filter",
 };