[PATCH v2 1/2] Introduce maximum WQE size to check limits
From: rao Shoaib
Date: Mon Nov 18 2019 - 14:55:03 EST
From: Rao Shoaib <rao.shoaib@xxxxxxxxxx>
Introduce maximum WQE size to impose limits on max SGE's and inline data
Signed-off-by: Rao Shoaib <rao.shoaib@xxxxxxxxxx>
---
drivers/infiniband/sw/rxe/rxe_param.h | 3 ++-
drivers/infiniband/sw/rxe/rxe_qp.c | 7 +++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/infiniband/sw/rxe/rxe_param.h b/drivers/infiniband/sw/rxe/rxe_param.h
index 1b596fb..31fb5c7 100644
--- a/drivers/infiniband/sw/rxe/rxe_param.h
+++ b/drivers/infiniband/sw/rxe/rxe_param.h
@@ -68,7 +68,6 @@ enum rxe_device_param {
RXE_HW_VER = 0,
RXE_MAX_QP = 0x10000,
RXE_MAX_QP_WR = 0x4000,
- RXE_MAX_INLINE_DATA = 400,
RXE_DEVICE_CAP_FLAGS = IB_DEVICE_BAD_PKEY_CNTR
| IB_DEVICE_BAD_QKEY_CNTR
| IB_DEVICE_AUTO_PATH_MIG
@@ -79,7 +78,9 @@ enum rxe_device_param {
| IB_DEVICE_RC_RNR_NAK_GEN
| IB_DEVICE_SRQ_RESIZE
| IB_DEVICE_MEM_MGT_EXTENSIONS,
+ RXE_MAX_WQE_SIZE = 0x2d0, /* For RXE_MAX_SGE */
RXE_MAX_SGE = 32,
+ RXE_MAX_INLINE_DATA = RXE_MAX_WQE_SIZE,
RXE_MAX_SGE_RD = 32,
RXE_MAX_CQ = 16384,
RXE_MAX_LOG_CQE = 15,
diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index aeea994..323e43d 100644
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -78,9 +78,12 @@ static int rxe_qp_chk_cap(struct rxe_dev *rxe, struct ib_qp_cap *cap,
}
}
- if (cap->max_inline_data > rxe->max_inline_data) {
+ if (cap->max_inline_data >
+ rxe->max_inline_data - sizeof(struct rxe_send_wqe)) {
pr_warn("invalid max inline data = %d > %d\n",
- cap->max_inline_data, rxe->max_inline_data);
+ cap->max_inline_data,
+ rxe->max_inline_data -
+ (u32)sizeof(struct rxe_send_wqe));
goto err1;
}
--
1.8.3.1