openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/mlx5: Add ODP SRQ support 

Add changes to the WQE page-fault handler to

1. Identify that the event is for a SRQ WQE
2. Pass SRQ object instead of a QP to the function that reads the WQE
3. Parse the SRQ WQE with respect to its structure

The rest is handled as for regular RQ WQE.

Signed-off-by: Moni Shoua <monis@mellanox.com>
Reviewed-by: Majd Dibbiny <majd@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Moni Shoua 2019-01-22 08:48:47 +02:00 committed by Jason Gunthorpe
parent fbeb4075c6
commit 08100fad5c
1 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
drivers/infiniband/hw/mlx5/odp.c
View File

@ -1070,19 +1070,32 @@ static int mlx5_ib_mr_initiator_pfault_handler(
/* /*
* Parse responder WQE and set wqe_end to the end of the WQE. * Parse responder WQE and set wqe_end to the end of the WQE.
*/ */
static int mlx5_ib_mr_responder_pfault_handler(struct mlx5_ib_dev *dev, static int mlx5_ib_mr_responder_pfault_handler_srq(struct mlx5_ib_dev *dev,
struct mlx5_ib_qp *qp, void *wqe, struct mlx5_ib_srq *srq,
void **wqe_end, void **wqe, void **wqe_end,
int wqe_length) int wqe_length)
{
int wqe_size = 1 << srq->msrq.wqe_shift;
if (wqe_size > wqe_length) {
mlx5_ib_err(dev, "Couldn't read all of the receive WQE's content\n");
return -EFAULT;
}
*wqe_end = *wqe + wqe_size;
*wqe += sizeof(struct mlx5_wqe_srq_next_seg);
return 0;
}
static int mlx5_ib_mr_responder_pfault_handler_rq(struct mlx5_ib_dev *dev,
struct mlx5_ib_qp *qp,
void *wqe, void **wqe_end,
int wqe_length)
{ {
struct mlx5_ib_wq *wq = &qp->rq; struct mlx5_ib_wq *wq = &qp->rq;
int wqe_size = 1 << wq->wqe_shift; int wqe_size = 1 << wq->wqe_shift;
if (qp->ibqp.srq) {
mlx5_ib_err(dev, "ODP fault on SRQ is not supported\n");
return -EFAULT;
}
if (qp->wq_sig) { if (qp->wq_sig) {
mlx5_ib_err(dev, "ODP fault with WQE signatures is not supported\n"); mlx5_ib_err(dev, "ODP fault with WQE signatures is not supported\n");
return -EFAULT; return -EFAULT;
@ -1142,6 +1155,14 @@ static inline struct mlx5_ib_qp *res_to_qp(struct mlx5_core_rsc_common *res)
return to_mibqp(mqp); return to_mibqp(mqp);
} }
static inline struct mlx5_ib_srq *res_to_srq(struct mlx5_core_rsc_common *res)
{
struct mlx5_core_srq *msrq =
container_of(res, struct mlx5_core_srq, common);
return to_mibsrq(msrq);
}
static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev, static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev,
struct mlx5_pagefault *pfault) struct mlx5_pagefault *pfault)
{ {
@ -1152,8 +1173,9 @@ static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev,
int resume_with_error = 1; int resume_with_error = 1;
u16 wqe_index = pfault->wqe.wqe_index; u16 wqe_index = pfault->wqe.wqe_index;
int requestor = pfault->type & MLX5_PFAULT_REQUESTOR; int requestor = pfault->type & MLX5_PFAULT_REQUESTOR;
struct mlx5_core_rsc_common *res; struct mlx5_core_rsc_common *res = NULL;
struct mlx5_ib_qp *qp; struct mlx5_ib_qp *qp = NULL;
struct mlx5_ib_srq *srq = NULL;
size_t bytes_copied; size_t bytes_copied;
res = odp_get_rsc(dev, pfault->wqe.wq_num, pfault->type); res = odp_get_rsc(dev, pfault->wqe.wq_num, pfault->type);
@ -1166,6 +1188,10 @@ static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev,
case MLX5_RES_QP: case MLX5_RES_QP:
qp = res_to_qp(res); qp = res_to_qp(res);
break; break;
case MLX5_RES_SRQ:
case MLX5_RES_XSRQ:
srq = res_to_srq(res);
break;
default: default:
mlx5_ib_err(dev, "wqe page fault for unsupported type %d\n", pfault->type); mlx5_ib_err(dev, "wqe page fault for unsupported type %d\n", pfault->type);
goto resolve_page_fault; goto resolve_page_fault;
@ -1177,14 +1203,21 @@ static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev,
goto resolve_page_fault; goto resolve_page_fault;
} }
if (requestor) if (qp) {
ret = mlx5_ib_read_user_wqe_sq(qp, wqe_index, if (requestor) {
buffer, PAGE_SIZE, ret = mlx5_ib_read_user_wqe_sq(qp, wqe_index,
&bytes_copied); buffer, PAGE_SIZE,
else &bytes_copied);
ret = mlx5_ib_read_user_wqe_rq(qp, wqe_index, } else {
buffer, PAGE_SIZE, ret = mlx5_ib_read_user_wqe_rq(qp, wqe_index,
&bytes_copied); buffer, PAGE_SIZE,
&bytes_copied);
}
} else {
ret = mlx5_ib_read_user_wqe_srq(srq, wqe_index,
buffer, PAGE_SIZE,
&bytes_copied);
}
if (ret) { if (ret) {
mlx5_ib_err(dev, "Failed reading a WQE following page fault, error=%d, wqe_index=%x, qpn=%x\n", mlx5_ib_err(dev, "Failed reading a WQE following page fault, error=%d, wqe_index=%x, qpn=%x\n",
@ -1194,13 +1227,18 @@ static void mlx5_ib_mr_wqe_pfault_handler(struct mlx5_ib_dev *dev,
wqe = buffer; wqe = buffer;
if (requestor) if (requestor)
ret = mlx5_ib_mr_initiator_pfault_handler(dev, pfault, qp, &wqe, ret = mlx5_ib_mr_initiator_pfault_handler(dev, pfault, qp,
&wqe_end, &wqe, &wqe_end,
bytes_copied); bytes_copied);
else if (qp)
ret = mlx5_ib_mr_responder_pfault_handler_rq(dev, qp,
wqe, &wqe_end,
bytes_copied);
else else
ret = mlx5_ib_mr_responder_pfault_handler(dev, qp, wqe, ret = mlx5_ib_mr_responder_pfault_handler_srq(dev, srq,
&wqe_end, &wqe, &wqe_end,
bytes_copied); bytes_copied);
if (ret < 0) if (ret < 0)
goto resolve_page_fault; goto resolve_page_fault;