OSDN Git Service

bpf: Rename bpf_htab to bpf_shtab in sock_map
authorAndrey Ignatov <rdna@fb.com>
Fri, 19 Jun 2020 21:11:42 +0000 (14:11 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Mon, 22 Jun 2020 20:22:58 +0000 (22:22 +0200)
commit032a6b3565489a26d6841eefa1fc29d95fc80c66
treee62d93d833ff8b6a68275b37cf84cdeccbaa91bb
parenta2d0d62f4d9e3546134ba08e102ca7decd4ed836
bpf: Rename bpf_htab to bpf_shtab in sock_map

There are two different `struct bpf_htab` in bpf code in the following
files:
- kernel/bpf/hashtab.c
- net/core/sock_map.c

It makes it impossible to find proper btf_id by name = "bpf_htab" and
kind = BTF_KIND_STRUCT what is needed to support access to map ptr so
that bpf program can access `struct bpf_htab` fields.

To make it possible one of the struct-s should be renamed, sock_map.c
looks like a better candidate for rename since it's specialized version
of hashtab.

Rename it to bpf_shtab ("sh" stands for Sock Hash).

Signed-off-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
Link: https://lore.kernel.org/bpf/c006a639e03c64ca50fc87c4bb627e0bfba90f4e.1592600985.git.rdna@fb.com
net/core/sock_map.c