Commit 4189777c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 



Tony Nguyen says:

====================
This series contains updates to igb, igc, ixgbe, ixgbevf, i40e and ice
drivers.

Kurt Kanzenbach fixes XDP for igb when PTP is enabled by pulling the
timestamp and adjusting appropriate values prior to XDP operations.

Magnus adds missing exception tracing for XDP on igb, igc, ixgbe,
ixgbevf, i40e and ice drivers.

Maciej adds tracking of AF_XDP zero copy enabled queues to resolve an
issue with copy mode Tx for the ice driver.

Note: Patch 7 will conflict when merged with net-next. Please carry
these changes forward. IGC_XDP_TX and IGC_XDP_REDIRECT will need to be
changed to return to conform with the net-next changes. Let me know if
you have issues.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 86b84066 e102db78

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

+6 −1
Original line number Diff line number Diff line
@@ -2313,15 +2313,20 @@ static int i40e_run_xdp(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];

		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);

		if (result == I40E_XDP_CONSUMED)

			goto out_failure;

		break;

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		if (err)

			goto out_failure;

		result = I40E_XDP_REDIR;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough; /* handle aborts by dropping packet */

	case XDP_DROP:

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

+6 −2
Original line number Diff line number Diff line
@@ -162,9 +162,10 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 


	if (likely(act == XDP_REDIRECT)) {

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;

		if (err)

			goto out_failure;

		rcu_read_unlock();

		return result;

		return I40E_XDP_REDIR;

	}



	switch (act) {
@@ -173,11 +174,14 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp) 
	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];

		result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);

		if (result == I40E_XDP_CONSUMED)

			goto out_failure;

		break;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough; /* handle aborts by dropping packet */

	case XDP_DROP:

drivers/net/ethernet/intel/ice/ice.h

+5 −3
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ struct ice_vsi { 
	struct ice_tc_cfg tc_cfg;

	struct bpf_prog *xdp_prog;

	struct ice_ring **xdp_rings;	 /* XDP ring array */

	unsigned long *af_xdp_zc_qps;	 /* tracks AF_XDP ZC enabled qps */

	u16 num_xdp_txq;		 /* Used XDP queues */

	u8 xdp_mapping_mode;		 /* ICE_MAP_MODE_[CONTIG|SCATTER] */
@@ -547,15 +548,16 @@ static inline void ice_set_ring_xdp(struct ice_ring *ring) 
 */

static inline struct xsk_buff_pool *ice_xsk_pool(struct ice_ring *ring)

{

	struct ice_vsi *vsi = ring->vsi;

	u16 qid = ring->q_index;



	if (ice_ring_is_xdp(ring))

		qid -= ring->vsi->num_xdp_txq;

		qid -= vsi->num_xdp_txq;



	if (!ice_is_xdp_ena_vsi(ring->vsi))

	if (!ice_is_xdp_ena_vsi(vsi) || !test_bit(qid, vsi->af_xdp_zc_qps))

		return NULL;



	return xsk_get_pool_from_qid(ring->vsi->netdev, qid);

	return xsk_get_pool_from_qid(vsi->netdev, qid);

}



/**

drivers/net/ethernet/intel/ice/ice_lib.c

+10 −0
Original line number Diff line number Diff line
@@ -105,8 +105,14 @@ static int ice_vsi_alloc_arrays(struct ice_vsi *vsi) 
	if (!vsi->q_vectors)

		goto err_vectors;



	vsi->af_xdp_zc_qps = bitmap_zalloc(max_t(int, vsi->alloc_txq, vsi->alloc_rxq), GFP_KERNEL);

	if (!vsi->af_xdp_zc_qps)

		goto err_zc_qps;



	return 0;



err_zc_qps:

	devm_kfree(dev, vsi->q_vectors);

err_vectors:

	devm_kfree(dev, vsi->rxq_map);

err_rxq_map:
@@ -288,6 +294,10 @@ static void ice_vsi_free_arrays(struct ice_vsi *vsi) 


	dev = ice_pf_to_dev(pf);



	if (vsi->af_xdp_zc_qps) {

		bitmap_free(vsi->af_xdp_zc_qps);

		vsi->af_xdp_zc_qps = NULL;

	}

	/* free the ring and vector containers */

	if (vsi->q_vectors) {

		devm_kfree(dev, vsi->q_vectors);

drivers/net/ethernet/intel/ice/ice_txrx.c

+9 −3
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, 
	    struct bpf_prog *xdp_prog)

{

	struct ice_ring *xdp_ring;

	int err;

	int err, result;

	u32 act;



	act = bpf_prog_run_xdp(xdp_prog, xdp);
@@ -532,14 +532,20 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp, 
		return ICE_XDP_PASS;

	case XDP_TX:

		xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];

		return ice_xmit_xdp_buff(xdp, xdp_ring);

		result = ice_xmit_xdp_buff(xdp, xdp_ring);

		if (result == ICE_XDP_CONSUMED)

			goto out_failure;

		return result;

	case XDP_REDIRECT:

		err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);

		return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;

		if (err)

			goto out_failure;

		return ICE_XDP_REDIR;

	default:

		bpf_warn_invalid_xdp_action(act);

		fallthrough;

	case XDP_ABORTED:

out_failure:

		trace_xdp_exception(rx_ring->netdev, xdp_prog, act);

		fallthrough;

	case XDP_DROP: