Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09728266 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpf: offload: rename bpf_offload_dev_match() to bpf_offload_prog_map_match() 



A set of new API functions exported for the drivers will soon use
'bpf_offload_dev_' as a prefix.  Rename the bpf_offload_dev_match()
which is internal to the core (used by the verifier) to avoid any
confusion.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 4612bebf

include/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ int bpf_map_offload_delete_elem(struct bpf_map *map, void *key); 
int bpf_map_offload_get_next_key(struct bpf_map *map,

				 void *key, void *next_key);



bool bpf_offload_dev_match(struct bpf_prog *prog, struct bpf_map *map);

bool bpf_offload_prog_map_match(struct bpf_prog *prog, struct bpf_map *map);



#if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)

int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);

kernel/bpf/offload.c

+1 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ int bpf_map_offload_info_fill(struct bpf_map_info *info, struct bpf_map *map) 
	return 0;

}



bool bpf_offload_dev_match(struct bpf_prog *prog, struct bpf_map *map)

bool bpf_offload_prog_map_match(struct bpf_prog *prog, struct bpf_map *map)

{

	struct bpf_offloaded_map *offmap;

	struct bpf_prog_offload *offload;

kernel/bpf/verifier.c

+1 −1
Original line number Diff line number Diff line
@@ -5054,7 +5054,7 @@ static int check_map_prog_compatibility(struct bpf_verifier_env *env, 
	}



	if ((bpf_prog_is_dev_bound(prog->aux) || bpf_map_is_dev_bound(map)) &&

	    !bpf_offload_dev_match(prog, map)) {

	    !bpf_offload_prog_map_match(prog, map)) {

		verbose(env, "offload device mismatch between prog and map\n");

		return -EINVAL;

	}