Commit 31578def authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Jason Gunthorpe
Browse files

RDMA/mlx5: Update mlx5_ib to use new cmd interface 

Reuse newly introduced mlx5_cmd_exec_in() and mlx5_cmd_exec_inout() to
reduce code duplication in mlx5_ib module.

Link: https://lore.kernel.org/r/20200506065513.4668-2-leon@kernel.org


Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent e4faa478

drivers/infiniband/hw/mlx5/cmd.c

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

/*

 * Copyright (c) 2017, Mellanox Technologies. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - Redistributions in binary form must reproduce the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer in the documentation and/or other materials

 *        provided with the distribution.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 * Copyright (c) 2017-2020, Mellanox Technologies inc. All rights reserved.

 */



#include "cmd.h"



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_special_contexts_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {};

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

	int err;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	err = mlx5_cmd_exec_inout(dev, query_special_contexts, in, out);

	if (!err)

		*mkey = MLX5_GET(query_special_contexts_out, out,

				 dump_fill_mkey);
@@ -55,7 +28,7 @@ int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey) 


	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	err = mlx5_cmd_exec_inout(dev, query_special_contexts, in, out);

	if (!err)

		*null_mkey = MLX5_GET(query_special_contexts_out, out,

				      null_mkey);
@@ -63,7 +36,7 @@ int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey) 
}



int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,

			       void *out, int out_size)

			       void *out)

{

	u32 in[MLX5_ST_SZ_DW(query_cong_params_in)] = {};
@@ -71,15 +44,7 @@ int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point, 
		 MLX5_CMD_OP_QUERY_CONG_PARAMS);

	MLX5_SET(query_cong_params_in, in, cong_protocol, cong_point);



	return mlx5_cmd_exec(dev, in, sizeof(in), out, out_size);

}



int mlx5_cmd_modify_cong_params(struct mlx5_core_dev *dev,

				void *in, int in_size)

{

	u32 out[MLX5_ST_SZ_DW(modify_cong_params_out)] = { };



	return mlx5_cmd_exec(dev, in, in_size, out, sizeof(out));

	return mlx5_cmd_exec_inout(dev, query_cong_params, in, out);

}



