Commit 1a097910 authored by Jason Wang's avatar Jason Wang Committed by David S. Miller

tuntap: move XDP flushing out of tun_do_xdp()

This will allow adding batch flushing on top.
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8ae1aff0
...@@ -1660,7 +1660,6 @@ static int tun_xdp_act(struct tun_struct *tun, struct bpf_prog *xdp_prog, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment