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

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

mlx4: setup xdp_rxq_info 



Driver hook points for xdp_rxq_info:
 * reg  : mlx4_en_create_rx_ring
 * unreg: mlx4_en_destroy_rx_ring

Tested on actual hardware.

Cc: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent c0124f32

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+2 −1
Original line number Diff line number Diff line
@@ -2172,8 +2172,9 @@ static int mlx4_en_alloc_resources(struct mlx4_en_priv *priv) 


		if (mlx4_en_create_rx_ring(priv, &priv->rx_ring[i],

					   prof->rx_ring_size, priv->stride,

					   node))

					   node, i))

			goto err;



	}



#ifdef CONFIG_RFS_ACCEL

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+10 −3
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ void mlx4_en_set_num_rx_rings(struct mlx4_en_dev *mdev) 


int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,

			   struct mlx4_en_rx_ring **pring,

			   u32 size, u16 stride, int node)

			   u32 size, u16 stride, int node, int queue_index)

{

	struct mlx4_en_dev *mdev = priv->mdev;

	struct mlx4_en_rx_ring *ring;
@@ -286,6 +286,9 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, 
	ring->log_stride = ffs(ring->stride) - 1;

	ring->buf_size = ring->size * ring->stride + TXBB_SIZE;



	if (xdp_rxq_info_reg(&ring->xdp_rxq, priv->dev, queue_index) < 0)

		goto err_ring;



	tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *

					sizeof(struct mlx4_en_rx_alloc));

	ring->rx_info = vzalloc_node(tmp, node);
@@ -293,7 +296,7 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, 
		ring->rx_info = vzalloc(tmp);

		if (!ring->rx_info) {

			err = -ENOMEM;

			goto err_ring;

			goto err_xdp_info;

		}

	}
@@ -317,6 +320,8 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv, 
err_info:

	vfree(ring->rx_info);

	ring->rx_info = NULL;

err_xdp_info:

	xdp_rxq_info_unreg(&ring->xdp_rxq);

err_ring:

	kfree(ring);

	*pring = NULL;
@@ -440,6 +445,7 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv, 
					lockdep_is_held(&mdev->state_lock));

	if (old_prog)

		bpf_prog_put(old_prog);

	xdp_rxq_info_unreg(&ring->xdp_rxq);

	mlx4_free_hwq_res(mdev->dev, &ring->wqres, size * stride + TXBB_SIZE);

	vfree(ring->rx_info);

	ring->rx_info = NULL;
@@ -652,6 +658,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
	int cq_ring = cq->ring;

	bool doorbell_pending;

	struct mlx4_cqe *cqe;

	struct xdp_buff xdp;

	int polled = 0;

	int index;
@@ -666,6 +673,7 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
	/* Protect accesses to: ring->xdp_prog, priv->mac_hash list */

	rcu_read_lock();

	xdp_prog = rcu_dereference(ring->xdp_prog);

	xdp.rxq = &ring->xdp_rxq;

	doorbell_pending = 0;



	/* We assume a 1:1 mapping between CQEs and Rx descriptors, so Rx
@@ -750,7 +758,6 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud 
		 * read bytes but not past the end of the frag.

		 */

		if (xdp_prog) {

			struct xdp_buff xdp;

			dma_addr_t dma;

			void *orig_data;

			u32 act;

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#endif

#include <linux/cpu_rmap.h>

#include <linux/ptp_clock_kernel.h>

#include <net/xdp.h>



#include <linux/mlx4/device.h>

#include <linux/mlx4/qp.h>
@@ -356,6 +357,7 @@ struct mlx4_en_rx_ring { 
	unsigned long dropped;

	int hwtstamp_rx_filter;

	cpumask_var_t affinity_mask;

	struct xdp_rxq_info xdp_rxq;

};



struct mlx4_en_cq {
@@ -720,7 +722,7 @@ void mlx4_en_set_num_rx_rings(struct mlx4_en_dev *mdev); 
void mlx4_en_recover_from_oom(struct mlx4_en_priv *priv);

int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,

			   struct mlx4_en_rx_ring **pring,

			   u32 size, u16 stride, int node);

			   u32 size, u16 stride, int node, int queue_index);

void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,

			     struct mlx4_en_rx_ring **pring,

			     u32 size, u16 stride);