Commit 5adf4c47 authored by Tariq Toukan's avatar Tariq Toukan Committed by Saeed Mahameed
Browse files

net/mlx5e: RX, Re-work initializaiton of RX function pointers 



Instead of exposing the RQ datapath handlers (from en_rx.c) so that
they are set in the control path (in en_main.c), wrap this logic
in a single function in en_rx.c and expose it alone.

Every profile will now have a pointer to the new mlx5e_rx_handlers
structure, instead of directly pointing to the previously-exposed
RQ handlers.

This significantly improves locality and modularity of the driver,
and allows many functions in en_rx.c to become static.

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

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

+10 −21
Original line number Diff line number Diff line
@@ -530,6 +530,8 @@ typedef struct sk_buff * 
typedef bool (*mlx5e_fp_post_rx_wqes)(struct mlx5e_rq *rq);

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



int mlx5e_rq_set_handlers(struct mlx5e_rq *rq, struct mlx5e_params *params, bool xsk);



enum mlx5e_rq_flag {

	MLX5E_RQ_FLAG_XDP_XMIT,

	MLX5E_RQ_FLAG_XDP_REDIRECT,
@@ -812,6 +814,13 @@ struct mlx5e_priv { 
	struct mlx5e_scratchpad    scratchpad;

};



struct mlx5e_rx_handlers {

	mlx5e_fp_handle_rx_cqe handle_rx_cqe;

	mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

};



extern const struct mlx5e_rx_handlers mlx5e_rx_handlers_nic;



struct mlx5e_profile {

	int	(*init)(struct mlx5_core_dev *mdev,

			struct net_device *netdev,
@@ -828,10 +837,7 @@ struct mlx5e_profile { 
	void	(*update_carrier)(struct mlx5e_priv *priv);

	unsigned int (*stats_grps_num)(struct mlx5e_priv *priv);

	mlx5e_stats_grp_t *stats_grps;

	struct {

		mlx5e_fp_handle_rx_cqe handle_rx_cqe;

		mlx5e_fp_handle_rx_cqe handle_rx_cqe_mpwqe;

	} rx_handlers;

	const struct mlx5e_rx_handlers *rx_handlers;

	int	max_tc;

	u8	rq_groups;

};
@@ -860,26 +866,9 @@ void mlx5e_page_dma_unmap(struct mlx5e_rq *rq, struct mlx5e_dma_info *dma_info); 
void mlx5e_page_release_dynamic(struct mlx5e_rq *rq,

				struct mlx5e_dma_info *dma_info,

				bool recycle);

void mlx5e_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);

void mlx5e_handle_rx_cqe_mpwrq(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);

bool mlx5e_post_rx_wqes(struct mlx5e_rq *rq);

int mlx5e_poll_ico_cq(struct mlx5e_cq *cq);

bool mlx5e_post_rx_mpwqes(struct mlx5e_rq *rq);

void mlx5e_dealloc_rx_wqe(struct mlx5e_rq *rq, u16 ix);

void mlx5e_dealloc_rx_mpwqe(struct mlx5e_rq *rq, u16 ix);

struct sk_buff *

mlx5e_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

				u16 cqe_bcnt, u32 head_offset, u32 page_idx);

struct sk_buff *

mlx5e_skb_from_cqe_mpwrq_nonlinear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,

				   u16 cqe_bcnt, u32 head_offset, u32 page_idx);

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);

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);



void mlx5e_get_stats(struct net_device *dev, struct rtnl_link_stats64 *stats);

void mlx5e_fold_sw_stats64(struct mlx5e_priv *priv, struct rtnl_link_stats64 *s);

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 


struct sk_buff *mlx5e_ipsec_handle_rx_skb(struct net_device *netdev,

					  struct sk_buff *skb, u32 *cqe_bcnt);

void mlx5e_ipsec_handle_rx_cqe(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);



void mlx5e_ipsec_inverse_table_init(void);

bool mlx5e_ipsec_feature_check(struct sk_buff *skb, struct net_device *netdev,

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

+5 −48
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "en_tc.h"

#include "en_rep.h"

#include "en_accel/ipsec.h"

#include "en_accel/ipsec_rxtx.h"

#include "en_accel/en_accel.h"

#include "en_accel/tls.h"

#include "accel/ipsec.h"
@@ -65,7 +64,6 @@ 
#include "en/hv_vhca_stats.h"

#include "en/devlink.h"

#include "lib/mlx5.h"

#include "fpga/ipsec.h"



bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev)

