| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID:
<SA6PR21MB42311EDDB1757E82740BC041CE94A@SA6PR21MB4231.namprd21.prod.outlook.com>
Date: Sun, 11 May 2025 18:30:52 +0000
From: Long Li <longli@...rosoft.com>
To: Konstantin Taranov <kotaranov@...ux.microsoft.com>, Konstantin Taranov
<kotaranov@...rosoft.com>, "pabeni@...hat.com" <pabeni@...hat.com>, Haiyang
Zhang <haiyangz@...rosoft.com>, KY Srinivasan <kys@...rosoft.com>,
"edumazet@...gle.com" <edumazet@...gle.com>, "kuba@...nel.org"
<kuba@...nel.org>, "davem@...emloft.net" <davem@...emloft.net>, Dexuan Cui
<decui@...rosoft.com>, "wei.liu@...nel.org" <wei.liu@...nel.org>,
"jgg@...pe.ca" <jgg@...pe.ca>, "leon@...nel.org" <leon@...nel.org>
CC: "linux-rdma@...r.kernel.org" <linux-rdma@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: RE: [PATCH rdma-next v4 3/4] RDMA/mana_ib: unify mana_ib functions to
support any gdma device
> -----Original Message-----
> From: Konstantin Taranov <kotaranov@...ux.microsoft.com>
> Sent: Wednesday, May 7, 2025 8:59 AM
> To: Konstantin Taranov <kotaranov@...rosoft.com>; pabeni@...hat.com;
> Haiyang Zhang <haiyangz@...rosoft.com>; KY Srinivasan <kys@...rosoft.com>;
> edumazet@...gle.com; kuba@...nel.org; davem@...emloft.net; Dexuan Cui
> <decui@...rosoft.com>; wei.liu@...nel.org; Long Li <longli@...rosoft.com>;
> jgg@...pe.ca; leon@...nel.org
> Cc: linux-rdma@...r.kernel.org; linux-kernel@...r.kernel.org;
> netdev@...r.kernel.org
> Subject: [PATCH rdma-next v4 3/4] RDMA/mana_ib: unify mana_ib functions to
> support any gdma device
>
> From: Konstantin Taranov <kotaranov@...rosoft.com>
>
> Use the installed gdma_device instead of hard-coded device in requests to the
> HW.
>
> Signed-off-by: Konstantin Taranov <kotaranov@...rosoft.com>
Reviewed-by: Long Li <longli@...rosoft.com>
> ---
> drivers/infiniband/hw/mana/cq.c | 4 +---
> drivers/infiniband/hw/mana/main.c | 27 +++++++++++++--------------
> drivers/infiniband/hw/mana/qp.c | 5 ++---
> 3 files changed, 16 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mana/cq.c b/drivers/infiniband/hw/mana/cq.c
> index 0fc4e26..28e154b 100644
> --- a/drivers/infiniband/hw/mana/cq.c
> +++ b/drivers/infiniband/hw/mana/cq.c
> @@ -15,14 +15,12 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
> struct ib_device *ibdev = ibcq->device;
> struct mana_ib_create_cq ucmd = {};
> struct mana_ib_dev *mdev;
> - struct gdma_context *gc;
> bool is_rnic_cq;
> u32 doorbell;
> u32 buf_size;
> int err;
>
> mdev = container_of(ibdev, struct mana_ib_dev, ib_dev);
> - gc = mdev_to_gc(mdev);
>
> cq->comp_vector = attr->comp_vector % ibdev->num_comp_vectors;
> cq->cq_handle = INVALID_MANA_HANDLE;
> @@ -65,7 +63,7 @@ int mana_ib_create_cq(struct ib_cq *ibcq, const struct
> ib_cq_init_attr *attr,
> ibdev_dbg(ibdev, "Failed to create kernel queue for
> create cq, %d\n", err);
> return err;
> }
> - doorbell = gc->mana_ib.doorbell;
> + doorbell = mdev->gdma_dev->doorbell;
> }
>
> if (is_rnic_cq) {
> diff --git a/drivers/infiniband/hw/mana/main.c
> b/drivers/infiniband/hw/mana/main.c
> index 3837e30..41a24a1 100644
> --- a/drivers/infiniband/hw/mana/main.c
> +++ b/drivers/infiniband/hw/mana/main.c
> @@ -244,7 +244,6 @@ void mana_ib_dealloc_ucontext(struct ib_ucontext
> *ibcontext) int mana_ib_create_kernel_queue(struct mana_ib_dev *mdev, u32
> size, enum gdma_queue_type type,
> struct mana_ib_queue *queue)
> {
> - struct gdma_context *gc = mdev_to_gc(mdev);
> struct gdma_queue_spec spec = {};
> int err;
>
> @@ -253,7 +252,7 @@ int mana_ib_create_kernel_queue(struct mana_ib_dev
> *mdev, u32 size, enum gdma_qu
> spec.type = type;
> spec.monitor_avl_buf = false;
> spec.queue_size = size;
> - err = mana_gd_create_mana_wq_cq(&gc->mana_ib, &spec, &queue-
> >kmem);
> + err = mana_gd_create_mana_wq_cq(mdev->gdma_dev, &spec, &queue-
> >kmem);
> if (err)
> return err;
> /* take ownership into mana_ib from mana */ @@ -784,7 +783,7 @@
> int mana_ib_create_eqs(struct mana_ib_dev *mdev)
> spec.eq.log2_throttle_limit = LOG2_EQ_THROTTLE;
> spec.eq.msix_index = 0;
>
> - err = mana_gd_create_mana_eq(&gc->mana_ib, &spec, &mdev-
> >fatal_err_eq);
> + err = mana_gd_create_mana_eq(mdev->gdma_dev, &spec,
> +&mdev->fatal_err_eq);
> if (err)
> return err;
>
> @@ -835,7 +834,7 @@ int mana_ib_gd_create_rnic_adapter(struct
> mana_ib_dev *mdev)
>
> 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.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.notify_eq_id = mdev->fatal_err_eq->id;
>
> if (mdev->adapter_caps.feature_flags &
> MANA_IB_FEATURE_CLIENT_ERROR_CQE_SUPPORT)
> @@ -860,7 +859,7 @@ int mana_ib_gd_destroy_rnic_adapter(struct
> mana_ib_dev *mdev)
>
> 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.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
>
> err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> @@ -887,7 +886,7 @@ int mana_ib_gd_add_gid(const struct ib_gid_attr *attr,
> void **context)
> }
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR,
> sizeof(req), sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.op = ADDR_OP_ADD;
> req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 :
> SGID_TYPE_IPV4; @@ -917,7 +916,7 @@ int mana_ib_gd_del_gid(const struct
> ib_gid_attr *attr, void **context)
> }
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_IP_ADDR,
> sizeof(req), sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.op = ADDR_OP_REMOVE;
> req.sgid_type = (ntype == RDMA_NETWORK_IPV6) ? SGID_TYPE_IPV6 :
> SGID_TYPE_IPV4; @@ -940,7 +939,7 @@ int mana_ib_gd_config_mac(struct
> mana_ib_dev *mdev, enum mana_ib_addr_op op, u8
> int err;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CONFIG_MAC_ADDR,
> sizeof(req), sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.op = op;
> copy_in_reverse(req.mac_addr, mac, ETH_ALEN); @@ -965,7 +964,7
> @@ int mana_ib_gd_create_cq(struct mana_ib_dev *mdev, struct mana_ib_cq
> *cq, u32 do
> return -EINVAL;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_CQ, sizeof(req),
> sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.gdma_region = cq->queue.gdma_region;
> req.eq_id = mdev->eqs[cq->comp_vector]->id; @@ -997,7 +996,7 @@
> int mana_ib_gd_destroy_cq(struct mana_ib_dev *mdev, struct mana_ib_cq *cq)
> return 0;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_CQ, sizeof(req),
> sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.cq_handle = cq->cq_handle;
>
> @@ -1023,7 +1022,7 @@ int mana_ib_gd_create_rc_qp(struct mana_ib_dev
> *mdev, struct mana_ib_qp *qp,
> int err, i;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_RC_QP, sizeof(req),
> sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.pd_handle = pd->pd_handle;
> req.send_cq_handle = send_cq->cq_handle; @@ -1059,7 +1058,7 @@
> int mana_ib_gd_destroy_rc_qp(struct mana_ib_dev *mdev, struct mana_ib_qp
> *qp)
> int err;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_RC_QP,
> sizeof(req), sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.rc_qp_handle = qp->qp_handle;
> err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> @@ -1082,7 +1081,7 @@ int mana_ib_gd_create_ud_qp(struct mana_ib_dev
> *mdev, struct mana_ib_qp *qp,
> int err, i;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_CREATE_UD_QP, sizeof(req),
> sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.pd_handle = pd->pd_handle;
> req.send_cq_handle = send_cq->cq_handle; @@ -1117,7 +1116,7 @@
> int mana_ib_gd_destroy_ud_qp(struct mana_ib_dev *mdev, struct mana_ib_qp
> *qp)
> int err;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_DESTROY_UD_QP,
> sizeof(req), sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.qp_handle = qp->qp_handle;
> err = mana_gd_send_request(gc, sizeof(req), &req, sizeof(resp), &resp);
> diff --git a/drivers/infiniband/hw/mana/qp.c b/drivers/infiniband/hw/mana/qp.c
> index c928af5..14fd7d6 100644
> --- a/drivers/infiniband/hw/mana/qp.c
> +++ b/drivers/infiniband/hw/mana/qp.c
> @@ -635,7 +635,6 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp,
> struct ib_pd *ibpd, {
> 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 gdma_context *gc = mdev_to_gc(mdev);
> u32 doorbell, queue_size;
> int i, err;
>
> @@ -654,7 +653,7 @@ static int mana_ib_create_ud_qp(struct ib_qp *ibqp,
> struct ib_pd *ibpd,
> goto destroy_queues;
> }
> }
> - doorbell = gc->mana_ib.doorbell;
> + doorbell = mdev->gdma_dev->doorbell;
>
> err = create_shadow_queue(&qp->shadow_rq, attr->cap.max_recv_wr,
> sizeof(struct ud_rq_shadow_wqe)); @@ -736,7
> +735,7 @@ static int mana_ib_gd_modify_qp(struct ib_qp *ibqp, struct
> ib_qp_attr *attr,
> int err;
>
> mana_gd_init_req_hdr(&req.hdr, MANA_IB_SET_QP_STATE, sizeof(req),
> sizeof(resp));
> - req.hdr.dev_id = gc->mana_ib.dev_id;
> + req.hdr.dev_id = mdev->gdma_dev->dev_id;
> req.adapter = mdev->adapter_handle;
> req.qp_handle = qp->qp_handle;
> req.qp_state = attr->qp_state;
> --
> 2.43.0
Powered by blists - more mailing lists