int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,
@@ -133,7 +98,7 @@ int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr, 
		MLX5_SET64(alloc_memic_in, in, range_start_addr,

			   hw_start_addr + (page_idx * PAGE_SIZE));



		ret = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

		ret = mlx5_cmd_exec_inout(dev, alloc_memic, in, out);

		if (ret) {

			spin_lock(&dm->lock);

			bitmap_clear(dm->memic_alloc_pages,
@@ -162,8 +127,7 @@ void mlx5_cmd_dealloc_memic(struct mlx5_dm *dm, phys_addr_t addr, u64 length) 
	struct mlx5_core_dev *dev = dm->dev;

	u64 hw_start_addr = MLX5_CAP64_DEV_MEM(dev, memic_bar_start_addr);

	u32 num_pages = DIV_ROUND_UP(length, PAGE_SIZE);

	u32 out[MLX5_ST_SZ_DW(dealloc_memic_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(dealloc_memic_in)] = {0};

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

	u64 start_page_idx;

	int err;
@@ -174,7 +138,7 @@ void mlx5_cmd_dealloc_memic(struct mlx5_dm *dm, phys_addr_t addr, u64 length) 
	MLX5_SET64(dealloc_memic_in, in, memic_start_addr, addr);

	MLX5_SET(dealloc_memic_in, in, memic_size, length);



	err =  mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	err =  mlx5_cmd_exec_in(dev, dealloc_memic, in);

	if (err)

		return;
@@ -199,48 +163,45 @@ int mlx5_cmd_query_ext_ppcnt_counters(struct mlx5_core_dev *dev, void *out) 
void mlx5_cmd_destroy_tir(struct mlx5_core_dev *dev, u32 tirn, u16 uid)

{

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

	u32 out[MLX5_ST_SZ_DW(destroy_tir_out)] = {};



	MLX5_SET(destroy_tir_in, in, opcode, MLX5_CMD_OP_DESTROY_TIR);

	MLX5_SET(destroy_tir_in, in, tirn, tirn);

	MLX5_SET(destroy_tir_in, in, uid, uid);

	mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(dev, destroy_tir, in);

}



void mlx5_cmd_destroy_tis(struct mlx5_core_dev *dev, u32 tisn, u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(destroy_tis_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(destroy_tis_out)] = {0};

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



	MLX5_SET(destroy_tis_in, in, opcode, MLX5_CMD_OP_DESTROY_TIS);

	MLX5_SET(destroy_tis_in, in, tisn, tisn);

	MLX5_SET(destroy_tis_in, in, uid, uid);

	mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(dev, destroy_tis, in);

}



void mlx5_cmd_destroy_rqt(struct mlx5_core_dev *dev, u32 rqtn, u16 uid)

{

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

	u32 out[MLX5_ST_SZ_DW(destroy_rqt_out)] = {};



	MLX5_SET(destroy_rqt_in, in, opcode, MLX5_CMD_OP_DESTROY_RQT);

	MLX5_SET(destroy_rqt_in, in, rqtn, rqtn);

	MLX5_SET(destroy_rqt_in, in, uid, uid);

	mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(dev, destroy_rqt, in);

}



int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn,

				    u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(alloc_transport_domain_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(alloc_transport_domain_out)] = {0};

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

	u32 out[MLX5_ST_SZ_DW(alloc_transport_domain_out)] = {};

	int err;



	MLX5_SET(alloc_transport_domain_in, in, opcode,

		 MLX5_CMD_OP_ALLOC_TRANSPORT_DOMAIN);

	MLX5_SET(alloc_transport_domain_in, in, uid, uid);



	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	err = mlx5_cmd_exec_inout(dev, alloc_transport_domain, in, out);

	if (!err)

		*tdn = MLX5_GET(alloc_transport_domain_out, out,

				transport_domain);
@@ -251,31 +212,28 @@ int mlx5_cmd_alloc_transport_domain(struct mlx5_core_dev *dev, u32 *tdn, 
void mlx5_cmd_dealloc_transport_domain(struct mlx5_core_dev *dev, u32 tdn,

				       u16 uid)

{

	u32 in[MLX5_ST_SZ_DW(dealloc_transport_domain_in)]   = {0};

	u32 out[MLX5_ST_SZ_DW(dealloc_transport_domain_out)] = {0};

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



	MLX5_SET(dealloc_transport_domain_in, in, opcode,

		 MLX5_CMD_OP_DEALLOC_TRANSPORT_DOMAIN);

	MLX5_SET(dealloc_transport_domain_in, in, uid, uid);

	MLX5_SET(dealloc_transport_domain_in, in, transport_domain, tdn);

	mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(dev, dealloc_transport_domain, in);

}



void mlx5_cmd_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn, u16 uid)

{

	u32 out[MLX5_ST_SZ_DW(dealloc_pd_out)] = {};

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



	MLX5_SET(dealloc_pd_in, in, opcode, MLX5_CMD_OP_DEALLOC_PD);

	MLX5_SET(dealloc_pd_in, in, pd, pdn);

	MLX5_SET(dealloc_pd_in, in, uid, uid);

	mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	mlx5_cmd_exec_in(dev, dealloc_pd, in);

}



int mlx5_cmd_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,

			u32 qpn, u16 uid)

{

	u32 out[MLX5_ST_SZ_DW(attach_to_mcg_out)] = {};

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

	void *gid;
@@ -284,13 +242,12 @@ int mlx5_cmd_attach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, 
	MLX5_SET(attach_to_mcg_in, in, uid, uid);

	gid = MLX5_ADDR_OF(attach_to_mcg_in, in, multicast_gid);

	memcpy(gid, mgid, sizeof(*mgid));

	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	return mlx5_cmd_exec_in(dev, attach_to_mcg, in);

}



int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid,

			u32 qpn, u16 uid)

{

	u32 out[MLX5_ST_SZ_DW(detach_from_mcg_out)] = {};

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

	void *gid;
@@ -299,7 +256,7 @@ int mlx5_cmd_detach_mcg(struct mlx5_core_dev *dev, union ib_gid *mgid, 
	MLX5_SET(detach_from_mcg_in, in, uid, uid);

	gid = MLX5_ADDR_OF(detach_from_mcg_in, in, multicast_gid);

	memcpy(gid, mgid, sizeof(*mgid));

	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	return mlx5_cmd_exec_in(dev, detach_from_mcg, in);

}



int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid)
@@ -310,7 +267,7 @@ int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid) 


	MLX5_SET(alloc_xrcd_in, in, opcode, MLX5_CMD_OP_ALLOC_XRCD);

	MLX5_SET(alloc_xrcd_in, in, uid, uid);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	err = mlx5_cmd_exec_inout(dev, alloc_xrcd, in, out);

	if (!err)

		*xrcdn = MLX5_GET(alloc_xrcd_out, out, xrcd);

	return err;
