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

net/mlx5e: Fetch WQE: reuse code and enforce typing 



There are multiple functions mlx5{e,i}_*_fetch_wqe that contain the same
code, that is repeated, because they operate on different SQ struct
types. mlx5e_sq_fetch_wqe also returns void *, instead of the concrete
WQE type.

This commit generalizes the fetch WQE operation by putting this code
into a single function. To simplify calls of the generic function in
concrete use cases, macros are provided that substitute the right WQE
size and cast the return type.

Before this patch, fetch_wqe used to calculate pi itself, but the value
was often known to the caller. This calculation is moved outside to
eliminate this unnecessary step and prepare for the fill_frag_edge
refactoring in the next patch.

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

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

+6 −6
Original line number Diff line number Diff line
@@ -33,19 +33,19 @@ mlx5e_wqc_has_room_for(struct mlx5_wq_cyc *wq, u16 cc, u16 pc, u16 n) 
	return (mlx5_wq_cyc_ctr2ix(wq, cc - pc) >= n) || (cc == pc);

}



static inline void *

mlx5e_sq_fetch_wqe(struct mlx5e_txqsq *sq, size_t size, u16 *pi)

static inline void *mlx5e_fetch_wqe(struct mlx5_wq_cyc *wq, u16 pi, size_t wqe_size)

{

	struct mlx5_wq_cyc *wq = &sq->wq;

	void *wqe;



	*pi  = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	wqe = mlx5_wq_cyc_get_wqe(wq, *pi);

	memset(wqe, 0, size);

	wqe = mlx5_wq_cyc_get_wqe(wq, pi);

	memset(wqe, 0, wqe_size);



	return wqe;

}



#define MLX5E_TX_FETCH_WQE(sq, pi) \

	((struct mlx5e_tx_wqe *)mlx5e_fetch_wqe(&(sq)->wq, pi, sizeof(struct mlx5e_tx_wqe)))



static inline struct mlx5e_tx_wqe *

mlx5e_post_nop(struct mlx5_wq_cyc *wq, u32 sqn, u16 *pc)

{

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

+4 −2
Original line number Diff line number Diff line
@@ -188,10 +188,12 @@ static void mlx5e_xdp_mpwqe_session_start(struct mlx5e_xdpsq *sq) 
	pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	contig_wqebbs = mlx5_wq_cyc_get_contig_wqebbs(wq, pi);



	if (unlikely(contig_wqebbs < MLX5_SEND_WQE_MAX_WQEBBS))

	if (unlikely(contig_wqebbs < MLX5_SEND_WQE_MAX_WQEBBS)) {

		mlx5e_fill_xdpsq_frag_edge(sq, wq, pi, contig_wqebbs);

		pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	}



	session->wqe = mlx5e_xdpsq_fetch_wqe(sq, &pi);

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



	prefetchw(session->wqe->data);

	session->ds_count  = MLX5E_XDP_TX_EMPTY_DS_COUNT;

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

+0 −13
Original line number Diff line number Diff line
@@ -186,19 +186,6 @@ mlx5e_xdp_mpwqe_add_dseg(struct mlx5e_xdpsq *sq, 
	session->ds_count++;

}



static inline struct mlx5e_tx_wqe *

mlx5e_xdpsq_fetch_wqe(struct mlx5e_xdpsq *sq, u16 *pi)

{

	struct mlx5_wq_cyc *wq = &sq->wq;

	struct mlx5e_tx_wqe *wqe;



	*pi = mlx5_wq_cyc_ctr2ix(wq, sq->pc);

	wqe = mlx5_wq_cyc_get_wqe(wq, *pi);

	memset(wqe, 0, sizeof(*wqe));



	return wqe;

}



static inline void

mlx5e_xdpi_fifo_push(struct mlx5e_xdp_info_fifo *fifo,

		     struct mlx5e_xdp_info *xi)

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,14 @@ struct mlx5e_dump_wqe { 
	struct mlx5_wqe_data_seg data;

};



#define MLX5E_TLS_FETCH_UMR_WQE(sq, pi) \

	((struct mlx5e_umr_wqe *)mlx5e_fetch_wqe(&(sq)->wq, pi, MLX5E_KTLS_STATIC_UMR_WQE_SZ))

#define MLX5E_TLS_FETCH_PROGRESS_WQE(sq, pi) \

	((struct mlx5e_tx_wqe *)mlx5e_fetch_wqe(&(sq)->wq, pi, MLX5E_KTLS_PROGRESS_WQE_SZ))

#define MLX5E_TLS_FETCH_DUMP_WQE(sq, pi) \

	((struct mlx5e_dump_wqe *)mlx5e_fetch_wqe(&(sq)->wq, pi, \

						  sizeof(struct mlx5e_dump_wqe)))



#define MLX5E_KTLS_DUMP_WQEBBS \

	(DIV_ROUND_UP(sizeof(struct mlx5e_dump_wqe), MLX5_SEND_WQE_BB))

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c

+10 −5
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ post_static_params(struct mlx5e_txqsq *sq, 
	struct mlx5e_umr_wqe *umr_wqe;

	u16 pi;



	umr_wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_STATIC_UMR_WQE_SZ, &pi);

	pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

	umr_wqe = MLX5E_TLS_FETCH_UMR_WQE(sq, pi);

	build_static_params(umr_wqe, sq->pc, sq->sqn, priv_tx, fence);

	tx_fill_wi(sq, pi, MLX5E_KTLS_STATIC_WQEBBS, 0, NULL);

	sq->pc += MLX5E_KTLS_STATIC_WQEBBS;
@@ -151,7 +152,8 @@ post_progress_params(struct mlx5e_txqsq *sq, 
	struct mlx5e_tx_wqe *wqe;

	u16 pi;



	wqe = mlx5e_sq_fetch_wqe(sq, MLX5E_KTLS_PROGRESS_WQE_SZ, &pi);

	pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

	wqe = MLX5E_TLS_FETCH_PROGRESS_WQE(sq, pi);

	build_progress_params(wqe, sq->pc, sq->sqn, priv_tx, fence);

	tx_fill_wi(sq, pi, MLX5E_KTLS_PROGRESS_WQEBBS, 0, NULL);

	sq->pc += MLX5E_KTLS_PROGRESS_WQEBBS;
@@ -278,7 +280,8 @@ tx_post_resync_dump(struct mlx5e_txqsq *sq, skb_frag_t *frag, u32 tisn, bool fir 
	int fsz;

	u16 pi;



	wqe = mlx5e_sq_fetch_wqe(sq, sizeof(*wqe), &pi);

	pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

	wqe = MLX5E_TLS_FETCH_DUMP_WQE(sq, pi);



	ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
@@ -449,7 +452,8 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct net_device *netdev, 


	if (unlikely(mlx5e_ktls_tx_offload_test_and_clear_pending(priv_tx))) {

		mlx5e_ktls_tx_post_param_wqes(sq, priv_tx, false, false);

		*wqe = mlx5e_sq_fetch_wqe(sq, sizeof(**wqe), pi);

		*pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

		*wqe = MLX5E_TX_FETCH_WQE(sq, *pi);

		stats->tls_ctx++;

	}
@@ -460,7 +464,8 @@ struct sk_buff *mlx5e_ktls_handle_tx_skb(struct net_device *netdev, 


		switch (ret) {

		case MLX5E_KTLS_SYNC_DONE:

			*wqe = mlx5e_sq_fetch_wqe(sq, sizeof(**wqe), pi);

			*pi = mlx5_wq_cyc_ctr2ix(&sq->wq, sq->pc);

			*wqe = MLX5E_TX_FETCH_WQE(sq, *pi);

			break;

		case MLX5E_KTLS_SYNC_SKIP_NO_DATA:

			if (likely(!skb->decrypted))

CRA Git | Maintained and supported by SUSTech CRA and CCSE