linux-stable.git/tools/bpf/bpftool/bash-completion, branch linux-5.2.y

bpf, bpftool: enable recvmsg attach types

2019-06-06T23:53:12+00:00

Trivial patch to bpftool in order to complete enabling attaching programs
to BPF_CGROUP_UDP{4,6}_RECVMSG.

Signed-off-by: Daniel Borkmann 
Acked-by: Andrey Ignatov 
Acked-by: Martin KaFai Lau 
Signed-off-by: Alexei Starovoitov

bpftool: fix indendation in bash-completion/bpftool

2019-04-26T04:45:14+00:00

Fix misaligned default case branch for `prog dump` sub-command.

Reported-by: Quentin Monnet 
Cc: Yonghong Song 
Reviewed-by: Quentin Monnet 
Signed-off-by: Andrii Nakryiko 
Signed-off-by: Alexei Starovoitov

bpftool: add bash completions for btf command

2019-04-26T04:45:14+00:00

Add full support for btf command in bash-completion script.

Cc: Quentin Monnet 
Cc: Yonghong Song 
Cc: Alexei Starovoitov 
Cc: Daniel Borkmann 
Reviewed-by: Quentin Monnet 
Signed-off-by: Andrii Nakryiko 
Signed-off-by: Alexei Starovoitov

bpftool: Support sysctl hook

2019-04-17T02:45:47+00:00

Add support for recently added BPF_PROG_TYPE_CGROUP_SYSCTL program type
and BPF_CGROUP_SYSCTL attach type.

Example of bpftool output with sysctl program from selftests:

  # bpftool p load ./test_sysctl_prog.o /mnt/bpf/sysctl_prog type cgroup/sysctl
  # bpftool p l
  9: cgroup_sysctl  name sysctl_tcp_mem  tag 0dd05f81a8d0d52e  gpl
          loaded_at 2019-04-16T12:57:27-0700  uid 0
          xlated 1008B  jited 623B  memlock 4096B
  # bpftool c a /mnt/cgroup2/bla sysctl id 9
  # bpftool c t
  CgroupPath
  ID       AttachType      AttachFlags     Name
  /mnt/cgroup2/bla
      9        sysctl                          sysctl_tcp_mem
  # bpftool c d /mnt/cgroup2/bla sysctl id 9
  # bpftool c t
  CgroupPath
  ID       AttachType      AttachFlags     Name

Signed-off-by: Andrey Ignatov 
Acked-by: Song Liu 
Acked-by: Jakub Kicinski 
Signed-off-by: Alexei Starovoitov

bpf: bpftool, fix documentation for attach types

2019-02-19T16:23:18+00:00

