hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jakub Kicinski 2018-01-11 20:29:07 -08:00 committed by Daniel Borkmann
parent bd475643d7
commit 0a9c1991f2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/netronome/nfp/bpf/offload.c
View File

@ -237,7 +237,7 @@ int nfp_net_bpf_offload(struct nfp_net *nn, struct bpf_prog *prog,
int err; int err;
if (prog) { if (prog) {
struct bpf_dev_offload *offload = prog->aux->offload; struct bpf_prog_offload *offload = prog->aux->offload;
if (!offload) if (!offload)
return -EINVAL; return -EINVAL;

4
include/linux/bpf.h
View File

@ -200,7 +200,7 @@ struct bpf_prog_offload_ops {
int insn_idx, int prev_insn_idx); int insn_idx, int prev_insn_idx);
}; };
struct bpf_dev_offload { struct bpf_prog_offload {
struct bpf_prog *prog; struct bpf_prog *prog;
struct net_device *netdev; struct net_device *netdev;
void *dev_priv; void *dev_priv;
@ -230,7 +230,7 @@ struct bpf_prog_aux {
#ifdef CONFIG_SECURITY #ifdef CONFIG_SECURITY
void *security; void *security;
#endif #endif
struct bpf_dev_offload *offload; struct bpf_prog_offload *offload;
union { union {
struct work_struct work; struct work_struct work;
struct rcu_head rcu; struct rcu_head rcu;

10
kernel/bpf/offload.c
View File

@ -32,7 +32,7 @@ static LIST_HEAD(bpf_prog_offload_devs);
int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr) 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 && if (attr->prog_type != BPF_PROG_TYPE_SCHED_CLS &&
attr->prog_type != BPF_PROG_TYPE_XDP) 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, static int __bpf_offload_ndo(struct bpf_prog *prog, enum bpf_netdev_command cmd,
struct netdev_bpf *data) struct netdev_bpf *data)
{ {
struct bpf_dev_offload *offload = prog->aux->offload; struct bpf_prog_offload *offload = prog->aux->offload;
struct net_device *netdev; struct net_device *netdev;
ASSERT_RTNL(); ASSERT_RTNL();
@ -110,7 +110,7 @@ exit_unlock:
int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env, int bpf_prog_offload_verify_insn(struct bpf_verifier_env *env,
int insn_idx, int prev_insn_idx) int insn_idx, int prev_insn_idx)
{ {
struct bpf_dev_offload *offload; struct bpf_prog_offload *offload;
int ret = -ENODEV; int ret = -ENODEV;
down_read(&bpf_devs_lock); 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) 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 = {}; struct netdev_bpf data = {};
data.offload.prog = prog; data.offload.prog = prog;
@ -242,7 +242,7 @@ static int bpf_offload_notification(struct notifier_block *notifier,
ulong event, void *ptr) ulong event, void *ptr)
{ {
struct net_device *netdev = netdev_notifier_info_to_dev(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(); ASSERT_RTNL();