mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
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: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: Roland Dreier <roland@purestorage.com>
This commit is contained in:
parent
1ffeb2eb8b
commit
e2c76824ca
6 changed files with 62 additions and 5 deletions
|
@ -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_MCG_QUOTA_OFFSET 0x28
|
||||||
#define QUERY_FUNC_CAP_MAX_EQ_OFFSET 0x2c
|
#define QUERY_FUNC_CAP_MAX_EQ_OFFSET 0x2c
|
||||||
#define QUERY_FUNC_CAP_RESERVED_EQ_OFFSET 0X30
|
#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_FMR_FLAG 0x80
|
||||||
#define QUERY_FUNC_CAP_FLAG_RDMA 0x40
|
#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;
|
size = dev->caps.num_mgms + dev->caps.num_amgms;
|
||||||
MLX4_PUT(outbox->buf, size, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);
|
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
|
} else
|
||||||
err = -EINVAL;
|
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);
|
MLX4_GET(size, outbox, QUERY_FUNC_CAP_MCG_QUOTA_OFFSET);
|
||||||
func_cap->mcg_quota = size & 0xFFFFFF;
|
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) {
|
for (i = 1; i <= func_cap->num_ports; ++i) {
|
||||||
err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 1,
|
err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 1,
|
||||||
MLX4_CMD_QUERY_FUNC_CAP,
|
MLX4_CMD_QUERY_FUNC_CAP,
|
||||||
|
|
|
@ -134,6 +134,9 @@ struct mlx4_func_cap {
|
||||||
int max_eq;
|
int max_eq;
|
||||||
int reserved_eq;
|
int reserved_eq;
|
||||||
int mcg_quota;
|
int mcg_quota;
|
||||||
|
u32 base_qpn;
|
||||||
|
u32 base_tunnel_qpn;
|
||||||
|
u32 base_proxy_qpn;
|
||||||
u8 physical_port[MLX4_MAX_PORTS + 1];
|
u8 physical_port[MLX4_MAX_PORTS + 1];
|
||||||
u8 port_flags[MLX4_MAX_PORTS + 1];
|
u8 port_flags[MLX4_MAX_PORTS + 1];
|
||||||
};
|
};
|
||||||
|
|
|
@ -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_ADDR] +
|
||||||
dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FC_EXCH];
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
/*The function checks if there are live vf, return the num of them*/
|
/*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;
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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
|
* We also reserve the MSB of the 24-bit QP number to indicate
|
||||||
* that a QP is an XRC QP.
|
* 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);
|
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,
|
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);
|
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)
|
if (err)
|
||||||
return 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)
|
void mlx4_cleanup_qp_table(struct mlx4_dev *dev)
|
||||||
|
|
|
@ -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)
|
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,
|
static int qp_alloc_res(struct mlx4_dev *dev, int slave, int op, int cmd,
|
||||||
|
|
|
@ -693,7 +693,18 @@ static inline int mlx4_is_master(struct mlx4_dev *dev)
|
||||||
|
|
||||||
static inline int mlx4_is_qp_reserved(struct mlx4_dev *dev, u32 qpn)
|
static inline int mlx4_is_qp_reserved(struct mlx4_dev *dev, u32 qpn)
|
||||||
{
|
{
|
||||||
return (qpn < dev->caps.sqp_start + 8);
|
return (qpn < dev->caps.base_sqpn + 8 +
|
||||||
|
16 * MLX4_MFUNC_MAX * !!mlx4_is_master(dev));
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline int mlx4_is_guest_proxy(struct mlx4_dev *dev, int slave, u32 qpn)
|
||||||
|
{
|
||||||
|
int base = dev->caps.sqp_start + slave * 8;
|
||||||
|
|
||||||
|
if (qpn >= base && qpn < base + 8)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int mlx4_is_mfunc(struct mlx4_dev *dev)
|
static inline int mlx4_is_mfunc(struct mlx4_dev *dev)
|
||||||
|
|
Loading…
Reference in a new issue