Commit 97e3afd6 authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Saeed Mahameed
Browse files

net/mlx5e: Unify constants for WQE_EMPTY_DS_COUNT 



A constant for the number of DS in an empty WQE (i.e. a WQE without data
segments) is needed in multiple places (normal TX data path, MPWQE in
XDP), but currently we have a constant for XDP and an inline formula in
normal TX. This patch introduces a common constant.

Additionally, mlx5e_xdp_mpwqe_session_start is converted to use struct
assignment, because the code nearby is touched.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 388a2b56

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

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#include "en.h"

#include <linux/indirect_call_wrapper.h>



#define MLX5E_TX_WQE_EMPTY_DS_COUNT (sizeof(struct mlx5e_tx_wqe) / MLX5_SEND_WQE_DS)



#define INL_HDR_START_SZ (sizeof(((struct mlx5_wqe_eth_seg *)NULL)->inline_hdr.start))



enum mlx5e_icosq_wqe_type {

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

+10 −7
Original line number Diff line number Diff line
@@ -196,16 +196,19 @@ static void mlx5e_xdp_mpwqe_session_start(struct mlx5e_xdpsq *sq) 
{

	struct mlx5e_xdp_mpwqe *session = &sq->mpwqe;

	struct mlx5e_xdpsq_stats *stats = sq->stats;

	struct mlx5e_tx_wqe *wqe;

	u16 pi;



	pi = mlx5e_xdpsq_get_next_pi(sq, MLX5E_XDP_MPW_MAX_WQEBBS);

	session->wqe = MLX5E_TX_FETCH_WQE(sq, pi);



	net_prefetchw(session->wqe->data);

	session->ds_count  = MLX5E_XDP_TX_EMPTY_DS_COUNT;

	session->pkt_count = 0;



	mlx5e_xdp_update_inline_state(sq);

	wqe = MLX5E_TX_FETCH_WQE(sq, pi);

	net_prefetchw(wqe->data);



	*session = (struct mlx5e_xdp_mpwqe) {

		.wqe = wqe,

		.ds_count = MLX5E_TX_WQE_EMPTY_DS_COUNT,

		.pkt_count = 0,

		.inline_on = mlx5e_xdp_get_inline_state(sq, session->inline_on),

	};



	stats->mpwqe++;

}

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

+8 −13
Original line number Diff line number Diff line
@@ -38,9 +38,7 @@ 
#include "en/txrx.h"



#define MLX5E_XDP_MIN_INLINE (ETH_HLEN + VLAN_HLEN)

#define MLX5E_XDP_TX_EMPTY_DS_COUNT \

	(sizeof(struct mlx5e_tx_wqe) / MLX5_SEND_WQE_DS)

#define MLX5E_XDP_TX_DS_COUNT (MLX5E_XDP_TX_EMPTY_DS_COUNT + 1 /* SG DS */)

#define MLX5E_XDP_TX_DS_COUNT (MLX5E_TX_WQE_EMPTY_DS_COUNT + 1 /* SG DS */)



#define MLX5E_XDP_INLINE_WQE_MAX_DS_CNT 16

#define MLX5E_XDP_INLINE_WQE_SZ_THRSD \
@@ -123,23 +121,20 @@ static inline void mlx5e_xmit_xdp_doorbell(struct mlx5e_xdpsq *sq) 
/* Enable inline WQEs to shift some load from a congested HCA (HW) to

 * a less congested cpu (SW).

 */

static inline void mlx5e_xdp_update_inline_state(struct mlx5e_xdpsq *sq)

static inline bool mlx5e_xdp_get_inline_state(struct mlx5e_xdpsq *sq, bool cur)

{

	u16 outstanding = sq->xdpi_fifo_pc - sq->xdpi_fifo_cc;

	struct mlx5e_xdp_mpwqe *session = &sq->mpwqe;



#define MLX5E_XDP_INLINE_WATERMARK_LOW	10

#define MLX5E_XDP_INLINE_WATERMARK_HIGH 128



	if (session->inline_on) {

		if (outstanding <= MLX5E_XDP_INLINE_WATERMARK_LOW)

			session->inline_on = 0;

		return;

	}

	if (cur && outstanding <= MLX5E_XDP_INLINE_WATERMARK_LOW)

		return false;



	if (!cur && outstanding >= MLX5E_XDP_INLINE_WATERMARK_HIGH)

		return true;



	/* inline is false */

	if (outstanding >= MLX5E_XDP_INLINE_WATERMARK_HIGH)

		session->inline_on = 1;

	return cur;

}



static inline bool mlx5e_xdp_mpqwe_is_full(struct mlx5e_xdp_mpwqe *session)

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

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void mlx5e_sq_xmit_prepare(struct mlx5e_txqsq *sq, struct sk_buff *skb, 
static void mlx5e_sq_calc_wqe_attr(struct sk_buff *skb, const struct mlx5e_tx_attr *attr,

				   struct mlx5e_tx_wqe_attr *wqe_attr)

{

	u16 ds_cnt = sizeof(struct mlx5e_tx_wqe) / MLX5_SEND_WQE_DS;

	u16 ds_cnt = MLX5E_TX_WQE_EMPTY_DS_COUNT;

	u16 ds_cnt_inl = 0;



	ds_cnt += !!attr->headlen + skb_shinfo(skb)->nr_frags;