[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5e6917de-53e2-467e-aa95-fa52eda9cd2c@linux.dev>
Date: Tue, 21 May 2024 11:02:25 +0200
From: Zhu Yanjun <zyjzyj2000@...il.com>
To: Konstantin Taranov <kotaranov@...ux.microsoft.com>,
kotaranov@...rosoft.com, sharmaajay@...rosoft.com, longli@...rosoft.com,
jgg@...pe.ca, leon@...nel.org
Cc: linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH rdma-next v2 2/3] RDMA/mana_ib: Implement uapi to create
and destroy RC QP
On 21.05.24 10:34, Konstantin Taranov wrote:
> From: Konstantin Taranov <kotaranov@...rosoft.com>
>
> Implement user requests to create and destroy an RC QP.
> As the user does not have an FMR queue, it is skipped and NO_FMR flag
> is used.
>
> Signed-off-by: Konstantin Taranov <kotaranov@...rosoft.com>
> ---
> drivers/infiniband/hw/mana/mana_ib.h | 4 ++
> drivers/infiniband/hw/mana/qp.c | 94 +++++++++++++++++++++++++++-
> include/uapi/rdma/mana-abi.h | 9 +++
> 3 files changed, 105 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mana/mana_ib.h b/drivers/infiniband/hw/mana/mana_ib.h
> index a3e229c83..5cccbe397 100644
> --- a/drivers/infiniband/hw/mana/mana_ib.h
> +++ b/drivers/infiniband/hw/mana/mana_ib.h
> @@ -248,6 +248,10 @@ struct mana_rnic_destroy_cq_resp {
> struct gdma_resp_hdr hdr;
> }; /* HW Data */
>
> +enum mana_rnic_create_rc_flags {
> + MANA_RC_FLAG_NO_FMR = 2,
> +};
> +
> struct mana_rnic_create_qp_req {
> struct gdma_req_hdr hdr;
> mana_handle_t adapter;
> diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
> index ba13c5abf..e04e5e778 100644
> --- a/drivers/infiniband/hw/mana/qp.c
> +++ b/drivers/infiniband/hw/mana/qp.c
> @@ -398,6 +398,78 @@ static int mana_ib_create_qp_raw(struct ib_qp *ibqp, struct ib_pd *ibpd,
> return err;
> }
>
> +static int mana_ib_create_rc_qp(struct ib_qp *ibqp, struct ib_pd *ibpd,
> + struct ib_qp_init_attr *attr, struct ib_udata *udata)
> +{
> + struct mana_ib_dev *mdev = container_of(ibpd->device, struct mana_ib_dev, ib_dev);
> + struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
> + struct mana_ib_create_rc_qp_resp resp = {};
> + struct mana_ib_ucontext *mana_ucontext;
> + struct mana_ib_create_rc_qp ucmd = {};
> + int i, err, j;
> + u64 flags = 0;
> + u32 doorbell;
> +
> + if (!udata || udata->inlen < sizeof(ucmd))
> + return -EINVAL;
> +
> + mana_ucontext = rdma_udata_to_drv_context(udata, struct mana_ib_ucontext, ibucontext);
> + doorbell = mana_ucontext->doorbell;
> + flags = MANA_RC_FLAG_NO_FMR;
> + err = ib_copy_from_udata(&ucmd, udata, min(sizeof(ucmd), udata->inlen));
> + if (err) {
> + ibdev_dbg(&mdev->ib_dev, "Failed to copy from udata, %d\n", err);
> + return err;
> + }
> +
> + for (i = 0, j = 0; i < MANA_RC_QUEUE_TYPE_MAX; ++i) {
> + // skip FMR for user-level RC QPs
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/dev-tools/checkpatch.rst?h=v6.9#n497
"
**C99_COMMENTS**
C99 style single line comments (//) should not be used.
Prefer the block comment style instead.
See:
https://www.kernel.org/doc/html/latest/process/coding-style.html#commenting
"
Zhu Yanjun
> + if (i == MANA_RC_SEND_QUEUE_FMR) {
> + qp->rc_qp.queues[i].id = INVALID_QUEUE_ID;
> + qp->rc_qp.queues[i].gdma_region = GDMA_INVALID_DMA_REGION;
> + continue;
> + }
> + err = mana_ib_create_queue(mdev, ucmd.queue_buf[j], ucmd.queue_size[j],
> + &qp->rc_qp.queues[i]);
> + if (err) {
> + ibdev_err(&mdev->ib_dev, "Failed to create queue %d, err %d\n", i, err);
> + goto destroy_queues;
> + }
> + j++;
> + }
> +
> + err = mana_ib_gd_create_rc_qp(mdev, qp, attr, doorbell, flags);
> + if (err) {
> + ibdev_err(&mdev->ib_dev, "Failed to create rc qp %d\n", err);
> + goto destroy_queues;
> + }
> + qp->ibqp.qp_num = qp->rc_qp.queues[MANA_RC_RECV_QUEUE_RESPONDER].id;
> + qp->port = attr->port_num;
> +
> + if (udata) {
> + for (i = 0, j = 0; i < MANA_RC_QUEUE_TYPE_MAX; ++i) {
> + if (i == MANA_RC_SEND_QUEUE_FMR)
> + continue;
> + resp.queue_id[j] = qp->rc_qp.queues[i].id;
> + j++;
> + }
> + err = ib_copy_to_udata(udata, &resp, min(sizeof(resp), udata->outlen));
> + if (err) {
> + ibdev_dbg(&mdev->ib_dev, "Failed to copy to udata, %d\n", err);
> + goto destroy_qp;
> + }
> + }
> +
> + return 0;
> +
> +destroy_qp:
> + mana_ib_gd_destroy_rc_qp(mdev, qp);
> +destroy_queues:
> + while (i-- > 0)
> + mana_ib_destroy_queue(mdev, &qp->rc_qp.queues[i]);
> + return err;
> +}
> +
> int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
> struct ib_udata *udata)
> {
> @@ -409,8 +481,9 @@ int mana_ib_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attr,
> udata);
>
> return mana_ib_create_qp_raw(ibqp, ibqp->pd, attr, udata);
> + case IB_QPT_RC:
> + return mana_ib_create_rc_qp(ibqp, ibqp->pd, attr, udata);
> default:
> - /* Creating QP other than IB_QPT_RAW_PACKET is not supported */
> ibdev_dbg(ibqp->device, "Creating QP type %u not supported\n",
> attr->qp_type);
> }
> @@ -473,6 +546,22 @@ static int mana_ib_destroy_qp_raw(struct mana_ib_qp *qp, struct ib_udata *udata)
> return 0;
> }
>
> +static int mana_ib_destroy_rc_qp(struct mana_ib_qp *qp, struct ib_udata *udata)
> +{
> + struct mana_ib_dev *mdev =
> + container_of(qp->ibqp.device, struct mana_ib_dev, ib_dev);
> + int i;
> +
> + /* Ignore return code as there is not much we can do about it.
> + * The error message is printed inside.
> + */
> + mana_ib_gd_destroy_rc_qp(mdev, qp);
> + for (i = 0; i < MANA_RC_QUEUE_TYPE_MAX; ++i)
> + mana_ib_destroy_queue(mdev, &qp->rc_qp.queues[i]);
> +
> + return 0;
> +}
> +
> int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)
> {
> struct mana_ib_qp *qp = container_of(ibqp, struct mana_ib_qp, ibqp);
> @@ -484,7 +573,8 @@ int mana_ib_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata)
> udata);
>
> return mana_ib_destroy_qp_raw(qp, udata);
> -
> + case IB_QPT_RC:
> + return mana_ib_destroy_rc_qp(qp, udata);
> default:
> ibdev_dbg(ibqp->device, "Unexpected QP type %u\n",
> ibqp->qp_type);
> diff --git a/include/uapi/rdma/mana-abi.h b/include/uapi/rdma/mana-abi.h
> index 2c41cc315..45c2df619 100644
> --- a/include/uapi/rdma/mana-abi.h
> +++ b/include/uapi/rdma/mana-abi.h
> @@ -45,6 +45,15 @@ struct mana_ib_create_qp_resp {
> __u32 reserved;
> };
>
> +struct mana_ib_create_rc_qp {
> + __aligned_u64 queue_buf[4];
> + __u32 queue_size[4];
> +};
> +
> +struct mana_ib_create_rc_qp_resp {
> + __u32 queue_id[4];
> +};
> +
> struct mana_ib_create_wq {
> __aligned_u64 wq_buf_addr;
> __u32 wq_buf_size;
Powered by blists - more mailing lists