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

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

bpf: offload: rename the ifindex field 



bpf_target_prog seems long and clunky, rename it to prog_ifindex.
We don't want to call this field just ifindex, because maps
may need a similar field in the future and bpf_attr members for
programs and maps are unnamed.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: default avatarQuentin Monnet <quentin.monnet@netronome.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 649f11dc

include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ union bpf_attr { 
		__u32		kern_version;	/* checked when prog_type=kprobe */

		__u32		prog_flags;

		char		prog_name[BPF_OBJ_NAME_LEN];

		__u32		prog_target_ifindex;	/* ifindex of netdev to prep for */

		__u32		prog_ifindex;	/* ifindex of netdev to prep for */

	};



	struct { /* anonymous struct used by BPF_OBJ_* commands */

kernel/bpf/offload.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) 
	init_waitqueue_head(&offload->verifier_done);



	rtnl_lock();

	offload->netdev = __dev_get_by_index(net, attr->prog_target_ifindex);

	offload->netdev = __dev_get_by_index(net, attr->prog_ifindex);

	if (!offload->netdev) {

		rtnl_unlock();

		kfree(offload);

kernel/bpf/syscall.c

+2 −2
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ struct bpf_prog *bpf_prog_get_type_dev(u32 ufd, enum bpf_prog_type type, 
EXPORT_SYMBOL_GPL(bpf_prog_get_type_dev);



/* last field in 'union bpf_attr' used by this command */

#define	BPF_PROG_LOAD_LAST_FIELD prog_target_ifindex

#define	BPF_PROG_LOAD_LAST_FIELD prog_ifindex



static int bpf_prog_load(union bpf_attr *attr)

{
@@ -1181,7 +1181,7 @@ static int bpf_prog_load(union bpf_attr *attr) 
	atomic_set(&prog->aux->refcnt, 1);

	prog->gpl_compatible = is_gpl ? 1 : 0;



	if (attr->prog_target_ifindex) {

	if (attr->prog_ifindex) {

		err = bpf_prog_offload_init(prog, attr);

		if (err)

			goto free_prog;

tools/include/uapi/linux/bpf.h

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ union bpf_attr { 
		__u32		kern_version;	/* checked when prog_type=kprobe */

		__u32		prog_flags;

		char		prog_name[BPF_OBJ_NAME_LEN];

		__u32		prog_target_ifindex;	/* ifindex of netdev to prep for */

		__u32		prog_ifindex;	/* ifindex of netdev to prep for */

	};



	struct { /* anonymous struct used by BPF_OBJ_* commands */