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

Commit 42b33468 authored by Jesper Dangaard Brouer's avatar Jesper Dangaard Brouer Committed by Alexei Starovoitov
Browse files

xdp: add flags argument to ndo_xdp_xmit API 



This patch only change the API and reject any use of flags. This is an
intermediate step that allows us to implement the flush flag operation
later, for each individual driver in a separate patch.

The plan is to implement flush operation via XDP_XMIT_FLUSH flag
and then remove XDP_XMIT_FLAGS_NONE when done.

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 69b45078

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+5 −1
Original line number Diff line number Diff line
@@ -3670,7 +3670,8 @@ netdev_tx_t i40e_lan_xmit_frame(struct sk_buff *skb, struct net_device *netdev) 
 * For error cases, a negative errno code is returned and no-frames

 * are transmitted (caller must handle freeing frames).

 **/

int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames)

int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,

		  u32 flags)

{

	struct i40e_netdev_priv *np = netdev_priv(dev);

	unsigned int queue_index = smp_processor_id();
@@ -3684,6 +3685,9 @@ int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames) 
	if (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs)

		return -ENXIO;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_NONE))

		return -EINVAL;



	for (i = 0; i < n; i++) {

		struct xdp_frame *xdpf = frames[i];

		int err;

drivers/net/ethernet/intel/i40e/i40e_txrx.h

+2 −1
Original line number Diff line number Diff line
@@ -487,7 +487,8 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw); 
void i40e_detect_recover_hung(struct i40e_vsi *vsi);

int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);

bool __i40e_chk_linearize(struct sk_buff *skb);

int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames);

int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,

		  u32 flags);

void i40e_xdp_flush(struct net_device *dev);



/**

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −1
Original line number Diff line number Diff line
@@ -10023,7 +10023,7 @@ static int ixgbe_xdp(struct net_device *dev, struct netdev_bpf *xdp) 
}



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

			  struct xdp_frame **frames)

			  struct xdp_frame **frames, u32 flags)

{

	struct ixgbe_adapter *adapter = netdev_priv(dev);

	struct ixgbe_ring *ring;
@@ -10033,6 +10033,9 @@ static int ixgbe_xdp_xmit(struct net_device *dev, int n, 
	if (unlikely(test_bit(__IXGBE_DOWN, &adapter->state)))

		return -ENETDOWN;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_NONE))

		return -EINVAL;



	/* During program transitions its possible adapter->xdp_prog is assigned

	 * but ring has not been configured yet. In this case simply abort xmit.

	 */

drivers/net/tun.c

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

};



static int tun_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames)

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

			struct xdp_frame **frames, u32 flags)

{

	struct tun_struct *tun = netdev_priv(dev);

	struct tun_file *tfile;
@@ -1294,6 +1295,9 @@ static int tun_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames 
	int cnt = n;

	int i;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_NONE))

		return -EINVAL;



	rcu_read_lock();



	numqueues = READ_ONCE(tun->numqueues);
@@ -1332,7 +1336,7 @@ static int tun_xdp_tx(struct net_device *dev, struct xdp_buff *xdp) 
	if (unlikely(!frame))

		return -EOVERFLOW;



	return tun_xdp_xmit(dev, 1, &frame);

	return tun_xdp_xmit(dev, 1, &frame, 0);

}



static void tun_xdp_flush(struct net_device *dev)

drivers/net/virtio_net.c

+4 −1
Original line number Diff line number Diff line
@@ -468,7 +468,7 @@ static int __virtnet_xdp_tx_xmit(struct virtnet_info *vi, 
}



static int virtnet_xdp_xmit(struct net_device *dev,

			    int n, struct xdp_frame **frames)

			    int n, struct xdp_frame **frames, u32 flags)

{

	struct virtnet_info *vi = netdev_priv(dev);

	struct receive_queue *rq = vi->rq;
@@ -481,6 +481,9 @@ static int virtnet_xdp_xmit(struct net_device *dev, 
	int err;

	int i;



	if (unlikely(flags & ~XDP_XMIT_FLAGS_NONE))

		return -EINVAL;



	qp = vi->curr_queue_pairs - vi->xdp_queue_pairs + smp_processor_id();

	sq = &vi->sq[qp];