Commit ec44e72b authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Open-code create and destroy QP calls 



FPGA, IPoIB and SW steering don't need anything from the
mlx5_core_create_qp() and mlx5_core_destroy_qp() except calls
to mlx5_cmd_exec().

Let's open-code it, so we will be able to move qp.c to mlx5_ib.

Reviewed-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent bb7fc863

drivers/net/ethernet/mellanox/mlx5/core/fpga/conn.c

+13 −11
Original line number Diff line number Diff line
@@ -534,8 +534,9 @@ static int mlx5_fpga_conn_create_qp(struct mlx5_fpga_conn *conn, 
				    unsigned int tx_size, unsigned int rx_size)

{

	struct mlx5_fpga_device *fdev = conn->fdev;

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

	struct mlx5_core_dev *mdev = fdev->mdev;

	u32 temp_qpc[MLX5_ST_SZ_DW(qpc)] = {0};

	u32 temp_qpc[MLX5_ST_SZ_DW(qpc)] = {};

	void *in = NULL, *qpc;

	int err, inlen;
@@ -600,10 +601,12 @@ static int mlx5_fpga_conn_create_qp(struct mlx5_fpga_conn *conn, 
	mlx5_fill_page_frag_array(&conn->qp.wq_ctrl.buf,

				  (__be64 *)MLX5_ADDR_OF(create_qp_in, in, pas));



	err = mlx5_core_create_qp(mdev, &conn->qp.mqp, in, inlen);

	MLX5_SET(create_qp_in, in, opcode, MLX5_CMD_OP_CREATE_QP);

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

	if (err)

		goto err_sq_bufs;



	conn->qp.mqp.qpn = MLX5_GET(create_qp_out, out, qpn);

	conn->qp.mqp.event = mlx5_fpga_conn_event;

	mlx5_fpga_dbg(fdev, "Created QP #0x%x\n", conn->qp.mqp.qpn);
@@ -658,7 +661,14 @@ static void mlx5_fpga_conn_flush_send_bufs(struct mlx5_fpga_conn *conn) 


static void mlx5_fpga_conn_destroy_qp(struct mlx5_fpga_conn *conn)

{

	mlx5_core_destroy_qp(conn->fdev->mdev, &conn->qp.mqp);

	struct mlx5_core_dev *dev = conn->fdev->mdev;

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

	struct mlx5_core_qp *qp = &conn->qp.mqp;



	MLX5_SET(destroy_qp_in, in, opcode, MLX5_CMD_OP_DESTROY_QP);

	MLX5_SET(destroy_qp_in, in, qpn, qp->qpn);

	mlx5_cmd_exec_in(dev, destroy_qp, in);



	mlx5_fpga_conn_free_recv_bufs(conn);

	mlx5_fpga_conn_flush_send_bufs(conn);

	kvfree(conn->qp.sq.bufs);
@@ -972,19 +982,11 @@ out: 


void mlx5_fpga_conn_destroy(struct mlx5_fpga_conn *conn)

{

	struct mlx5_fpga_device *fdev = conn->fdev;

	struct mlx5_core_dev *mdev = fdev->mdev;

	int err = 0;



	conn->qp.active = false;

	tasklet_disable(&conn->cq.tasklet);

	synchronize_irq(conn->cq.mcq.irqn);



	mlx5_fpga_destroy_qp(conn->fdev->mdev, conn->fpga_qpn);

	err = mlx5_core_qp_modify(mdev, MLX5_CMD_OP_2ERR_QP, 0, NULL,

				  &conn->qp.mqp);

	if (err)

		mlx5_fpga_warn(fdev, "qp_modify 2ERR failed: %d\n", err);

	mlx5_fpga_conn_destroy_qp(conn);

	mlx5_fpga_conn_destroy_cq(conn);

drivers/net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c

+14 −16
Original line number Diff line number Diff line
@@ -219,17 +219,12 @@ void mlx5i_uninit_underlay_qp(struct mlx5e_priv *priv) 


int mlx5i_create_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp)

{

	u32 *in = NULL;

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

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

	void *addr_path;

	int ret = 0;

	int inlen;

	void *qpc;



	inlen = MLX5_ST_SZ_BYTES(create_qp_in);

	in = kvzalloc(inlen, GFP_KERNEL);

	if (!in)

		return -ENOMEM;



	qpc = MLX5_ADDR_OF(create_qp_in, in, qpc);

	MLX5_SET(qpc, qpc, st, MLX5_QP_ST_UD);

	MLX5_SET(qpc, qpc, pm_state, MLX5_QP_PM_MIGRATED);
@@ -240,20 +235,23 @@ int mlx5i_create_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp 
	MLX5_SET(ads, addr_path, vhca_port_num, 1);

	MLX5_SET(ads, addr_path, grh, 1);



	ret = mlx5_core_create_qp(mdev, qp, in, inlen);

	if (ret) {

		mlx5_core_err(mdev, "Failed creating IPoIB QP err : %d\n", ret);

		goto out;

	}



out:

	kvfree(in);

	MLX5_SET(create_qp_in, in, opcode, MLX5_CMD_OP_CREATE_QP);

	ret = mlx5_cmd_exec_inout(mdev, create_qp, in, out);

	if (ret)

		return ret;



	qp->qpn = MLX5_GET(create_qp_out, out, qpn);



	return 0;

}



void mlx5i_destroy_underlay_qp(struct mlx5_core_dev *mdev, struct mlx5_core_qp *qp)

{

	mlx5_core_destroy_qp(mdev, qp);

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



	MLX5_SET(destroy_qp_in, in, opcode, MLX5_CMD_OP_DESTROY_QP);

	MLX5_SET(destroy_qp_in, in, qpn, qp->qpn);

	mlx5_cmd_exec_in(mdev, destroy_qp, in);

}



int mlx5i_create_tis(struct mlx5_core_dev *mdev, u32 underlay_qpn, u32 *tisn)

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c

+12 −6
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ static void dr_qp_event(struct mlx5_core_qp *mqp, int event) 
static struct mlx5dr_qp *dr_create_rc_qp(struct mlx5_core_dev *mdev,

					 struct dr_qp_init_attr *attr)

{

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

	u32 temp_qpc[MLX5_ST_SZ_DW(qpc)] = {};

	struct mlx5_wq_param wqp;

	struct mlx5dr_qp *dr_qp;
@@ -180,13 +181,12 @@ static struct mlx5dr_qp *dr_create_rc_qp(struct mlx5_core_dev *mdev, 
				  (__be64 *)MLX5_ADDR_OF(create_qp_in,

							 in, pas));



	err = mlx5_core_create_qp(mdev, &dr_qp->mqp, in, inlen);

	MLX5_SET(create_qp_in, in, opcode, MLX5_CMD_OP_CREATE_QP);

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

	dr_qp->mqp.qpn = MLX5_GET(create_qp_out, out, qpn);

	kfree(in);



	if (err) {

		mlx5_core_warn(mdev, " Can't create QP\n");

	if (err)

		goto err_in;

	}

	dr_qp->mqp.event = dr_qp_event;

	dr_qp->uar = attr->uar;
@@ -204,7 +204,13 @@ err_wq: 
static void dr_destroy_qp(struct mlx5_core_dev *mdev,

			  struct mlx5dr_qp *dr_qp)

{

	mlx5_core_destroy_qp(mdev, &dr_qp->mqp);

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

	struct mlx5_core_qp *qp = &dr_qp->mqp;



	MLX5_SET(destroy_qp_in, in, opcode, MLX5_CMD_OP_DESTROY_QP);

	MLX5_SET(destroy_qp_in, in, qpn, qp->qpn);

	mlx5_cmd_exec_in(mdev, destroy_qp, in);



	kfree(dr_qp->sq.wqe_head);

	mlx5_wq_destroy(&dr_qp->wq_ctrl);

	kfree(dr_qp);

CRA Git | Maintained and supported by SUSTech CRA and CCSE