Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9d917b authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Alexei Starovoitov
Browse files

tun: implement flush flag for ndo_xdp_xmit 



When passed the XDP_XMIT_FLUSH flag tun_xdp_xmit now performs the same
kind of socket wake up as in tun_xdp_flush(). The wake up code from
tun_xdp_flush is generalized and shared with tun_xdp_xmit.

Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 5e2e6095

drivers/net/tun.c

+13 −6
Original line number Diff line number Diff line
@@ -1285,6 +1285,14 @@ static const struct net_device_ops tun_netdev_ops = { 
	.ndo_get_stats64	= tun_net_get_stats64,

};



static void __tun_xdp_flush_tfile(struct tun_file *tfile)

{

	/* Notify and wake up reader process */

	if (tfile->flags & TUN_FASYNC)

		kill_fasync(&tfile->fasync, SIGIO, POLL_IN);

	tfile->socket.sk->sk_data_ready(tfile->socket.sk);

}



static int tun_xdp_xmit(struct net_device *dev, int n,

			struct xdp_frame **frames, u32 flags)

{
@@ -1295,7 +1303,7 @@ static int tun_xdp_xmit(struct net_device *dev, int n, 
	int cnt = n;

	int i;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_NONE))

	if (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))

		return -EINVAL;



	rcu_read_lock();
@@ -1325,6 +1333,9 @@ static int tun_xdp_xmit(struct net_device *dev, int n, 
	}

	spin_unlock(&tfile->tx_ring.producer_lock);



	if (flags & XDP_XMIT_FLUSH)

		__tun_xdp_flush_tfile(tfile);



	rcu_read_unlock();

	return cnt - drops;

}
@@ -1353,11 +1364,7 @@ static void tun_xdp_flush(struct net_device *dev) 


	tfile = rcu_dereference(tun->tfiles[smp_processor_id() %

					    numqueues]);

	/* Notify and wake up reader process */

	if (tfile->flags & TUN_FASYNC)

		kill_fasync(&tfile->fasync, SIGIO, POLL_IN);

	tfile->socket.sk->sk_data_ready(tfile->socket.sk);



	__tun_xdp_flush_tfile(tfile);

out:

	rcu_read_unlock();

}