Commit f5f502a3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Saeed Mahameed says:

====================
mlx5-updates-2023-08-07

1) Few cleanups

2) Dynamic completion EQs

The driver creates completion EQs for all vectors directly on driver
load, even if those EQs will not be utilized later on.

To allow more flexibility in managing completion EQs and to reduce the
memory overhead of driver load, this series will adjust completion EQs
creation to be dynamic. Meaning, completion EQs will be created only
when needed.

Patch #1 introduces a counter for tracking the current number of
completion EQs.
Patches #2-6 refactor the existing infrastructure of managing completion
EQs and completion IRQs to be compatible with per-vector
allocation/release requests.
Patches #7-8 modify the CPU-to-IRQ affinity calculation to be resilient
in case the affinity is requested but completion IRQ is not allocated yet.
Patch #9 function rename.
Patch #10 handles the corner case of SF performing an IRQ request when no
SF IRQ pool is found, and no PF IRQ exists for the same vector.
Patch #11 modify driver to use dynamically allocate completion EQs.

* tag 'mlx5-updates-2023-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux:
  net/mlx5: Bridge, Only handle registered netdev bridge events
  net/mlx5: E-Switch, Remove redundant arg ignore_flow_lvl
  net/mlx5: Fix typo reminder -> remainder
  net/mlx5: remove many unnecessary NULL values
  net/mlx5: Allocate completion EQs dynamically
  net/mlx5: Handle SF IRQ request in the absence of SF IRQ pool
  net/mlx5: Rename mlx5_comp_vectors_count() to mlx5_comp_vectors_max()
  net/mlx5: Add IRQ vector to CPU lookup function
  net/mlx5: Introduce mlx5_cpumask_default_spread
  net/mlx5: Implement single completion EQ create/destroy methods
  net/mlx5: Use xarray to store and manage completion EQs
  net/mlx5: Refactor completion IRQ request/release handlers in EQ layer
  net/mlx5: Use xarray to store and manage completion IRQs
  net/mlx5: Refactor completion IRQ request/release API
  net/mlx5: Track the current number of completion EQs
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2c2b8874 b56fb19c

drivers/infiniband/hw/mlx5/cq.c

+1 −1
Original line number Diff line number Diff line
@@ -993,7 +993,7 @@ int mlx5_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
		INIT_WORK(&cq->notify_work, notify_soft_wc_handler);

	}



	err = mlx5_vector2eqn(dev->mdev, vector, &eqn);

	err = mlx5_comp_eqn_get(dev->mdev, vector, &eqn);

	if (err)

		goto err_cqb;

drivers/infiniband/hw/mlx5/devx.c

+1 −1
Original line number Diff line number Diff line
@@ -1002,7 +1002,7 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_QUERY_EQN)( 
		return PTR_ERR(c);

	dev = to_mdev(c->ibucontext.device);



	err = mlx5_vector2eqn(dev->mdev, user_vector, &dev_eqn);

	err = mlx5_comp_eqn_get(dev->mdev, user_vector, &dev_eqn);

	if (err < 0)

		return err;

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -3685,7 +3685,7 @@ static int mlx5_ib_stage_init_init(struct mlx5_ib_dev *dev) 
	if (mlx5_use_mad_ifc(dev))

		get_ext_port_caps(dev);



	dev->ib_dev.num_comp_vectors    = mlx5_comp_vectors_count(mdev);

	dev->ib_dev.num_comp_vectors    = mlx5_comp_vectors_max(mdev);



	mutex_init(&dev->cap_mask_mutex);

	INIT_LIST_HEAD(&dev->qp_list);

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

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) 
{

	return is_kdump_kernel() ?

		MLX5E_MIN_NUM_CHANNELS :

		min_t(int, mlx5_comp_vectors_count(mdev), MLX5E_MAX_NUM_CHANNELS);

		min_t(int, mlx5_comp_vectors_max(mdev), MLX5E_MAX_NUM_CHANNELS);

}



/* The maximum WQE size can be retrieved by max_wqe_sz_sq in

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

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ mlx5_esw_bridge_rep_vport_num_vhca_id_get(struct net_device *dev, struct mlx5_es 
		return NULL;



	priv = netdev_priv(dev);



	if (!priv->mdev->priv.eswitch->br_offloads)

		return NULL;



	rpriv = priv->ppriv;

	*vport_num = rpriv->rep->vport;

	*esw_owner_vhca_id = MLX5_CAP_GEN(priv->mdev, vhca_id);