[PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Konstantin Taranov]

From: Konstantin Taranov <kotaranov@microsoft.com>

Get CQ type from the used gdma device. The MANA_IB_CREATE_RNIC_CQ
flag is ignored. It was used in older kernel versions where
the mana_ib was shared between ethernet and rnic.

Fixes: d4293f96ce0b ("RDMA/mana_ib: unify mana_ib functions to support any gdma device")
Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
---
 drivers/infiniband/hw/mana/cq.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
index 1becc8779..2dce1b677 100644
--- a/drivers/infiniband/hw/mana/cq.c
+++ b/drivers/infiniband/hw/mana/cq.c
@@ -24,6 +24,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 
 	cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
 	cq->cq_handle = INVALID_MANA_HANDLE;
+	is_rnic_cq = mana_ib_is_rnic(mdev);
 
 	if (udata) {
 		if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
@@ -35,8 +36,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 			return err;
 		}
 
-		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
-
 		if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) ||
 		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
 			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
@@ -55,7 +54,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
 							  ibucontext);
 		doorbell = mana_ucontext->doorbell;
 	} else {
-		is_rnic_cq = true;
 		buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe * COMP_ENTRY_SIZE));
 		cq->cqe = buf_size / COMP_ENTRY_SIZE;
 		err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ, &cq->queue);
-- 
2.43.0

RE: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Long Li]

> Subject: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the
> device type
> 
> From: Konstantin Taranov <kotaranov@microsoft.com>
> 
> Get CQ type from the used gdma device. The MANA_IB_CREATE_RNIC_CQ flag
> is ignored. It was used in older kernel versions where the mana_ib was shared
> between ethernet and rnic.
> 
> Fixes: d4293f96ce0b ("RDMA/mana_ib: unify mana_ib functions to support
> any gdma device")
> Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>

Reviewed-by: Long Li <longli@microsoft.com>

> ---
>  drivers/infiniband/hw/mana/cq.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mana/cq.c
> b/drivers/infiniband/hw/mana/cq.c index 1becc8779..2dce1b677 100644
> --- a/drivers/infiniband/hw/mana/cq.c
> +++ b/drivers/infiniband/hw/mana/cq.c
> @@ -24,6 +24,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
> 
>  	cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
>  	cq->cq_handle = INVALID_MANA_HANDLE;
> +	is_rnic_cq = mana_ib_is_rnic(mdev);
> 
>  	if (udata) {
>  		if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
> @@ -35,8 +36,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
>  			return err;
>  		}
> 
> -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> -
>  		if ((!is_rnic_cq && attr->cqe > mdev-
> >adapter_caps.max_qp_wr) ||
>  		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
>  			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr-
> >cqe); @@ -55,7 +54,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const
> struct ib_cq_init_attr *attr,
>  							  ibucontext);
>  		doorbell = mana_ucontext->doorbell;
>  	} else {
> -		is_rnic_cq = true;
>  		buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr-
> >cqe * COMP_ENTRY_SIZE));
>  		cq->cqe = buf_size / COMP_ENTRY_SIZE;
>  		err = mana_ib_create_kernel_queue(mdev, buf_size,
> GDMA_CQ, &cq->queue);
> --
> 2.43.0

Re: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Leon Romanovsky]

On Fri, Jan 09, 2026 at 04:37:30AM -0800, Konstantin Taranov wrote:
> From: Konstantin Taranov <kotaranov@microsoft.com>
> 
> Get CQ type from the used gdma device. The MANA_IB_CREATE_RNIC_CQ
> flag is ignored. It was used in older kernel versions where
> the mana_ib was shared between ethernet and rnic.
> 
> Fixes: d4293f96ce0b ("RDMA/mana_ib: unify mana_ib functions to support any gdma device")
> Signed-off-by: Konstantin Taranov <kotaranov@microsoft.com>
> ---
>  drivers/infiniband/hw/mana/cq.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
> index 1becc8779..2dce1b677 100644
> --- a/drivers/infiniband/hw/mana/cq.c
> +++ b/drivers/infiniband/hw/mana/cq.c
> @@ -24,6 +24,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
>  
>  	cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
>  	cq->cq_handle = INVALID_MANA_HANDLE;
> +	is_rnic_cq = mana_ib_is_rnic(mdev);
>  
>  	if (udata) {
>  		if (udata->inlen < offsetof(struct mana_ib_create_cq, flags))
> @@ -35,8 +36,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
>  			return err;
>  		}
>  
> -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);

