bpf: rename bpf_dev_offload -> bpf_prog_offload

With map offload coming, we need to call program offload structure
something less ambiguous.  Pure rename, no functional changes.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/drivers/net/ethernet/netronome/nfp/bpf/offload.c b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
index 320b2250d29a3520a6f2bf1e480990ae67350cfc..6590228d3755ddcc794ef127eb370e90bb478cf1 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/bpf/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/offload.c
@@ -237,7 +237,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog,
        int err;
 
        if (prog) {
-               struct bpf_dev_offload *offload = prog->aux->offload;
+               struct bpf_prog_offload *offload = prog->aux->offload;
 
                if (!offload)
                        return -EINVAL;

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index c60ddfb34d41f5b3c40c0cb4ae6f9555107cb09b..9fff1ace1d8ec62947dd2620f68dd827bf7d5029 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -200,7 +200,7 @@ struct bpf_prog_offload_ops {
                         int insn_idx, int prev_insn_idx);
 };
 
-struct bpf_dev_offload {
+struct bpf_prog_offload {
        struct bpf_prog         *prog;
        struct net_device       *netdev;
        void                    *dev_priv;
@@ -230,7 +230,7 @@ struct bpf_prog_aux {
 #ifdef CONFIG_SECURITY
        void *security;
 #endif
-       struct bpf_dev_offload *offload;
+       struct bpf_prog_offload *offload;
        union {
                struct work_struct work;
                struct rcu_head rcu;

diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c
index 040d4e0edf3f0c6fb334cab3b3887609cf9ef95e..001ddfde7874ad64ea05a928950746b21140c270 100644 (file)
--- a/kernel/bpf/offload.c
+++ b/kernel/bpf/offload.c
@@ -32,7 +32,7 @@ static LIST_HEAD(bpf_prog_offload_devs);
 
 int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr)
 {
-       struct bpf_dev_offload *offload;
+       struct bpf_prog_offload *offload;
 
        if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS &&
            attr->prog_type != BPF_PROG_TYPE_XDP)
@@ -72,7 +72,7 @@ err_free:
 static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd,
                             struct netdev_bpf *data)
 {
-       struct bpf_dev_offload *offload = prog->aux->offload;
+       struct bpf_prog_offload *offload = prog->aux->offload;
        struct net_device *netdev;
 
        ASSERT_RTNL();
@@ -110,7 +110,7 @@ exit_unlock:
 int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env,
                                 int insn_idx, int prev_insn_idx)
 {
-       struct bpf_dev_offload *offload;
+       struct bpf_prog_offload *offload;
        int ret = -ENODEV;
 
        down_read(&bpf_devs_lock);
@@ -124,7 +124,7 @@ int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env,
 
 static void __bpf_prog_offload_destroy(struct bpf_prog *prog)
 {
-       struct bpf_dev_offload *offload = prog->aux->offload;
+       struct bpf_prog_offload *offload = prog->aux->offload;
        struct netdev_bpf data = {};
 
        data.offload.prog = prog;
@@ -242,7 +242,7 @@ static int bpf_offload_notification(struct notifier_block *notifier,
                                    ulong event, void *ptr)
 {
        struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
-       struct bpf_dev_offload *offload, *tmp;
+       struct bpf_prog_offload *offload, *tmp;
 
        ASSERT_RTNL();