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

net/mlx5e: Take RQT out of TIR and group RX resources 



RQT is not part of TIR, as multiple TIRs may point to the same RQT, as
it happens with indir_tir and inner_indir_tir. These instances of a TIR
don't use the embedded RQT.

This commit takes RQT out of TIR, making them independent. The RQTs are
placed into struct mlx5e_rx_res, and items in that struct are regrouped
by functionality: RSS, channels and PTP.

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

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

+4 −4
Original line number Diff line number Diff line
@@ -1050,10 +1050,10 @@ int mlx5e_create_indirect_rqt(struct mlx5e_priv *priv); 
int mlx5e_create_indirect_tirs(struct mlx5e_priv *priv, bool inner_ttc);

void mlx5e_destroy_indirect_tirs(struct mlx5e_priv *priv);



int mlx5e_create_direct_rqts(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

void mlx5e_destroy_direct_rqts(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

int mlx5e_create_direct_tirs(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv, struct mlx5e_tir *tirs, int n);

int mlx5e_create_direct_rqts(struct mlx5e_priv *priv);

void mlx5e_destroy_direct_rqts(struct mlx5e_priv *priv);

int mlx5e_create_direct_tirs(struct mlx5e_priv *priv);

void mlx5e_destroy_direct_tirs(struct mlx5e_priv *priv);



int mlx5e_create_tis(struct mlx5_core_dev *mdev, void *in, u32 *tisn);

void mlx5e_destroy_tis(struct mlx5_core_dev *mdev, u32 tisn);

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

+1 −1
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static void mlx5e_ptp_rx_unset_fs(struct mlx5e_priv *priv) 
static int mlx5e_ptp_rx_set_fs(struct mlx5e_priv *priv)

{

	struct mlx5e_ptp_fs *ptp_fs = priv->fs.ptp_fs;

	u32 tirn = priv->rx_res->ptp_tir.tirn;

	u32 tirn = priv->rx_res->ptp.tir.tirn;

	struct mlx5_flow_handle *rule;

	int err;

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

+18 −7
Original line number Diff line number Diff line
@@ -19,18 +19,29 @@ struct mlx5e_rss_params { 


struct mlx5e_tir {

	u32 tirn;

	struct mlx5e_rqt rqt;

	struct list_head list;

};



struct mlx5e_rx_res {

	struct mlx5e_rqt indir_rqt;

	struct mlx5e_tir indir_tirs[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir inner_indir_tirs[MLX5E_NUM_INDIR_TIRS];

	struct mlx5e_tir direct_tirs[MLX5E_MAX_NUM_CHANNELS];

	struct mlx5e_tir xsk_tirs[MLX5E_MAX_NUM_CHANNELS];

	struct mlx5e_tir ptp_tir;

	struct mlx5e_rss_params rss_params;



	struct mlx5e_rqt indir_rqt;

	struct {

		struct mlx5e_tir indir_tir;

		struct mlx5e_tir inner_indir_tir;

	} rss[MLX5E_NUM_INDIR_TIRS];



	struct {

		struct mlx5e_rqt direct_rqt;

		struct mlx5e_tir direct_tir;

		struct mlx5e_rqt xsk_rqt;

		struct mlx5e_tir xsk_tir;

	} channels[MLX5E_MAX_NUM_CHANNELS];



	struct {

		struct mlx5e_rqt rqt;

		struct mlx5e_tir tir;

	} ptp;

};



#endif /* __MLX5_EN_RX_RES_H__ */

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

+2 −2
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ void mlx5e_deactivate_xsk(struct mlx5e_channel *c) 


int mlx5e_xsk_redirect_rqt_to_channel(struct mlx5e_priv *priv, struct mlx5e_channel *c)

{

	return mlx5e_rqt_redirect_direct(&priv->rx_res->xsk_tirs[c->ix].rqt, c->xskrq.rqn);

	return mlx5e_rqt_redirect_direct(&priv->rx_res->channels[c->ix].xsk_rqt, c->xskrq.rqn);

}



int mlx5e_xsk_redirect_rqt_to_drop(struct mlx5e_priv *priv, u16 ix)

{

	return mlx5e_rqt_redirect_direct(&priv->rx_res->xsk_tirs[ix].rqt, priv->drop_rq.rqn);

	return mlx5e_rqt_redirect_direct(&priv->rx_res->channels[ix].xsk_rqt, priv->drop_rq.rqn);

}



int mlx5e_xsk_redirect_rqts_to_channels(struct mlx5e_priv *priv, struct mlx5e_channels *chs)

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

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk, 
	priv_rx->sw_stats = &priv->tls->sw_stats;

	mlx5e_set_ktls_rx_priv_ctx(tls_ctx, priv_rx);



	rqtn = priv->rx_res->direct_tirs[rxq].rqt.rqtn;

	rqtn = priv->rx_res->channels[rxq].direct_rqt.rqtn;



	err = mlx5e_ktls_create_tir(mdev, &priv_rx->tirn, rqtn);

	if (err)