Added vendor_part_id
Fixed bug in rxe_resp.c at RKEY_VIOLATION: failed to ack bad rkeys
Fixed failure to init mr in rxe_resp.c at check_rkey
Fixed failure to allow invalidation of invalid MWs
Signed-off-by: Bob Pearson <rpearson@xxxxxxx>
---
drivers/infiniband/sw/rxe/rxe.c | 1 +
drivers/infiniband/sw/rxe/rxe_mw.c | 20 ++++++++++++--------
drivers/infiniband/sw/rxe/rxe_param.h | 1 +
drivers/infiniband/sw/rxe/rxe_resp.c | 9 ++++++---
4 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
index 10f441ac7203..11b043edd647 100644
--- a/drivers/infiniband/sw/rxe/rxe.c
+++ b/drivers/infiniband/sw/rxe/rxe.c
@@ -43,6 +43,7 @@ static void rxe_init_device_param(struct rxe_dev *rxe)
rxe->max_inline_data = RXE_MAX_INLINE_DATA;
rxe->attr.vendor_id = RXE_VENDOR_ID;
+ rxe->attr.vendor_part_id = RXE_VENDOR_PART_ID;
rxe->attr.max_mr_size = RXE_MAX_MR_SIZE;
rxe->attr.page_size_cap = RXE_PAGE_SIZE_CAP;
rxe->attr.max_qp = RXE_MAX_QP;
diff --git a/drivers/infiniband/sw/rxe/rxe_mw.c b/drivers/infiniband/sw/rxe/rxe_mw.c
index 4178cf501a2b..a443deae35a3 100644
--- a/drivers/infiniband/sw/rxe/rxe_mw.c
+++ b/drivers/infiniband/sw/rxe/rxe_mw.c
@@ -28,7 +28,6 @@ static void rxe_set_mw_rkey(struct rxe_mw *mw)
pr_err_once("unable to get random rkey for mw\n");
}
-/* this temporary code to test ibv_alloc_mw, ibv_dealloc_mw */
struct ib_mw *rxe_alloc_mw(struct ib_pd *ibpd, enum ib_mw_type type,
struct ib_udata *udata)
{
@@ -326,9 +325,12 @@ int rxe_bind_mw(struct rxe_qp *qp, struct rxe_send_wqe *wqe)
static int check_invalidate_mw(struct rxe_qp *qp, struct rxe_mw *mw)
{
- if (unlikely(mw->state != RXE_MEM_STATE_VALID)) {
- pr_err_once("attempt to invalidate a MW that is not valid\n");
- return -EINVAL;
+ /* run_test requires invalidate to work when !valid so don't check */
+ if (0) {
+ if (unlikely(mw->state != RXE_MEM_STATE_VALID)) {
+ pr_err_once("attempt to invalidate a MW that is not valid\n");
+ return -EINVAL;
+ }
}
/* o10-37.2.26 */
@@ -344,9 +346,11 @@ static void do_invalidate_mw(struct rxe_mw *mw)
{
mw->qp = NULL;
- rxe_drop_ref(mw->mr);
- atomic_dec(&mw->mr->num_mw);
- mw->mr = NULL;
+ if (mw->mr) {
+ rxe_drop_ref(mw->mr);
+ atomic_dec(&mw->mr->num_mw);
+ mw->mr = NULL;
+ }
mw->access = 0;
mw->addr = 0;
@@ -378,7 +382,7 @@ int rxe_mw_check_access(struct rxe_qp *qp, struct rxe_mw *mw,
struct rxe_pd *pd = to_rpd(mw->ibmw.pd);
if (unlikely(mw->state != RXE_MEM_STATE_VALID)) {
- pr_err_once("attempt to access a MW that is not in the valid state\n");
+ pr_err_once("attempt to access a MW that is not valid\n");
return -EINVAL;
}
diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
index e1d485bdd6af..beaa3f844819 100644
--- a/drivers/infiniband/sw/rxe/rxe_param.h
+++ b/drivers/infiniband/sw/rxe/rxe_param.h
@@ -107,6 +107,7 @@ enum rxe_device_param {
/* IBTA v1.4 A3.3.1 VENDOR INFORMATION section */
RXE_VENDOR_ID = 0XFFFFFF,
+ RXE_VENDOR_PART_ID = 1,
};
/* default/initial rxe port parameters */
diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index d6e957a34910..bf7ef56aaf1c 100644
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -392,8 +392,8 @@ static enum resp_states check_length(struct rxe_qp *qp,
static enum resp_states check_rkey(struct rxe_qp *qp,
struct rxe_pkt_info *pkt)
{
- struct rxe_mr *mr;
- struct rxe_mw *mw;
+ struct rxe_mr *mr = NULL;
+ struct rxe_mw *mw = NULL;
struct rxe_dev *rxe = to_rdev(qp->ibqp.device);
u64 va;
u32 rkey;
@@ -1368,7 +1368,10 @@ int rxe_responder(void *arg)
/* Class C */
do_class_ac_error(qp, AETH_NAK_REM_ACC_ERR,
IB_WC_REM_ACCESS_ERR);
- state = RESPST_COMPLETE;
+ if (qp->resp.wqe)
+ state = RESPST_COMPLETE;
+ else
+ state = RESPST_ACKNOWLEDGE;
} else {
qp->resp.drop_msg = 1;
if (qp->srq) {
--
2.25.1
