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

net/mlx5e: Drop error CQE handling from the XSK RX handler 



This commit removes the redundant check and removes the unused cqe parameter
of skb_from_cqe handlers.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent cdfc6ffb

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

+2 −2
Original line number Diff line number Diff line
@@ -648,8 +648,8 @@ typedef struct sk_buff * 
(*mlx5e_fp_skb_from_cqe_mpwrq)(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

			       u16 cqe_bcnt, u32 head_offset, u32 page_idx);

typedef struct sk_buff *

(*mlx5e_fp_skb_from_cqe)(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,

			 struct mlx5e_wqe_frag_info *wi, u32 cqe_bcnt);

(*mlx5e_fp_skb_from_cqe)(struct mlx5e_rq *rq, struct mlx5e_wqe_frag_info *wi,

			 u32 cqe_bcnt);

typedef bool (*mlx5e_fp_post_rx_wqes)(struct mlx5e_rq *rq);

typedef void (*mlx5e_fp_dealloc_wqe)(struct mlx5e_rq*, u16);

typedef void (*mlx5e_fp_shampo_dealloc_hd)(struct mlx5e_rq*, u16, u16, bool);

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.c

+0 −6
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct sk_buff *mlx5e_xsk_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, 
}



struct sk_buff *mlx5e_xsk_skb_from_cqe_linear(struct mlx5e_rq *rq,

					      struct mlx5_cqe64 *cqe,

					      struct mlx5e_wqe_frag_info *wi,

					      u32 cqe_bcnt)

{
@@ -99,11 +98,6 @@ struct sk_buff *mlx5e_xsk_skb_from_cqe_linear(struct mlx5e_rq *rq, 
	xsk_buff_dma_sync_for_cpu(xdp, rq->xsk_pool);

	net_prefetch(xdp->data);



	if (unlikely(get_cqe_opcode(cqe) != MLX5_CQE_RESP_SEND)) {

		rq->stats->wqe_err++;

		return NULL;

	}



	prog = rcu_dereference(rq->xdp_prog);

	if (likely(prog && mlx5e_xdp_handle(rq, NULL, prog, xdp)))

		return NULL; /* page/packet was consumed by XDP */

drivers/net/ethernet/mellanox/mlx5/core/en/xsk/rx.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ struct sk_buff *mlx5e_xsk_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, 
						    u32 head_offset,

						    u32 page_idx);

struct sk_buff *mlx5e_xsk_skb_from_cqe_linear(struct mlx5e_rq *rq,

					      struct mlx5_cqe64 *cqe,

					      struct mlx5e_wqe_frag_info *wi,

					      u32 cqe_bcnt);

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

+8 −8
Original line number Diff line number Diff line
@@ -1521,8 +1521,8 @@ static void mlx5e_fill_xdp_buff(struct mlx5e_rq *rq, void *va, u16 headroom, 
}



static struct sk_buff *

mlx5e_skb_from_cqe_linear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,

			  struct mlx5e_wqe_frag_info *wi, u32 cqe_bcnt)

mlx5e_skb_from_cqe_linear(struct mlx5e_rq *rq, struct mlx5e_wqe_frag_info *wi,

			  u32 cqe_bcnt)

{

	struct mlx5e_dma_info *di = wi->di;

	u16 rx_headroom = rq->buff.headroom;
@@ -1565,8 +1565,8 @@ mlx5e_skb_from_cqe_linear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe, 
}



static struct sk_buff *

mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,

			     struct mlx5e_wqe_frag_info *wi, u32 cqe_bcnt)

mlx5e_skb_from_cqe_nonlinear(struct mlx5e_rq *rq, struct mlx5e_wqe_frag_info *wi,

			     u32 cqe_bcnt)

{

	struct mlx5e_rq_frag_info *frag_info = &rq->wqe.info.arr[0];

	struct mlx5e_wqe_frag_info *head_wi = wi;
@@ -1709,7 +1709,7 @@ static void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
	skb = INDIRECT_CALL_2(rq->wqe.skb_from_cqe,

			      mlx5e_skb_from_cqe_linear,

			      mlx5e_skb_from_cqe_nonlinear,

			      rq, cqe, wi, cqe_bcnt);

			      rq, wi, cqe_bcnt);

	if (!skb) {

		/* probably for XDP */

		if (__test_and_clear_bit(MLX5E_RQ_FLAG_XDP_XMIT, rq->flags)) {
@@ -1762,7 +1762,7 @@ static void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
	skb = INDIRECT_CALL_2(rq->wqe.skb_from_cqe,

			      mlx5e_skb_from_cqe_linear,

			      mlx5e_skb_from_cqe_nonlinear,

			      rq, cqe, wi, cqe_bcnt);

			      rq, wi, cqe_bcnt);

	if (!skb) {

		/* probably for XDP */

		if (__test_and_clear_bit(MLX5E_RQ_FLAG_XDP_XMIT, rq->flags)) {
@@ -2361,7 +2361,7 @@ static void mlx5i_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe) 
	skb = INDIRECT_CALL_2(rq->wqe.skb_from_cqe,

			      mlx5e_skb_from_cqe_linear,

			      mlx5e_skb_from_cqe_nonlinear,

			      rq, cqe, wi, cqe_bcnt);

			      rq, wi, cqe_bcnt);

	if (!skb)

		goto wq_free_wqe;
@@ -2453,7 +2453,7 @@ static void mlx5e_trap_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe 
		goto free_wqe;

	}



	skb = mlx5e_skb_from_cqe_nonlinear(rq, cqe, wi, cqe_bcnt);

	skb = mlx5e_skb_from_cqe_nonlinear(rq, wi, cqe_bcnt);

	if (!skb)

		goto free_wqe;