mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-03-31 05:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

libbpf: further decouple feature checking logic from bpf_object

Browse Source 
Add feat_supported() helper that accepts feature cache instead of
bpf_object. This allows low-level code in bpf.c to not know or care
about higher-level concept of bpf_object, yet it will be able to utilize
custom feature checking in cases where BPF token might influence the
outcome.

Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20231213190842.3844987-4-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
Andrii Nakryiko
2023-12-13 11:08:35 -08:00
committed by Andrii Nakryiko
parent 11c977ffaf
commit feda0728e0
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libbpf.c
View File

@@ -5074,17 +5074,14 @@ static struct kern_feature_desc {
},
};
bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id)
bool feat_supported(struct kern_feature_cache *cache, enum kern_feature_id feat_id)
{
struct kern_feature_desc *feat = &feature_probes[feat_id];
struct kern_feature_cache *cache = &feature_cache;
int ret;
if (obj && obj->gen_loader)
/* To generate loader program assume the latest kernel
* to avoid doing extra prog_load, map_create syscalls.
*/
return true;
/* assume global feature cache, unless custom one is provided */
if (!cache)
cache = &feature_cache;
if (READ_ONCE(cache->res[feat_id]) == FEAT_UNKNOWN) {
ret = feat->probe();
@@ -5101,6 +5098,17 @@ bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id)
return READ_ONCE(cache->res[feat_id]) == FEAT_SUPPORTED;
}
bool kernel_supports(const struct bpf_object *obj, enum kern_feature_id feat_id)
{
if (obj && obj->gen_loader)
/* To generate loader program assume the latest kernel
* to avoid doing extra prog_load, map_create syscalls.
*/
return true;
return feat_supported(NULL, feat_id);
}
static bool map_is_reuse_compat(const struct bpf_map *map, int map_fd)
{
struct bpf_map_info map_info;