Commit 8c654a1b authored by Maxim Mikityanskiy's avatar Maxim Mikityanskiy Committed by Jakub Kicinski
Browse files

net/mlx5e: xsk: Remove dead code in validation 



One of the checks in mlx5e_rx_is_linear_skb verifies that the RX buffer
fits into the XSK frame size. Remove the duplicating check from
mlx5e_validate_xsk_param. It allows to make mlx5e_rx_get_min_frag_sz
static.

Remove mlx5e_rx_is_xdp altogether, as its only usage is located in a
branch where xsk == NULL.

Signed-off-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent ddbef365

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

+3 −9
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ 
#include "en_accel/en_accel.h"

#include "en_accel/ipsec.h"



static bool mlx5e_rx_is_xdp(struct mlx5e_params *params,

			    struct mlx5e_xsk_param *xsk)

{

	return params->xdp_prog || xsk;

}



u16 mlx5e_get_linear_rq_headroom(struct mlx5e_params *params,

				 struct mlx5e_xsk_param *xsk)

{
@@ -22,7 +16,7 @@ u16 mlx5e_get_linear_rq_headroom(struct mlx5e_params *params, 
		return xsk->headroom;



	headroom = NET_IP_ALIGN;

	if (mlx5e_rx_is_xdp(params, xsk))

	if (params->xdp_prog)

		headroom += XDP_PACKET_HEADROOM;

	else

		headroom += MLX5_RX_HEADROOM;
@@ -30,7 +24,7 @@ u16 mlx5e_get_linear_rq_headroom(struct mlx5e_params *params, 
	return headroom;

}



u32 mlx5e_rx_get_min_frag_sz(struct mlx5e_params *params,

static u32 mlx5e_rx_get_min_frag_sz(struct mlx5e_params *params,

				    struct mlx5e_xsk_param *xsk)

{

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

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

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ void mlx5e_init_rq_type_params(struct mlx5_core_dev *mdev, struct mlx5e_params * 


u16 mlx5e_get_linear_rq_headroom(struct mlx5e_params *params,

				 struct mlx5e_xsk_param *xsk);

u32 mlx5e_rx_get_min_frag_sz(struct mlx5e_params *params,

			     struct mlx5e_xsk_param *xsk);

u8 mlx5e_mpwqe_log_pkts_per_wqe(struct mlx5e_params *params,

				struct mlx5e_xsk_param *xsk);

bool mlx5e_rx_is_linear_skb(struct mlx5e_params *params,

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

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ bool mlx5e_validate_xsk_param(struct mlx5e_params *params, 
			xsk->chunk_size < MLX5E_MIN_XSK_CHUNK_SIZE)

		return false;



	/* Current MTU and XSK headroom don't allow packets to fit the frames. */

	if (mlx5e_rx_get_min_frag_sz(params, xsk) > xsk->chunk_size)

		return false;



	/* frag_sz is different for regular and XSK RQs, so ensure that linear

	 * SKB mode is possible.

	 */