You need to add code which prohibits future use of this BIT(0) in ucmd.flags for backward compatibility
and maybe delete MANA_IB_CREATE_RNIC_CQ from UAPI too.

Thanks

> -
>  		if ((!is_rnic_cq && attr->cqe > mdev->adapter_caps.max_qp_wr) ||
>  		    attr->cqe > U32_MAX / COMP_ENTRY_SIZE) {
>  			ibdev_dbg(ibdev, "CQE %d exceeding limit\n", attr->cqe);
> @@ -55,7 +54,6 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr,
>  							  ibucontext);
>  		doorbell = mana_ucontext->doorbell;
>  	} else {
> -		is_rnic_cq = true;
>  		buf_size = MANA_PAGE_ALIGN(roundup_pow_of_two(attr->cqe * COMP_ENTRY_SIZE));
>  		cq->cqe = buf_size / COMP_ENTRY_SIZE;
>  		err = mana_ib_create_kernel_queue(mdev, buf_size, GDMA_CQ, &cq->queue);
> -- 
> 2.43.0
> 

RE: [EXTERNAL] Re: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Konstantin Taranov]

> >
> > -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> 
> You need to add code which prohibits future use of this BIT(0) in ucmd.flags
> for backward compatibility and maybe delete MANA_IB_CREATE_RNIC_CQ
> from UAPI too.
> 
> Thanks
> 

Hi Leon. I thought that my proposed change is backward and forward compatible.
If I add code that prohibits this flag, then the older rdma-core will fail to create CQ,
as it sets this flag. Add rdma-core should set the flag to support older kernels.

So, the current solution is as follows:
rdma-core always sends the flag. The kernels without this patch still use this flag.
Newer kernels just ignore the flag and create the CQ according to the client.
It is not fully possible to retire this flag now, as we want to be backwards compatible and
support older kernels and older rdma-core.
Or did you mean something else? Or do I miss something?

Thanks

Re: [EXTERNAL] Re: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Leon Romanovsky]

On Tue, Jan 13, 2026 at 12:27:57PM +0000, Konstantin Taranov wrote:
> > >
> > > -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> > 
> > You need to add code which prohibits future use of this BIT(0) in ucmd.flags
> > for backward compatibility and maybe delete MANA_IB_CREATE_RNIC_CQ
> > from UAPI too.
> > 
> > Thanks
> > 
> 
> Hi Leon. I thought that my proposed change is backward and forward compatible.
> If I add code that prohibits this flag, then the older rdma-core will fail to create CQ,
> as it sets this flag. Add rdma-core should set the flag to support older kernels.
> 
> So, the current solution is as follows:
> rdma-core always sends the flag. The kernels without this patch still use this flag.
> Newer kernels just ignore the flag and create the CQ according to the client.
> It is not fully possible to retire this flag now, as we want to be backwards compatible and
> support older kernels and older rdma-core.
> Or did you mean something else? Or do I miss something?

There needs to be a way to document in the code that this bit is reserved and
must not be used.

Thanks

> 
> Thanks

RE: [EXTERNAL] Re: [PATCH rdma-next 1/1] RDMA/mana_ib: take CQ type from the device type

[Konstantin Taranov]

> On Tue, Jan 13, 2026 at 12:27:57PM +0000, Konstantin Taranov wrote:
> > > >
> > > > -		is_rnic_cq = !!(ucmd.flags & MANA_IB_CREATE_RNIC_CQ);
> > >
> > > You need to add code which prohibits future use of this BIT(0) in
> > > ucmd.flags for backward compatibility and maybe delete
> > > MANA_IB_CREATE_RNIC_CQ from UAPI too.
> > >
> > > Thanks
> > >
> >
> > Hi Leon. I thought that my proposed change is backward and forward
> compatible.
> > If I add code that prohibits this flag, then the older rdma-core will
> > fail to create CQ, as it sets this flag. Add rdma-core should set the flag to
> support older kernels.
> >
> > So, the current solution is as follows:
> > rdma-core always sends the flag. The kernels without this patch still use
> this flag.
> > Newer kernels just ignore the flag and create the CQ according to the client.
> > It is not fully possible to retire this flag now, as we want to be
> > backwards compatible and support older kernels and older rdma-core.
> > Or did you mean something else? Or do I miss something?
> 
> There needs to be a way to document in the code that this bit is reserved
> and must not be used.

Got it! I will add comments to the code that the bit is reserved and should
not be reused.

Thanks

> 
> Thanks
> 
> >
> > Thanks