hw/rdma: Protect against concurrent execution of poll_cq
The function rdma_poll_cq is called from two contexts - completion handler thread which sense new completion on backend channel and explicitly as result of guest issuing poll_cq command. Add lock to protect against concurrent executions. Signed-off-by: Yuval Shaia <yuval.shaia@oracle.com> Reviewed-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Message-Id: <1552300155-25216-4-git-send-email-yuval.shaia@oracle.com> Reviewed-by: Kamal Heib <kamalheib1@gmail.com> Signed-off-by: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
This commit is contained in:
parent
b20fc79510
commit
2cfa953009
|
@ -70,6 +70,7 @@ static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)
|
||||||
BackendCtx *bctx;
|
BackendCtx *bctx;
|
||||||
struct ibv_wc wc[2];
|
struct ibv_wc wc[2];
|
||||||
|
|
||||||
|
qemu_mutex_lock(&rdma_dev_res->lock);
|
||||||
do {
|
do {
|
||||||
ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
|
ne = ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc);
|
||||||
|
|
||||||
|
@ -89,6 +90,7 @@ static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq)
|
||||||
g_free(bctx);
|
g_free(bctx);
|
||||||
}
|
}
|
||||||
} while (ne > 0);
|
} while (ne > 0);
|
||||||
|
qemu_mutex_unlock(&rdma_dev_res->lock);
|
||||||
|
|
||||||
if (ne < 0) {
|
if (ne < 0) {
|
||||||
rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
|
rdma_error_report("ibv_poll_cq fail, rc=%d, errno=%d", ne, errno);
|
||||||
|
|
|
@ -617,12 +617,16 @@ int rdma_rm_init(RdmaDeviceResources *dev_res, struct ibv_device_attr *dev_attr)
|
||||||
|
|
||||||
init_ports(dev_res);
|
init_ports(dev_res);
|
||||||
|
|
||||||
|
qemu_mutex_init(&dev_res->lock);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void rdma_rm_fini(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
|
void rdma_rm_fini(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev,
|
||||||
const char *ifname)
|
const char *ifname)
|
||||||
{
|
{
|
||||||
|
qemu_mutex_destroy(&dev_res->lock);
|
||||||
|
|
||||||
fini_ports(dev_res, backend_dev, ifname);
|
fini_ports(dev_res, backend_dev, ifname);
|
||||||
|
|
||||||
res_tbl_free(&dev_res->uc_tbl);
|
res_tbl_free(&dev_res->uc_tbl);
|
||||||
|
|
|
@ -105,6 +105,7 @@ typedef struct RdmaDeviceResources {
|
||||||
RdmaRmResTbl cq_tbl;
|
RdmaRmResTbl cq_tbl;
|
||||||
RdmaRmResTbl cqe_ctx_tbl;
|
RdmaRmResTbl cqe_ctx_tbl;
|
||||||
GHashTable *qp_hash; /* Keeps mapping between real and emulated */
|
GHashTable *qp_hash; /* Keeps mapping between real and emulated */
|
||||||
|
QemuMutex lock;
|
||||||
} RdmaDeviceResources;
|
} RdmaDeviceResources;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue