mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tuntap: rename struct tun_steering_prog to struct tun_prog

Browse source 
To be reused by other eBPF program other than queue selection.

Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jason Wang 2018-01-16 16:31:01 +08:00 committed by David S. Miller
parent ca46abd6f8
commit cd5681d7d8
1 changed files with 16 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/net/tun.c
View file

@ -196,7 +196,7 @@ struct tun_flow_entry {
#define TUN_NUM_FLOW_ENTRIES 1024 #define TUN_NUM_FLOW_ENTRIES 1024
struct tun_steering_prog { struct tun_prog {
struct rcu_head rcu; struct rcu_head rcu;
struct bpf_prog *prog; struct bpf_prog *prog;
}; };
@ -238,7 +238,7 @@ struct tun_struct {
u32 rx_batched; u32 rx_batched;
struct tun_pcpu_stats __percpu *pcpu_stats; struct tun_pcpu_stats __percpu *pcpu_stats;
struct bpf_prog __rcu *xdp_prog; struct bpf_prog __rcu *xdp_prog;
struct tun_steering_prog __rcu *steering_prog; struct tun_prog __rcu *steering_prog;
}; };
bool tun_is_xdp_buff(void *ptr) bool tun_is_xdp_buff(void *ptr)
@ -590,7 +590,7 @@ static u16 tun_automq_select_queue(struct tun_struct *tun, struct sk_buff *skb)
static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb) static u16 tun_ebpf_select_queue(struct tun_struct *tun, struct sk_buff *skb)
{ {
struct tun_steering_prog *prog; struct tun_prog *prog;
u16 ret = 0; u16 ret = 0;
prog = rcu_dereference(tun->steering_prog); prog = rcu_dereference(tun->steering_prog);
@ -2184,19 +2184,18 @@ static ssize_t tun_chr_read_iter(struct kiocb *iocb, struct iov_iter *to)
return ret; return ret;
} }
static void tun_steering_prog_free(struct rcu_head *rcu) static void tun_prog_free(struct rcu_head *rcu)
{ {
struct tun_steering_prog *prog = container_of(rcu, struct tun_prog *prog = container_of(rcu, struct tun_prog, rcu);
struct tun_steering_prog, rcu);
bpf_prog_destroy(prog->prog); bpf_prog_destroy(prog->prog);
kfree(prog); kfree(prog);
} }
static int __tun_set_steering_ebpf(struct tun_struct *tun, static int __tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p,
struct bpf_prog *prog) struct bpf_prog *prog)
{ {
struct tun_steering_prog *old, *new = NULL; struct tun_prog *old, *new = NULL;
if (prog) { if (prog) {
new = kmalloc(sizeof(*new), GFP_KERNEL); new = kmalloc(sizeof(*new), GFP_KERNEL);
@ -2206,13 +2205,13 @@ static int __tun_set_steering_ebpf(struct tun_struct *tun,
} }
spin_lock_bh(&tun->lock); spin_lock_bh(&tun->lock);
old = rcu_dereference_protected(tun->steering_prog, old = rcu_dereference_protected(*prog_p,
lockdep_is_held(&tun->lock)); lockdep_is_held(&tun->lock));
rcu_assign_pointer(tun->steering_prog, new); rcu_assign_pointer(*prog_p, new);
spin_unlock_bh(&tun->lock); spin_unlock_bh(&tun->lock);
if (old) if (old)
call_rcu(&old->rcu, tun_steering_prog_free); call_rcu(&old->rcu, tun_prog_free);
return 0; return 0;
} }
@ -2225,7 +2224,7 @@ static void tun_free_netdev(struct net_device *dev)
free_percpu(tun->pcpu_stats); free_percpu(tun->pcpu_stats);
tun_flow_uninit(tun); tun_flow_uninit(tun);
security_tun_dev_free_security(tun->security); security_tun_dev_free_security(tun->security);
__tun_set_steering_ebpf(tun, NULL); __tun_set_ebpf(tun, &tun->steering_prog, NULL);
} }
static void tun_setup(struct net_device *dev) static void tun_setup(struct net_device *dev)
@ -2720,7 +2719,8 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
return ret; return ret;
} }
static int tun_set_steering_ebpf(struct tun_struct *tun, void __user *data) static int tun_set_ebpf(struct tun_struct *tun, struct tun_prog **prog_p,
void __user *data)
{ {
struct bpf_prog *prog; struct bpf_prog *prog;
int fd; int fd;
@ -2736,7 +2736,7 @@ static int tun_set_steering_ebpf(struct tun_struct *tun, void __user *data)
return PTR_ERR(prog); return PTR_ERR(prog);
} }
return __tun_set_steering_ebpf(tun, prog); return __tun_set_ebpf(tun, prog_p, prog);
} }
static long __tun_chr_ioctl(struct file *file, unsigned int cmd, static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
@ -3016,7 +3016,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
break; break;
case TUNSETSTEERINGEBPF: case TUNSETSTEERINGEBPF:
ret = tun_set_steering_ebpf(tun, argp); ret = tun_set_ebpf(tun, &tun->steering_prog, argp);
break; break;
default: default: