Commit 40653f28 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

{rdma,net}/mlx5: export mlx5_vport_get_vhca_id 



vhca id is already cached in the vport structure no need to query on
every mlx5 layer, use the mlx5_vport_get_vhca_id, where possible.

Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Reviewed-by: default avatarParav Pandit <parav@nvidia.com>
Signed-off-by: default avatarAlexei Lazar <alazar@nvidia.com>
Reviewed-by: default avatarFeng Liu <feliu@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
parent 1baf3042

drivers/infiniband/hw/mlx5/std_types.c

+4 −23
Original line number Diff line number Diff line
@@ -83,33 +83,14 @@ static int fill_vport_icm_addr(struct mlx5_core_dev *mdev, u16 vport, 
static int fill_vport_vhca_id(struct mlx5_core_dev *mdev, u16 vport,

			      struct mlx5_ib_uapi_query_port *info)

{

	size_t out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);

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

	void *out;

	int err;



	out = kzalloc(out_sz, GFP_KERNEL);

	if (!out)

		return -ENOMEM;

	int err = mlx5_vport_get_vhca_id(mdev, vport, &info->vport_vhca_id);



	MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);

	MLX5_SET(query_hca_cap_in, in, other_function, true);

	MLX5_SET(query_hca_cap_in, in, function_id, vport);

	MLX5_SET(query_hca_cap_in, in, op_mod,

		 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE |

		 HCA_CAP_OPMOD_GET_CUR);



	err = mlx5_cmd_exec(mdev, in, sizeof(in), out, out_sz);

	if (err)

		goto out;



	info->vport_vhca_id = MLX5_GET(query_hca_cap_out, out,

				       capability.cmd_hca_cap.vhca_id);

		return err;



	info->flags |= MLX5_IB_UAPI_QUERY_PORT_VPORT_VHCA_ID;

out:

	kfree(out);

	return err;



	return 0;

}



static int fill_multiport_info(struct mlx5_ib_dev *dev, u32 port_num,

drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c

+2 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB

/* Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. */



#include <linux/mlx5/vport.h>



#include "reporter_vnic.h"

#include "en_stats.h"

#include "devlink.h"

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

+0 −2
Original line number Diff line number Diff line
@@ -447,8 +447,6 @@ int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap 
#define mlx5_vport_get_other_func_general_cap(dev, vport, out)		\

	mlx5_vport_get_other_func_cap(dev, vport, out, MLX5_CAP_GENERAL)



int mlx5_vport_get_vhca_id(struct mlx5_core_dev *dev, u16 vport, u16 *vhca_id);



static inline u32 mlx5_sriov_get_vf_total_msix(struct pci_dev *pdev)

{

	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);

drivers/net/ethernet/mellanox/mlx5/core/steering/hws/cmd.c

+11 −5
Original line number Diff line number Diff line
@@ -1199,22 +1199,28 @@ int mlx5hws_cmd_query_caps(struct mlx5_core_dev *mdev, 
int mlx5hws_cmd_query_gvmi(struct mlx5_core_dev *mdev, bool other_function,

			   u16 vport_number, u16 *gvmi)

{

	bool ec_vf_func = other_function ? mlx5_core_is_ec_vf_vport(mdev, vport_number) : false;

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

	int out_size;

	void *out;

	int err;



	if (other_function) {

		err = mlx5_vport_get_vhca_id(mdev, vport_number, gvmi);

		if  (!err)

			return 0;



		mlx5_core_err(mdev, "Failed to get vport vhca id for vport %d\n",

			      vport_number);

		return err;

	}



	/* get vhca_id for `this` function */

	out_size = MLX5_ST_SZ_BYTES(query_hca_cap_out);

	out = kzalloc(out_size, GFP_KERNEL);

	if (!out)

		return -ENOMEM;



	MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);

	MLX5_SET(query_hca_cap_in, in, other_function, other_function);

	MLX5_SET(query_hca_cap_in, in, function_id,

		 mlx5_vport_to_func_id(mdev, vport_number, ec_vf_func));

	MLX5_SET(query_hca_cap_in, in, ec_vf_function, ec_vf_func);

	MLX5_SET(query_hca_cap_in, in, op_mod,

		 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE << 1 | HCA_CAP_OPMOD_GET_CUR);

drivers/net/ethernet/mellanox/mlx5/core/steering/sws/dr_cmd.c

+12 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/* Copyright (c) 2019 Mellanox Technologies. */



#include "dr_types.h"

#include "eswitch.h"



int mlx5dr_cmd_query_esw_vport_context(struct mlx5_core_dev *mdev,

				       bool other_vport,
@@ -34,21 +35,28 @@ int mlx5dr_cmd_query_esw_vport_context(struct mlx5_core_dev *mdev, 
int mlx5dr_cmd_query_gvmi(struct mlx5_core_dev *mdev, bool other_vport,

			  u16 vport_number, u16 *gvmi)

{

	bool ec_vf_func = other_vport ? mlx5_core_is_ec_vf_vport(mdev, vport_number) : false;

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

	int out_size;

	void *out;

	int err;



	if (other_vport) {

		err = mlx5_vport_get_vhca_id(mdev, vport_number, gvmi);

		if  (!err)

			return 0;



		mlx5_core_err(mdev, "Failed to get vport vhca id for vport %d\n",

			      vport_number);

		return err;

	}



	/* get vhca_id for `this` function */

	out_size = MLX5_ST_SZ_BYTES(query_hca_cap_out);

	out = kzalloc(out_size, GFP_KERNEL);

	if (!out)

		return -ENOMEM;



	MLX5_SET(query_hca_cap_in, in, opcode, MLX5_CMD_OP_QUERY_HCA_CAP);

	MLX5_SET(query_hca_cap_in, in, other_function, other_vport);

	MLX5_SET(query_hca_cap_in, in, function_id, mlx5_vport_to_func_id(mdev, vport_number, ec_vf_func));

	MLX5_SET(query_hca_cap_in, in, ec_vf_function, ec_vf_func);

	MLX5_SET(query_hca_cap_in, in, op_mod,

		 MLX5_SET_HCA_CAP_OP_MOD_GENERAL_DEVICE << 1 |

		 HCA_CAP_OPMOD_GET_CUR);