bpftool has support for attach types "stream_verdict" and
"stream_parser" but the documentation was referring to them as
"skb_verdict" and "skb_parse". The inconsistency comes from commit
b7d3826c2ed6 ("bpf: bpftool, add support for attaching programs to
maps").

This patch changes the documentation to match the implementation:
- "bpftool prog help"
- man pages
- bash completion

Signed-off-by: Alban Crequy 
Reviewed-by: Quentin Monnet 
Signed-off-by: Daniel Borkmann

tools: bpftool: add bash completion for bpftool probes

2019-01-23T06:15:40+00:00

Add the bash completion related to the newly introduced "bpftool feature
probe" command.

Signed-off-by: Quentin Monnet 
Reviewed-by: Jakub Kicinski 
Reviewed-by: Stanislav Fomichev 
Signed-off-by: Alexei Starovoitov

bpftool: add bash completion for peek/push/enqueue/pop/dequeue

2019-01-17T09:30:32+00:00

bpftool map peek id       - suggests only queue and stack map ids
bpftool map pop id        - suggests only stack map ids
bpftool map dequeue id    - suggests only queue map ids

bpftool map push id       - suggests only stack map ids
bpftool map enqueue id    - suggests only queue map ids

bpftool map push id 1     - suggests 'value', not 'key'
bpftool map enqueue id 2  - suggests 'value', not 'key'

bpftool map update id  - suggests 'value', not 'key'
bpftool map lookup id  - suggests nothing

Signed-off-by: Stanislav Fomichev 
Signed-off-by: Daniel Borkmann

tools: bpftool: replace Netronome boilerplate with SPDX license headers

2018-12-13T11:08:44+00:00

Replace the repeated license text with SDPX identifiers.

Signed-off-by: Jakub Kicinski 
Acked-by: Roman Gushchin 
Acked-by: YueHaibing 
Acked-by: Yonghong Song 
Acked-by: Stanislav Fomichev 
Acked-by: Sean Young 
Acked-by: Jiri Benc 
Acked-by: David Calavera 
Acked-by: Andrey Ignatov 
Acked-by: Joe Stringer 
Acked-by: David Ahern 
Acked-by: Alexei Starovoitov 
Acked-by: Petar Penkov 
Acked-by: Sandipan Das 
Acked-by: Prashant Bhole 
Acked-by: Stephen Hemminger 
Acked-by: John Fastabend 
Acked-by: Taeung Song 
Acked-by: Jiri Olsa 
Acked-by: Daniel Borkmann 
CC: okash.khawaja@gmail.com
Signed-off-by: Daniel Borkmann

bpf: libbpf: bpftool: Print bpf_line_info during prog dump

2018-12-09T21:54:38+00:00

This patch adds print bpf_line_info function in 'prog dump jitted'
and 'prog dump xlated':

[root@arch-fb-vm1 bpf]# ~/devshare/fb-kernel/linux/tools/bpf/bpftool/bpftool prog dump jited pinned /sys/fs/bpf/test_btf_haskv
[...]
int test_long_fname_2(struct dummy_tracepoint_args * arg):
bpf_prog_44a040bf25481309_test_long_fname_2:
; static int test_long_fname_2(struct dummy_tracepoint_args *arg)
   0:	push   %rbp
   1:	mov    %rsp,%rbp
   4:	sub    $0x30,%rsp
   b:	sub    $0x28,%rbp
   f:	mov    %rbx,0x0(%rbp)
  13:	mov    %r13,0x8(%rbp)
  17:	mov    %r14,0x10(%rbp)
  1b:	mov    %r15,0x18(%rbp)
  1f:	xor    %eax,%eax
  21:	mov    %rax,0x20(%rbp)
  25:	xor    %esi,%esi
; int key = 0;
  27:	mov    %esi,-0x4(%rbp)
; if (!arg->sock)
  2a:	mov    0x8(%rdi),%rdi
; if (!arg->sock)
  2e:	cmp    $0x0,%rdi
  32:	je     0x0000000000000070
  34:	mov    %rbp,%rsi
; counts = bpf_map_lookup_elem(&btf_map, &key);
  37:	add    $0xfffffffffffffffc,%rsi
  3b:	movabs $0xffff8881139d7480,%rdi
  45:	add    $0x110,%rdi
  4c:	mov    0x0(%rsi),%eax
  4f:	cmp    $0x4,%rax
  53:	jae    0x000000000000005e
  55:	shl    $0x3,%rax
  59:	add    %rdi,%rax
  5c:	jmp    0x0000000000000060
  5e:	xor    %eax,%eax
; if (!counts)
  60:	cmp    $0x0,%rax
  64:	je     0x0000000000000070
; counts->v6++;
  66:	mov    0x4(%rax),%edi
  69:	add    $0x1,%rdi
  6d:	mov    %edi,0x4(%rax)
  70:	mov    0x0(%rbp),%rbx
  74:	mov    0x8(%rbp),%r13
  78:	mov    0x10(%rbp),%r14
  7c:	mov    0x18(%rbp),%r15
  80:	add    $0x28,%rbp
  84:	leaveq
  85:	retq
[...]

With linum:
[root@arch-fb-vm1 bpf]# ~/devshare/fb-kernel/linux/tools/bpf/bpftool/bpftool prog dump jited pinned /sys/fs/bpf/test_btf_haskv linum
int _dummy_tracepoint(struct dummy_tracepoint_args * arg):
bpf_prog_b07ccb89267cf242__dummy_tracepoint:
; return test_long_fname_1(arg); [file:/data/users/kafai/fb-kernel/linux/tools/testing/selftests/bpf/test_btf_haskv.c line_num:54 line_col:9]
   0:	push   %rbp
   1:	mov    %rsp,%rbp
   4:	sub    $0x28,%rsp
   b:	sub    $0x28,%rbp
   f:	mov    %rbx,0x0(%rbp)
  13:	mov    %r13,0x8(%rbp)
  17:	mov    %r14,0x10(%rbp)
  1b:	mov    %r15,0x18(%rbp)
  1f:	xor    %eax,%eax
  21:	mov    %rax,0x20(%rbp)
  25:	callq  0x000000000000851e
; return test_long_fname_1(arg); [file:/data/users/kafai/fb-kernel/linux/tools/testing/selftests/bpf/test_btf_haskv.c line_num:54 line_col:2]
  2a:	xor    %eax,%eax
  2c:	mov    0x0(%rbp),%rbx
  30:	mov    0x8(%rbp),%r13
  34:	mov    0x10(%rbp),%r14
  38:	mov    0x18(%rbp),%r15
  3c:	add    $0x28,%rbp
  40:	leaveq
  41:	retq
[...]

Signed-off-by: Martin KaFai Lau 
Acked-by: Yonghong Song 
Signed-off-by: Alexei Starovoitov

tools: bpftool: add a command to dump the trace pipe

2018-12-05T15:41:52+00:00

BPF programs can use the bpf_trace_printk() helper to print debug
information into the trace pipe. Add a subcommand
"bpftool prog tracelog" to simply dump this pipe to the console.

This is for a good part copied from iproute2, where the feature is
available with "tc exec bpf dbg". Changes include dumping pipe content
to stdout instead of stderr and adding JSON support (content is dumped
as an array of strings, one per line read from the pipe). This version
is dual-licensed, with Daniel's permission.

Cc: Daniel Borkmann 
Suggested-by: Daniel Borkmann 
Signed-off-by: Quentin Monnet 
Reviewed-by: Jakub Kicinski 
Signed-off-by: Daniel Borkmann