Commit c874dff4 authored by Andrii Nakryiko's avatar Andrii Nakryiko
Browse files

Merge branch 'bpftool: miscellaneous fixes' 



Quentin Monnet says:

====================

This set contains several independent minor fixes for bpftool, its
Makefile, and its documentation. Please refer to individual commits for
details.
====================

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
parents 325d956d b06be565

tools/bpf/bpftool/Documentation/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

include ../../../scripts/Makefile.include

include ../../../scripts/utilities.mak



INSTALL ?= install

RM ?= rm -f

tools/bpf/bpftool/Documentation/bpftool-map.rst

+4 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ SYNOPSIS 
	{ **-f** | **--bpffs** } | { **-n** | **--nomount** } }



	*COMMANDS* :=

	{ **show** | **list** | **create** | **dump** | **update** | **lookup** | **getnext**

	| **delete** | **pin** | **help** }

	{ **show** | **list** | **create** | **dump** | **update** | **lookup** | **getnext** |

	**delete** | **pin** | **help** }



MAP COMMANDS

=============
@@ -52,7 +52,7 @@ MAP COMMANDS 
|		| **devmap** | **devmap_hash** | **sockmap** | **cpumap** | **xskmap** | **sockhash**

|		| **cgroup_storage** | **reuseport_sockarray** | **percpu_cgroup_storage**

|		| **queue** | **stack** | **sk_storage** | **struct_ops** | **ringbuf** | **inode_storage**

		| **task_storage** }

|		| **task_storage** | **bloom_filter** }



DESCRIPTION

===========

tools/bpf/bpftool/Documentation/bpftool-prog.rst

+4 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ SYNOPSIS 
	{ **-L** | **--use-loader** } }



	*COMMANDS* :=

	{ **show** | **list** | **dump xlated** | **dump jited** | **pin** | **load**

	| **loadall** | **help** }

	{ **show** | **list** | **dump xlated** | **dump jited** | **pin** | **load** |

	**loadall** | **help** }



PROG COMMANDS

=============

tools/bpf/bpftool/Makefile

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

include ../../scripts/Makefile.include

include ../../scripts/utilities.mak



ifeq ($(srctree),)

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

tools/bpf/bpftool/bash-completion/bpftool

+2 −1
Original line number Diff line number Diff line
@@ -710,7 +710,8 @@ _bpftool() 
                                hash_of_maps devmap devmap_hash sockmap cpumap \

                                xskmap sockhash cgroup_storage reuseport_sockarray \

                                percpu_cgroup_storage queue stack sk_storage \

                                struct_ops inode_storage task_storage ringbuf'

                                struct_ops ringbuf inode_storage task_storage \

                                bloom_filter'

                            COMPREPLY=( $( compgen -W "$BPFTOOL_MAP_CREATE_TYPES" -- "$cur" ) )

                            return 0

                            ;;