From: Jason Wang Date: Wed, 12 Sep 2018 03:17:05 +0000 (+0800) Subject: tuntap: move XDP flushing out of tun_do_xdp() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1a097910adda6b3328fc235575bba0e9ee408492;p=linux.git tuntap: move XDP flushing out of tun_do_xdp() This will allow adding batch flushing on top. Signed-off-by: Jason Wang Signed-off-by: David S. Miller --- diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 14fe94098180d..3ae539374f6bb 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1660,7 +1660,6 @@ static int tun_xdp_act(struct tun_struct *tun, struct bpf_prog *xdp_prog, switch (act) { case XDP_REDIRECT: err = xdp_do_redirect(tun->dev, xdp, xdp_prog); - xdp_do_flush_map(); if (err) return err; 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); if (err < 0) goto err_xdp; + if (err == XDP_REDIRECT) + xdp_do_flush_map(); if (err != XDP_PASS) goto out;