Message ID | 20200616113303.8123-1-tklauser@distanz.ch |
---|---|
State | Accepted |
Delegated to: | BPF Maintainers |
Headers | show |
Series | [bpf] tools, bpftool: Add ringbuf map type to map command docs | expand |
On Tue, Jun 16, 2020 at 4:34 AM Tobias Klauser <tklauser@distanz.ch> wrote: > > Commit c34a06c56df7 ("tools/bpftool: Add ringbuf map to a list of known > map types") added the symbolic "ringbuf" name. Document it in the bpftool > map command docs and usage as well. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > --- Thanks! Acked-by: Andrii Nakryiko <andriin@fb.com> > tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- > tools/bpf/bpftool/map.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > [...]
Andrii Nakryiko wrote: > On Tue, Jun 16, 2020 at 4:34 AM Tobias Klauser <tklauser@distanz.ch> wrote: > > > > Commit c34a06c56df7 ("tools/bpftool: Add ringbuf map to a list of known > > map types") added the symbolic "ringbuf" name. Document it in the bpftool > > map command docs and usage as well. > > > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> > > --- > > Thanks! > > Acked-by: Andrii Nakryiko <andriin@fb.com> Acked-by: John Fastabend <john.fastabend@gmail.com> > > > tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- > > tools/bpf/bpftool/map.c | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > [...]
On 6/16/20 1:33 PM, Tobias Klauser wrote: > Commit c34a06c56df7 ("tools/bpftool: Add ringbuf map to a list of known > map types") added the symbolic "ringbuf" name. Document it in the bpftool > map command docs and usage as well. > > Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Applied, thanks!
diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst b/tools/bpf/bpftool/Documentation/bpftool-map.rst index 31101643e57c..70c78faa47ab 100644 --- a/tools/bpf/bpftool/Documentation/bpftool-map.rst +++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst @@ -49,7 +49,7 @@ MAP COMMANDS | | **lru_percpu_hash** | **lpm_trie** | **array_of_maps** | **hash_of_maps** | | **devmap** | **devmap_hash** | **sockmap** | **cpumap** | **xskmap** | **sockhash** | | **cgroup_storage** | **reuseport_sockarray** | **percpu_cgroup_storage** -| | **queue** | **stack** | **sk_storage** | **struct_ops** } +| | **queue** | **stack** | **sk_storage** | **struct_ops** | **ringbuf** } DESCRIPTION =========== diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c index 99109a6afe17..1d3b60651078 100644 --- a/tools/bpf/bpftool/map.c +++ b/tools/bpf/bpftool/map.c @@ -1591,7 +1591,7 @@ static int do_help(int argc, char **argv) " lru_percpu_hash | lpm_trie | array_of_maps | hash_of_maps |\n" " devmap | devmap_hash | sockmap | cpumap | xskmap | sockhash |\n" " cgroup_storage | reuseport_sockarray | percpu_cgroup_storage |\n" - " queue | stack | sk_storage | struct_ops }\n" + " queue | stack | sk_storage | struct_ops | ringbuf }\n" " " HELP_SPEC_OPTIONS "\n" "", bin_name, argv[-2]);
Commit c34a06c56df7 ("tools/bpftool: Add ringbuf map to a list of known map types") added the symbolic "ringbuf" name. Document it in the bpftool map command docs and usage as well. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> --- tools/bpf/bpftool/Documentation/bpftool-map.rst | 2 +- tools/bpf/bpftool/map.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)