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: Jakub Kicinski <jakub.kicinski@netronome.com> Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Родитель
649f11dcd1
Коммит
1f6f4cb7ba
|
@ -262,7 +262,7 @@ union bpf_attr {
|
||||||
__u32 kern_version; /* checked when prog_type=kprobe */
|
__u32 kern_version; /* checked when prog_type=kprobe */
|
||||||
__u32 prog_flags;
|
__u32 prog_flags;
|
||||||
char prog_name[BPF_OBJ_NAME_LEN];
|
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 */
|
struct { /* anonymous struct used by BPF_OBJ_* commands */
|
||||||
|
|
|
@ -29,7 +29,7 @@ int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr)
|
||||||
init_waitqueue_head(&offload->verifier_done);
|
init_waitqueue_head(&offload->verifier_done);
|
||||||
|
|
||||||
rtnl_lock();
|
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) {
|
if (!offload->netdev) {
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
kfree(offload);
|
kfree(offload);
|
||||||
|
|
|
@ -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);
|
EXPORT_SYMBOL_GPL(bpf_prog_get_type_dev);
|
||||||
|
|
||||||
/* last field in 'union bpf_attr' used by this command */
|
/* 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)
|
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);
|
atomic_set(&prog->aux->refcnt, 1);
|
||||||
prog->gpl_compatible = is_gpl ? 1 : 0;
|
prog->gpl_compatible = is_gpl ? 1 : 0;
|
||||||
|
|
||||||
if (attr->prog_target_ifindex) {
|
if (attr->prog_ifindex) {
|
||||||
err = bpf_prog_offload_init(prog, attr);
|
err = bpf_prog_offload_init(prog, attr);
|
||||||
if (err)
|
if (err)
|
||||||
goto free_prog;
|
goto free_prog;
|
||||||
|
|
|
@ -262,7 +262,7 @@ union bpf_attr {
|
||||||
__u32 kern_version; /* checked when prog_type=kprobe */
|
__u32 kern_version; /* checked when prog_type=kprobe */
|
||||||
__u32 prog_flags;
|
__u32 prog_flags;
|
||||||
char prog_name[BPF_OBJ_NAME_LEN];
|
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 */
|
struct { /* anonymous struct used by BPF_OBJ_* commands */
|
||||||
|
|
Загрузка…
Ссылка в новой задаче