@@ -318,13 +275,12 @@ int mlx5_cmd_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn, u16 uid) 


int mlx5_cmd_xrcd_dealloc(struct mlx5_core_dev *dev, u32 xrcdn, u16 uid)

{

	u32 out[MLX5_ST_SZ_DW(dealloc_xrcd_out)] = {};

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



	MLX5_SET(dealloc_xrcd_in, in, opcode, MLX5_CMD_OP_DEALLOC_XRCD);

	MLX5_SET(dealloc_xrcd_in, in, xrcd, xrcdn);

	MLX5_SET(dealloc_xrcd_in, in, uid, uid);

	return mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	return mlx5_cmd_exec_in(dev, dealloc_xrcd, in);

}



int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,
@@ -350,7 +306,7 @@ int mlx5_cmd_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb, 
	data = MLX5_ADDR_OF(mad_ifc_in, in, mad);

	memcpy(data, inb, MLX5_FLD_SZ_BYTES(mad_ifc_in, mad));



	err = mlx5_cmd_exec(dev, in, inlen, out, outlen);

	err = mlx5_cmd_exec_inout(dev, mad_ifc, in, out);

	if (err)

		goto out;

drivers/infiniband/hw/mlx5/cmd.h

+1 −3
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ 
int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey);

int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey);

int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,

			       void *out, int out_size);

			       void *out);

int mlx5_cmd_query_ext_ppcnt_counters(struct mlx5_core_dev *dev, void *out);

int mlx5_cmd_modify_cong_params(struct mlx5_core_dev *mdev,

				void *in, int in_size);

int mlx5_cmd_alloc_memic(struct mlx5_dm *dm, phys_addr_t *addr,

			 u64 length, u32 alignment);

void mlx5_cmd_dealloc_memic(struct mlx5_dm *dm, phys_addr_t addr, u64 length);

drivers/infiniband/hw/mlx5/cong.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int mlx5_ib_get_cc_params(struct mlx5_ib_dev *dev, u8 port_num, 


	node = mlx5_ib_param_to_node(offset);



	err = mlx5_cmd_query_cong_params(mdev, node, out, outlen);

	err = mlx5_cmd_query_cong_params(mdev, node, out);

	if (err)

		goto free;
@@ -339,7 +339,7 @@ static int mlx5_ib_set_cc_params(struct mlx5_ib_dev *dev, u8 port_num, 
	MLX5_SET(field_select_r_roce_rp, field, field_select_r_roce_rp,

		 attr_mask);



	err = mlx5_cmd_modify_cong_params(mdev, in, inlen);

	err = mlx5_cmd_exec_in(dev->mdev, modify_cong_params, in);

	kvfree(in);

alloc_err:

	mlx5_ib_put_native_port_mdev(dev, port_num + 1);

drivers/infiniband/hw/mlx5/main.c

+2 −3
Original line number Diff line number Diff line
@@ -2570,8 +2570,7 @@ static int mlx5_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) 
	uid = context ? context->devx_uid : 0;

	MLX5_SET(alloc_pd_in, in, opcode, MLX5_CMD_OP_ALLOC_PD);

	MLX5_SET(alloc_pd_in, in, uid, uid);

	err = mlx5_cmd_exec(to_mdev(ibdev)->mdev, in, sizeof(in),

			    out, sizeof(out));

	err = mlx5_cmd_exec_inout(to_mdev(ibdev)->mdev, alloc_pd, in, out);

	if (err)

		return err;

drivers/infiniband/hw/mlx5/odp.c

+2 −3
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ static void mlx5_ib_page_fault_resume(struct mlx5_ib_dev *dev, 
{

	int wq_num = pfault->event_subtype == MLX5_PFAULT_SUBTYPE_WQE ?

		     pfault->wqe.wq_num : pfault->token;

	u32 out[MLX5_ST_SZ_DW(page_fault_resume_out)] = { };

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

	int err;
@@ -457,7 +456,7 @@ static void mlx5_ib_page_fault_resume(struct mlx5_ib_dev *dev, 
	MLX5_SET(page_fault_resume_in, in, wq_number, wq_num);

	MLX5_SET(page_fault_resume_in, in, error, !!error);



	err = mlx5_cmd_exec(dev->mdev, in, sizeof(in), out, sizeof(out));

	err = mlx5_cmd_exec_in(dev->mdev, page_fault_resume, in);

	if (err)

		mlx5_ib_err(dev, "Failed to resolve the page fault on WQ 0x%x err %d\n",

			    wq_num, err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE