Commit 5edce151 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2022-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2022-03-17

1) From Maxim Mikityanskiy,
   Datapath improvements in preparation for XDP multi buffer

   This series contains general improvements for the datapath that are
   useful for the upcoming XDP multi buffer support:

   a. Non-linear legacy RQ: validate MTU for robustness, build the linear
      part of SKB over the first hardware fragment (instead of copying the
      packet headers), adjust headroom calculations to allow enabling headroom
      in the non-linear mode (useful for XDP multi buffer).

   b. XDP: do the XDP program test before function call, optimize
      parameters of mlx5e_xdp_handle.

2) From Rongwei Liu, DR, reduce steering memory usage
   Currently, mlx5 driver uses mlx5_htbl/chunk/ste to organize
   steering logic. However there is a little memory waste.

   This update targets to reduce steering memory footprint by:
   a. Adjust struct member layout.
   b. Remove duplicated indicator by using simple functions call.

   With 500k TX rules(3 ste) plus 500k RX rules(6 stes), these patches
   can save around 17% memory.

3) Three cleanup commits at the end of this series.
===================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3e66fd54 770c9a3a

drivers/net/ethernet/mellanox/mlx5/core/alloc.c

+0 −60
Original line number Diff line number Diff line
@@ -71,53 +71,6 @@ static void *mlx5_dma_zalloc_coherent_node(struct mlx5_core_dev *dev, 
	return cpu_handle;

}



static int mlx5_buf_alloc_node(struct mlx5_core_dev *dev, int size,

			       struct mlx5_frag_buf *buf, int node)

{

	dma_addr_t t;



	buf->size = size;

	buf->npages       = 1;

	buf->page_shift   = (u8)get_order(size) + PAGE_SHIFT;



	buf->frags = kzalloc(sizeof(*buf->frags), GFP_KERNEL);

	if (!buf->frags)

		return -ENOMEM;



	buf->frags->buf   = mlx5_dma_zalloc_coherent_node(dev, size,

							  &t, node);

	if (!buf->frags->buf)

		goto err_out;



	buf->frags->map = t;



	while (t & ((1 << buf->page_shift) - 1)) {

		--buf->page_shift;

		buf->npages *= 2;

	}



	return 0;

err_out:

	kfree(buf->frags);

	return -ENOMEM;

}



int mlx5_buf_alloc(struct mlx5_core_dev *dev,

		   int size, struct mlx5_frag_buf *buf)

{

	return mlx5_buf_alloc_node(dev, size, buf, dev->priv.numa_node);

}

EXPORT_SYMBOL(mlx5_buf_alloc);



void mlx5_buf_free(struct mlx5_core_dev *dev, struct mlx5_frag_buf *buf)

{

	dma_free_coherent(mlx5_core_dma_dev(dev), buf->size, buf->frags->buf,

			  buf->frags->map);



	kfree(buf->frags);

}

EXPORT_SYMBOL_GPL(mlx5_buf_free);



int mlx5_frag_buf_alloc_node(struct mlx5_core_dev *dev, int size,

			     struct mlx5_frag_buf *buf, int node)

{
@@ -286,19 +239,6 @@ void mlx5_db_free(struct mlx5_core_dev *dev, struct mlx5_db *db) 
}

EXPORT_SYMBOL_GPL(mlx5_db_free);



void mlx5_fill_page_array(struct mlx5_frag_buf *buf, __be64 *pas)

{

	u64 addr;

	int i;



	for (i = 0; i < buf->npages; i++) {

		addr = buf->frags->map + (i << buf->page_shift);



		pas[i] = cpu_to_be64(addr);

	}

}

EXPORT_SYMBOL_GPL(mlx5_fill_page_array);



void mlx5_fill_page_frag_array_perm(struct mlx5_frag_buf *buf, __be64 *pas, u8 perm)

{

	int i;

drivers/net/ethernet/mellanox/mlx5/core/en/params.c

+55 −14
Original line number Diff line number Diff line
@@ -188,12 +188,18 @@ u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev, 
			  struct mlx5e_params *params,

			  struct mlx5e_xsk_param *xsk)

{

	bool is_linear_skb = (params->rq_wq_type == MLX5_WQ_TYPE_CYCLIC) ?

		mlx5e_rx_is_linear_skb(params, xsk) :

		mlx5e_rx_mpwqe_is_linear_skb(mdev, params, xsk);

	u16 linear_headroom = mlx5e_get_linear_rq_headroom(params, xsk);



	return is_linear_skb || params->packet_merge.type == MLX5E_PACKET_MERGE_SHAMPO ?

		mlx5e_get_linear_rq_headroom(params, xsk) : 0;

	if (params->rq_wq_type == MLX5_WQ_TYPE_CYCLIC)

		return linear_headroom;



	if (mlx5e_rx_mpwqe_is_linear_skb(mdev, params, xsk))

		return linear_headroom;



	if (params->packet_merge.type == MLX5E_PACKET_MERGE_SHAMPO)

		return linear_headroom;



	return 0;

}



u16 mlx5e_calc_sq_stop_room(struct mlx5_core_dev *mdev, struct mlx5e_params *params)
@@ -392,16 +398,25 @@ void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e 
	};

}



static int mlx5e_max_nonlinear_mtu(int first_frag_size, int frag_size)

{

	/* Optimization for small packets: the last fragment is bigger than the others. */

	return first_frag_size + (MLX5E_MAX_RX_FRAGS - 2) * frag_size + PAGE_SIZE;

}



#define DEFAULT_FRAG_SIZE (2048)



static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,

static int mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev,

				     struct mlx5e_params *params,

				     struct mlx5e_xsk_param *xsk,

				     struct mlx5e_rq_frags_info *info)

{

	u32 byte_count = MLX5E_SW2HW_MTU(params, params->sw_mtu);

	int frag_size_max = DEFAULT_FRAG_SIZE;

	int first_frag_size_max;

	u32 buf_size = 0;

	u16 headroom;

	int max_mtu;

	int i;



	if (mlx5_fpga_is_ipsec_device(mdev))
@@ -420,21 +435,42 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
		goto out;

	}



	if (byte_count > PAGE_SIZE +

	    (MLX5E_MAX_RX_FRAGS - 1) * frag_size_max)

	headroom = mlx5e_get_linear_rq_headroom(params, xsk);

	first_frag_size_max = SKB_WITH_OVERHEAD(frag_size_max - headroom);



	max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max);

	if (byte_count > max_mtu) {

		frag_size_max = PAGE_SIZE;

		first_frag_size_max = SKB_WITH_OVERHEAD(frag_size_max - headroom);



		max_mtu = mlx5e_max_nonlinear_mtu(first_frag_size_max, frag_size_max);

		if (byte_count > max_mtu) {

			mlx5_core_err(mdev, "MTU %u is too big for non-linear legacy RQ (max %d)\n",

				      params->sw_mtu, max_mtu);

			return -EINVAL;

		}

	}



	i = 0;

	while (buf_size < byte_count) {

		int frag_size = byte_count - buf_size;



		if (i < MLX5E_MAX_RX_FRAGS - 1)

		if (i == 0)

			frag_size = min(frag_size, first_frag_size_max);

		else if (i < MLX5E_MAX_RX_FRAGS - 1)

			frag_size = min(frag_size, frag_size_max);



		info->arr[i].frag_size = frag_size;

		buf_size += frag_size;



		if (i == 0) {

			/* Ensure that headroom and tailroom are included. */

			frag_size += headroom;

			frag_size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info));

		}



		info->arr[i].frag_stride = roundup_pow_of_two(frag_size);



		buf_size += frag_size;

		i++;

	}

	info->num_frags = i;
@@ -444,6 +480,8 @@ static void mlx5e_build_rq_frags_info(struct mlx5_core_dev *mdev, 
out:

	info->wqe_bulk = max_t(u8, info->wqe_bulk, 8);

	info->log_num_frags = order_base_2(info->num_frags);



	return 0;

}



static u8 mlx5e_get_rqwq_log_stride(u8 wq_type, int ndsegs)
@@ -540,6 +578,7 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
	void *rqc = param->rqc;

	void *wq = MLX5_ADDR_OF(rqc, rqc, wq);

	int ndsegs = 1;

	int err;



	switch (params->rq_wq_type) {

	case MLX5_WQ_TYPE_LINKED_LIST_STRIDING_RQ: {
@@ -579,7 +618,9 @@ int mlx5e_build_rq_param(struct mlx5_core_dev *mdev, 
	}

	default: /* MLX5_WQ_TYPE_CYCLIC */

		MLX5_SET(wq, wq, log_wq_sz, params->log_rq_mtu_frames);

		mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info);

		err = mlx5e_build_rq_frags_info(mdev, params, xsk, &param->frags_info);

		if (err)

			return err;

		ndsegs = param->frags_info.num_frags;

	}

drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c

+0 −1
Original line number Diff line number Diff line
@@ -1161,7 +1161,6 @@ mlx5_tc_ct_block_flow_offload_del(struct mlx5_ct_ft *ft, 
	}



	rhashtable_remove_fast(&ft->ct_entries_ht, &entry->node, cts_ht_params);

	mlx5_tc_ct_entry_remove_from_tuples(entry);

	spin_unlock_bh(&ct_priv->ht_lock);



	mlx5_tc_ct_entry_put(entry);

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c

+1 −6
Original line number Diff line number Diff line
@@ -120,19 +120,14 @@ mlx5e_xmit_xdp_buff(struct mlx5e_xdpsq *sq, struct mlx5e_rq *rq, 


/* returns true if packet was consumed by xdp */

bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di,

		      u32 *len, struct xdp_buff *xdp)

		      struct bpf_prog *prog, struct xdp_buff *xdp)

{

	struct bpf_prog *prog = rcu_dereference(rq->xdp_prog);

	u32 act;

	int err;



	if (!prog)

		return false;



	act = bpf_prog_run_xdp(prog, xdp);

	switch (act) {

	case XDP_PASS:

		*len = xdp->data_end - xdp->data;

		return false;

	case XDP_TX:

		if (unlikely(!mlx5e_xmit_xdp_buff(rq->xdpsq, rq, di, xdp)))

drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
struct mlx5e_xsk_param;

int mlx5e_xdp_max_mtu(struct mlx5e_params *params, struct mlx5e_xsk_param *xsk);

bool mlx5e_xdp_handle(struct mlx5e_rq *rq, struct mlx5e_dma_info *di,

		      u32 *len, struct xdp_buff *xdp);

		      struct bpf_prog *prog, struct xdp_buff *xdp);

void mlx5e_xdp_mpwqe_complete(struct mlx5e_xdpsq *sq);

bool mlx5e_poll_xdpsq_cq(struct mlx5e_cq *cq);

void mlx5e_free_xdpsq_descs(struct mlx5e_xdpsq *sq);