On Tue, Mar 26, 2019 at 02:54:31PM +0200, Kamal Heib wrote:
> Adding the required functions and definitions for support managing the
> shared receive queues (SRQs).
>
> Signed-off-by: Kamal Heib <kamalhe...@gmail.com>
> ---
> hw/rdma/rdma_rm.c | 83 ++++++++++++++++++++++++++++++++++++++++++
> hw/rdma/rdma_rm.h | 10 +++++
> hw/rdma/rdma_rm_defs.h | 8 ++++
> 3 files changed, 101 insertions(+)
>
> diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c
> index bac3b2f4a6c3..bc5873cb4c14 100644
> --- a/hw/rdma/rdma_rm.c
> +++ b/hw/rdma/rdma_rm.c
> @@ -542,6 +542,86 @@ void rdma_rm_dealloc_qp(RdmaDeviceResources *dev_res,
> uint32_t qp_handle)
> rdma_res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn);
> }
>
> +RdmaRmSRQ *rdma_rm_get_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle)
> +{
> + return rdma_res_tbl_get(&dev_res->srq_tbl, srq_handle);
> +}
> +
> +int rdma_rm_alloc_srq(RdmaDeviceResources *dev_res, uint32_t pd_handle,
> + uint32_t max_wr, uint32_t max_sge, uint32_t srq_limit,
> + uint32_t *srq_handle, void *opaque)
> +{
> + RdmaRmSRQ *srq;
> + RdmaRmPD *pd;
> + int rc;
> +
> + pd = rdma_rm_get_pd(dev_res, pd_handle);
> + if (!pd) {
> + return -EINVAL;
> + }
> +
> + srq = rdma_res_tbl_alloc(&dev_res->srq_tbl, srq_handle);
> + if (!srq) {
> + return -ENOMEM;
> + }
> +
> + rc = rdma_backend_create_srq(&srq->backend_srq, &pd->backend_pd,
> + max_wr, max_sge, srq_limit);
> + if (rc) {
> + rc = -EIO;
> + goto out_dealloc_srq;
> + }
> +
> + srq->opaque = opaque;
> +
> + return 0;
> +
> +out_dealloc_srq:
> + rdma_res_tbl_dealloc(&dev_res->srq_tbl, *srq_handle);
> +
> + return rc;
> +}
> +
> +int rdma_rm_query_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle,
> + struct ibv_srq_attr *srq_attr)
> +{
> + RdmaRmSRQ *srq;
> +
> + srq = rdma_rm_get_srq(dev_res, srq_handle);
> + if (!srq) {
> + return -EINVAL;
> + }
> +
> + return rdma_backend_query_srq(&srq->backend_srq, srq_attr);
> +}
> +
> +int rdma_rm_modify_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle,
> + struct ibv_srq_attr *srq_attr, int srq_attr_mask)
> +{
> + RdmaRmSRQ *srq;
> +
> + srq = rdma_rm_get_srq(dev_res, srq_handle);
> + if (!srq) {
> + return -EINVAL;
> + }
> +
> + return rdma_backend_modify_srq(&srq->backend_srq, srq_attr,
> + srq_attr_mask);
Such a blind pass-through?? don't you want to make sure that for example
max_sge is valid? I mean just for the sake of being fair to caller?
> +}
> +
> +void rdma_rm_dealloc_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle)
> +{
> + RdmaRmSRQ *srq;
> +
> + srq = rdma_rm_get_srq(dev_res, srq_handle);
> + if (!srq) {
> + return;
> + }
> +
> + rdma_backend_destroy_srq(&srq->backend_srq, dev_res);
> + rdma_res_tbl_dealloc(&dev_res->srq_tbl, srq_handle);
> +}
> +
> void *rdma_rm_get_cqe_ctx(RdmaDeviceResources *dev_res, uint32_t cqe_ctx_id)
> {
> void **cqe_ctx;
> @@ -671,6 +751,8 @@ int rdma_rm_init(RdmaDeviceResources *dev_res, struct
> ibv_device_attr *dev_attr)
> res_tbl_init("CQE_CTX", &dev_res->cqe_ctx_tbl, dev_attr->max_qp *
> dev_attr->max_qp_wr, sizeof(void *));
> res_tbl_init("UC", &dev_res->uc_tbl, MAX_UCS, sizeof(RdmaRmUC));
> + res_tbl_init("SRQ", &dev_res->srq_tbl, dev_attr->max_srq,
> + sizeof(RdmaRmSRQ));
>
> init_ports(dev_res);
>
> @@ -689,6 +771,7 @@ void rdma_rm_fini(RdmaDeviceResources *dev_res,
> RdmaBackendDev *backend_dev,
>
> fini_ports(dev_res, backend_dev, ifname);
>
> + res_tbl_free(&dev_res->srq_tbl);
> res_tbl_free(&dev_res->uc_tbl);
> res_tbl_free(&dev_res->cqe_ctx_tbl);
> res_tbl_free(&dev_res->qp_tbl);
> diff --git a/hw/rdma/rdma_rm.h b/hw/rdma/rdma_rm.h
> index 4f03f9b8c5f1..e88ab95e264b 100644
> --- a/hw/rdma/rdma_rm.h
> +++ b/hw/rdma/rdma_rm.h
> @@ -65,6 +65,16 @@ int rdma_rm_query_qp(RdmaDeviceResources *dev_res,
> RdmaBackendDev *backend_dev,
> int attr_mask, struct ibv_qp_init_attr *init_attr);
> void rdma_rm_dealloc_qp(RdmaDeviceResources *dev_res, uint32_t qp_handle);
>
> +RdmaRmSRQ *rdma_rm_get_srq(RdmaDeviceResources *dev_res, uint32_t
> srq_handle);
> +int rdma_rm_alloc_srq(RdmaDeviceResources *dev_res, uint32_t pd_handle,
> + uint32_t max_wr, uint32_t max_sge, uint32_t srq_limit,
> + uint32_t *srq_handle, void *opaque);
> +int rdma_rm_query_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle,
> + struct ibv_srq_attr *srq_attr);
> +int rdma_rm_modify_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle,
> + struct ibv_srq_attr *srq_attr, int srq_attr_mask);
> +void rdma_rm_dealloc_srq(RdmaDeviceResources *dev_res, uint32_t srq_handle);
> +
> int rdma_rm_alloc_cqe_ctx(RdmaDeviceResources *dev_res, uint32_t *cqe_ctx_id,
> void *ctx);
> void *rdma_rm_get_cqe_ctx(RdmaDeviceResources *dev_res, uint32_t cqe_ctx_id);
> diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h
> index c200d311de37..2a3a409d92a0 100644
> --- a/hw/rdma/rdma_rm_defs.h
> +++ b/hw/rdma/rdma_rm_defs.h
> @@ -33,6 +33,7 @@
> #define MAX_QP_RD_ATOM 16
> #define MAX_QP_INIT_RD_ATOM 16
> #define MAX_AH 64
> +#define MAX_SRQ 512
>
> #define MAX_RM_TBL_NAME 16
> #define MAX_CONSEQ_EMPTY_POLL_CQ 4096 /* considered as error above this */
> @@ -89,6 +90,12 @@ typedef struct RdmaRmQP {
> enum ibv_qp_state qp_state;
> } RdmaRmQP;
>
> +typedef struct RdmaRmSRQ {
> + RdmaBackendSRQ backend_srq;
> + uint32_t recv_cq_handle;
> + void *opaque;
> +} RdmaRmSRQ;
> +
> typedef struct RdmaRmGid {
> union ibv_gid gid;
> int backend_gid_index;
> @@ -128,6 +135,7 @@ struct RdmaDeviceResources {
> RdmaRmResTbl qp_tbl;
> RdmaRmResTbl cq_tbl;
> RdmaRmResTbl cqe_ctx_tbl;
> + RdmaRmResTbl srq_tbl;
> GHashTable *qp_hash; /* Keeps mapping between real and emulated */
> QemuMutex lock;
> RdmaRmStats stats;
> --
> 2.20.1
>
>
