* [PATCH for-next v2] RDMA/efa: Validate SQ depth based on WQE size
@ 2026-05-17 17:52 Yonatan Nachum
2026-05-18 12:00 ` Leon Romanovsky
0 siblings, 1 reply; 2+ messages in thread
From: Yonatan Nachum @ 2026-05-17 17:52 UTC (permalink / raw)
To: jgg, leon, linux-rdma
Cc: mrgolin, sleybo, matua, gal.pressman, Yonatan Nachum,
Daniel Kranzdorf
Change the SQ depth validation to take into account the SQ WQE size.
This is needed since when using 128-byte WQE the max SQ depth is cut in
half. On create QP command, userspace provides SQ ring size which is SQ
depth X WQE size so we can calculate the requested WQE size in the
kernel.
Fixes: 40909f664d27 ("RDMA/efa: Add EFA verbs implementation")
Reviewed-by: Daniel Kranzdorf <dkkranzd@amazon.com>
Reviewed-by: Michael Margolin <mrgolin@amazon.com>
Signed-off-by: Yonatan Nachum <ynachum@amazon.com>
---
Changelog:
v2:
* Add fixes line.
v1: https://lore.kernel.org/all/20260507112110.869212-1-ynachum@amazon.com/
drivers/infiniband/hw/efa/efa_verbs.c | 39 ++++++++++++++++++---------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
index 395290ab0584..9a6cbb70581b 100644
--- a/drivers/infiniband/hw/efa/efa_verbs.c
+++ b/drivers/infiniband/hw/efa/efa_verbs.c
@@ -597,14 +597,27 @@ static int qp_mmap_entries_setup(struct efa_qp *qp,
return -ENOMEM;
}
+static int efa_calc_sq_wqe_size(u32 sq_ring_size, u32 max_send_wr)
+{
+ return max_send_wr == 0 ? 0 : sq_ring_size / max_send_wr;
+}
+
+static u32 efa_calc_sq_max_depth(struct efa_dev *dev, u32 sq_wqe_size)
+{
+ return sq_wqe_size == 0 ? 0 :
+ rounddown_pow_of_two(dev->dev_attr.max_llq_size / sq_wqe_size);
+}
+
static int efa_qp_validate_cap(struct efa_dev *dev,
- struct ib_qp_init_attr *init_attr)
+ struct ib_qp_init_attr *init_attr,
+ u32 sq_wqe_size)
{
- if (init_attr->cap.max_send_wr > dev->dev_attr.max_sq_depth) {
+ u32 sq_max_depth = efa_calc_sq_max_depth(dev, sq_wqe_size);
+
+ if (init_attr->cap.max_send_wr > sq_max_depth) {
ibdev_dbg(&dev->ibdev,
"qp: requested send wr[%u] exceeds the max[%u]\n",
- init_attr->cap.max_send_wr,
- dev->dev_attr.max_sq_depth);
+ init_attr->cap.max_send_wr, sq_max_depth);
return -EINVAL;
}
if (init_attr->cap.max_recv_wr > dev->dev_attr.max_rq_depth) {
@@ -671,19 +684,12 @@ int efa_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init_attr,
struct efa_qp *qp = to_eqp(ibqp);
struct efa_ucontext *ucontext;
u16 supported_efa_flags = 0;
+ u32 sq_wqe_size;
int err;
ucontext = rdma_udata_to_drv_context(udata, struct efa_ucontext,
ibucontext);
- err = efa_qp_validate_cap(dev, init_attr);
- if (err)
- goto err_out;
-
- err = efa_qp_validate_attr(dev, init_attr);
- if (err)
- goto err_out;
-
err = ib_copy_validate_udata_in_cm(udata, cmd, driver_qp_type, 0);
if (err)
goto err_out;
@@ -705,6 +711,15 @@ int efa_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init_attr,
goto err_out;
}
+ sq_wqe_size = efa_calc_sq_wqe_size(cmd.sq_ring_size, init_attr->cap.max_send_wr);
+ err = efa_qp_validate_cap(dev, init_attr, sq_wqe_size);
+ if (err)
+ goto err_out;
+
+ err = efa_qp_validate_attr(dev, init_attr);
+ if (err)
+ goto err_out;
+
create_qp_params.uarn = ucontext->uarn;
create_qp_params.pd = to_epd(ibqp->pd)->pdn;
--
2.50.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for-next v2] RDMA/efa: Validate SQ depth based on WQE size
2026-05-17 17:52 [PATCH for-next v2] RDMA/efa: Validate SQ depth based on WQE size Yonatan Nachum
@ 2026-05-18 12:00 ` Leon Romanovsky
0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2026-05-18 12:00 UTC (permalink / raw)
To: Yonatan Nachum
Cc: jgg, linux-rdma, mrgolin, sleybo, matua, gal.pressman,
Daniel Kranzdorf
On Sun, May 17, 2026 at 05:52:16PM +0000, Yonatan Nachum wrote:
> Change the SQ depth validation to take into account the SQ WQE size.
> This is needed since when using 128-byte WQE the max SQ depth is cut in
> half. On create QP command, userspace provides SQ ring size which is SQ
> depth X WQE size so we can calculate the requested WQE size in the
> kernel.
>
> Fixes: 40909f664d27 ("RDMA/efa: Add EFA verbs implementation")
> Reviewed-by: Daniel Kranzdorf <dkkranzd@amazon.com>
> Reviewed-by: Michael Margolin <mrgolin@amazon.com>
> Signed-off-by: Yonatan Nachum <ynachum@amazon.com>
> ---
> Changelog:
> v2:
> * Add fixes line.
> v1: https://lore.kernel.org/all/20260507112110.869212-1-ynachum@amazon.com/
>
> drivers/infiniband/hw/efa/efa_verbs.c | 39 ++++++++++++++++++---------
> 1 file changed, 27 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/infiniband/hw/efa/efa_verbs.c b/drivers/infiniband/hw/efa/efa_verbs.c
> index 395290ab0584..9a6cbb70581b 100644
> --- a/drivers/infiniband/hw/efa/efa_verbs.c
> +++ b/drivers/infiniband/hw/efa/efa_verbs.c
> @@ -597,14 +597,27 @@ static int qp_mmap_entries_setup(struct efa_qp *qp,
> return -ENOMEM;
> }
>
> +static int efa_calc_sq_wqe_size(u32 sq_ring_size, u32 max_send_wr)
> +{
> + return max_send_wr == 0 ? 0 : sq_ring_size / max_send_wr;
> +}
> +
> +static u32 efa_calc_sq_max_depth(struct efa_dev *dev, u32 sq_wqe_size)
> +{
> + return sq_wqe_size == 0 ? 0 :
> + rounddown_pow_of_two(dev->dev_attr.max_llq_size / sq_wqe_size);
> +}
Please review sashiko's findings:
https://sashiko.dev/#/patchset/20260517175216.614494-1-ynachum@amazon.com
It appears that a valid input can trigger rounddown_pow_of_two(0).
Thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-18 12:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-17 17:52 [PATCH for-next v2] RDMA/efa: Validate SQ depth based on WQE size Yonatan Nachum
2026-05-18 12:00 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox