On Tue, Sep 21, 2021 at 2:30 PM Joanne Koong <joannekoong@xxxxxx> wrote:
>
> This patch adds the libbpf infrastructure that will allow the user to
> specify a configurable number of hash functions to use for the bloom
> filter map.
>
> Please note that this patch does not enforce that a pinned bloom filter
> map may only be reused if the number of hash functions is the same. If
> they are not the same, the number of hash functions used will be the one
> that was set for the pinned map.
>
> Signed-off-by: Joanne Koong <joannekoong@xxxxxx>
> ---
> include/uapi/linux/bpf.h | 5 ++++-
> tools/include/uapi/linux/bpf.h | 5 ++++-
> tools/lib/bpf/bpf.c | 2 ++
> tools/lib/bpf/bpf.h | 1 +
> tools/lib/bpf/libbpf.c | 32 +++++++++++++++++++++++++++-----
> tools/lib/bpf/libbpf.h | 2 ++
> tools/lib/bpf/libbpf.map | 1 +
> tools/lib/bpf/libbpf_internal.h | 4 +++-
> 8 files changed, 44 insertions(+), 8 deletions(-)
>
> diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
> index fec9fcfe0629..2e3048488feb 100644
> --- a/include/uapi/linux/bpf.h
> +++ b/include/uapi/linux/bpf.h
> @@ -1262,7 +1262,10 @@ union bpf_attr {
> __u32 map_flags; /* BPF_MAP_CREATE related
> * flags defined above.
> */
> - __u32 inner_map_fd; /* fd pointing to the inner map */
> + union {
> + __u32 inner_map_fd; /* fd pointing to the inner map */
> + __u32 nr_hash_funcs; /* or number of hash functions */
> + };
> __u32 numa_node; /* numa node (effective only if
> * BPF_F_NUMA_NODE is set).
> */
> diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
> index fec9fcfe0629..2e3048488feb 100644
> --- a/tools/include/uapi/linux/bpf.h
> +++ b/tools/include/uapi/linux/bpf.h
> @@ -1262,7 +1262,10 @@ union bpf_attr {
> __u32 map_flags; /* BPF_MAP_CREATE related
> * flags defined above.
> */
> - __u32 inner_map_fd; /* fd pointing to the inner map */
> + union {
> + __u32 inner_map_fd; /* fd pointing to the inner map */
> + __u32 nr_hash_funcs; /* or number of hash functions */
> + };
> __u32 numa_node; /* numa node (effective only if
> * BPF_F_NUMA_NODE is set).
> */
these changes should be part of patch 1, otherwise patch 1 leaves
kernel in non-compilable state and breaks bisection
> diff --git a/tools/lib/bpf/bpf.c b/tools/lib/bpf/bpf.c
> index 2401fad090c5..8a9dd4f6d6c8 100644
> --- a/tools/lib/bpf/bpf.c
> +++ b/tools/lib/bpf/bpf.c
> @@ -100,6 +100,8 @@ int bpf_create_map_xattr(const struct bpf_create_map_attr *create_attr)
> if (attr.map_type == BPF_MAP_TYPE_STRUCT_OPS)
> attr.btf_vmlinux_value_type_id =
> create_attr->btf_vmlinux_value_type_id;
> + else if (attr.map_type == BPF_MAP_TYPE_BLOOM_FILTER)
> + attr.nr_hash_funcs = create_attr->nr_hash_funcs;
> else
> attr.inner_map_fd = create_attr->inner_map_fd;
>
> diff --git a/tools/lib/bpf/bpf.h b/tools/lib/bpf/bpf.h
> index 6fffb3cdf39b..1194b6f01572 100644
> --- a/tools/lib/bpf/bpf.h
> +++ b/tools/lib/bpf/bpf.h
> @@ -49,6 +49,7 @@ struct bpf_create_map_attr {
> union {
> __u32 inner_map_fd;
> __u32 btf_vmlinux_value_type_id;
> + __u32 nr_hash_funcs;
> };
> };
>
> diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
> index da65a1666a5e..e51e68a07aaf 100644
> --- a/tools/lib/bpf/libbpf.c
> +++ b/tools/lib/bpf/libbpf.c
> @@ -378,6 +378,7 @@ struct bpf_map {
> char *pin_path;
> bool pinned;
> bool reused;
> + __u32 nr_hash_funcs;
nit: please keep it next to inner_map_fd field
> };
>
> enum extern_type {
> @@ -1291,6 +1292,11 @@ static bool bpf_map_type__is_map_in_map(enum bpf_map_type type)
> return false;
> }
>
> +static inline bool bpf_map__is_bloom_filter(const struct bpf_map *map)
> +{
> + return map->def.type == BPF_MAP_TYPE_BLOOM_FILTER;
> +}
this is used in only one place, it's ok to just open-code it
> +
> int bpf_object__section_size(const struct bpf_object *obj, const char *name,
> __u32 *size)
> {
[...]
> @@ -8610,6 +8624,14 @@ int bpf_map__set_value_size(struct bpf_map *map, __u32 size)
> return 0;
> }
>
> +int bpf_map__set_nr_hash_funcs(struct bpf_map *map, __u32 nr_hash_funcs)
> +{
> + if (map->fd >= 0)
> + return libbpf_err(-EBUSY);
should we disallow this for anything but BLOOM_FILTER?
> + map->nr_hash_funcs = nr_hash_funcs;
> + return 0;
> +}
> +
> __u32 bpf_map__btf_key_type_id(const struct bpf_map *map)
> {
> return map ? map->btf_key_type_id : 0;
> diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
> index d0bedd673273..5c441744f766 100644
> --- a/tools/lib/bpf/libbpf.h
> +++ b/tools/lib/bpf/libbpf.h
> @@ -550,6 +550,8 @@ LIBBPF_API __u32 bpf_map__btf_value_type_id(const struct bpf_map *map);
> /* get/set map if_index */
> LIBBPF_API __u32 bpf_map__ifindex(const struct bpf_map *map);
> LIBBPF_API int bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex);
> +/* set nr_hash_funcs */
> +LIBBPF_API int bpf_map__set_nr_hash_funcs(struct bpf_map *map, __u32 nr_hash_funcs);
Let's not add this setter at all right now. Let's allow setting this
from BPF source code only in BTF map definition. It's unlikely anyone
would be setting the number of hash functions dynamically and I just
hate the idea of this one-off setter just for one specific map type.
We can always add it later if there really will be a need for that.
>
> typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);
> LIBBPF_API int bpf_map__set_priv(struct bpf_map *map, void *priv,
[...]