{
@@ -428,29 +426,6 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
		pool_size = MLX5_MPWRQ_PAGES_PER_WQE <<

			mlx5e_mpwqe_get_log_rq_size(params, xsk);



		rq->post_wqes = mlx5e_post_rx_mpwqes;

		rq->dealloc_wqe = mlx5e_dealloc_rx_mpwqe;



		rq->handle_rx_cqe = c->priv->profile->rx_handlers.handle_rx_cqe_mpwqe;

#ifdef CONFIG_MLX5_EN_IPSEC

		if (MLX5_IPSEC_DEV(mdev)) {

			err = -EINVAL;

			netdev_err(c->netdev, "MPWQE RQ with IPSec offload not supported\n");

			goto err_rq_wq_destroy;

		}

#endif

		if (!rq->handle_rx_cqe) {

			err = -EINVAL;

			netdev_err(c->netdev, "RX handler of MPWQE RQ is not set, err %d\n", err);

			goto err_rq_wq_destroy;

		}



		rq->mpwqe.skb_from_cqe_mpwrq = xsk ?

			mlx5e_xsk_skb_from_cqe_mpwrq_linear :

			mlx5e_rx_mpwqe_is_linear_skb(mdev, params, NULL) ?

				mlx5e_skb_from_cqe_mpwrq_linear :

				mlx5e_skb_from_cqe_mpwrq_nonlinear;



		rq->mpwqe.log_stride_sz = mlx5e_mpwqe_get_log_stride_size(mdev, params, xsk);

		rq->mpwqe.num_strides =

			BIT(mlx5e_mpwqe_get_log_num_strides(mdev, params, xsk));
@@ -492,30 +467,13 @@ static int mlx5e_alloc_rq(struct mlx5e_channel *c, 
		if (err)

			goto err_free;



		rq->post_wqes = mlx5e_post_rx_wqes;

		rq->dealloc_wqe = mlx5e_dealloc_rx_wqe;



#ifdef CONFIG_MLX5_EN_IPSEC

		if ((mlx5_fpga_ipsec_device_caps(mdev) & MLX5_ACCEL_IPSEC_CAP_DEVICE) &&

		    c->priv->ipsec)

			rq->handle_rx_cqe = mlx5e_ipsec_handle_rx_cqe;

		else

#endif

			rq->handle_rx_cqe = c->priv->profile->rx_handlers.handle_rx_cqe;

		if (!rq->handle_rx_cqe) {

			err = -EINVAL;

			netdev_err(c->netdev, "RX handler of RQ is not set, err %d\n", err);

			goto err_free;

		}



		rq->wqe.skb_from_cqe = xsk ?

			mlx5e_xsk_skb_from_cqe_linear :

			mlx5e_rx_is_linear_skb(params, NULL) ?

				mlx5e_skb_from_cqe_linear :

				mlx5e_skb_from_cqe_nonlinear;

		rq->mkey_be = c->mkey_be;

	}



	err = mlx5e_rq_set_handlers(rq, params, xsk);

	if (err)

		goto err_free;



	if (xsk) {

		err = xdp_rxq_info_reg_mem_model(&rq->xdp_rxq,

						 MEM_TYPE_XSK_BUFF_POOL, NULL);
@@ -5288,8 +5246,7 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.update_rx	   = mlx5e_update_nic_rx,

	.update_stats	   = mlx5e_update_ndo_stats,

	.update_carrier	   = mlx5e_update_carrier,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq,

	.rx_handlers       = &mlx5e_rx_handlers_nic,

	.max_tc		   = MLX5E_MAX_NUM_TC,

	.rq_groups	   = MLX5E_NUM_RQ_GROUPS(XSK),

	.stats_grps	   = mlx5e_nic_stats_grps,

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

+2 −4
Original line number Diff line number Diff line
@@ -1143,8 +1143,7 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
	.enable		        = mlx5e_rep_enable,

	.update_rx		= mlx5e_update_rep_rx,

	.update_stats           = mlx5e_update_ndo_stats,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe_rep,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq_rep,

	.rx_handlers            = &mlx5e_rx_handlers_rep,

	.max_tc			= 1,

	.rq_groups		= MLX5E_NUM_RQ_GROUPS(REGULAR),

	.stats_grps		= mlx5e_rep_stats_grps,
@@ -1163,8 +1162,7 @@ static const struct mlx5e_profile mlx5e_uplink_rep_profile = { 
	.update_rx		= mlx5e_update_rep_rx,

	.update_stats           = mlx5e_update_ndo_stats,

	.update_carrier	        = mlx5e_update_carrier,

	.rx_handlers.handle_rx_cqe       = mlx5e_handle_rx_cqe_rep,

	.rx_handlers.handle_rx_cqe_mpwqe = mlx5e_handle_rx_cqe_mpwrq_rep,

	.rx_handlers            = &mlx5e_rx_handlers_rep,

	.max_tc			= MLX5E_MAX_NUM_TC,

	.rq_groups		= MLX5E_NUM_RQ_GROUPS(REGULAR),

	.stats_grps		= mlx5e_ul_rep_stats_grps,

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

+2 −4
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#include "lib/port_tun.h"



#ifdef CONFIG_MLX5_ESWITCH

extern const struct mlx5e_rx_handlers mlx5e_rx_handlers_rep;



struct mlx5e_neigh_update_table {

	struct rhashtable       neigh_ht;

	/* Save the neigh hash entries in a list in addition to the hash table
@@ -223,10 +225,6 @@ bool mlx5e_is_uplink_rep(struct mlx5e_priv *priv); 
int mlx5e_add_sqs_fwd_rules(struct mlx5e_priv *priv);

void mlx5e_remove_sqs_fwd_rules(struct mlx5e_priv *priv);



void mlx5e_handle_rx_cqe_rep(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe);

void mlx5e_handle_rx_cqe_mpwrq_rep(struct mlx5e_rq *rq,

				   struct mlx5_cqe64 *cqe);



void mlx5e_rep_queue_neigh_stats_work(struct mlx5e_priv *priv);



bool mlx5e_eswitch_vf_rep(struct net_device *netdev);