mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

tuntap: move XDP flushing out of tun_do_xdp()

Browse source 
This will allow adding batch flushing on top.

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-09-12 11:17:05 +08:00 committed by David S. Miller
parent 8ae1aff0b3
commit 1a097910ad
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/tun.c
View file

@ -1660,7 +1660,6 @@ static int tun_xdp_act(struct tun_struct *tun, struct bpf_prog *xdp_prog,
switch (act) { switch (act) {
case XDP_REDIRECT: case XDP_REDIRECT:
err = xdp_do_redirect(tun->dev, xdp, xdp_prog); err = xdp_do_redirect(tun->dev, xdp, xdp_prog);
xdp_do_flush_map();
if (err) if (err)
return err; return err;
break; break;
@ -1749,6 +1748,8 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,
err = tun_xdp_act(tun, xdp_prog, &xdp, act); err = tun_xdp_act(tun, xdp_prog, &xdp, act);
if (err < 0) if (err < 0)
goto err_xdp; goto err_xdp;
if (err == XDP_REDIRECT)
xdp_do_flush_map();
if (err != XDP_PASS) if (err != XDP_PASS)
goto out; goto out;