Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2c76824 authored by Jack Morgenstein's avatar Jack Morgenstein Committed by Roland Dreier
Browse files

mlx4_core: Add proxy and tunnel QPs to the reserved QP area 



In addition, pass the proxy and tunnel QP numbers to slaves so the
driver can perform special QP paravirtualization.

Signed-off-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 1ffeb2eb

drivers/net/ethernet/mellanox/mlx4/fw.c

+14 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave, 
#define QUERY_FUNC_CAP_MCG_QUOTA_OFFSET		0x28

#define QUERY_FUNC_CAP_MAX_EQ_OFFSET		0x2c

#define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET	0X30

#define QUERY_FUNC_CAP_BASE_TUNNEL_QPN_OFFSET	0x44

#define QUERY_FUNC_CAP_BASE_PROXY_QPN_OFFSET	0x48



#define QUERY_FUNC_CAP_FMR_FLAG			0x80

#define QUERY_FUNC_CAP_FLAG_RDMA		0x40
@@ -247,6 +249,12 @@ int mlx4_QUERY_FUNC_CAP_wrapper(struct mlx4_dev *dev, int slave, 
		size = dev->caps.num_mgms + dev->caps.num_amgms;

		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);



		size = dev->caps.base_tunnel_sqpn + 8 * slave;

		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_BASE_TUNNEL_QPN_OFFSET);



		size = dev->caps.sqp_start + 8 * slave;

		MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_BASE_PROXY_QPN_OFFSET);



	} else

		err = -EINVAL;
@@ -312,6 +320,12 @@ int mlx4_QUERY_FUNC_CAP(struct mlx4_dev *dev, struct mlx4_func_cap *func_cap) 
	MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);

	func_cap->mcg_quota = size & 0xFFFFFF;



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_BASE_TUNNEL_QPN_OFFSET);

	func_cap->base_tunnel_qpn = size & 0xFFFFFF;



	MLX4_GET(size, outbox, QUERY_FUNC_CAP_BASE_PROXY_QPN_OFFSET);

	func_cap->base_proxy_qpn = size & 0xFFFFFF;



	for (i = 1; i <= func_cap->num_ports; ++i) {

		err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 1,

				   MLX4_CMD_QUERY_FUNC_CAP,

drivers/net/ethernet/mellanox/mlx4/fw.h

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ struct mlx4_func_cap { 
	int	max_eq;

	int	reserved_eq;

	int	mcg_quota;

	u32	base_qpn;

	u32	base_tunnel_qpn;

	u32	base_proxy_qpn;

	u8	physical_port[MLX4_MAX_PORTS + 1];

	u8	port_flags[MLX4_MAX_PORTS + 1];

};

drivers/net/ethernet/mellanox/mlx4/main.c

+5 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
		dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_ADDR] +

		dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_EXCH];



	dev->caps.sqp_demux = (mlx4_is_master(dev)) ? MLX4_MAX_NUM_SLAVES : 0;

	return 0;

}

/*The function checks if there are live vf, return the num of them*/
@@ -541,6 +542,10 @@ static int mlx4_slave_cap(struct mlx4_dev *dev) 
		return -ENODEV;

	}



	/* Calculate our sqp_start */

	dev->caps.sqp_start = func_cap.base_proxy_qpn;

	dev->caps.base_tunnel_sqpn = func_cap.base_tunnel_qpn;



	return 0;

}

drivers/net/ethernet/mellanox/mlx4/qp.c

+26 −3
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) 
	 * We also reserve the MSB of the 24-bit QP number to indicate

	 * that a QP is an XRC QP.

	 */

	dev->caps.sqp_start =

	dev->caps.base_sqpn =

		ALIGN(dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW], 8);



	{
@@ -437,13 +437,36 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) 


	}



       /* Reserve 8 real SQPs in both native and SRIOV modes.

	* In addition, in SRIOV mode, reserve 8 proxy SQPs per function

	* (for all PFs and VFs), and 8 corresponding tunnel QPs.

	* Each proxy SQP works opposite its own tunnel QP.

	*

	* The QPs are arranged as follows:

	* a. 8 real SQPs

	* b. All the proxy SQPs (8 per function)

	* c. All the tunnel QPs (8 per function)

	*/



	err = mlx4_bitmap_init(&qp_table->bitmap, dev->caps.num_qps,

			       (1 << 23) - 1, dev->caps.sqp_start + 8,

			       (1 << 23) - 1, dev->caps.base_sqpn + 8 +

			       16 * MLX4_MFUNC_MAX * !!mlx4_is_master(dev),

			       reserved_from_top);



	/* In mfunc, sqp_start is the base of the proxy SQPs, since the PF also

	 * uses paravirtualized SQPs.

	 * In native mode, sqp_start is the base of the real SQPs. */

	if (mlx4_is_mfunc(dev)) {

		dev->caps.sqp_start = dev->caps.base_sqpn +

			8 * (mlx4_master_func_num(dev) + 1);

		dev->caps.base_tunnel_sqpn = dev->caps.sqp_start + 8 * MLX4_MFUNC_MAX;

	} else

		dev->caps.sqp_start = dev->caps.base_sqpn;



	if (err)

		return err;



	return mlx4_CONF_SPECIAL_QP(dev, dev->caps.sqp_start);

	return mlx4_CONF_SPECIAL_QP(dev, dev->caps.base_sqpn);

}



void mlx4_cleanup_qp_table(struct mlx4_dev *dev)

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

+2 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,8 @@ static void res_end_move(struct mlx4_dev *dev, int slave, 


static int valid_reserved(struct mlx4_dev *dev, int slave, int qpn)

{

	return mlx4_is_qp_reserved(dev, qpn);

	return mlx4_is_qp_reserved(dev, qpn) &&

		(mlx4_is_master(dev) || mlx4_is_guest_proxy(dev, slave, qpn));

}



static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,