Commit 12da68e2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2023-12-13' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2023-12-13

Preparation for mlx5e socket direct feature.

Socket direct will allow multiple PF devices attached to different
NUMA nodes but sharing the same physical port.

The following series is a small refactoring series in preparation
to support socket direct in the following submission.

Highlights:
 - Define required device registers and bits related to socket direct
 - Flow steering re-arrangements
 - Generalize TX objects (TISs) and store them in a common object, will
   be useful in the next series for per function object management.
 - Decouple raw CQ objects from their parent netdev priv
 - Prepare devcom for Socket Direct device group discovery.

Please see the individual patches for more information.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d6beb085 952f9a5f

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

+15 −10
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ struct page_pool; 
#define MLX5E_HW2SW_MTU(params, hwmtu) ((hwmtu) - ((params)->hard_mtu))

#define MLX5E_SW2HW_MTU(params, swmtu) ((swmtu) + ((params)->hard_mtu))



#define MLX5E_MAX_NUM_TC	8

#define MLX5E_MAX_NUM_MQPRIO_CH_TC TC_QOPT_MAX_QUEUE



#define MLX5_RX_HEADROOM NET_SKB_PAD
@@ -364,7 +363,7 @@ struct mlx5e_cq { 
	/* control */

	struct net_device         *netdev;

	struct mlx5_core_dev      *mdev;

	struct mlx5e_priv         *priv;

	struct workqueue_struct   *workqueue;

	struct mlx5_wq_ctrl        wq_ctrl;

} ____cacheline_aligned_in_smp;
@@ -758,7 +757,7 @@ struct mlx5e_channel { 
	/* data path */

	struct mlx5e_rq            rq;

	struct mlx5e_xdpsq         rq_xdpsq;

	struct mlx5e_txqsq         sq[MLX5E_MAX_NUM_TC];

	struct mlx5e_txqsq         sq[MLX5_MAX_NUM_TC];

	struct mlx5e_icosq         icosq;   /* internal control operations */

	struct mlx5e_txqsq __rcu * __rcu *qos_sqs;

	bool                       xdp;
@@ -808,7 +807,7 @@ struct mlx5e_channels { 


struct mlx5e_channel_stats {

	struct mlx5e_ch_stats ch;

	struct mlx5e_sq_stats sq[MLX5E_MAX_NUM_TC];

	struct mlx5e_sq_stats sq[MLX5_MAX_NUM_TC];

	struct mlx5e_rq_stats rq;

	struct mlx5e_rq_stats xskrq;

	struct mlx5e_xdpsq_stats rq_xdpsq;
@@ -818,8 +817,8 @@ struct mlx5e_channel_stats { 


struct mlx5e_ptp_stats {

	struct mlx5e_ch_stats ch;

	struct mlx5e_sq_stats sq[MLX5E_MAX_NUM_TC];

	struct mlx5e_ptp_cq_stats cq[MLX5E_MAX_NUM_TC];

	struct mlx5e_sq_stats sq[MLX5_MAX_NUM_TC];

	struct mlx5e_ptp_cq_stats cq[MLX5_MAX_NUM_TC];

	struct mlx5e_rq_stats rq;

} ____cacheline_aligned_in_smp;
@@ -887,7 +886,6 @@ struct mlx5e_priv { 
	struct mlx5e_rq            drop_rq;



	struct mlx5e_channels      channels;

	u32                        tisn[MLX5_MAX_PORTS][MLX5E_MAX_NUM_TC];

	struct mlx5e_rx_res       *rx_res;

	u32                       *tx_rates;
@@ -985,6 +983,8 @@ struct mlx5e_profile { 
	void	(*update_stats)(struct mlx5e_priv *priv);

	void	(*update_carrier)(struct mlx5e_priv *priv);

	int	(*max_nch_limit)(struct mlx5_core_dev *mdev);

	u32	(*get_tisn)(struct mlx5_core_dev *mdev, struct mlx5e_priv *priv,

			    u8 lag_port, u8 tc);

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

	mlx5e_stats_grp_t *stats_grps;

	const struct mlx5e_rx_handlers *rx_handlers;
@@ -992,6 +992,11 @@ struct mlx5e_profile { 
	u32     features;

};



u32 mlx5e_profile_get_tisn(struct mlx5_core_dev *mdev,

			   struct mlx5e_priv *priv,

			   const struct mlx5e_profile *profile,

			   u8 lag_port, u8 tc);



#define mlx5e_profile_feature_cap(profile, feature)	\

	((profile)->features & BIT(MLX5E_PROFILE_FEATURE_##feature))
@@ -1039,6 +1044,8 @@ int mlx5e_open_xdpsq(struct mlx5e_channel *c, struct mlx5e_params *params, 
void mlx5e_close_xdpsq(struct mlx5e_xdpsq *sq);



struct mlx5e_create_cq_param {

	struct net_device *netdev;

	struct workqueue_struct *wq;

	struct napi_struct *napi;

	struct mlx5e_ch_stats *ch_stats;

	int node;
@@ -1046,7 +1053,7 @@ struct mlx5e_create_cq_param { 
};



struct mlx5e_cq_param;

int mlx5e_open_cq(struct mlx5e_priv *priv, struct dim_cq_moder moder,

int mlx5e_open_cq(struct mlx5_core_dev *mdev, struct dim_cq_moder moder,

		  struct mlx5e_cq_param *param, struct mlx5e_create_cq_param *ccp,

		  struct mlx5e_cq *cq);

void mlx5e_close_cq(struct mlx5e_cq *cq);
@@ -1133,8 +1140,6 @@ void mlx5e_close_drop_rq(struct mlx5e_rq *drop_rq); 
int mlx5e_create_tis(struct mlx5_core_dev *mdev, void *in, u32 *tisn);

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



int mlx5e_create_tises(struct mlx5e_priv *priv);

void mlx5e_destroy_tises(struct mlx5e_priv *priv);

int mlx5e_update_nic_rx(struct mlx5e_priv *priv);

void mlx5e_update_carrier(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ int mlx5e_monitor_counter_supported(struct mlx5e_priv *priv) 
	return true;

}



void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv)

static void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv)

{

	u32 in[MLX5_ST_SZ_DW(arm_monitor_counter_in)] = {};

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

+0 −1
Original line number Diff line number Diff line
@@ -7,6 +7,5 @@ 
int  mlx5e_monitor_counter_supported(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_init(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_cleanup(struct mlx5e_priv *priv);

void mlx5e_monitor_counter_arm(struct mlx5e_priv *priv);



#endif /* __MLX5_MONITOR_H__ */

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

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ void mlx5e_build_rq_params(struct mlx5_core_dev *mdev, 
void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct mlx5e_channel *c)

{

	*ccp = (struct mlx5e_create_cq_param) {

		.netdev = c->netdev,

		.wq = c->priv->wq,

		.napi = &c->napi,

		.ch_stats = c->stats,

		.node = cpu_to_node(c->cpu),

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

+11 −5
Original line number Diff line number Diff line
@@ -518,9 +518,11 @@ static int mlx5e_ptp_open_txqsqs(struct mlx5e_ptp *c, 


	for (tc = 0; tc < num_tc; tc++) {

		int txq_ix = ix_base + tc;

		u32 tisn;



		err = mlx5e_ptp_open_txqsq(c, c->priv->tisn[c->lag_port][tc], txq_ix,

					   cparams, tc, &c->ptpsq[tc]);

		tisn = mlx5e_profile_get_tisn(c->mdev, c->priv, c->priv->profile,

					      c->lag_port, tc);

		err = mlx5e_ptp_open_txqsq(c, tisn, txq_ix, cparams, tc, &c->ptpsq[tc]);

		if (err)

			goto close_txqsq;

	}
@@ -555,6 +557,8 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 


	num_tc = mlx5e_get_dcb_num_tc(params);



	ccp.netdev   = c->netdev;

	ccp.wq       = c->priv->wq;

	ccp.node     = dev_to_node(mlx5_core_dma_dev(c->mdev));

	ccp.ch_stats = c->stats;

	ccp.napi     = &c->napi;
@@ -565,7 +569,7 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 
	for (tc = 0; tc < num_tc; tc++) {

		struct mlx5e_cq *cq = &c->ptpsq[tc].txqsq.cq;



		err = mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

		err = mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

		if (err)

			goto out_err_txqsq_cq;

	}
@@ -574,7 +578,7 @@ static int mlx5e_ptp_open_tx_cqs(struct mlx5e_ptp *c, 
		struct mlx5e_cq *cq = &c->ptpsq[tc].ts_cq;

		struct mlx5e_ptpsq *ptpsq = &c->ptpsq[tc];



		err = mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

		err = mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

		if (err)

			goto out_err_ts_cq;
@@ -602,6 +606,8 @@ static int mlx5e_ptp_open_rx_cq(struct mlx5e_ptp *c, 
	struct mlx5e_cq_param *cq_param;

	struct mlx5e_cq *cq = &c->rq.cq;



	ccp.netdev   = c->netdev;

	ccp.wq       = c->priv->wq;

	ccp.node     = dev_to_node(mlx5_core_dma_dev(c->mdev));

	ccp.ch_stats = c->stats;

	ccp.napi     = &c->napi;
@@ -609,7 +615,7 @@ static int mlx5e_ptp_open_rx_cq(struct mlx5e_ptp *c, 


	cq_param = &cparams->rq_param.cqp;



	return mlx5e_open_cq(c->priv, ptp_moder, cq_param, &ccp, cq);

	return mlx5e_open_cq(c->mdev, ptp_moder, cq_param, &ccp, cq);

}



static void mlx5e_ptp_close_tx_cqs(struct mlx5e_ptp *c)