diff mbox series

[rdma-next,v2,2/5] RDMA/mana_ib: Create and destroy rnic adapter

Message ID 1706886397-16600-3-git-send-email-kotaranov@linux.microsoft.com
State New
Headers
Series RDMA/mana_ib: Enable RNIC adapter and populate it with GIDs |

Commit Message

Konstantin Taranov Feb. 2, 2024, 3:06 p.m. UTC 
  This patch adds RNIC creation and destruction.
If creation of RNIC fails, we support only RAW QPs as they are served by
ethernet driver.

Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
---
 drivers/infiniband/hw/mana/main.c    | 31 +++++++++++++++++++++++++++++++
 drivers/infiniband/hw/mana/mana_ib.h | 29 +++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

Comments

Leon Romanovsky Feb. 4, 2024, 12:30 p.m. UTC | #1 
On Fri, Feb 02, 2024 at 07:06:34AM -0800, Konstantin Taranov wrote:
> This patch adds RNIC creation and destruction.
> If creation of RNIC fails, we support only RAW QPs as they are served by
> ethernet driver.

So please make sure that you are creating RNIC only when you are
supporting it. The idea that some function tries-and-fails with dmesg
errors is not good idea.

Thanks

> 
> Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
> ---
>  drivers/infiniband/hw/mana/main.c    | 31 +++++++++++++++++++++++++++++++
>  drivers/infiniband/hw/mana/mana_ib.h | 29 +++++++++++++++++++++++++++++
>  2 files changed, 60 insertions(+)
> 
> diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
> index c64d569..33cd69e 100644
> --- a/drivers/infiniband/hw/mana/main.c
> +++ b/drivers/infiniband/hw/mana/main.c
> @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct mana_ib_dev *mdev)
>  
>  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
>  {
> +	struct mana_rnic_create_adapter_resp resp = {};
> +	struct mana_rnic_create_adapter_req req = {};
> +	struct gdma_context *gc = mdev_to_gc(mdev);
>  	int err;
>  
> +	mdev->adapter_handle = INVALID_MANA_HANDLE;
> +
>  	err = mana_ib_create_eqs(mdev);
>  	if (err) {
>  		ibdev_err(&mdev->ib_dev, "Failed to create EQs for RNIC err %d", err);
>  		goto cleanup;
>  	}
>  
> +	mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER, sizeof(req), sizeof(resp));
> +	req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> +	req.hdr.dev_id = gc->mana_ib.dev_id;
> +	req.notify_eq_id = mdev->fatal_err_eq->id;
> +
> +	err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> +	if (err) {
> +		ibdev_err(&mdev->ib_dev, "Failed to create RNIC adapter err %d", err);
> +		goto cleanup;
> +	}
> +	mdev->adapter_handle = resp.adapter;
> +
>  	return;
>  
>  cleanup:
> @@ -599,5 +616,19 @@ void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
>  
>  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)
>  {
> +	struct mana_rnic_destroy_adapter_resp resp = {};
> +	struct mana_rnic_destroy_adapter_req req = {};
> +	struct gdma_context *gc;
> +
> +	if (!rnic_is_enabled(mdev))
> +		return;
> +
> +	gc = mdev_to_gc(mdev);
> +	mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER, sizeof(req), sizeof(resp));
> +	req.hdr.dev_id = gc->mana_ib.dev_id;
> +	req.adapter = mdev->adapter_handle;
> +
> +	mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> +	mdev->adapter_handle = INVALID_MANA_HANDLE;
>  	mana_ib_destroy_eqs(mdev);
>  }
> diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h
> index a4b94ee..96454cf 100644
> --- a/drivers/infiniband/hw/mana/mana_ib.h
> +++ b/drivers/infiniband/hw/mana/mana_ib.h
> @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {
>  struct mana_ib_dev {
>  	struct ib_device ib_dev;
>  	struct gdma_dev *gdma_dev;
> +	mana_handle_t adapter_handle;
>  	struct gdma_queue *fatal_err_eq;
>  	struct mana_ib_adapter_caps adapter_caps;
>  };
> @@ -115,6 +116,8 @@ struct mana_ib_rwq_ind_table {
>  
>  enum mana_ib_command_code {
>  	MANA_IB_GET_ADAPTER_CAP = 0x30001,
> +	MANA_IB_CREATE_ADAPTER  = 0x30002,
> +	MANA_IB_DESTROY_ADAPTER = 0x30003,
>  };
>  
>  struct mana_ib_query_adapter_caps_req {
> @@ -143,6 +146,32 @@ struct mana_ib_query_adapter_caps_resp {
>  	u32 max_inline_data_size;
>  }; /* HW Data */
>  
> +struct mana_rnic_create_adapter_req {
> +	struct gdma_req_hdr hdr;
> +	u32 notify_eq_id;
> +	u32 reserved;
> +	u64 feature_flags;
> +}; /*HW Data */
> +
> +struct mana_rnic_create_adapter_resp {
> +	struct gdma_resp_hdr hdr;
> +	mana_handle_t adapter;
> +}; /* HW Data */
> +
> +struct mana_rnic_destroy_adapter_req {
> +	struct gdma_req_hdr hdr;
> +	mana_handle_t adapter;
> +}; /*HW Data */
> +
> +struct mana_rnic_destroy_adapter_resp {
> +	struct gdma_resp_hdr hdr;
> +}; /* HW Data */
> +
> +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev)
> +{
> +	return mdev->adapter_handle != INVALID_MANA_HANDLE;
> +}
> +
>  static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
>  {
>  	return mdev->gdma_dev->gdma_context;
> -- 
> 1.8.3.1
>
Konstantin Taranov Feb. 4, 2024, 3:50 p.m. UTC | #2 
> From: Leon Romanovsky <leon@kernel.org>
> On Fri, Feb 02, 2024 at 07:06:34AM -0800, Konstantin Taranov wrote:
> > This patch adds RNIC creation and destruction.
> > If creation of RNIC fails, we support only RAW QPs as they are served
> > by ethernet driver.
> 
> So please make sure that you are creating RNIC only when you are supporting
> it. The idea that some function tries-and-fails with dmesg errors is not good
> idea.
> 
> Thanks
> 

Hi Leon. Thanks for your comments and suggestion. I will incorporate them in the next version.
Regarding this "try-and-fail", we cannot guarantee now that RNIC is supported, and try-and-fail is the only way
to skip RNIC creation without impeding RAW QPs. Could you, please, suggest how we could correctly incorporate
the "try-and-fail" strategy to get it upstreamed?

> >
> > Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
> > ---
> >  drivers/infiniband/hw/mana/main.c    | 31
> +++++++++++++++++++++++++++++++
> >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > +++++++++++++++++++++++++++++
> >  2 files changed, 60 insertions(+)
> >
> > diff --git a/drivers/infiniband/hw/mana/main.c
> > b/drivers/infiniband/hw/mana/main.c
> > index c64d569..33cd69e 100644
> > --- a/drivers/infiniband/hw/mana/main.c
> > +++ b/drivers/infiniband/hw/mana/main.c
> > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > mana_ib_dev *mdev)
> >
> >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)  {
> > +     struct mana_rnic_create_adapter_resp resp = {};
> > +     struct mana_rnic_create_adapter_req req = {};
> > +     struct gdma_context *gc = mdev_to_gc(mdev);
> >       int err;
> >
> > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > +
> >       err = mana_ib_create_eqs(mdev);
> >       if (err) {
> >               ibdev_err(&mdev->ib_dev, "Failed to create EQs for RNIC err %d",
> err);
> >               goto cleanup;
> >       }
> >
> > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> sizeof(req), sizeof(resp));
> > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > +
> > +     err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > +     if (err) {
> > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC adapter err %d",
> err);
> > +             goto cleanup;
> > +     }
> > +     mdev->adapter_handle = resp.adapter;
> > +
> >       return;
> >
> >  cleanup:
> > @@ -599,5 +616,19 @@ void mana_ib_gd_create_rnic_adapter(struct
> > mana_ib_dev *mdev)
> >
> >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)  {
> > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > +     struct mana_rnic_destroy_adapter_req req = {};
> > +     struct gdma_context *gc;
> > +
> > +     if (!rnic_is_enabled(mdev))
> > +             return;
> > +
> > +     gc = mdev_to_gc(mdev);
> > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER,
> sizeof(req), sizeof(resp));
> > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > +     req.adapter = mdev->adapter_handle;
> > +
> > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> >       mana_ib_destroy_eqs(mdev);
> >  }
> > diff --git a/drivers/infiniband/hw/mana/mana_ib.h
> > b/drivers/infiniband/hw/mana/mana_ib.h
> > index a4b94ee..96454cf 100644
> > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct mana_ib_dev {
> >       struct ib_device ib_dev;
> >       struct gdma_dev *gdma_dev;
> > +     mana_handle_t adapter_handle;
> >       struct gdma_queue *fatal_err_eq;
> >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6 +116,8
> > @@ struct mana_ib_rwq_ind_table {
> >
> >  enum mana_ib_command_code {
> >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> >  };
> >
> >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@ struct
> > mana_ib_query_adapter_caps_resp {
> >       u32 max_inline_data_size;
> >  }; /* HW Data */
> >
> > +struct mana_rnic_create_adapter_req {
> > +     struct gdma_req_hdr hdr;
> > +     u32 notify_eq_id;
> > +     u32 reserved;
> > +     u64 feature_flags;
> > +}; /*HW Data */
> > +
> > +struct mana_rnic_create_adapter_resp {
> > +     struct gdma_resp_hdr hdr;
> > +     mana_handle_t adapter;
> > +}; /* HW Data */
> > +
> > +struct mana_rnic_destroy_adapter_req {
> > +     struct gdma_req_hdr hdr;
> > +     mana_handle_t adapter;
> > +}; /*HW Data */
> > +
> > +struct mana_rnic_destroy_adapter_resp {
> > +     struct gdma_resp_hdr hdr;
> > +}; /* HW Data */
> > +
> > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > +
> >  static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev
> > *mdev)  {
> >       return mdev->gdma_dev->gdma_context;
> > --
> > 1.8.3.1
> >
Leon Romanovsky Feb. 4, 2024, 4:51 p.m. UTC | #3 
On Sun, Feb 04, 2024 at 03:50:40PM +0000, Konstantin Taranov wrote:
> > From: Leon Romanovsky <leon@kernel.org>
> > On Fri, Feb 02, 2024 at 07:06:34AM -0800, Konstantin Taranov wrote:
> > > This patch adds RNIC creation and destruction.
> > > If creation of RNIC fails, we support only RAW QPs as they are served
> > > by ethernet driver.
> > 
> > So please make sure that you are creating RNIC only when you are supporting
> > it. The idea that some function tries-and-fails with dmesg errors is not good
> > idea.
> > 
> > Thanks
> > 
> 
> Hi Leon. Thanks for your comments and suggestion. I will incorporate them in the next version.
> Regarding this "try-and-fail", we cannot guarantee now that RNIC is supported, and try-and-fail is the only way
> to skip RNIC creation without impeding RAW QPs. Could you, please, suggest how we could correctly incorporate
> the "try-and-fail" strategy to get it upstreamed?

You already query NIC for its capabilities, so you can check if it supports RNIC.

> 
> > >
> > > Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
> > > ---
> > >  drivers/infiniband/hw/mana/main.c    | 31
> > +++++++++++++++++++++++++++++++
> > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > +++++++++++++++++++++++++++++
> > >  2 files changed, 60 insertions(+)
> > >
> > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > b/drivers/infiniband/hw/mana/main.c
> > > index c64d569..33cd69e 100644
> > > --- a/drivers/infiniband/hw/mana/main.c
> > > +++ b/drivers/infiniband/hw/mana/main.c
> > > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > > mana_ib_dev *mdev)
> > >
> > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > +     struct mana_rnic_create_adapter_req req = {};
> > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > >       int err;
> > >
> > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > +
> > >       err = mana_ib_create_eqs(mdev);
> > >       if (err) {
> > >               ibdev_err(&mdev->ib_dev, "Failed to create EQs for RNIC err %d",
> > err);
> > >               goto cleanup;
> > >       }
> > >
> > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> > sizeof(req), sizeof(resp));
> > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > +
> > > +     err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > > +     if (err) {
> > > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC adapter err %d",
> > err);
> > > +             goto cleanup;
> > > +     }
> > > +     mdev->adapter_handle = resp.adapter;
> > > +
> > >       return;
> > >
> > >  cleanup:
> > > @@ -599,5 +616,19 @@ void mana_ib_gd_create_rnic_adapter(struct
> > > mana_ib_dev *mdev)
> > >
> > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > +     struct gdma_context *gc;
> > > +
> > > +     if (!rnic_is_enabled(mdev))
> > > +             return;
> > > +
> > > +     gc = mdev_to_gc(mdev);
> > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER,
> > sizeof(req), sizeof(resp));
> > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > +     req.adapter = mdev->adapter_handle;
> > > +
> > > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > >       mana_ib_destroy_eqs(mdev);
> > >  }
> > > diff --git a/drivers/infiniband/hw/mana/mana_ib.h
> > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > index a4b94ee..96454cf 100644
> > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct mana_ib_dev {
> > >       struct ib_device ib_dev;
> > >       struct gdma_dev *gdma_dev;
> > > +     mana_handle_t adapter_handle;
> > >       struct gdma_queue *fatal_err_eq;
> > >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6 +116,8
> > > @@ struct mana_ib_rwq_ind_table {
> > >
> > >  enum mana_ib_command_code {
> > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > >  };
> > >
> > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@ struct
> > > mana_ib_query_adapter_caps_resp {
> > >       u32 max_inline_data_size;
> > >  }; /* HW Data */
> > >
> > > +struct mana_rnic_create_adapter_req {
> > > +     struct gdma_req_hdr hdr;
> > > +     u32 notify_eq_id;
> > > +     u32 reserved;
> > > +     u64 feature_flags;
> > > +}; /*HW Data */
> > > +
> > > +struct mana_rnic_create_adapter_resp {
> > > +     struct gdma_resp_hdr hdr;
> > > +     mana_handle_t adapter;
> > > +}; /* HW Data */
> > > +
> > > +struct mana_rnic_destroy_adapter_req {
> > > +     struct gdma_req_hdr hdr;
> > > +     mana_handle_t adapter;
> > > +}; /*HW Data */
> > > +
> > > +struct mana_rnic_destroy_adapter_resp {
> > > +     struct gdma_resp_hdr hdr;
> > > +}; /* HW Data */
> > > +
> > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > > +
> > >  static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev
> > > *mdev)  {
> > >       return mdev->gdma_dev->gdma_context;
> > > --
> > > 1.8.3.1
> > >
Konstantin Taranov Feb. 4, 2024, 5:17 p.m. UTC | #4 
> From: Leon Romanovsky <leon@kernel.org>
> On Sun, Feb 04, 2024 at 03:50:40PM +0000, Konstantin Taranov wrote:
> > > From: Leon Romanovsky <leon@kernel.org> On Fri, Feb 02, 2024 at
> > > 07:06:34AM -0800, Konstantin Taranov wrote:
> > > > This patch adds RNIC creation and destruction.
> > > > If creation of RNIC fails, we support only RAW QPs as they are
> > > > served by ethernet driver.
> > >
> > > So please make sure that you are creating RNIC only when you are
> > > supporting it. The idea that some function tries-and-fails with
> > > dmesg errors is not good idea.
> > >
> > > Thanks
> > >
> >
> > Hi Leon. Thanks for your comments and suggestion. I will incorporate them
> in the next version.
> > Regarding this "try-and-fail", we cannot guarantee now that RNIC is
> > supported, and try-and-fail is the only way to skip RNIC creation
> > without impeding RAW QPs. Could you, please, suggest how we could
> correctly incorporate the "try-and-fail" strategy to get it upstreamed?
> 
> You already query NIC for its capabilities, so you can check if it supports RNIC.

At the moment, the capabilities do not indicate whether RNIC creation will be successful.
The reason is additional checks during RNIC creation that are not reflected in capabilities.
The question is whether we can have the proposed "try and disable" or we must opt for failing the whole mana_ib.

> 
> >
> > > >
> > > > Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
> > > > ---
> > > >  drivers/infiniband/hw/mana/main.c    | 31
> > > +++++++++++++++++++++++++++++++
> > > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > > +++++++++++++++++++++++++++++
> > > >  2 files changed, 60 insertions(+)
> > > >
> > > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > > b/drivers/infiniband/hw/mana/main.c
> > > > index c64d569..33cd69e 100644
> > > > --- a/drivers/infiniband/hw/mana/main.c
> > > > +++ b/drivers/infiniband/hw/mana/main.c
> > > > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > > > mana_ib_dev *mdev)
> > > >
> > > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > > +     struct mana_rnic_create_adapter_req req = {};
> > > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > > >       int err;
> > > >
> > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > +
> > > >       err = mana_ib_create_eqs(mdev);
> > > >       if (err) {
> > > >               ibdev_err(&mdev->ib_dev, "Failed to create EQs for
> > > > RNIC err %d",
> > > err);
> > > >               goto cleanup;
> > > >       }
> > > >
> > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> > > sizeof(req), sizeof(resp));
> > > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > > +
> > > > +     err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),
> &resp);
> > > > +     if (err) {
> > > > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC
> > > > + adapter err %d",
> > > err);
> > > > +             goto cleanup;
> > > > +     }
> > > > +     mdev->adapter_handle = resp.adapter;
> > > > +
> > > >       return;
> > > >
> > > >  cleanup:
> > > > @@ -599,5 +616,19 @@ void mana_ib_gd_create_rnic_adapter(struct
> > > > mana_ib_dev *mdev)
> > > >
> > > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > > +     struct gdma_context *gc;
> > > > +
> > > > +     if (!rnic_is_enabled(mdev))
> > > > +             return;
> > > > +
> > > > +     gc = mdev_to_gc(mdev);
> > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER,
> > > sizeof(req), sizeof(resp));
> > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > +     req.adapter = mdev->adapter_handle;
> > > > +
> > > > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > >       mana_ib_destroy_eqs(mdev);
> > > >  }
> > > > diff --git a/drivers/infiniband/hw/mana/mana_ib.h
> > > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > > index a4b94ee..96454cf 100644
> > > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct
> mana_ib_dev {
> > > >       struct ib_device ib_dev;
> > > >       struct gdma_dev *gdma_dev;
> > > > +     mana_handle_t adapter_handle;
> > > >       struct gdma_queue *fatal_err_eq;
> > > >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6
> > > > +116,8 @@ struct mana_ib_rwq_ind_table {
> > > >
> > > >  enum mana_ib_command_code {
> > > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > > >  };
> > > >
> > > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@
> > > > struct mana_ib_query_adapter_caps_resp {
> > > >       u32 max_inline_data_size;
> > > >  }; /* HW Data */
> > > >
> > > > +struct mana_rnic_create_adapter_req {
> > > > +     struct gdma_req_hdr hdr;
> > > > +     u32 notify_eq_id;
> > > > +     u32 reserved;
> > > > +     u64 feature_flags;
> > > > +}; /*HW Data */
> > > > +
> > > > +struct mana_rnic_create_adapter_resp {
> > > > +     struct gdma_resp_hdr hdr;
> > > > +     mana_handle_t adapter;
> > > > +}; /* HW Data */
> > > > +
> > > > +struct mana_rnic_destroy_adapter_req {
> > > > +     struct gdma_req_hdr hdr;
> > > > +     mana_handle_t adapter;
> > > > +}; /*HW Data */
> > > > +
> > > > +struct mana_rnic_destroy_adapter_resp {
> > > > +     struct gdma_resp_hdr hdr;
> > > > +}; /* HW Data */
> > > > +
> > > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > > > +
> > > >  static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev
> > > > *mdev)  {
> > > >       return mdev->gdma_dev->gdma_context;
> > > > --
> > > > 1.8.3.1
> > > >
Leon Romanovsky Feb. 5, 2024, 7:54 a.m. UTC | #5 
On Sun, Feb 04, 2024 at 05:17:59PM +0000, Konstantin Taranov wrote:
> > From: Leon Romanovsky <leon@kernel.org>
> > On Sun, Feb 04, 2024 at 03:50:40PM +0000, Konstantin Taranov wrote:
> > > > From: Leon Romanovsky <leon@kernel.org> On Fri, Feb 02, 2024 at
> > > > 07:06:34AM -0800, Konstantin Taranov wrote:
> > > > > This patch adds RNIC creation and destruction.
> > > > > If creation of RNIC fails, we support only RAW QPs as they are
> > > > > served by ethernet driver.
> > > >
> > > > So please make sure that you are creating RNIC only when you are
> > > > supporting it. The idea that some function tries-and-fails with
> > > > dmesg errors is not good idea.
> > > >
> > > > Thanks
> > > >
> > >
> > > Hi Leon. Thanks for your comments and suggestion. I will incorporate them
> > in the next version.
> > > Regarding this "try-and-fail", we cannot guarantee now that RNIC is
> > > supported, and try-and-fail is the only way to skip RNIC creation
> > > without impeding RAW QPs. Could you, please, suggest how we could
> > correctly incorporate the "try-and-fail" strategy to get it upstreamed?
> > 
> > You already query NIC for its capabilities, so you can check if it supports RNIC.
> 
> At the moment, the capabilities do not indicate whether RNIC creation will be successful.
> The reason is additional checks during RNIC creation that are not reflected in capabilities.
> The question is whether we can have the proposed "try and disable" or we must opt for failing the whole mana_ib.

RNIC creation can be seen as an example of any other feature which will
be added later, you will never know if it will be successful or not
without capabilities.

If you continue with this try-and-fail approach, I afraid that you will
end up with whole driver written in this style. Style where you don't
separate between "real" failures (wrong configuration, OOM e.t.c) and
"expected" failures (feature is not supported).

Thanks

> 
> > 
> > >
> > > > >
> > > > > Signed-off-by: Konstantin Taranov <kotaranov@linux.microsoft.com>
> > > > > ---
> > > > >  drivers/infiniband/hw/mana/main.c    | 31
> > > > +++++++++++++++++++++++++++++++
> > > > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > > > +++++++++++++++++++++++++++++
> > > > >  2 files changed, 60 insertions(+)
> > > > >
> > > > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > > > b/drivers/infiniband/hw/mana/main.c
> > > > > index c64d569..33cd69e 100644
> > > > > --- a/drivers/infiniband/hw/mana/main.c
> > > > > +++ b/drivers/infiniband/hw/mana/main.c
> > > > > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > > > > mana_ib_dev *mdev)
> > > > >
> > > > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > > > +     struct mana_rnic_create_adapter_req req = {};
> > > > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > > > >       int err;
> > > > >
> > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > +
> > > > >       err = mana_ib_create_eqs(mdev);
> > > > >       if (err) {
> > > > >               ibdev_err(&mdev->ib_dev, "Failed to create EQs for
> > > > > RNIC err %d",
> > > > err);
> > > > >               goto cleanup;
> > > > >       }
> > > > >
> > > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> > > > sizeof(req), sizeof(resp));
> > > > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > > > +
> > > > > +     err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),
> > &resp);
> > > > > +     if (err) {
> > > > > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC
> > > > > + adapter err %d",
> > > > err);
> > > > > +             goto cleanup;
> > > > > +     }
> > > > > +     mdev->adapter_handle = resp.adapter;
> > > > > +
> > > > >       return;
> > > > >
> > > > >  cleanup:
> > > > > @@ -599,5 +616,19 @@ void mana_ib_gd_create_rnic_adapter(struct
> > > > > mana_ib_dev *mdev)
> > > > >
> > > > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)  {
> > > > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > > > +     struct gdma_context *gc;
> > > > > +
> > > > > +     if (!rnic_is_enabled(mdev))
> > > > > +             return;
> > > > > +
> > > > > +     gc = mdev_to_gc(mdev);
> > > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER,
> > > > sizeof(req), sizeof(resp));
> > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > +     req.adapter = mdev->adapter_handle;
> > > > > +
> > > > > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > >       mana_ib_destroy_eqs(mdev);
> > > > >  }
> > > > > diff --git a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > index a4b94ee..96454cf 100644
> > > > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct
> > mana_ib_dev {
> > > > >       struct ib_device ib_dev;
> > > > >       struct gdma_dev *gdma_dev;
> > > > > +     mana_handle_t adapter_handle;
> > > > >       struct gdma_queue *fatal_err_eq;
> > > > >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6
> > > > > +116,8 @@ struct mana_ib_rwq_ind_table {
> > > > >
> > > > >  enum mana_ib_command_code {
> > > > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > > > >  };
> > > > >
> > > > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@
> > > > > struct mana_ib_query_adapter_caps_resp {
> > > > >       u32 max_inline_data_size;
> > > > >  }; /* HW Data */
> > > > >
> > > > > +struct mana_rnic_create_adapter_req {
> > > > > +     struct gdma_req_hdr hdr;
> > > > > +     u32 notify_eq_id;
> > > > > +     u32 reserved;
> > > > > +     u64 feature_flags;
> > > > > +}; /*HW Data */
> > > > > +
> > > > > +struct mana_rnic_create_adapter_resp {
> > > > > +     struct gdma_resp_hdr hdr;
> > > > > +     mana_handle_t adapter;
> > > > > +}; /* HW Data */
> > > > > +
> > > > > +struct mana_rnic_destroy_adapter_req {
> > > > > +     struct gdma_req_hdr hdr;
> > > > > +     mana_handle_t adapter;
> > > > > +}; /*HW Data */
> > > > > +
> > > > > +struct mana_rnic_destroy_adapter_resp {
> > > > > +     struct gdma_resp_hdr hdr;
> > > > > +}; /* HW Data */
> > > > > +
> > > > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > > > > +
> > > > >  static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev
> > > > > *mdev)  {
> > > > >       return mdev->gdma_dev->gdma_context;
> > > > > --
> > > > > 1.8.3.1
> > > > >
Konstantin Taranov Feb. 5, 2024, 9:15 a.m. UTC | #6 
> From: Leon Romanovsky <leon@kernel.org>
> On Sun, Feb 04, 2024 at 05:17:59PM +0000, Konstantin Taranov wrote:
> > > From: Leon Romanovsky <leon@kernel.org> On Sun, Feb 04, 2024 at
> > > 03:50:40PM +0000, Konstantin Taranov wrote:
> > > > > From: Leon Romanovsky <leon@kernel.org> On Fri, Feb 02, 2024 at
> > > > > 07:06:34AM -0800, Konstantin Taranov wrote:
> > > > > > This patch adds RNIC creation and destruction.
> > > > > > If creation of RNIC fails, we support only RAW QPs as they are
> > > > > > served by ethernet driver.
> > > > >
> > > > > So please make sure that you are creating RNIC only when you are
> > > > > supporting it. The idea that some function tries-and-fails with
> > > > > dmesg errors is not good idea.
> > > > >
> > > > > Thanks
> > > > >
> > > >
> > > > Hi Leon. Thanks for your comments and suggestion. I will
> > > > incorporate them
> > > in the next version.
> > > > Regarding this "try-and-fail", we cannot guarantee now that RNIC
> > > > is supported, and try-and-fail is the only way to skip RNIC
> > > > creation without impeding RAW QPs. Could you, please, suggest how
> > > > we could
> > > correctly incorporate the "try-and-fail" strategy to get it upstreamed?
> > >
> > > You already query NIC for its capabilities, so you can check if it supports
> RNIC.
> >
> > At the moment, the capabilities do not indicate whether RNIC creation will
> be successful.
> > The reason is additional checks during RNIC creation that are not reflected
> in capabilities.
> > The question is whether we can have the proposed "try and disable" or we
> must opt for failing the whole mana_ib.
> 
> RNIC creation can be seen as an example of any other feature which will be
> added later, you will never know if it will be successful or not without
> capabilities.
> 
> If you continue with this try-and-fail approach, I afraid that you will end up
> with whole driver written in this style. Style where you don't separate
> between "real" failures (wrong configuration, OOM e.t.c) and "expected"
> failures (feature is not supported).
> 

Hi Leon. I understand your concerns and I see how try-and-fail approach can go wrong.
I think you misunderstood the current HW limitation we have. We *do* distinguish between 
failures and this " try-and-fail " will be used once during initialization. As I mentioned above,
our current HW capabilities cannot reflect whether RNIC is supported. Therefore, we must try
to create it to understand whether it is really supported. So, if we succeed then the RNIC feature
is supported and all RNIC-related operations will work. Otherwise, RNIC capability is not present
and in this case, we just wanted to warn the user about it. If it concerns you, I can remove this warn message. 

Given the provided explanation, I would appreciate if you wrote whether this approach of querying RNIC support
could be accepted. 

Thanks!

> Thanks
> 
> >
> > >
> > > >
> > > > > >
> > > > > > Signed-off-by: Konstantin Taranov
> > > > > > <kotaranov@linux.microsoft.com>
> > > > > > ---
> > > > > >  drivers/infiniband/hw/mana/main.c    | 31
> > > > > +++++++++++++++++++++++++++++++
> > > > > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > > > > +++++++++++++++++++++++++++++
> > > > > >  2 files changed, 60 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > > > > b/drivers/infiniband/hw/mana/main.c
> > > > > > index c64d569..33cd69e 100644
> > > > > > --- a/drivers/infiniband/hw/mana/main.c
> > > > > > +++ b/drivers/infiniband/hw/mana/main.c
> > > > > > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > > > > > mana_ib_dev *mdev)
> > > > > >
> > > > > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
> > > > > > {
> > > > > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > > > > +     struct mana_rnic_create_adapter_req req = {};
> > > > > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > > > > >       int err;
> > > > > >
> > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > > +
> > > > > >       err = mana_ib_create_eqs(mdev);
> > > > > >       if (err) {
> > > > > >               ibdev_err(&mdev->ib_dev, "Failed to create EQs
> > > > > > for RNIC err %d",
> > > > > err);
> > > > > >               goto cleanup;
> > > > > >       }
> > > > > >
> > > > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> > > > > sizeof(req), sizeof(resp));
> > > > > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > > > > +
> > > > > > +     err = mana_gd_send_request(gc, sizeof(req), &req,
> > > > > > + sizeof(resp),
> > > &resp);
> > > > > > +     if (err) {
> > > > > > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC
> > > > > > + adapter err %d",
> > > > > err);
> > > > > > +             goto cleanup;
> > > > > > +     }
> > > > > > +     mdev->adapter_handle = resp.adapter;
> > > > > > +
> > > > > >       return;
> > > > > >
> > > > > >  cleanup:
> > > > > > @@ -599,5 +616,19 @@ void
> > > > > > mana_ib_gd_create_rnic_adapter(struct
> > > > > > mana_ib_dev *mdev)
> > > > > >
> > > > > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev
> > > > > > *mdev)  {
> > > > > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > > > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > > > > +     struct gdma_context *gc;
> > > > > > +
> > > > > > +     if (!rnic_is_enabled(mdev))
> > > > > > +             return;
> > > > > > +
> > > > > > +     gc = mdev_to_gc(mdev);
> > > > > > +     mana_gd_init_req_hdr(&req.hdr,
> MANA_IB_DESTROY_ADAPTER,
> > > > > sizeof(req), sizeof(resp));
> > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > +     req.adapter = mdev->adapter_handle;
> > > > > > +
> > > > > > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),
> &resp);
> > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > >       mana_ib_destroy_eqs(mdev);  } diff --git
> > > > > > a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > index a4b94ee..96454cf 100644
> > > > > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct
> > > mana_ib_dev {
> > > > > >       struct ib_device ib_dev;
> > > > > >       struct gdma_dev *gdma_dev;
> > > > > > +     mana_handle_t adapter_handle;
> > > > > >       struct gdma_queue *fatal_err_eq;
> > > > > >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6
> > > > > > +116,8 @@ struct mana_ib_rwq_ind_table {
> > > > > >
> > > > > >  enum mana_ib_command_code {
> > > > > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > > > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > > > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > > > > >  };
> > > > > >
> > > > > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@
> > > > > > struct mana_ib_query_adapter_caps_resp {
> > > > > >       u32 max_inline_data_size;  }; /* HW Data */
> > > > > >
> > > > > > +struct mana_rnic_create_adapter_req {
> > > > > > +     struct gdma_req_hdr hdr;
> > > > > > +     u32 notify_eq_id;
> > > > > > +     u32 reserved;
> > > > > > +     u64 feature_flags;
> > > > > > +}; /*HW Data */
> > > > > > +
> > > > > > +struct mana_rnic_create_adapter_resp {
> > > > > > +     struct gdma_resp_hdr hdr;
> > > > > > +     mana_handle_t adapter;
> > > > > > +}; /* HW Data */
> > > > > > +
> > > > > > +struct mana_rnic_destroy_adapter_req {
> > > > > > +     struct gdma_req_hdr hdr;
> > > > > > +     mana_handle_t adapter;
> > > > > > +}; /*HW Data */
> > > > > > +
> > > > > > +struct mana_rnic_destroy_adapter_resp {
> > > > > > +     struct gdma_resp_hdr hdr; }; /* HW Data */
> > > > > > +
> > > > > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > > > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > > > > > +
> > > > > >  static inline struct gdma_context *mdev_to_gc(struct
> > > > > > mana_ib_dev
> > > > > > *mdev)  {
> > > > > >       return mdev->gdma_dev->gdma_context;
> > > > > > --
> > > > > > 1.8.3.1
> > > > > >
Leon Romanovsky Feb. 5, 2024, 9:57 a.m. UTC | #7 
On Mon, Feb 05, 2024 at 09:15:19AM +0000, Konstantin Taranov wrote:
> > From: Leon Romanovsky <leon@kernel.org>
> > On Sun, Feb 04, 2024 at 05:17:59PM +0000, Konstantin Taranov wrote:
> > > > From: Leon Romanovsky <leon@kernel.org> On Sun, Feb 04, 2024 at
> > > > 03:50:40PM +0000, Konstantin Taranov wrote:
> > > > > > From: Leon Romanovsky <leon@kernel.org> On Fri, Feb 02, 2024 at
> > > > > > 07:06:34AM -0800, Konstantin Taranov wrote:
> > > > > > > This patch adds RNIC creation and destruction.
> > > > > > > If creation of RNIC fails, we support only RAW QPs as they are
> > > > > > > served by ethernet driver.
> > > > > >
> > > > > > So please make sure that you are creating RNIC only when you are
> > > > > > supporting it. The idea that some function tries-and-fails with
> > > > > > dmesg errors is not good idea.
> > > > > >
> > > > > > Thanks
> > > > > >
> > > > >
> > > > > Hi Leon. Thanks for your comments and suggestion. I will
> > > > > incorporate them
> > > > in the next version.
> > > > > Regarding this "try-and-fail", we cannot guarantee now that RNIC
> > > > > is supported, and try-and-fail is the only way to skip RNIC
> > > > > creation without impeding RAW QPs. Could you, please, suggest how
> > > > > we could
> > > > correctly incorporate the "try-and-fail" strategy to get it upstreamed?
> > > >
> > > > You already query NIC for its capabilities, so you can check if it supports
> > RNIC.
> > >
> > > At the moment, the capabilities do not indicate whether RNIC creation will
> > be successful.
> > > The reason is additional checks during RNIC creation that are not reflected
> > in capabilities.
> > > The question is whether we can have the proposed "try and disable" or we
> > must opt for failing the whole mana_ib.
> > 
> > RNIC creation can be seen as an example of any other feature which will be
> > added later, you will never know if it will be successful or not without
> > capabilities.
> > 
> > If you continue with this try-and-fail approach, I afraid that you will end up
> > with whole driver written in this style. Style where you don't separate
> > between "real" failures (wrong configuration, OOM e.t.c) and "expected"
> > failures (feature is not supported).
> > 
> 
> Hi Leon. I understand your concerns and I see how try-and-fail approach can go wrong.
> I think you misunderstood the current HW limitation we have. We *do* distinguish between 
> failures 

This is not what the code is doing, you are ignoring real errors.
The distinguish is usually done by checking the return value of the function after looking
after specific error code returned by FW/HW.

> and this " try-and-fail " will be used once during initialization. As I mentioned above,
> our current HW capabilities cannot reflect whether RNIC is supported. Therefore, we must try
> to create it to understand whether it is really supported. So, if we succeed then the RNIC feature
> is supported and all RNIC-related operations will work. Otherwise, RNIC capability is not present
> and in this case, we just wanted to warn the user about it. If it concerns you, I can remove this warn message. 
> 
> Given the provided explanation, I would appreciate if you wrote whether this approach of querying RNIC support
> could be accepted. 

Unless you have a good explanation why you can add new FW command to configure RNIC, but can't add FW command
to query if RNIC is supported. I'm not keen on adopting this approach.

Thanks

> 
> Thanks!
> 
> > Thanks
> > 
> > >
> > > >
> > > > >
> > > > > > >
> > > > > > > Signed-off-by: Konstantin Taranov
> > > > > > > <kotaranov@linux.microsoft.com>
> > > > > > > ---
> > > > > > >  drivers/infiniband/hw/mana/main.c    | 31
> > > > > > +++++++++++++++++++++++++++++++
> > > > > > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > > > > > +++++++++++++++++++++++++++++
> > > > > > >  2 files changed, 60 insertions(+)
> > > > > > >
> > > > > > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > > > > > b/drivers/infiniband/hw/mana/main.c
> > > > > > > index c64d569..33cd69e 100644
> > > > > > > --- a/drivers/infiniband/hw/mana/main.c
> > > > > > > +++ b/drivers/infiniband/hw/mana/main.c
> > > > > > > @@ -581,14 +581,31 @@ static void mana_ib_destroy_eqs(struct
> > > > > > > mana_ib_dev *mdev)
> > > > > > >
> > > > > > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
> > > > > > > {
> > > > > > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > > > > > +     struct mana_rnic_create_adapter_req req = {};
> > > > > > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > > > > > >       int err;
> > > > > > >
> > > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > > > +
> > > > > > >       err = mana_ib_create_eqs(mdev);
> > > > > > >       if (err) {
> > > > > > >               ibdev_err(&mdev->ib_dev, "Failed to create EQs
> > > > > > > for RNIC err %d",
> > > > > > err);
> > > > > > >               goto cleanup;
> > > > > > >       }
> > > > > > >
> > > > > > > +     mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER,
> > > > > > sizeof(req), sizeof(resp));
> > > > > > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > > > > > +
> > > > > > > +     err = mana_gd_send_request(gc, sizeof(req), &req,
> > > > > > > + sizeof(resp),
> > > > &resp);
> > > > > > > +     if (err) {
> > > > > > > +             ibdev_err(&mdev->ib_dev, "Failed to create RNIC
> > > > > > > + adapter err %d",
> > > > > > err);
> > > > > > > +             goto cleanup;
> > > > > > > +     }
> > > > > > > +     mdev->adapter_handle = resp.adapter;
> > > > > > > +
> > > > > > >       return;
> > > > > > >
> > > > > > >  cleanup:
> > > > > > > @@ -599,5 +616,19 @@ void
> > > > > > > mana_ib_gd_create_rnic_adapter(struct
> > > > > > > mana_ib_dev *mdev)
> > > > > > >
> > > > > > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev
> > > > > > > *mdev)  {
> > > > > > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > > > > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > > > > > +     struct gdma_context *gc;
> > > > > > > +
> > > > > > > +     if (!rnic_is_enabled(mdev))
> > > > > > > +             return;
> > > > > > > +
> > > > > > > +     gc = mdev_to_gc(mdev);
> > > > > > > +     mana_gd_init_req_hdr(&req.hdr,
> > MANA_IB_DESTROY_ADAPTER,
> > > > > > sizeof(req), sizeof(resp));
> > > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > > +     req.adapter = mdev->adapter_handle;
> > > > > > > +
> > > > > > > +     mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp),
> > &resp);
> > > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > > >       mana_ib_destroy_eqs(mdev);  } diff --git
> > > > > > > a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > index a4b94ee..96454cf 100644
> > > > > > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct
> > > > mana_ib_dev {
> > > > > > >       struct ib_device ib_dev;
> > > > > > >       struct gdma_dev *gdma_dev;
> > > > > > > +     mana_handle_t adapter_handle;
> > > > > > >       struct gdma_queue *fatal_err_eq;
> > > > > > >       struct mana_ib_adapter_caps adapter_caps;  }; @@ -115,6
> > > > > > > +116,8 @@ struct mana_ib_rwq_ind_table {
> > > > > > >
> > > > > > >  enum mana_ib_command_code {
> > > > > > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > > > > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > > > > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > > > > > >  };
> > > > > > >
> > > > > > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32 @@
> > > > > > > struct mana_ib_query_adapter_caps_resp {
> > > > > > >       u32 max_inline_data_size;  }; /* HW Data */
> > > > > > >
> > > > > > > +struct mana_rnic_create_adapter_req {
> > > > > > > +     struct gdma_req_hdr hdr;
> > > > > > > +     u32 notify_eq_id;
> > > > > > > +     u32 reserved;
> > > > > > > +     u64 feature_flags;
> > > > > > > +}; /*HW Data */
> > > > > > > +
> > > > > > > +struct mana_rnic_create_adapter_resp {
> > > > > > > +     struct gdma_resp_hdr hdr;
> > > > > > > +     mana_handle_t adapter;
> > > > > > > +}; /* HW Data */
> > > > > > > +
> > > > > > > +struct mana_rnic_destroy_adapter_req {
> > > > > > > +     struct gdma_req_hdr hdr;
> > > > > > > +     mana_handle_t adapter;
> > > > > > > +}; /*HW Data */
> > > > > > > +
> > > > > > > +struct mana_rnic_destroy_adapter_resp {
> > > > > > > +     struct gdma_resp_hdr hdr; }; /* HW Data */
> > > > > > > +
> > > > > > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > > > > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE; }
> > > > > > > +
> > > > > > >  static inline struct gdma_context *mdev_to_gc(struct
> > > > > > > mana_ib_dev
> > > > > > > *mdev)  {
> > > > > > >       return mdev->gdma_dev->gdma_context;
> > > > > > > --
> > > > > > > 1.8.3.1
> > > > > > >
Konstantin Taranov Feb. 6, 2024, 2:20 p.m. UTC | #8 
> From: Leon Romanovsky <leon@kernel.org>
> Sent: Monday, 5 February 2024 10:57
> To: Konstantin Taranov <kotaranov@microsoft.com>
> Cc: Konstantin Taranov <kotaranov@linux.microsoft.com>;
> sharmaajay@microsoft.com; Long Li <longli@microsoft.com>; jgg@ziepe.ca;
> linux-rdma@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: Re: [EXTERNAL] Re: [PATCH rdma-next v2 2/5] RDMA/mana_ib:
> Create and destroy rnic adapter
> 
> [You don't often get email from leon@kernel.org. Learn why this is important
> at https://aka.ms/LearnAboutSenderIdentification ]
> 
> On Mon, Feb 05, 2024 at 09:15:19AM +0000, Konstantin Taranov wrote:
> > > From: Leon Romanovsky <leon@kernel.org> On Sun, Feb 04, 2024 at
> > > 05:17:59PM +0000, Konstantin Taranov wrote:
> > > > > From: Leon Romanovsky <leon@kernel.org> On Sun, Feb 04, 2024 at
> > > > > 03:50:40PM +0000, Konstantin Taranov wrote:
> > > > > > > From: Leon Romanovsky <leon@kernel.org> On Fri, Feb 02, 2024
> > > > > > > at 07:06:34AM -0800, Konstantin Taranov wrote:
> > > > > > > > This patch adds RNIC creation and destruction.
> > > > > > > > If creation of RNIC fails, we support only RAW QPs as they
> > > > > > > > are served by ethernet driver.
> > > > > > >
> > > > > > > So please make sure that you are creating RNIC only when you
> > > > > > > are supporting it. The idea that some function
> > > > > > > tries-and-fails with dmesg errors is not good idea.
> > > > > > >
> > > > > > > Thanks
> > > > > > >
> > > > > >
> > > > > > Hi Leon. Thanks for your comments and suggestion. I will
> > > > > > incorporate them
> > > > > in the next version.
> > > > > > Regarding this "try-and-fail", we cannot guarantee now that
> > > > > > RNIC is supported, and try-and-fail is the only way to skip
> > > > > > RNIC creation without impeding RAW QPs. Could you, please,
> > > > > > suggest how we could
> > > > > correctly incorporate the "try-and-fail" strategy to get it upstreamed?
> > > > >
> > > > > You already query NIC for its capabilities, so you can check if
> > > > > it supports
> > > RNIC.
> > > >
> > > > At the moment, the capabilities do not indicate whether RNIC
> > > > creation will
> > > be successful.
> > > > The reason is additional checks during RNIC creation that are not
> > > > reflected
> > > in capabilities.
> > > > The question is whether we can have the proposed "try and disable"
> > > > or we
> > > must opt for failing the whole mana_ib.
> > >
> > > RNIC creation can be seen as an example of any other feature which
> > > will be added later, you will never know if it will be successful or
> > > not without capabilities.
> > >
> > > If you continue with this try-and-fail approach, I afraid that you
> > > will end up with whole driver written in this style. Style where you
> > > don't separate between "real" failures (wrong configuration, OOM e.t.c)
> and "expected"
> > > failures (feature is not supported).
> > >
> >
> > Hi Leon. I understand your concerns and I see how try-and-fail approach can
> go wrong.
> > I think you misunderstood the current HW limitation we have. We *do*
> > distinguish between failures
> 
> This is not what the code is doing, you are ignoring real errors.
> The distinguish is usually done by checking the return value of the function
> after looking after specific error code returned by FW/HW.
> 
> > and this " try-and-fail " will be used once during initialization. As
> > I mentioned above, our current HW capabilities cannot reflect whether
> > RNIC is supported. Therefore, we must try to create it to understand
> > whether it is really supported. So, if we succeed then the RNIC
> > feature is supported and all RNIC-related operations will work. Otherwise,
> RNIC capability is not present and in this case, we just wanted to warn the
> user about it. If it concerns you, I can remove this warn message.
> >
> > Given the provided explanation, I would appreciate if you wrote
> > whether this approach of querying RNIC support could be accepted.
> 
> Unless you have a good explanation why you can add new FW command to
> configure RNIC, but can't add FW command to query if RNIC is supported. I'm
> not keen on adopting this approach.
> 

The main reason was backward compatibility with old firmware that had the
aforementioned limitation. Anyway, we will try to internally retire the old firmware
and will send the v3 patches without the "try and fail" approach (in 2-3 weeks).

Thanks.

> Thanks
> 
> >
> > Thanks!
> >
> > > Thanks
> > >
> > > >
> > > > >
> > > > > >
> > > > > > > >
> > > > > > > > Signed-off-by: Konstantin Taranov
> > > > > > > > <kotaranov@linux.microsoft.com>
> > > > > > > > ---
> > > > > > > >  drivers/infiniband/hw/mana/main.c    | 31
> > > > > > > +++++++++++++++++++++++++++++++
> > > > > > > >  drivers/infiniband/hw/mana/mana_ib.h | 29
> > > > > > > > +++++++++++++++++++++++++++++
> > > > > > > >  2 files changed, 60 insertions(+)
> > > > > > > >
> > > > > > > > diff --git a/drivers/infiniband/hw/mana/main.c
> > > > > > > > b/drivers/infiniband/hw/mana/main.c
> > > > > > > > index c64d569..33cd69e 100644
> > > > > > > > --- a/drivers/infiniband/hw/mana/main.c
> > > > > > > > +++ b/drivers/infiniband/hw/mana/main.c
> > > > > > > > @@ -581,14 +581,31 @@ static void
> > > > > > > > mana_ib_destroy_eqs(struct mana_ib_dev *mdev)
> > > > > > > >
> > > > > > > >  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev
> > > > > > > > *mdev) {
> > > > > > > > +     struct mana_rnic_create_adapter_resp resp = {};
> > > > > > > > +     struct mana_rnic_create_adapter_req req = {};
> > > > > > > > +     struct gdma_context *gc = mdev_to_gc(mdev);
> > > > > > > >       int err;
> > > > > > > >
> > > > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > > > > +
> > > > > > > >       err = mana_ib_create_eqs(mdev);
> > > > > > > >       if (err) {
> > > > > > > >               ibdev_err(&mdev->ib_dev, "Failed to create
> > > > > > > > EQs for RNIC err %d",
> > > > > > > err);
> > > > > > > >               goto cleanup;
> > > > > > > >       }
> > > > > > > >
> > > > > > > > +     mana_gd_init_req_hdr(&req.hdr,
> > > > > > > > + MANA_IB_CREATE_ADAPTER,
> > > > > > > sizeof(req), sizeof(resp));
> > > > > > > > +     req.hdr.req.msg_version = GDMA_MESSAGE_V2;
> > > > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > > > +     req.notify_eq_id = mdev->fatal_err_eq->id;
> > > > > > > > +
> > > > > > > > +     err = mana_gd_send_request(gc, sizeof(req), &req,
> > > > > > > > + sizeof(resp),
> > > > > &resp);
> > > > > > > > +     if (err) {
> > > > > > > > +             ibdev_err(&mdev->ib_dev, "Failed to create
> > > > > > > > + RNIC adapter err %d",
> > > > > > > err);
> > > > > > > > +             goto cleanup;
> > > > > > > > +     }
> > > > > > > > +     mdev->adapter_handle = resp.adapter;
> > > > > > > > +
> > > > > > > >       return;
> > > > > > > >
> > > > > > > >  cleanup:
> > > > > > > > @@ -599,5 +616,19 @@ void
> > > > > > > > mana_ib_gd_create_rnic_adapter(struct
> > > > > > > > mana_ib_dev *mdev)
> > > > > > > >
> > > > > > > >  void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev
> > > > > > > > *mdev)  {
> > > > > > > > +     struct mana_rnic_destroy_adapter_resp resp = {};
> > > > > > > > +     struct mana_rnic_destroy_adapter_req req = {};
> > > > > > > > +     struct gdma_context *gc;
> > > > > > > > +
> > > > > > > > +     if (!rnic_is_enabled(mdev))
> > > > > > > > +             return;
> > > > > > > > +
> > > > > > > > +     gc = mdev_to_gc(mdev);
> > > > > > > > +     mana_gd_init_req_hdr(&req.hdr,
> > > MANA_IB_DESTROY_ADAPTER,
> > > > > > > sizeof(req), sizeof(resp));
> > > > > > > > +     req.hdr.dev_id = gc->mana_ib.dev_id;
> > > > > > > > +     req.adapter = mdev->adapter_handle;
> > > > > > > > +
> > > > > > > > +     mana_gd_send_request(gc, sizeof(req), &req,
> > > > > > > > + sizeof(resp),
> > > &resp);
> > > > > > > > +     mdev->adapter_handle = INVALID_MANA_HANDLE;
> > > > > > > >       mana_ib_destroy_eqs(mdev);  } diff --git
> > > > > > > > a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > > b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > > index a4b94ee..96454cf 100644
> > > > > > > > --- a/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > > +++ b/drivers/infiniband/hw/mana/mana_ib.h
> > > > > > > > @@ -48,6 +48,7 @@ struct mana_ib_adapter_caps {  struct
> > > > > mana_ib_dev {
> > > > > > > >       struct ib_device ib_dev;
> > > > > > > >       struct gdma_dev *gdma_dev;
> > > > > > > > +     mana_handle_t adapter_handle;
> > > > > > > >       struct gdma_queue *fatal_err_eq;
> > > > > > > >       struct mana_ib_adapter_caps adapter_caps;  }; @@
> > > > > > > > -115,6
> > > > > > > > +116,8 @@ struct mana_ib_rwq_ind_table {
> > > > > > > >
> > > > > > > >  enum mana_ib_command_code {
> > > > > > > >       MANA_IB_GET_ADAPTER_CAP = 0x30001,
> > > > > > > > +     MANA_IB_CREATE_ADAPTER  = 0x30002,
> > > > > > > > +     MANA_IB_DESTROY_ADAPTER = 0x30003,
> > > > > > > >  };
> > > > > > > >
> > > > > > > >  struct mana_ib_query_adapter_caps_req { @@ -143,6 +146,32
> > > > > > > > @@ struct mana_ib_query_adapter_caps_resp {
> > > > > > > >       u32 max_inline_data_size;  }; /* HW Data */
> > > > > > > >
> > > > > > > > +struct mana_rnic_create_adapter_req {
> > > > > > > > +     struct gdma_req_hdr hdr;
> > > > > > > > +     u32 notify_eq_id;
> > > > > > > > +     u32 reserved;
> > > > > > > > +     u64 feature_flags;
> > > > > > > > +}; /*HW Data */
> > > > > > > > +
> > > > > > > > +struct mana_rnic_create_adapter_resp {
> > > > > > > > +     struct gdma_resp_hdr hdr;
> > > > > > > > +     mana_handle_t adapter; }; /* HW Data */
> > > > > > > > +
> > > > > > > > +struct mana_rnic_destroy_adapter_req {
> > > > > > > > +     struct gdma_req_hdr hdr;
> > > > > > > > +     mana_handle_t adapter; }; /*HW Data */
> > > > > > > > +
> > > > > > > > +struct mana_rnic_destroy_adapter_resp {
> > > > > > > > +     struct gdma_resp_hdr hdr; }; /* HW Data */
> > > > > > > > +
> > > > > > > > +static inline bool rnic_is_enabled(struct mana_ib_dev *mdev) {
> > > > > > > > +     return mdev->adapter_handle != INVALID_MANA_HANDLE;
> > > > > > > > +}
> > > > > > > > +
> > > > > > > >  static inline struct gdma_context *mdev_to_gc(struct
> > > > > > > > mana_ib_dev
> > > > > > > > *mdev)  {
> > > > > > > >       return mdev->gdma_dev->gdma_context;
> > > > > > > > --
> > > > > > > > 1.8.3.1
> > > > > > > >
Jason Gunthorpe Feb. 6, 2024, 2:32 p.m. UTC | #9 
On Tue, Feb 06, 2024 at 02:20:35PM +0000, Konstantin Taranov wrote:

> > Unless you have a good explanation why you can add new FW command to
> > configure RNIC, but can't add FW command to query if RNIC is supported. I'm
> > not keen on adopting this approach.
> 
> The main reason was backward compatibility with old firmware that had the
> aforementioned limitation. Anyway, we will try to internally retire the old firmware
> and will send the v3 patches without the "try and fail" approach (in 2-3 weeks).

I think this is the right thing to do for these cloud devices that can
reliably retire old software. It is how Amazon has been running
EFA. Get your deployment in good shape and then get patches comitted
upstream. No reason to suffer with backwards compatability forever in
the software to save a few weeks.

Jason
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index c64d569..33cd69e 100644
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -581,14 +581,31 @@  static void mana_ib_destroy_eqs(struct mana_ib_dev *mdev)
 
 void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
 {
+	struct mana_rnic_create_adapter_resp resp = {};
+	struct mana_rnic_create_adapter_req req = {};
+	struct gdma_context *gc = mdev_to_gc(mdev);
 	int err;
 
+	mdev->adapter_handle = INVALID_MANA_HANDLE;
+
 	err = mana_ib_create_eqs(mdev);
 	if (err) {
 		ibdev_err(&mdev->ib_dev, "Failed to create EQs for RNIC err %d", err);
 		goto cleanup;
 	}
 
+	mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_ADAPTER, sizeof(req), sizeof(resp));
+	req.hdr.req.msg_version = GDMA_MESSAGE_V2;
+	req.hdr.dev_id = gc->mana_ib.dev_id;
+	req.notify_eq_id = mdev->fatal_err_eq->id;
+
+	err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
+	if (err) {
+		ibdev_err(&mdev->ib_dev, "Failed to create RNIC adapter err %d", err);
+		goto cleanup;
+	}
+	mdev->adapter_handle = resp.adapter;
+
 	return;
 
 cleanup:
@@ -599,5 +616,19 @@  void mana_ib_gd_create_rnic_adapter(struct mana_ib_dev *mdev)
 
 void mana_ib_gd_destroy_rnic_adapter(struct mana_ib_dev *mdev)
 {
+	struct mana_rnic_destroy_adapter_resp resp = {};
+	struct mana_rnic_destroy_adapter_req req = {};
+	struct gdma_context *gc;
+
+	if (!rnic_is_enabled(mdev))
+		return;
+
+	gc = mdev_to_gc(mdev);
+	mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_ADAPTER, sizeof(req), sizeof(resp));
+	req.hdr.dev_id = gc->mana_ib.dev_id;
+	req.adapter = mdev->adapter_handle;
+
+	mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
+	mdev->adapter_handle = INVALID_MANA_HANDLE;
 	mana_ib_destroy_eqs(mdev);
 }
diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h
index a4b94ee..96454cf 100644
--- a/drivers/infiniband/hw/mana/mana_ib.h
+++ b/drivers/infiniband/hw/mana/mana_ib.h
@@ -48,6 +48,7 @@  struct mana_ib_adapter_caps {
 struct mana_ib_dev {
 	struct ib_device ib_dev;
 	struct gdma_dev *gdma_dev;
+	mana_handle_t adapter_handle;
 	struct gdma_queue *fatal_err_eq;
 	struct mana_ib_adapter_caps adapter_caps;
 };
@@ -115,6 +116,8 @@  struct mana_ib_rwq_ind_table {
 
 enum mana_ib_command_code {
 	MANA_IB_GET_ADAPTER_CAP = 0x30001,
+	MANA_IB_CREATE_ADAPTER  = 0x30002,
+	MANA_IB_DESTROY_ADAPTER = 0x30003,
 };
 
 struct mana_ib_query_adapter_caps_req {
@@ -143,6 +146,32 @@  struct mana_ib_query_adapter_caps_resp {
 	u32 max_inline_data_size;
 }; /* HW Data */
 
+struct mana_rnic_create_adapter_req {
+	struct gdma_req_hdr hdr;
+	u32 notify_eq_id;
+	u32 reserved;
+	u64 feature_flags;
+}; /*HW Data */
+
+struct mana_rnic_create_adapter_resp {
+	struct gdma_resp_hdr hdr;
+	mana_handle_t adapter;
+}; /* HW Data */
+
+struct mana_rnic_destroy_adapter_req {
+	struct gdma_req_hdr hdr;
+	mana_handle_t adapter;
+}; /*HW Data */
+
+struct mana_rnic_destroy_adapter_resp {
+	struct gdma_resp_hdr hdr;
+}; /* HW Data */
+
+static inline bool rnic_is_enabled(struct mana_ib_dev *mdev)
+{
+	return mdev->adapter_handle != INVALID_MANA_HANDLE;
+}
+
 static inline struct gdma_context *mdev_to_gc(struct mana_ib_dev *mdev)
 {
 	return mdev->gdma_dev->gdma_context;