Skip to content

Commit

Permalink
net/mlx5: Use software VHCA id when it's supported
Browse files Browse the repository at this point in the history
[ Upstream commit dc402cc ]

Use software VHCA id when it's supported by the firmware.

A unique id is allocated upon mlx5_mdev_init() and freed upon
mlx5_mdev_uninit(), as such it stays the same during the full life cycle
of the device including upon health recovery if occurred.

The conjunction of sw_vhca_id with sw_owner_id will be a global unique
id per function which uses mlx5_core.

The sw_vhca_id is set upon init_hca command and is used to specify the
VHCA that the NIC vport is affiliated with.

This functionality is needed upon migration of VM which is MPV based.
(i.e. multi port device).

Signed-off-by: Yishai Hadas <yishaih@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: 9ca05b0 ("RDMA/mlx5: Rely on RoCE fw cap instead of devlink when setting profile")
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yishai Hadas authored and gregkh committed Sep 20, 2022
1 parent 630a755 commit ddc58af
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 3 deletions.
4 changes: 4 additions & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/fw.c
Expand Up @@ -289,6 +289,10 @@ int mlx5_cmd_init_hca(struct mlx5_core_dev *dev, uint32_t *sw_owner_id)
sw_owner_id[i]);
}

if (MLX5_CAP_GEN_2_MAX(dev, sw_vhca_id_valid) &&
dev->priv.sw_vhca_id > 0)
MLX5_SET(init_hca_in, in, sw_vhca_id, dev->priv.sw_vhca_id);

return mlx5_cmd_exec_in(dev, init_hca, in);
}

Expand Down
49 changes: 49 additions & 0 deletions drivers/net/ethernet/mellanox/mlx5/core/main.c
Expand Up @@ -90,6 +90,8 @@ module_param_named(prof_sel, prof_sel, uint, 0444);
MODULE_PARM_DESC(prof_sel, "profile selector. Valid range 0 - 2");

static u32 sw_owner_id[4];
#define MAX_SW_VHCA_ID (BIT(__mlx5_bit_sz(cmd_hca_cap_2, sw_vhca_id)) - 1)
static DEFINE_IDA(sw_vhca_ida);

enum {
MLX5_ATOMIC_REQ_MODE_BE = 0x0,
Expand Down Expand Up @@ -499,6 +501,31 @@ static int max_uc_list_get_devlink_param(struct mlx5_core_dev *dev)
return err;
}

static int handle_hca_cap_2(struct mlx5_core_dev *dev, void *set_ctx)
{
void *set_hca_cap;
int err;

if (!MLX5_CAP_GEN_MAX(dev, hca_cap_2))
return 0;

err = mlx5_core_get_caps(dev, MLX5_CAP_GENERAL_2);
if (err)
return err;

if (!MLX5_CAP_GEN_2_MAX(dev, sw_vhca_id_valid) ||
!(dev->priv.sw_vhca_id > 0))
return 0;

set_hca_cap = MLX5_ADDR_OF(set_hca_cap_in, set_ctx,
capability);
memcpy(set_hca_cap, dev->caps.hca[MLX5_CAP_GENERAL_2]->cur,
MLX5_ST_SZ_BYTES(cmd_hca_cap_2));
MLX5_SET(cmd_hca_cap_2, set_hca_cap, sw_vhca_id_valid, 1);

return set_caps(dev, set_ctx, MLX5_CAP_GENERAL_2);
}

static int handle_hca_cap(struct mlx5_core_dev *dev, void *set_ctx)
{
struct mlx5_profile *prof = &dev->profile;
Expand Down Expand Up @@ -669,6 +696,13 @@ static int set_hca_cap(struct mlx5_core_dev *dev)
goto out;
}

memset(set_ctx, 0, set_sz);
err = handle_hca_cap_2(dev, set_ctx);
if (err) {
mlx5_core_err(dev, "handle_hca_cap_2 failed\n");
goto out;
}

out:
kfree(set_ctx);
return err;
Expand Down Expand Up @@ -1512,6 +1546,18 @@ int mlx5_mdev_init(struct mlx5_core_dev *dev, int profile_idx)
if (err)
goto err_hca_caps;

/* The conjunction of sw_vhca_id with sw_owner_id will be a global
* unique id per function which uses mlx5_core.
* Those values are supplied to FW as part of the init HCA command to
* be used by both driver and FW when it's applicable.
*/
dev->priv.sw_vhca_id = ida_alloc_range(&sw_vhca_ida, 1,
MAX_SW_VHCA_ID,
GFP_KERNEL);
if (dev->priv.sw_vhca_id < 0)
mlx5_core_err(dev, "failed to allocate sw_vhca_id, err=%d\n",
dev->priv.sw_vhca_id);

return 0;

err_hca_caps:
Expand All @@ -1537,6 +1583,9 @@ void mlx5_mdev_uninit(struct mlx5_core_dev *dev)
{
struct mlx5_priv *priv = &dev->priv;

if (priv->sw_vhca_id > 0)
ida_free(&sw_vhca_ida, dev->priv.sw_vhca_id);

mlx5_hca_caps_free(dev);
mlx5_adev_cleanup(dev);
mlx5_pagealloc_cleanup(dev);
Expand Down
14 changes: 11 additions & 3 deletions drivers/net/ethernet/mellanox/mlx5/core/vport.c
Expand Up @@ -1086,9 +1086,17 @@ int mlx5_nic_vport_affiliate_multiport(struct mlx5_core_dev *master_mdev,
goto free;

MLX5_SET(modify_nic_vport_context_in, in, field_select.affiliation, 1);
MLX5_SET(modify_nic_vport_context_in, in,
nic_vport_context.affiliated_vhca_id,
MLX5_CAP_GEN(master_mdev, vhca_id));
if (MLX5_CAP_GEN_2(master_mdev, sw_vhca_id_valid)) {
MLX5_SET(modify_nic_vport_context_in, in,
nic_vport_context.vhca_id_type, VHCA_ID_TYPE_SW);
MLX5_SET(modify_nic_vport_context_in, in,
nic_vport_context.affiliated_vhca_id,
MLX5_CAP_GEN_2(master_mdev, sw_vhca_id));
} else {
MLX5_SET(modify_nic_vport_context_in, in,
nic_vport_context.affiliated_vhca_id,
MLX5_CAP_GEN(master_mdev, vhca_id));
}
MLX5_SET(modify_nic_vport_context_in, in,
nic_vport_context.affiliation_criteria,
MLX5_CAP_GEN(port_mdev, affiliate_nic_vport_criteria));
Expand Down
1 change: 1 addition & 0 deletions include/linux/mlx5/driver.h
Expand Up @@ -606,6 +606,7 @@ struct mlx5_priv {
spinlock_t ctx_lock;
struct mlx5_adev **adev;
int adev_idx;
int sw_vhca_id;
struct mlx5_events *events;

struct mlx5_flow_steering *steering;
Expand Down

0 comments on commit ddc58af

Please sign in to comment.