Commit 390d9b56 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mlx5-updates-2021-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 

Saeed Mahameed says:

====================
mlx5-updates-2021-02-01

mlx5 netdev updates:

1) Trivial refactoring ahead of the upcoming uplink representor series.
2) Increased RSS table size to 256, for better results
3) Misc. Cleanup and very trivial improvements

* tag 'mlx5-updates-2021-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: DR, Avoid unnecessary csum recalculation on supporting devices
  net/mlx5e: CT: remove useless conversion to PTR_ERR then ERR_PTR
  net/mlx5e: accel, remove redundant space
  net/mlx5e: kTLS, Improve TLS RX workqueue scope
  net/mlx5e: remove h from printk format specifier
  net/mlx5e: Increase indirection RQ table size to 256
  net/mlx5e: Enable napi in channel's activation stage
  net/mlx5e: Move representor neigh init into profile enable
  net/mlx5e: Avoid false lock depenency warning on tc_ht
  net/mlx5e: Move set vxlan nic info to profile init
  net/mlx5e: Move netif_carrier_off() out of mlx5e_priv_init()
  net/mlx5e: Refactor mlx5e_netdev_init/cleanup to mlx5e_priv_init/cleanup
  net/mxl5e: Add change profile method
  net/mlx5e: Separate between netdev objects and mlx5e profiles initialization
====================

Link: https://lore.kernel.org/r/20210202065457.613312-1-saeed@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a1a809c4 a283ea1b

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

+18 −18
Original line number Diff line number Diff line
@@ -137,10 +137,10 @@ struct page_pool; 
#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES                0x80

#define MLX5E_PARAMS_DEFAULT_MIN_RX_WQES_MPW            0x2



#define MLX5E_LOG_INDIR_RQT_SIZE       0x7

#define MLX5E_LOG_INDIR_RQT_SIZE       0x8

#define MLX5E_INDIR_RQT_SIZE           BIT(MLX5E_LOG_INDIR_RQT_SIZE)

#define MLX5E_MIN_NUM_CHANNELS         0x1

#define MLX5E_MAX_NUM_CHANNELS         MLX5E_INDIR_RQT_SIZE

#define MLX5E_MAX_NUM_CHANNELS         (MLX5E_INDIR_RQT_SIZE / 2)

#define MLX5E_MAX_NUM_SQS              (MLX5E_MAX_NUM_CHANNELS * MLX5E_MAX_NUM_TC)

#define MLX5E_TX_CQ_POLL_BUDGET        128

#define MLX5E_TX_XSK_POLL_BUDGET       64
@@ -895,8 +895,7 @@ extern const struct mlx5e_rx_handlers mlx5e_rx_handlers_nic; 


struct mlx5e_profile {

	int	(*init)(struct mlx5_core_dev *mdev,

			struct net_device *netdev,

			const struct mlx5e_profile *profile, void *ppriv);

			struct net_device *netdev);

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

	int	(*init_rx)(struct mlx5e_priv *priv);

	void	(*cleanup_rx)(struct mlx5e_priv *priv);
@@ -1155,24 +1154,25 @@ int mlx5e_ethtool_set_pauseparam(struct mlx5e_priv *priv, 
				 struct ethtool_pauseparam *pauseparam);



/* mlx5e generic netdev management API */

int mlx5e_netdev_init(struct net_device *netdev,

		      struct mlx5e_priv *priv,

		      struct mlx5_core_dev *mdev,

		      const struct mlx5e_profile *profile,

		      void *ppriv);

void mlx5e_netdev_cleanup(struct net_device *netdev, struct mlx5e_priv *priv);

static inline unsigned int

mlx5e_calc_max_nch(struct mlx5e_priv *priv, const struct mlx5e_profile *profile)

{

	return priv->netdev->num_rx_queues / max_t(u8, profile->rq_groups, 1);

}



int mlx5e_priv_init(struct mlx5e_priv *priv,

		    struct net_device *netdev,

		    struct mlx5_core_dev *mdev);

void mlx5e_priv_cleanup(struct mlx5e_priv *priv);

struct net_device *

mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *profile,

		    int nch, void *ppriv);

mlx5e_create_netdev(struct mlx5_core_dev *mdev, unsigned int txqs, unsigned int rxqs);

int mlx5e_attach_netdev(struct mlx5e_priv *priv);

void mlx5e_detach_netdev(struct mlx5e_priv *priv);

void mlx5e_destroy_netdev(struct mlx5e_priv *priv);

int mlx5e_netdev_change_profile(struct mlx5e_priv *priv,

				const struct mlx5e_profile *new_profile, void *new_ppriv);

void mlx5e_set_netdev_mtu_boundaries(struct mlx5e_priv *priv);

void mlx5e_build_nic_params(struct mlx5e_priv *priv,

			    struct mlx5e_xsk *xsk,

			    struct mlx5e_rss_params *rss_params,

			    struct mlx5e_params *params,

			    u16 mtu);

void mlx5e_build_nic_params(struct mlx5e_priv *priv, struct mlx5e_xsk *xsk, u16 mtu);

void mlx5e_build_rq_params(struct mlx5_core_dev *mdev,

			   struct mlx5e_params *params);

void mlx5e_build_rss_params(struct mlx5e_rss_params *rss_params,

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

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int mlx5e_validate_params(struct mlx5e_priv *priv, struct mlx5e_params *params) 


	stop_room = mlx5e_calc_sq_stop_room(priv->mdev, params);

	if (stop_room >= sq_size) {

		netdev_err(priv->netdev, "Stop room %hu is bigger than the SQ size %zu\n",

		netdev_err(priv->netdev, "Stop room %u is bigger than the SQ size %zu\n",

			   stop_room, sq_size);

		return -EINVAL;

	}

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

+6 −6
Original line number Diff line number Diff line
@@ -428,16 +428,13 @@ static int mlx5e_ptp_open_queues(struct mlx5e_port_ptp *c, 
	if (err)

		return err;



	napi_enable(&c->napi);



	err = mlx5e_ptp_open_txqsqs(c, cparams);

	if (err)

		goto disable_napi;

		goto close_cqs;



	return 0;



disable_napi:

	napi_disable(&c->napi);

close_cqs:

	mlx5e_ptp_close_cqs(c);



	return err;
@@ -446,7 +443,6 @@ static int mlx5e_ptp_open_queues(struct mlx5e_port_ptp *c, 
static void mlx5e_ptp_close_queues(struct mlx5e_port_ptp *c)

{

	mlx5e_ptp_close_txqsqs(c);

	napi_disable(&c->napi);

	mlx5e_ptp_close_cqs(c);

}
@@ -515,6 +511,8 @@ void mlx5e_ptp_activate_channel(struct mlx5e_port_ptp *c) 
{

	int tc;



	napi_enable(&c->napi);



	for (tc = 0; tc < c->num_tc; tc++)

		mlx5e_activate_txqsq(&c->ptpsq[tc].txqsq);

}
@@ -525,4 +523,6 @@ void mlx5e_ptp_deactivate_channel(struct mlx5e_port_ptp *c) 


	for (tc = 0; tc < c->num_tc; tc++)

		mlx5e_deactivate_txqsq(&c->ptpsq[tc].txqsq);



	napi_disable(&c->napi);

}

drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c

+13 −5
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv) 


	err = rhashtable_init(&neigh_update->neigh_ht, &mlx5e_neigh_ht_params);

	if (err)

		return err;

		goto out_err;



	INIT_LIST_HEAD(&neigh_update->neigh_list);

	mutex_init(&neigh_update->encap_lock);
@@ -287,14 +287,19 @@ int mlx5e_rep_neigh_init(struct mlx5e_rep_priv *rpriv) 
			  mlx5e_rep_neigh_stats_work);

	mlx5e_rep_neigh_update_init_interval(rpriv);



	rpriv->neigh_update.netevent_nb.notifier_call = mlx5e_rep_netevent_event;

	err = register_netevent_notifier(&rpriv->neigh_update.netevent_nb);

	neigh_update->netevent_nb.notifier_call = mlx5e_rep_netevent_event;

	err = register_netevent_notifier(&neigh_update->netevent_nb);

	if (err)

		goto out_err;

		goto out_notifier;

	return 0;



out_err:

out_notifier:

	neigh_update->netevent_nb.notifier_call = NULL;

	rhashtable_destroy(&neigh_update->neigh_ht);

out_err:

	netdev_warn(rpriv->netdev,

		    "Failed to initialize neighbours handling for vport %d\n",

		    rpriv->rep->vport);

	return err;

}
@@ -303,6 +308,9 @@ void mlx5e_rep_neigh_cleanup(struct mlx5e_rep_priv *rpriv) 
	struct mlx5e_neigh_update_table *neigh_update = &rpriv->neigh_update;

	struct mlx5e_priv *priv = netdev_priv(rpriv->netdev);



	if (!rpriv->neigh_update.netevent_nb.notifier_call)

		return;



	unregister_netevent_notifier(&neigh_update->netevent_nb);



	flush_workqueue(priv->wq); /* flush neigh update works */

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

+2 −5
Original line number Diff line number Diff line
@@ -770,7 +770,6 @@ mlx5_tc_ct_shared_counter_get(struct mlx5_tc_ct_priv *ct_priv, 
	struct mlx5_ct_counter *shared_counter;

	struct mlx5_ct_entry *rev_entry;

	__be16 tmp_port;

	int ret;



	/* get the reversed tuple */

	tmp_port = rev_tuple.port.src;
@@ -804,10 +803,8 @@ mlx5_tc_ct_shared_counter_get(struct mlx5_tc_ct_priv *ct_priv, 
	mutex_unlock(&ct_priv->shared_counter_lock);



	shared_counter = mlx5_tc_ct_counter_create(ct_priv);

	if (IS_ERR(shared_counter)) {

		ret = PTR_ERR(shared_counter);

		return ERR_PTR(ret);

	}

	if (IS_ERR(shared_counter))

		return shared_counter;



	shared_counter->is_shared = true;

	refcount_set(&shared_counter->refcount, 1);