From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940701111425.55290971004945; Thu, 31 Jan 2019 05:18:21 -0800 (PST) Received: from localhost ([127.0.0.1]:54652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCEP-0005rk-BF for importer@patchew.org; Thu, 31 Jan 2019 08:18:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5g-0007BW-Qa for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5Z-0000HF-M5 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:12 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:38932) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5Z-0000H2-3n for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:05 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4LC8128564; Thu, 31 Jan 2019 13:09:02 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2120.oracle.com with ESMTP id 2q8g6rghfn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:02 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD91Nu011933 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:01 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0VD91Gk010822; Thu, 31 Jan 2019 13:09:01 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:08:59 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=fwvjZdHEkvyPRvn1TJjM3ljW/jClmCLz/iqjpegg0fE=; b=j2o0nBuxglV8ivcmXHV9MNV398RMHgRq/ZuLa50C/FvjjCAAEk7+wZCs4OIT2hbd6SPo nz3SC2xf4f9Xxikzi1fNCUq/+WbkQfE6la7WN4UEQaWGvKMwjObXCcgrEnVNChHMypXP w0ikglmWVvwulffGDtJ9jXb0zj3uGp0HtnE6ltkdxW958sM7NNdbYbx8BFxNgKr4T7Aa tqO0cIjsWArF3elMjblmPJXBwqoxLAxSz8w5UwQrTyzTJgxlcF0ZK/HsFPtrLdJ3POdG Ydqrs9Fm/Osj8kGNb0fgY6Xv8hgjBDDQDgyqE1rMnQqnQSLbE/YTzW6AFf+1TKLfta9T Lg== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:41 +0200 Message-Id: <20190131130850.6850-2-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 01/10] hw/rdma: Switch to generic error reporting way X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Utilize error_report for all pr_err calls and some pr_dbg that are considered as errors. For the remaining pr_dbg calls, the important ones were replaced by trace points while other deleted. Signed-off-by: Yuval Shaia --- hw/rdma/rdma_backend.c | 336 ++++++++++++++-------------------- hw/rdma/rdma_rm.c | 121 +++++------- hw/rdma/rdma_utils.c | 11 +- hw/rdma/rdma_utils.h | 45 +---- hw/rdma/trace-events | 32 +++- hw/rdma/vmw/pvrdma.h | 2 +- hw/rdma/vmw/pvrdma_cmd.c | 113 +++--------- hw/rdma/vmw/pvrdma_dev_ring.c | 26 +-- hw/rdma/vmw/pvrdma_main.c | 132 +++++-------- hw/rdma/vmw/pvrdma_qp_ops.c | 49 ++--- hw/rdma/vmw/trace-events | 16 +- 11 files changed, 337 insertions(+), 546 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index fd571f21e5..5f60856d19 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -14,7 +14,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/error-report.h" #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/qmp/qlist.h" @@ -39,7 +38,6 @@ =20 typedef struct BackendCtx { void *up_ctx; - bool is_tx_req; struct ibv_sge sge; /* Used to save MAD recv buffer */ } BackendCtx; =20 @@ -52,7 +50,7 @@ static void (*comp_handler)(void *ctx, struct ibv_wc *wc); =20 static void dummy_comp_handler(void *ctx, struct ibv_wc *wc) { - pr_err("No completion handler is registered\n"); + rdma_error_report("No completion handler is registered"); } =20 static inline void complete_work(enum ibv_wc_status status, uint32_t vendo= r_err, @@ -66,29 +64,24 @@ static inline void complete_work(enum ibv_wc_status sta= tus, uint32_t vendor_err, comp_handler(ctx, &wc); } =20 -static void poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *ibcq) +static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq = *ibcq) { int i, ne; BackendCtx *bctx; struct ibv_wc wc[2]; =20 - pr_dbg("Entering poll_cq loop on cq %p\n", ibcq); do { ne =3D ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc); =20 - pr_dbg("Got %d completion(s) from cq %p\n", ne, ibcq); + trace_rdma_poll_cq(ne, ibcq); =20 for (i =3D 0; i < ne; i++) { - pr_dbg("wr_id=3D0x%" PRIx64 "\n", wc[i].wr_id); - pr_dbg("status=3D%d\n", wc[i].status); - bctx =3D rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id); if (unlikely(!bctx)) { - pr_dbg("Error: Failed to find ctx for req %" PRId64 "\n", - wc[i].wr_id); + rdma_error_report("No matching ctx for req %"PRId64, + wc[i].wr_id); continue; } - pr_dbg("Processing %s CQE\n", bctx->is_tx_req ? "send" : "recv= "); =20 comp_handler(bctx->up_ctx, &wc[i]); =20 @@ -98,7 +91,7 @@ static void poll_cq(RdmaDeviceResources *rdma_dev_res, st= ruct ibv_cq *ibcq) } while (ne > 0); =20 if (ne < 0) { - pr_dbg("Got error %d from ibv_poll_cq\n", ne); + rdma_error_report("ibv_poll_cq fail, rc=3D%d, errno=3D%d", ne, err= no); } } =20 @@ -115,12 +108,10 @@ static void *comp_handler_thread(void *arg) flags =3D fcntl(backend_dev->channel->fd, F_GETFL); rc =3D fcntl(backend_dev->channel->fd, F_SETFL, flags | O_NONBLOCK); if (rc < 0) { - pr_dbg("Fail to change to non-blocking mode\n"); + rdma_error_report("Failed to change backend channel FD to non-bloc= king"); return NULL; } =20 - pr_dbg("Starting\n"); - pfds[0].fd =3D backend_dev->channel->fd; pfds[0].events =3D G_IO_IN | G_IO_HUP | G_IO_ERR; =20 @@ -132,27 +123,25 @@ static void *comp_handler_thread(void *arg) } while (!rc && backend_dev->comp_thread.run); =20 if (backend_dev->comp_thread.run) { - pr_dbg("Waiting for completion on channel %p\n", backend_dev->= channel); rc =3D ibv_get_cq_event(backend_dev->channel, &ev_cq, &ev_ctx); - pr_dbg("ibv_get_cq_event=3D%d\n", rc); if (unlikely(rc)) { - pr_dbg("---> ibv_get_cq_event (%d)\n", rc); + rdma_error_report("ibv_get_cq_event fail, rc=3D%d, errno= =3D%d", rc, + errno); continue; } =20 rc =3D ibv_req_notify_cq(ev_cq, 0); if (unlikely(rc)) { - pr_dbg("Error %d from ibv_req_notify_cq\n", rc); + rdma_error_report("ibv_req_notify_cq fail, rc=3D%d, errno= =3D%d", rc, + errno); } =20 - poll_cq(backend_dev->rdma_dev_res, ev_cq); + rdma_poll_cq(backend_dev->rdma_dev_res, ev_cq); =20 ibv_ack_cq_events(ev_cq, 1); } } =20 - pr_dbg("Going down\n"); - /* TODO: Post cqe for all remaining buffs that were posted */ =20 backend_dev->comp_thread.is_running =3D false; @@ -177,55 +166,54 @@ static inline int rdmacm_mux_can_process_async(RdmaBa= ckendDev *backend_dev) return atomic_read(&backend_dev->rdmacm_mux.can_receive); } =20 -static int check_mux_op_status(CharBackend *mad_chr_be) +static int rdmacm_mux_check_op_status(CharBackend *mad_chr_be) { RdmaCmMuxMsg msg =3D {}; int ret; =20 - pr_dbg("Reading response\n"); ret =3D qemu_chr_fe_read_all(mad_chr_be, (uint8_t *)&msg, sizeof(msg)); if (ret !=3D sizeof(msg)) { - pr_dbg("Invalid message size %d, expecting %ld\n", ret, sizeof(msg= )); + rdma_error_report("Got invalid message from mux: size %d, expectin= g %ld", + ret, sizeof(msg)); return -EIO; } =20 - pr_dbg("msg_type=3D%d\n", msg.hdr.msg_type); - pr_dbg("op_code=3D%d\n", msg.hdr.op_code); - pr_dbg("err_code=3D%d\n", msg.hdr.err_code); + trace_rdmacm_mux_check_op_status(msg.hdr.msg_type, msg.hdr.op_code, + msg.hdr.err_code); =20 if (msg.hdr.msg_type !=3D RDMACM_MUX_MSG_TYPE_RESP) { - pr_dbg("Invalid message type %d\n", msg.hdr.msg_type); + rdma_error_report("Got invalid message type %d", msg.hdr.msg_type); return -EIO; } =20 if (msg.hdr.err_code !=3D RDMACM_MUX_ERR_CODE_OK) { - pr_dbg("Operation failed in mux, error code %d\n", msg.hdr.err_cod= e); + rdma_error_report("Operation failed in mux, error code %d", + msg.hdr.err_code); return -EIO; } =20 return 0; } =20 -static int exec_rdmacm_mux_req(RdmaBackendDev *backend_dev, RdmaCmMuxMsg *= msg) +static int rdmacm_mux_send(RdmaBackendDev *backend_dev, RdmaCmMuxMsg *msg) { int rc =3D 0; =20 - pr_dbg("Executing request %d\n", msg->hdr.op_code); - msg->hdr.msg_type =3D RDMACM_MUX_MSG_TYPE_REQ; + trace_rdmacm_mux("send", msg->hdr.msg_type, msg->hdr.op_code); disable_rdmacm_mux_async(backend_dev); rc =3D qemu_chr_fe_write(backend_dev->rdmacm_mux.chr_be, (const uint8_t *)msg, sizeof(*msg)); if (rc !=3D sizeof(*msg)) { enable_rdmacm_mux_async(backend_dev); - pr_dbg("Fail to send request to rdmacm_mux (rc=3D%d)\n", rc); + rdma_error_report("Failed to send request to rdmacm_mux (rc=3D%d)"= , rc); return -EIO; } =20 - rc =3D check_mux_op_status(backend_dev->rdmacm_mux.chr_be); + rc =3D rdmacm_mux_check_op_status(backend_dev->rdmacm_mux.chr_be); if (rc) { - pr_dbg("Fail to execute rdmacm_mux request %d (rc=3D%d)\n", - msg->hdr.op_code, rc); + rdma_error_report("Failed to execute rdmacm_mux request %d (rc=3D%= d)", + msg->hdr.op_code, rc); } =20 enable_rdmacm_mux_async(backend_dev); @@ -237,7 +225,6 @@ static void stop_backend_thread(RdmaBackendThread *thre= ad) { thread->run =3D false; while (thread->is_running) { - pr_dbg("Waiting for thread to complete\n"); sleep(THR_POLL_TO / SCALE_US / 2); } } @@ -273,7 +260,7 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, =20 rc =3D ibv_query_port(backend_dev->context, backend_dev->port_num, por= t_attr); if (rc) { - pr_dbg("Error %d from ibv_query_port\n", rc); + rdma_error_report("ibv_query_port fail, rc=3D%d, errno=3D%d", rc, = errno); return -EIO; } =20 @@ -282,7 +269,7 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, =20 void rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ= *cq) { - poll_cq(rdma_dev_res, cq->ibcq); + rdma_poll_cq(rdma_dev_res, cq->ibcq); } =20 static GHashTable *ah_hash; @@ -294,8 +281,8 @@ static struct ibv_ah *create_ah(RdmaBackendDev *backend= _dev, struct ibv_pd *pd, struct ibv_ah *ah =3D g_hash_table_lookup(ah_hash, ah_key); =20 if (ah) { - trace_create_ah_cache_hit(be64_to_cpu(dgid->global.subnet_prefix), - be64_to_cpu(dgid->global.interface_id)); + trace_rdma_create_ah_cache_hit(be64_to_cpu(dgid->global.subnet_pre= fix), + be64_to_cpu(dgid->global.interface_= id)); g_bytes_unref(ah_key); } else { struct ibv_ah_attr ah_attr =3D { @@ -312,13 +299,13 @@ static struct ibv_ah *create_ah(RdmaBackendDev *backe= nd_dev, struct ibv_pd *pd, g_hash_table_insert(ah_hash, ah_key, ah); } else { g_bytes_unref(ah_key); - pr_dbg("Fail to create AH for gid <0x%" PRIx64 ", 0x%" PRIx64 = ">\n", - be64_to_cpu(dgid->global.subnet_prefix), - be64_to_cpu(dgid->global.interface_id)); + rdma_error_report("Failed to create AH for gid <0x%" PRIx64", = 0x%"PRIx64">", + be64_to_cpu(dgid->global.subnet_prefix), + be64_to_cpu(dgid->global.interface_id)); } =20 - trace_create_ah_cache_miss(be64_to_cpu(dgid->global.subnet_prefix), - be64_to_cpu(dgid->global.interface_id)); + trace_rdma_create_ah_cache_miss(be64_to_cpu(dgid->global.subnet_pr= efix), + be64_to_cpu(dgid->global.interface= _id)); } =20 return ah; @@ -349,12 +336,10 @@ static int build_host_sge_array(RdmaDeviceResources *= rdma_dev_res, RdmaRmMR *mr; int ssge_idx; =20 - pr_dbg("num_sge=3D%d\n", num_sge); - for (ssge_idx =3D 0; ssge_idx < num_sge; ssge_idx++) { mr =3D rdma_rm_get_mr(rdma_dev_res, ssge[ssge_idx].lkey); if (unlikely(!mr)) { - pr_dbg("Invalid lkey 0x%x\n", ssge[ssge_idx].lkey); + rdma_error_report("Invalid lkey 0x%x", ssge[ssge_idx].lkey); return VENDOR_ERR_INVLKEY | ssge[ssge_idx].lkey; } =20 @@ -362,17 +347,28 @@ static int build_host_sge_array(RdmaDeviceResources *= rdma_dev_res, dsge->length =3D ssge[ssge_idx].length; dsge->lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); =20 - pr_dbg("ssge->addr=3D0x%" PRIx64 "\n", ssge[ssge_idx].addr); - pr_dbg("dsge->addr=3D0x%" PRIx64 "\n", dsge->addr); - pr_dbg("dsge->length=3D%d\n", dsge->length); - pr_dbg("dsge->lkey=3D0x%x\n", dsge->lkey); - dsge++; } =20 return 0; } =20 +static void trace_mad_message(const char *title, char *buf, size_t len) +{ + int i; + char *b =3D g_malloc0(len * 3 + 1); + char b1[4]; + + for (i =3D 0; i < len; i++) { + sprintf(b1, "%.2X ", buf[i] & 0x000000FF); + strcat(b, b1); + } + + trace_rdma_mad_message(title, len, b); + + g_free(b); +} + static int mad_send(RdmaBackendDev *backend_dev, uint8_t sgid_idx, union ibv_gid *sgid, struct ibv_sge *sge, uint32_t num= _sge) { @@ -380,8 +376,6 @@ static int mad_send(RdmaBackendDev *backend_dev, uint8_= t sgid_idx, char *hdr, *data; int ret; =20 - pr_dbg("num_sge=3D%d\n", num_sge); - if (num_sge !=3D 2) { return -EINVAL; } @@ -390,7 +384,6 @@ static int mad_send(RdmaBackendDev *backend_dev, uint8_= t sgid_idx, memcpy(msg.hdr.sgid.raw, sgid->raw, sizeof(msg.hdr.sgid)); =20 msg.umad_len =3D sge[0].length + sge[1].length; - pr_dbg("umad_len=3D%d\n", msg.umad_len); =20 if (msg.umad_len > sizeof(msg.umad.mad)) { return -ENOMEM; @@ -398,36 +391,31 @@ static int mad_send(RdmaBackendDev *backend_dev, uint= 8_t sgid_idx, =20 msg.umad.hdr.addr.qpn =3D htobe32(1); msg.umad.hdr.addr.grh_present =3D 1; - pr_dbg("sgid_idx=3D%d\n", sgid_idx); - pr_dbg("sgid=3D0x%llx\n", sgid->global.interface_id); msg.umad.hdr.addr.gid_index =3D sgid_idx; memcpy(msg.umad.hdr.addr.gid, sgid->raw, sizeof(msg.umad.hdr.addr.gid)= ); msg.umad.hdr.addr.hop_limit =3D 0xFF; =20 hdr =3D rdma_pci_dma_map(backend_dev->dev, sge[0].addr, sge[0].length); if (!hdr) { - pr_dbg("Fail to map to sge[0]\n"); return -ENOMEM; } data =3D rdma_pci_dma_map(backend_dev->dev, sge[1].addr, sge[1].length= ); if (!data) { - pr_dbg("Fail to map to sge[1]\n"); rdma_pci_dma_unmap(backend_dev->dev, hdr, sge[0].length); return -ENOMEM; } =20 - pr_dbg_buf("mad_hdr", hdr, sge[0].length); - pr_dbg_buf("mad_data", data, sge[1].length); - memcpy(&msg.umad.mad[0], hdr, sge[0].length); memcpy(&msg.umad.mad[sge[0].length], data, sge[1].length); =20 rdma_pci_dma_unmap(backend_dev->dev, data, sge[1].length); rdma_pci_dma_unmap(backend_dev->dev, hdr, sge[0].length); =20 - ret =3D exec_rdmacm_mux_req(backend_dev, &msg); + trace_mad_message("send", msg.umad.mad, msg.umad_len); + + ret =3D rdmacm_mux_send(backend_dev, &msg); if (ret) { - pr_dbg("Fail to send MAD to rdma_umadmux (%d)\n", ret); + rdma_error_report("Failed to send MAD to rdma_umadmux (%d)", ret); return -EIO; } =20 @@ -447,12 +435,11 @@ void rdma_backend_post_send(RdmaBackendDev *backend_d= ev, int rc; struct ibv_send_wr wr =3D {0}, *bad_wr; =20 - if (!qp->ibqp) { /* This field does not get initialized for QP0 and QP= 1 */ + if (!qp->ibqp) { /* This field is not initialized for QP0 and QP1 */ if (qp_type =3D=3D IBV_QPT_SMI) { - pr_dbg("QP0 unsupported\n"); + rdma_error_report("Got QP0 request"); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_QP0, ctx); } else if (qp_type =3D=3D IBV_QPT_GSI) { - pr_dbg("QP1\n"); rc =3D mad_send(backend_dev, sgid_idx, sgid, sge, num_sge); if (rc) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_MAD_SEND, ctx= ); @@ -463,22 +450,17 @@ void rdma_backend_post_send(RdmaBackendDev *backend_d= ev, return; } =20 - pr_dbg("num_sge=3D%d\n", num_sge); - bctx =3D g_malloc0(sizeof(*bctx)); bctx->up_ctx =3D ctx; - bctx->is_tx_req =3D 1; =20 rc =3D rdma_rm_alloc_cqe_ctx(backend_dev->rdma_dev_res, &bctx_id, bctx= ); if (unlikely(rc)) { - pr_dbg("Failed to allocate cqe_ctx\n"); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_NOMEM, ctx); goto out_free_bctx; } =20 rc =3D build_host_sge_array(backend_dev->rdma_dev_res, new_sge, sge, n= um_sge); if (rc) { - pr_dbg("Error: Failed to build host SGE array\n"); complete_work(IBV_WC_GENERAL_ERR, rc, ctx); goto out_dealloc_cqe_ctx; } @@ -500,10 +482,9 @@ void rdma_backend_post_send(RdmaBackendDev *backend_de= v, wr.wr_id =3D bctx_id; =20 rc =3D ibv_post_send(qp->ibqp, &wr, &bad_wr); - pr_dbg("ibv_post_send=3D%d\n", rc); if (rc) { - pr_dbg("Fail (%d, %d) to post send WQE to qpn %d\n", rc, errno, - qp->ibqp->qp_num); + rdma_error_report("ibv_post_send fail, qpn=3D0x%x, rc=3D%d, errno= =3D%d", + qp->ibqp->qp_num, rc, errno); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_FAIL_BACKEND, ctx); goto out_dealloc_cqe_ctx; } @@ -526,29 +507,23 @@ static unsigned int save_mad_recv_buffer(RdmaBackendD= ev *backend_dev, uint32_t bctx_id; =20 if (num_sge !=3D 1) { - pr_dbg("Invalid num_sge (%d), expecting 1\n", num_sge); + rdma_error_report("Invalid num_sge (%d), expecting 1", num_sge); return VENDOR_ERR_INV_NUM_SGE; } =20 if (sge[0].length < RDMA_MAX_PRIVATE_DATA + sizeof(struct ibv_grh)) { - pr_dbg("Too small buffer for MAD\n"); + rdma_error_report("Too small buffer for MAD"); return VENDOR_ERR_INV_MAD_BUFF; } =20 - pr_dbg("addr=3D0x%" PRIx64"\n", sge[0].addr); - pr_dbg("length=3D%d\n", sge[0].length); - pr_dbg("lkey=3D%d\n", sge[0].lkey); - bctx =3D g_malloc0(sizeof(*bctx)); =20 rc =3D rdma_rm_alloc_cqe_ctx(backend_dev->rdma_dev_res, &bctx_id, bctx= ); if (unlikely(rc)) { g_free(bctx); - pr_dbg("Fail to allocate cqe_ctx\n"); return VENDOR_ERR_NOMEM; } =20 - pr_dbg("bctx_id %d, bctx %p, ctx %p\n", bctx_id, bctx, ctx); bctx->up_ctx =3D ctx; bctx->sge =3D *sge; =20 @@ -572,11 +547,10 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_d= ev, =20 if (!qp->ibqp) { /* This field does not get initialized for QP0 and QP= 1 */ if (qp_type =3D=3D IBV_QPT_SMI) { - pr_dbg("QP0 unsupported\n"); + rdma_error_report("Got QP0 request"); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_QP0, ctx); } if (qp_type =3D=3D IBV_QPT_GSI) { - pr_dbg("QP1\n"); rc =3D save_mad_recv_buffer(backend_dev, sge, num_sge, ctx); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); @@ -585,22 +559,17 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_d= ev, return; } =20 - pr_dbg("num_sge=3D%d\n", num_sge); - bctx =3D g_malloc0(sizeof(*bctx)); bctx->up_ctx =3D ctx; - bctx->is_tx_req =3D 0; =20 rc =3D rdma_rm_alloc_cqe_ctx(rdma_dev_res, &bctx_id, bctx); if (unlikely(rc)) { - pr_dbg("Failed to allocate cqe_ctx\n"); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_NOMEM, ctx); goto out_free_bctx; } =20 rc =3D build_host_sge_array(rdma_dev_res, new_sge, sge, num_sge); if (rc) { - pr_dbg("Error: Failed to build host SGE array\n"); complete_work(IBV_WC_GENERAL_ERR, rc, ctx); goto out_dealloc_cqe_ctx; } @@ -609,10 +578,9 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_de= v, wr.sg_list =3D new_sge; wr.wr_id =3D bctx_id; rc =3D ibv_post_recv(qp->ibqp, &wr, &bad_wr); - pr_dbg("ibv_post_recv=3D%d\n", rc); if (rc) { - pr_dbg("Fail (%d, %d) to post recv WQE to qpn %d\n", rc, errno, - qp->ibqp->qp_num); + rdma_error_report("ibv_post_recv fail, qpn=3D0x%x, rc=3D%d, errno= =3D%d", + qp->ibqp->qp_num, rc, errno); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_FAIL_BACKEND, ctx); goto out_dealloc_cqe_ctx; } @@ -630,7 +598,12 @@ int rdma_backend_create_pd(RdmaBackendDev *backend_dev= , RdmaBackendPD *pd) { pd->ibpd =3D ibv_alloc_pd(backend_dev->context); =20 - return pd->ibpd ? 0 : -EIO; + if (!pd->ibpd) { + rdma_error_report("ibv_alloc_pd fail, errno=3D%d", errno); + return -EIO; + } + + return 0; } =20 void rdma_backend_destroy_pd(RdmaBackendPD *pd) @@ -643,16 +616,15 @@ void rdma_backend_destroy_pd(RdmaBackendPD *pd) int rdma_backend_create_mr(RdmaBackendMR *mr, RdmaBackendPD *pd, void *add= r, size_t length, int access) { - pr_dbg("addr=3D0x%p\n", addr); - pr_dbg("len=3D%zu\n", length); mr->ibmr =3D ibv_reg_mr(pd->ibpd, addr, length, access); - if (mr->ibmr) { - pr_dbg("lkey=3D0x%x\n", mr->ibmr->lkey); - pr_dbg("rkey=3D0x%x\n", mr->ibmr->rkey); - mr->ibpd =3D pd->ibpd; + if (!mr->ibmr) { + rdma_error_report("ibv_reg_mr fail, errno=3D%d", errno); + return -EIO; } =20 - return mr->ibmr ? 0 : -EIO; + mr->ibpd =3D pd->ibpd; + + return 0; } =20 void rdma_backend_destroy_mr(RdmaBackendMR *mr) @@ -667,21 +639,21 @@ int rdma_backend_create_cq(RdmaBackendDev *backend_de= v, RdmaBackendCQ *cq, { int rc; =20 - pr_dbg("cqe=3D%d\n", cqe); - - pr_dbg("dev->channel=3D%p\n", backend_dev->channel); cq->ibcq =3D ibv_create_cq(backend_dev->context, cqe + 1, NULL, backend_dev->channel, 0); + if (!cq->ibcq) { + rdma_error_report("ibv_create_cq fail, errno=3D%d", errno); + return -EIO; + } =20 - if (cq->ibcq) { - rc =3D ibv_req_notify_cq(cq->ibcq, 0); - if (rc) { - pr_dbg("Error %d from ibv_req_notify_cq\n", rc); - } - cq->backend_dev =3D backend_dev; + rc =3D ibv_req_notify_cq(cq->ibcq, 0); + if (rc) { + rdma_warn_report("ibv_req_notify_cq fail, rc=3D%d, errno=3D%d", rc= , errno); } =20 - return cq->ibcq ? 0 : -EIO; + cq->backend_dev =3D backend_dev; + + return 0; } =20 void rdma_backend_destroy_cq(RdmaBackendCQ *cq) @@ -700,7 +672,6 @@ int rdma_backend_create_qp(RdmaBackendQP *qp, uint8_t q= p_type, struct ibv_qp_init_attr attr =3D {0}; =20 qp->ibqp =3D 0; - pr_dbg("qp_type=3D%d\n", qp_type); =20 switch (qp_type) { case IBV_QPT_GSI: @@ -713,7 +684,7 @@ int rdma_backend_create_qp(RdmaBackendQP *qp, uint8_t q= p_type, break; =20 default: - pr_dbg("Unsupported QP type %d\n", qp_type); + rdma_error_report("Unsupported QP type %d", qp_type); return -EIO; } =20 @@ -725,14 +696,9 @@ int rdma_backend_create_qp(RdmaBackendQP *qp, uint8_t = qp_type, attr.cap.max_send_sge =3D max_send_sge; attr.cap.max_recv_sge =3D max_recv_sge; =20 - pr_dbg("max_send_wr=3D%d\n", max_send_wr); - pr_dbg("max_recv_wr=3D%d\n", max_recv_wr); - pr_dbg("max_send_sge=3D%d\n", max_send_sge); - pr_dbg("max_recv_sge=3D%d\n", max_recv_sge); - qp->ibqp =3D ibv_create_qp(pd->ibpd, &attr); - if (likely(!qp->ibqp)) { - pr_dbg("Error from ibv_create_qp\n"); + if (!qp->ibqp) { + rdma_error_report("ibv_create_qp fail, errno=3D%d", errno); return -EIO; } =20 @@ -740,8 +706,6 @@ int rdma_backend_create_qp(RdmaBackendQP *qp, uint8_t q= p_type, =20 /* TODO: Query QP to get max_inline_data and save it to be used in sen= d */ =20 - pr_dbg("qpn=3D0x%x\n", qp->ibqp->qp_num); - return 0; } =20 @@ -751,9 +715,6 @@ int rdma_backend_qp_state_init(RdmaBackendDev *backend_= dev, RdmaBackendQP *qp, struct ibv_qp_attr attr =3D {0}; int rc, attr_mask; =20 - pr_dbg("qpn=3D0x%x\n", qp->ibqp->qp_num); - pr_dbg("sport_num=3D%d\n", backend_dev->port_num); - attr_mask =3D IBV_QP_STATE | IBV_QP_PKEY_INDEX | IBV_QP_PORT; attr.qp_state =3D IBV_QPS_INIT; attr.pkey_index =3D 0; @@ -762,21 +723,23 @@ int rdma_backend_qp_state_init(RdmaBackendDev *backen= d_dev, RdmaBackendQP *qp, switch (qp_type) { case IBV_QPT_RC: attr_mask |=3D IBV_QP_ACCESS_FLAGS; + trace_rdma_backend_rc_qp_state_init(qp->ibqp->qp_num); break; =20 case IBV_QPT_UD: attr.qkey =3D qkey; attr_mask |=3D IBV_QP_QKEY; + trace_rdma_backend_ud_qp_state_init(qp->ibqp->qp_num, qkey); break; =20 default: - pr_dbg("Unsupported QP type %d\n", qp_type); + rdma_error_report("Unsupported QP type %d", qp_type); return -EIO; } =20 rc =3D ibv_modify_qp(qp->ibqp, &attr, attr_mask); if (rc) { - pr_dbg("Error %d from ibv_modify_qp\n", rc); + rdma_error_report("ibv_modify_qp fail, rc=3D%d, errno=3D%d", rc, e= rrno); return -EIO; } =20 @@ -802,14 +765,6 @@ int rdma_backend_qp_state_rtr(RdmaBackendDev *backend_= dev, RdmaBackendQP *qp, =20 switch (qp_type) { case IBV_QPT_RC: - pr_dbg("dgid=3D0x%" PRIx64 ",%" PRIx64 "\n", - be64_to_cpu(ibv_gid.global.subnet_prefix), - be64_to_cpu(ibv_gid.global.interface_id)); - pr_dbg("dqpn=3D0x%x\n", dqpn); - pr_dbg("sgid_idx=3D%d\n", qp->sgid_idx); - pr_dbg("sport_num=3D%d\n", backend_dev->port_num); - pr_dbg("rq_psn=3D0x%x\n", rq_psn); - attr.path_mtu =3D IBV_MTU_1024; attr.dest_qp_num =3D dqpn; attr.max_dest_rd_atomic =3D 1; @@ -824,20 +779,28 @@ int rdma_backend_qp_state_rtr(RdmaBackendDev *backend= _dev, RdmaBackendQP *qp, attr_mask |=3D IBV_QP_AV | IBV_QP_PATH_MTU | IBV_QP_DEST_QPN | IBV_QP_RQ_PSN | IBV_QP_MAX_DEST_RD_ATOMIC | IBV_QP_MIN_RNR_TIMER; + + trace_rdma_backend_rc_qp_state_rtr(qp->ibqp->qp_num, + be64_to_cpu(ibv_gid.global. + subnet_prefix), + be64_to_cpu(ibv_gid.global. + interface_id), + qp->sgid_idx, dqpn, rq_psn); break; =20 case IBV_QPT_UD: - pr_dbg("qkey=3D0x%x\n", qkey); if (use_qkey) { attr.qkey =3D qkey; attr_mask |=3D IBV_QP_QKEY; } + trace_rdma_backend_ud_qp_state_rtr(qp->ibqp->qp_num, use_qkey ? qk= ey : + 0); break; } =20 rc =3D ibv_modify_qp(qp->ibqp, &attr, attr_mask); if (rc) { - pr_dbg("Error %d from ibv_modify_qp\n", rc); + rdma_error_report("ibv_modify_qp fail, rc=3D%d, errno=3D%d", rc, e= rrno); return -EIO; } =20 @@ -850,9 +813,6 @@ int rdma_backend_qp_state_rts(RdmaBackendQP *qp, uint8_= t qp_type, struct ibv_qp_attr attr =3D {0}; int rc, attr_mask; =20 - pr_dbg("qpn=3D0x%x\n", qp->ibqp->qp_num); - pr_dbg("sq_psn=3D0x%x\n", sq_psn); - attr.qp_state =3D IBV_QPS_RTS; attr.sq_psn =3D sq_psn; attr_mask =3D IBV_QP_STATE | IBV_QP_SQ_PSN; @@ -866,20 +826,22 @@ int rdma_backend_qp_state_rts(RdmaBackendQP *qp, uint= 8_t qp_type, =20 attr_mask |=3D IBV_QP_TIMEOUT | IBV_QP_RETRY_CNT | IBV_QP_RNR_RETR= Y | IBV_QP_MAX_QP_RD_ATOMIC; + trace_rdma_backend_rc_qp_state_rts(qp->ibqp->qp_num, sq_psn); break; =20 case IBV_QPT_UD: if (use_qkey) { - pr_dbg("qkey=3D0x%x\n", qkey); attr.qkey =3D qkey; attr_mask |=3D IBV_QP_QKEY; } + trace_rdma_backend_ud_qp_state_rts(qp->ibqp->qp_num, sq_psn, + use_qkey ? qkey : 0); break; } =20 rc =3D ibv_modify_qp(qp->ibqp, &attr, attr_mask); if (rc) { - pr_dbg("Error %d from ibv_modify_qp\n", rc); + rdma_error_report("ibv_modify_qp fail, rc=3D%d, errno=3D%d", rc, e= rrno); return -EIO; } =20 @@ -890,7 +852,6 @@ int rdma_backend_query_qp(RdmaBackendQP *qp, struct ibv= _qp_attr *attr, int attr_mask, struct ibv_qp_init_attr *init_att= r) { if (!qp->ibqp) { - pr_dbg("QP1\n"); attr->qp_state =3D IBV_QPS_RTS; return 0; } @@ -906,20 +867,23 @@ void rdma_backend_destroy_qp(RdmaBackendQP *qp) } =20 #define CHK_ATTR(req, dev, member, fmt) ({ \ - pr_dbg("%s=3D"fmt","fmt"\n", #member, dev.member, req->member); \ + trace_rdma_check_dev_attr(#member, dev.member, req->member); \ if (req->member > dev.member) { \ - warn_report("%s =3D "fmt" is higher than host device capability "f= mt, \ - #member, req->member, dev.member); \ + rdma_warn_report("%s =3D "fmt" is higher than host device capabili= ty "fmt, \ + #member, req->member, dev.member); \ req->member =3D dev.member; \ } \ - pr_dbg("%s=3D"fmt"\n", #member, req->member); }) +}) =20 static int init_device_caps(RdmaBackendDev *backend_dev, struct ibv_device_attr *dev_attr) { struct ibv_device_attr bk_dev_attr; + int rc; =20 - if (ibv_query_device(backend_dev->context, &bk_dev_attr)) { + rc =3D ibv_query_device(backend_dev->context, &bk_dev_attr); + if (rc) { + rdma_error_report("ibv_query_device fail, rc=3D%d, errno=3D%d", rc= , errno); return -EIO; } =20 @@ -928,9 +892,7 @@ static int init_device_caps(RdmaBackendDev *backend_dev, CHK_ATTR(dev_attr, bk_dev_attr, max_mr_size, "%" PRId64); CHK_ATTR(dev_attr, bk_dev_attr, max_qp, "%d"); CHK_ATTR(dev_attr, bk_dev_attr, max_sge, "%d"); - CHK_ATTR(dev_attr, bk_dev_attr, max_qp_wr, "%d"); CHK_ATTR(dev_attr, bk_dev_attr, max_cq, "%d"); - CHK_ATTR(dev_attr, bk_dev_attr, max_cqe, "%d"); CHK_ATTR(dev_attr, bk_dev_attr, max_mr, "%d"); CHK_ATTR(dev_attr, bk_dev_attr, max_pd, "%d"); CHK_ATTR(dev_attr, bk_dev_attr, max_qp_rd_atom, "%d"); @@ -946,10 +908,6 @@ static inline void build_mad_hdr(struct ibv_grh *grh, = union ibv_gid *sgid, grh->paylen =3D htons(paylen); grh->sgid =3D *sgid; grh->dgid =3D *my_gid; - - pr_dbg("paylen=3D%d (net=3D0x%x)\n", paylen, grh->paylen); - pr_dbg("dgid=3D0x%llx\n", my_gid->global.interface_id); - pr_dbg("sgid=3D0x%llx\n", sgid->global.interface_id); } =20 static void process_incoming_mad_req(RdmaBackendDev *backend_dev, @@ -960,21 +918,13 @@ static void process_incoming_mad_req(RdmaBackendDev *= backend_dev, BackendCtx *bctx; char *mad; =20 - pr_dbg("umad_len=3D%d\n", msg->umad_len); - -#ifdef PVRDMA_DEBUG - struct umad_hdr *hdr =3D (struct umad_hdr *)&msg->umad.mad; - pr_dbg("bv %x cls %x cv %x mtd %x st %d tid %" PRIx64 " at %x atm %x\n= ", - hdr->base_version, hdr->mgmt_class, hdr->class_version, - hdr->method, hdr->status, be64toh(hdr->tid), - hdr->attr_id, hdr->attr_mod); -#endif + trace_mad_message("recv", msg->umad.mad, msg->umad_len); =20 qemu_mutex_lock(&backend_dev->recv_mads_list.lock); o_ctx_id =3D qlist_pop(backend_dev->recv_mads_list.list); qemu_mutex_unlock(&backend_dev->recv_mads_list.lock); if (!o_ctx_id) { - pr_dbg("No more free MADs buffers, waiting for a while\n"); + rdma_warn_report("No more free MADs buffers, waiting for a while"); sleep(THR_POLL_TO); return; } @@ -982,12 +932,10 @@ static void process_incoming_mad_req(RdmaBackendDev *= backend_dev, cqe_ctx_id =3D qnum_get_uint(qobject_to(QNum, o_ctx_id)); bctx =3D rdma_rm_get_cqe_ctx(backend_dev->rdma_dev_res, cqe_ctx_id); if (unlikely(!bctx)) { - pr_dbg("Error: Fail to find ctx for %ld\n", cqe_ctx_id); + rdma_error_report("No matching ctx for req %ld", cqe_ctx_id); return; } =20 - pr_dbg("id %ld, bctx %p, ctx %p\n", cqe_ctx_id, bctx, bctx->up_ctx); - mad =3D rdma_pci_dma_map(backend_dev->dev, bctx->sge.addr, bctx->sge.length); if (!mad || bctx->sge.length < msg->umad_len + MAD_HDR_SIZE) { @@ -995,7 +943,6 @@ static void process_incoming_mad_req(RdmaBackendDev *ba= ckend_dev, bctx->up_ctx); } else { struct ibv_wc wc =3D {0}; - pr_dbg_buf("mad", msg->umad.mad, msg->umad_len); memset(mad, 0, bctx->sge.length); build_mad_hdr((struct ibv_grh *)mad, (union ibv_gid *)&msg->umad.hdr.addr.gid, &msg->hdr.= sgid, @@ -1025,13 +972,11 @@ static void rdmacm_mux_read(void *opaque, const uint= 8_t *buf, int size) RdmaBackendDev *backend_dev =3D (RdmaBackendDev *)opaque; RdmaCmMuxMsg *msg =3D (RdmaCmMuxMsg *)buf; =20 - pr_dbg("Got %d bytes\n", size); - pr_dbg("msg_type=3D%d\n", msg->hdr.msg_type); - pr_dbg("op_code=3D%d\n", msg->hdr.op_code); + trace_rdmacm_mux("read", msg->hdr.msg_type, msg->hdr.op_code); =20 if (msg->hdr.msg_type !=3D RDMACM_MUX_MSG_TYPE_REQ && msg->hdr.op_code !=3D RDMACM_MUX_OP_CODE_MAD) { - pr_dbg("Error: Not a MAD request, skipping\n"); + rdma_error_report("Error: Not a MAD request, skipping"); return; } process_incoming_mad_req(backend_dev, msg); @@ -1045,7 +990,7 @@ static int mad_init(RdmaBackendDev *backend_dev, CharB= ackend *mad_chr_be) =20 ret =3D qemu_chr_fe_backend_connected(backend_dev->rdmacm_mux.chr_be); if (!ret) { - pr_dbg("Missing chardev for MAD multiplexer\n"); + rdma_error_report("Missing chardev for MAD multiplexer"); return -EIO; } =20 @@ -1063,7 +1008,6 @@ static int mad_init(RdmaBackendDev *backend_dev, Char= Backend *mad_chr_be) =20 static void mad_fini(RdmaBackendDev *backend_dev) { - pr_dbg("Stopping MAD\n"); disable_rdmacm_mux_async(backend_dev); qemu_chr_fe_disconnect(backend_dev->rdmacm_mux.chr_be); if (backend_dev->recv_mads_list.list) { @@ -1079,17 +1023,15 @@ int rdma_backend_get_gid_index(RdmaBackendDev *back= end_dev, int ret; int i =3D 0; =20 - pr_dbg("0x%llx, 0x%llx\n", - (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix), - (long long unsigned int)be64_to_cpu(gid->global.interface_id)); - do { ret =3D ibv_query_gid(backend_dev->context, backend_dev->port_num,= i, &sgid); i++; } while (!ret && (memcmp(&sgid, gid, sizeof(*gid)))); =20 - pr_dbg("gid_index=3D%d\n", i - 1); + trace_rdma_backend_get_gid_index(be64_to_cpu(gid->global.subnet_prefix= ), + be64_to_cpu(gid->global.interface_id), + i - 1); =20 return ret ? ret : i - 1; } @@ -1100,16 +1042,15 @@ int rdma_backend_add_gid(RdmaBackendDev *backend_de= v, const char *ifname, RdmaCmMuxMsg msg =3D {}; int ret; =20 - pr_dbg("0x%llx, 0x%llx\n", - (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix), - (long long unsigned int)be64_to_cpu(gid->global.interface_id)); + trace_rdma_backend_gid_change("add", be64_to_cpu(gid->global.subnet_pr= efix), + be64_to_cpu(gid->global.interface_id)); =20 msg.hdr.op_code =3D RDMACM_MUX_OP_CODE_REG; memcpy(msg.hdr.sgid.raw, gid->raw, sizeof(msg.hdr.sgid)); =20 - ret =3D exec_rdmacm_mux_req(backend_dev, &msg); + ret =3D rdmacm_mux_send(backend_dev, &msg); if (ret) { - pr_dbg("Fail to register GID to rdma_umadmux (%d)\n", ret); + rdma_error_report("Failed to register GID to rdma_umadmux (%d)", r= et); return -EIO; } =20 @@ -1126,16 +1067,16 @@ int rdma_backend_del_gid(RdmaBackendDev *backend_de= v, const char *ifname, RdmaCmMuxMsg msg =3D {}; int ret; =20 - pr_dbg("0x%llx, 0x%llx\n", - (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix), - (long long unsigned int)be64_to_cpu(gid->global.interface_id)); + trace_rdma_backend_gid_change("del", be64_to_cpu(gid->global.subnet_pr= efix), + be64_to_cpu(gid->global.interface_id)); =20 msg.hdr.op_code =3D RDMACM_MUX_OP_CODE_UNREG; memcpy(msg.hdr.sgid.raw, gid->raw, sizeof(msg.hdr.sgid)); =20 - ret =3D exec_rdmacm_mux_req(backend_dev, &msg); + ret =3D rdmacm_mux_send(backend_dev, &msg); if (ret) { - pr_dbg("Fail to unregister GID from rdma_umadmux (%d)\n", ret); + rdma_error_report("Failed to unregister GID from rdma_umadmux (%d)= ", + ret); return -EIO; } =20 @@ -1196,9 +1137,7 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, PC= IDevice *pdev, backend_dev->ib_dev =3D *dev_list; } =20 - pr_dbg("Using backend device %s, port %d\n", - ibv_get_device_name(backend_dev->ib_dev), backend_dev->port_num= ); - pr_dbg("uverb device %s\n", backend_dev->ib_dev->dev_name); + rdma_info_report("uverb device %s", backend_dev->ib_dev->dev_name); =20 backend_dev->context =3D ibv_open_device(backend_dev->ib_dev); if (!backend_dev->context) { @@ -1213,7 +1152,6 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, PC= IDevice *pdev, ret =3D -EIO; goto out_close_device; } - pr_dbg("dev->backend_dev.channel=3D%p\n", backend_dev->channel); =20 ret =3D init_device_caps(backend_dev, dev_attr); if (ret) { @@ -1225,7 +1163,7 @@ int rdma_backend_init(RdmaBackendDev *backend_dev, PC= IDevice *pdev, =20 ret =3D mad_init(backend_dev, mad_chr_be); if (ret) { - error_setg(errp, "Fail to initialize mad"); + error_setg(errp, "Failed to initialize mad"); ret =3D -EIO; goto out_destroy_comm_channel; } @@ -1253,13 +1191,11 @@ out: =20 void rdma_backend_start(RdmaBackendDev *backend_dev) { - pr_dbg("Starting rdma_backend\n"); start_comp_thread(backend_dev); } =20 void rdma_backend_stop(RdmaBackendDev *backend_dev) { - pr_dbg("Stopping rdma_backend\n"); stop_backend_thread(&backend_dev->comp_thread); } =20 diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 268ff633a4..64c6ea1a4e 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "cpu.h" =20 +#include "trace.h" #include "rdma_utils.h" #include "rdma_backend.h" #include "rdma_rm.h" @@ -49,25 +50,26 @@ static inline void res_tbl_free(RdmaRmResTbl *tbl) g_free(tbl->bitmap); } =20 -static inline void *res_tbl_get(RdmaRmResTbl *tbl, uint32_t handle) +static inline void *rdma_res_tbl_get(RdmaRmResTbl *tbl, uint32_t handle) { - pr_dbg("%s, handle=3D%d\n", tbl->name, handle); + trace_rdma_res_tbl_get(tbl->name, handle); =20 if ((handle < tbl->tbl_sz) && (test_bit(handle, tbl->bitmap))) { return tbl->tbl + handle * tbl->res_sz; } else { - pr_dbg("Invalid handle %d\n", handle); + rdma_error_report("Table %s, invalid handle %d", tbl->name, handle= ); return NULL; } } =20 -static inline void *res_tbl_alloc(RdmaRmResTbl *tbl, uint32_t *handle) +static inline void *rdma_res_tbl_alloc(RdmaRmResTbl *tbl, uint32_t *handle) { qemu_mutex_lock(&tbl->lock); =20 *handle =3D find_first_zero_bit(tbl->bitmap, tbl->tbl_sz); if (*handle > tbl->tbl_sz) { - pr_dbg("Failed to alloc, bitmap is full\n"); + rdma_error_report("Table %s, failed to allocate, bitmap is full", + tbl->name); qemu_mutex_unlock(&tbl->lock); return NULL; } @@ -78,14 +80,14 @@ static inline void *res_tbl_alloc(RdmaRmResTbl *tbl, ui= nt32_t *handle) =20 memset(tbl->tbl + *handle * tbl->res_sz, 0, tbl->res_sz); =20 - pr_dbg("%s, handle=3D%d\n", tbl->name, *handle); + trace_rdma_res_tbl_alloc(tbl->name, *handle); =20 return tbl->tbl + *handle * tbl->res_sz; } =20 -static inline void res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle) +static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl, uint32_t handle) { - pr_dbg("%s, handle=3D%d\n", tbl->name, handle); + trace_rdma_res_tbl_dealloc(tbl->name, handle); =20 qemu_mutex_lock(&tbl->lock); =20 @@ -102,7 +104,7 @@ int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, Rdma= BackendDev *backend_dev, RdmaRmPD *pd; int ret =3D -ENOMEM; =20 - pd =3D res_tbl_alloc(&dev_res->pd_tbl, pd_handle); + pd =3D rdma_res_tbl_alloc(&dev_res->pd_tbl, pd_handle); if (!pd) { goto out; } @@ -118,7 +120,7 @@ int rdma_rm_alloc_pd(RdmaDeviceResources *dev_res, Rdma= BackendDev *backend_dev, return 0; =20 out_tbl_dealloc: - res_tbl_dealloc(&dev_res->pd_tbl, *pd_handle); + rdma_res_tbl_dealloc(&dev_res->pd_tbl, *pd_handle); =20 out: return ret; @@ -126,7 +128,7 @@ out: =20 RdmaRmPD *rdma_rm_get_pd(RdmaDeviceResources *dev_res, uint32_t pd_handle) { - return res_tbl_get(&dev_res->pd_tbl, pd_handle); + return rdma_res_tbl_get(&dev_res->pd_tbl, pd_handle); } =20 void rdma_rm_dealloc_pd(RdmaDeviceResources *dev_res, uint32_t pd_handle) @@ -135,7 +137,7 @@ void rdma_rm_dealloc_pd(RdmaDeviceResources *dev_res, u= int32_t pd_handle) =20 if (pd) { rdma_backend_destroy_pd(&pd->backend_pd); - res_tbl_dealloc(&dev_res->pd_tbl, pd_handle); + rdma_res_tbl_dealloc(&dev_res->pd_tbl, pd_handle); } } =20 @@ -150,20 +152,15 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, =20 pd =3D rdma_rm_get_pd(dev_res, pd_handle); if (!pd) { - pr_dbg("Invalid PD\n"); return -EINVAL; } =20 - mr =3D res_tbl_alloc(&dev_res->mr_tbl, mr_handle); + mr =3D rdma_res_tbl_alloc(&dev_res->mr_tbl, mr_handle); if (!mr) { - pr_dbg("Failed to allocate obj in table\n"); return -ENOMEM; } - pr_dbg("mr_handle=3D%d\n", *mr_handle); - - pr_dbg("host_virt=3D0x%p\n", host_virt); - pr_dbg("guest_start=3D0x%" PRIx64 "\n", guest_start); - pr_dbg("length=3D%zu\n", guest_length); + trace_rdma_rm_alloc_mr(*mr_handle, host_virt, guest_start, guest_lengt= h, + access_flags); =20 if (host_virt) { mr->virt =3D host_virt; @@ -174,7 +171,6 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint= 32_t pd_handle, ret =3D rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, m= r->virt, mr->length, access_flags); if (ret) { - pr_dbg("Fail in rdma_backend_create_mr, err=3D%d\n", ret); ret =3D -EIO; goto out_dealloc_mr; } @@ -189,14 +185,14 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, return 0; =20 out_dealloc_mr: - res_tbl_dealloc(&dev_res->mr_tbl, *mr_handle); + rdma_res_tbl_dealloc(&dev_res->mr_tbl, *mr_handle); =20 return ret; } =20 RdmaRmMR *rdma_rm_get_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle) { - return res_tbl_get(&dev_res->mr_tbl, mr_handle); + return rdma_res_tbl_get(&dev_res->mr_tbl, mr_handle); } =20 void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, uint32_t mr_handle) @@ -205,12 +201,12 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res,= uint32_t mr_handle) =20 if (mr) { rdma_backend_destroy_mr(&mr->backend_mr); - pr_dbg("start=3D0x%" PRIx64 "\n", mr->start); + trace_rdma_rm_dealloc_mr(mr_handle, mr->start); if (mr->start) { mr->virt -=3D (mr->start & (TARGET_PAGE_SIZE - 1)); munmap(mr->virt, mr->length); } - res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); + rdma_res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); } } =20 @@ -222,12 +218,13 @@ int rdma_rm_alloc_uc(RdmaDeviceResources *dev_res, ui= nt32_t pfn, /* TODO: Need to make sure pfn is between bar start address and * bsd+RDMA_BAR2_UAR_SIZE if (pfn > RDMA_BAR2_UAR_SIZE) { - pr_err("pfn out of range (%d > %d)\n", pfn, RDMA_BAR2_UAR_SIZE); + rdma_error_report("pfn out of range (%d > %d)", pfn, + RDMA_BAR2_UAR_SIZE); return -ENOMEM; } */ =20 - uc =3D res_tbl_alloc(&dev_res->uc_tbl, uc_handle); + uc =3D rdma_res_tbl_alloc(&dev_res->uc_tbl, uc_handle); if (!uc) { return -ENOMEM; } @@ -237,7 +234,7 @@ int rdma_rm_alloc_uc(RdmaDeviceResources *dev_res, uint= 32_t pfn, =20 RdmaRmUC *rdma_rm_get_uc(RdmaDeviceResources *dev_res, uint32_t uc_handle) { - return res_tbl_get(&dev_res->uc_tbl, uc_handle); + return rdma_res_tbl_get(&dev_res->uc_tbl, uc_handle); } =20 void rdma_rm_dealloc_uc(RdmaDeviceResources *dev_res, uint32_t uc_handle) @@ -245,13 +242,13 @@ void rdma_rm_dealloc_uc(RdmaDeviceResources *dev_res,= uint32_t uc_handle) RdmaRmUC *uc =3D rdma_rm_get_uc(dev_res, uc_handle); =20 if (uc) { - res_tbl_dealloc(&dev_res->uc_tbl, uc_handle); + rdma_res_tbl_dealloc(&dev_res->uc_tbl, uc_handle); } } =20 RdmaRmCQ *rdma_rm_get_cq(RdmaDeviceResources *dev_res, uint32_t cq_handle) { - return res_tbl_get(&dev_res->cq_tbl, cq_handle); + return rdma_res_tbl_get(&dev_res->cq_tbl, cq_handle); } =20 int rdma_rm_alloc_cq(RdmaDeviceResources *dev_res, RdmaBackendDev *backend= _dev, @@ -260,7 +257,7 @@ int rdma_rm_alloc_cq(RdmaDeviceResources *dev_res, Rdma= BackendDev *backend_dev, int rc; RdmaRmCQ *cq; =20 - cq =3D res_tbl_alloc(&dev_res->cq_tbl, cq_handle); + cq =3D rdma_res_tbl_alloc(&dev_res->cq_tbl, cq_handle); if (!cq) { return -ENOMEM; } @@ -287,8 +284,6 @@ void rdma_rm_req_notify_cq(RdmaDeviceResources *dev_res= , uint32_t cq_handle, { RdmaRmCQ *cq; =20 - pr_dbg("cq_handle=3D%d, notify=3D0x%x\n", cq_handle, notify); - cq =3D rdma_rm_get_cq(dev_res, cq_handle); if (!cq) { return; @@ -297,8 +292,6 @@ void rdma_rm_req_notify_cq(RdmaDeviceResources *dev_res= , uint32_t cq_handle, if (cq->notify !=3D CNT_SET) { cq->notify =3D notify ? CNT_ARM : CNT_CLEAR; } - - pr_dbg("notify=3D%d\n", cq->notify); } =20 void rdma_rm_dealloc_cq(RdmaDeviceResources *dev_res, uint32_t cq_handle) @@ -312,7 +305,7 @@ void rdma_rm_dealloc_cq(RdmaDeviceResources *dev_res, u= int32_t cq_handle) =20 rdma_backend_destroy_cq(&cq->backend_cq); =20 - res_tbl_dealloc(&dev_res->cq_tbl, cq_handle); + rdma_res_tbl_dealloc(&dev_res->cq_tbl, cq_handle); } =20 RdmaRmQP *rdma_rm_get_qp(RdmaDeviceResources *dev_res, uint32_t qpn) @@ -323,6 +316,10 @@ RdmaRmQP *rdma_rm_get_qp(RdmaDeviceResources *dev_res,= uint32_t qpn) =20 g_bytes_unref(key); =20 + if (!qp) { + rdma_error_report("Invalid QP handle %d", qpn); + } + return qp; } =20 @@ -338,11 +335,8 @@ int rdma_rm_alloc_qp(RdmaDeviceResources *dev_res, uin= t32_t pd_handle, RdmaRmPD *pd; uint32_t rm_qpn; =20 - pr_dbg("qp_type=3D%d\n", qp_type); - pd =3D rdma_rm_get_pd(dev_res, pd_handle); if (!pd) { - pr_err("Invalid pd handle (%d)\n", pd_handle); return -EINVAL; } =20 @@ -350,8 +344,8 @@ int rdma_rm_alloc_qp(RdmaDeviceResources *dev_res, uint= 32_t pd_handle, rcq =3D rdma_rm_get_cq(dev_res, recv_cq_handle); =20 if (!scq || !rcq) { - pr_err("Invalid send_cqn or recv_cqn (%d, %d)\n", - send_cq_handle, recv_cq_handle); + rdma_error_report("Invalid send_cqn or recv_cqn (%d, %d)", + send_cq_handle, recv_cq_handle); return -EINVAL; } =20 @@ -360,11 +354,10 @@ int rdma_rm_alloc_qp(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, rcq->notify =3D CNT_SET; } =20 - qp =3D res_tbl_alloc(&dev_res->qp_tbl, &rm_qpn); + qp =3D rdma_res_tbl_alloc(&dev_res->qp_tbl, &rm_qpn); if (!qp) { return -ENOMEM; } - pr_dbg("rm_qpn=3D%d\n", rm_qpn); =20 qp->qpn =3D rm_qpn; qp->qp_state =3D IBV_QPS_RESET; @@ -382,13 +375,13 @@ int rdma_rm_alloc_qp(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, } =20 *qpn =3D rdma_backend_qpn(&qp->backend_qp); - pr_dbg("rm_qpn=3D%d, backend_qpn=3D0x%x\n", rm_qpn, *qpn); + trace_rdma_rm_alloc_qp(rm_qpn, *qpn, qp_type); g_hash_table_insert(dev_res->qp_hash, g_bytes_new(qpn, sizeof(*qpn)), = qp); =20 return 0; =20 out_dealloc_qp: - res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn); + rdma_res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn); =20 return rc; } @@ -402,28 +395,22 @@ int rdma_rm_modify_qp(RdmaDeviceResources *dev_res, R= dmaBackendDev *backend_dev, RdmaRmQP *qp; int ret; =20 - pr_dbg("qpn=3D0x%x\n", qp_handle); - pr_dbg("qkey=3D0x%x\n", qkey); - qp =3D rdma_rm_get_qp(dev_res, qp_handle); if (!qp) { return -EINVAL; } =20 - pr_dbg("qp_type=3D%d\n", qp->qp_type); - pr_dbg("attr_mask=3D0x%x\n", attr_mask); - if (qp->qp_type =3D=3D IBV_QPT_SMI) { - pr_dbg("QP0 unsupported\n"); + rdma_error_report("Got QP0 request"); return -EPERM; } else if (qp->qp_type =3D=3D IBV_QPT_GSI) { - pr_dbg("QP1\n"); return 0; } =20 + trace_rdma_rm_modify_qp(qp_handle, attr_mask, qp_state, sgid_idx); + if (attr_mask & IBV_QP_STATE) { qp->qp_state =3D qp_state; - pr_dbg("qp_state=3D%d\n", qp->qp_state); =20 if (qp->qp_state =3D=3D IBV_QPS_INIT) { ret =3D rdma_backend_qp_state_init(backend_dev, &qp->backend_q= p, @@ -435,11 +422,11 @@ int rdma_rm_modify_qp(RdmaDeviceResources *dev_res, R= dmaBackendDev *backend_dev, =20 if (qp->qp_state =3D=3D IBV_QPS_RTR) { /* Get backend gid index */ - pr_dbg("Guest sgid_idx=3D%d\n", sgid_idx); sgid_idx =3D rdma_rm_get_backend_gid_index(dev_res, backend_de= v, sgid_idx); if (sgid_idx <=3D 0) { /* TODO check also less than bk.max_sgi= d */ - pr_dbg("Fail to get bk sgid_idx for sgid_idx %d\n", sgid_i= dx); + rdma_error_report("Failed to get bk sgid_idx for sgid_idx = %d", + sgid_idx); return -EIO; } =20 @@ -471,15 +458,11 @@ int rdma_rm_query_qp(RdmaDeviceResources *dev_res, Rd= maBackendDev *backend_dev, { RdmaRmQP *qp; =20 - pr_dbg("qpn=3D0x%x\n", qp_handle); - qp =3D rdma_rm_get_qp(dev_res, qp_handle); if (!qp) { return -EINVAL; } =20 - pr_dbg("qp_type=3D%d\n", qp->qp_type); - return rdma_backend_query_qp(&qp->backend_qp, attr, attr_mask, init_at= tr); } =20 @@ -499,20 +482,18 @@ void rdma_rm_dealloc_qp(RdmaDeviceResources *dev_res,= uint32_t qp_handle) =20 rdma_backend_destroy_qp(&qp->backend_qp); =20 - res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn); + rdma_res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn); } =20 void *rdma_rm_get_cqe_ctx(RdmaDeviceResources *dev_res, uint32_t cqe_ctx_i= d) { void **cqe_ctx; =20 - cqe_ctx =3D res_tbl_get(&dev_res->cqe_ctx_tbl, cqe_ctx_id); + cqe_ctx =3D rdma_res_tbl_get(&dev_res->cqe_ctx_tbl, cqe_ctx_id); if (!cqe_ctx) { return NULL; } =20 - pr_dbg("ctx=3D%p\n", *cqe_ctx); - return *cqe_ctx; } =20 @@ -521,12 +502,11 @@ int rdma_rm_alloc_cqe_ctx(RdmaDeviceResources *dev_re= s, uint32_t *cqe_ctx_id, { void **cqe_ctx; =20 - cqe_ctx =3D res_tbl_alloc(&dev_res->cqe_ctx_tbl, cqe_ctx_id); + cqe_ctx =3D rdma_res_tbl_alloc(&dev_res->cqe_ctx_tbl, cqe_ctx_id); if (!cqe_ctx) { return -ENOMEM; } =20 - pr_dbg("ctx=3D%p\n", ctx); *cqe_ctx =3D ctx; =20 return 0; @@ -534,7 +514,7 @@ int rdma_rm_alloc_cqe_ctx(RdmaDeviceResources *dev_res,= uint32_t *cqe_ctx_id, =20 void rdma_rm_dealloc_cqe_ctx(RdmaDeviceResources *dev_res, uint32_t cqe_ct= x_id) { - res_tbl_dealloc(&dev_res->cqe_ctx_tbl, cqe_ctx_id); + rdma_res_tbl_dealloc(&dev_res->cqe_ctx_tbl, cqe_ctx_id); } =20 int rdma_rm_add_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_= dev, @@ -544,7 +524,6 @@ int rdma_rm_add_gid(RdmaDeviceResources *dev_res, RdmaB= ackendDev *backend_dev, =20 rc =3D rdma_backend_add_gid(backend_dev, ifname, gid); if (rc) { - pr_dbg("Fail to add gid\n"); return -EINVAL; } =20 @@ -565,7 +544,6 @@ int rdma_rm_del_gid(RdmaDeviceResources *dev_res, RdmaB= ackendDev *backend_dev, rc =3D rdma_backend_del_gid(backend_dev, ifname, &dev_res->port.gid_tbl[gid_idx].gid); if (rc) { - pr_dbg("Fail to delete gid\n"); return -EINVAL; } =20 @@ -580,7 +558,7 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *= dev_res, RdmaBackendDev *backend_dev, int sgid_id= x) { if (unlikely(sgid_idx < 0 || sgid_idx >=3D MAX_PORT_GIDS)) { - pr_dbg("Got invalid sgid_idx %d\n", sgid_idx); + rdma_error_report("Got invalid sgid_idx %d", sgid_idx); return -EINVAL; } =20 @@ -590,9 +568,6 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *= dev_res, &dev_res->port.gid_tbl[sgid_idx].gid); } =20 - pr_dbg("backend_gid_index=3D%d\n", - dev_res->port.gid_tbl[sgid_idx].backend_gid_index); - return dev_res->port.gid_tbl[sgid_idx].backend_gid_index; } =20 diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index 4fbea8cde2..f1c980c6be 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -14,6 +14,7 @@ */ =20 #include "qemu/osdep.h" +#include "trace.h" #include "rdma_utils.h" =20 #ifdef PVRDMA_DEBUG @@ -26,14 +27,14 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr,= dma_addr_t plen) hwaddr len =3D plen; =20 if (!addr) { - pr_dbg("addr is NULL\n"); + rdma_error_report("addr is NULL"); return NULL; } =20 p =3D pci_dma_map(dev, addr, &len, DMA_DIRECTION_TO_DEVICE); if (!p) { - pr_dbg("Fail in pci_dma_map, addr=3D0x%" PRIx64 ", len=3D%" PRId64= "\n", - addr, len); + rdma_error_report("pci_dma_map fail, addr=3D0x%"PRIx64", len=3D%"P= RId64, + addr, len); return NULL; } =20 @@ -42,14 +43,14 @@ void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr,= dma_addr_t plen) return NULL; } =20 - pr_dbg("0x%" PRIx64 " -> %p (len=3D% " PRId64 ")\n", addr, p, len); + trace_rdma_pci_dma_map(addr, p, len); =20 return p; } =20 void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len) { - pr_dbg("%p\n", buffer); + trace_rdma_pci_dma_unmap(buffer); if (buffer) { pci_dma_unmap(dev, buffer, len, DMA_DIRECTION_TO_DEVICE, 0); } diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index 4490ea0b94..acd148837f 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -17,48 +17,17 @@ #ifndef RDMA_UTILS_H #define RDMA_UTILS_H =20 +#include "qemu/error-report.h" #include "hw/pci/pci.h" #include "sysemu/dma.h" #include "stdio.h" =20 -#define pr_info(fmt, ...) \ - fprintf(stdout, "%s: %-20s (%3d): " fmt, "rdma", __func__, __LINE__,\ - ## __VA_ARGS__) - -#define pr_err(fmt, ...) \ - fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "rdma", __func__, \ - __LINE__, ## __VA_ARGS__) - -#ifdef PVRDMA_DEBUG -extern unsigned long pr_dbg_cnt; - -#define init_pr_dbg(void) \ -{ \ - pr_dbg_cnt =3D 0; \ -} - -#define pr_dbg(fmt, ...) \ - fprintf(stdout, "%lx %ld: %-20s (%3d): " fmt, pthread_self(), pr_dbg_c= nt++, \ - __func__, __LINE__, ## __VA_ARGS__) - -#define pr_dbg_buf(title, buf, len) \ -{ \ - int i; \ - char *b =3D g_malloc0(len * 3 + 1); \ - char b1[4]; \ - for (i =3D 0; i < len; i++) { \ - sprintf(b1, "%.2X ", buf[i] & 0x000000FF); \ - strcat(b, b1); \ - } \ - pr_dbg("%s (%d): %s\n", title, len, b); \ - g_free(b); \ -} - -#else -#define init_pr_dbg(void) -#define pr_dbg(fmt, ...) -#define pr_dbg_buf(title, buf, len) -#endif +#define rdma_error_report(fmt, ...) \ + error_report("%s: " fmt, "rdma", ## __VA_ARGS__) +#define rdma_warn_report(fmt, ...) \ + warn_report("%s: " fmt, "rdma", ## __VA_ARGS__) +#define rdma_info_report(fmt, ...) \ + info_report("%s: " fmt, "rdma", ## __VA_ARGS__) =20 void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); diff --git a/hw/rdma/trace-events b/hw/rdma/trace-events index c4c202e647..09cec43fd8 100644 --- a/hw/rdma/trace-events +++ b/hw/rdma/trace-events @@ -1,5 +1,31 @@ # See docs/tracing.txt for syntax documentation. =20 -#hw/rdma/rdma_backend.c -create_ah_cache_hit(uint64_t subnet, uint64_t net_id) "subnet =3D 0x%"PRIx= 64" net_id =3D 0x%"PRIx64 -create_ah_cache_miss(uint64_t subnet, uint64_t net_id) "subnet =3D 0x%"PRI= x64" net_id =3D 0x%"PRIx64 +# hw/rdma/rdma_backend.c +rdma_check_dev_attr(const char *name, int max_bk, int max_fe) "%s: be=3D%d= , fe=3D%d" +rdma_create_ah_cache_hit(uint64_t subnet, uint64_t if_id) "subnet=3D0x%"PR= Ix64",if_id=3D0x%"PRIx64 +rdma_create_ah_cache_miss(uint64_t subnet, uint64_t if_id) "subnet=3D0x%"P= RIx64",if_id=3D0x%"PRIx64 +rdma_poll_cq(int ne, void *ibcq) "Got %d completion(s) from cq %p" +rdmacm_mux(const char *title, int msg_type, int op_code) "%s: msg_type=3D%= d, op_code=3D%d" +rdmacm_mux_check_op_status(int msg_type, int op_code, int err_code) "resp:= msg_type=3D%d, op_code=3D%d, err_code=3D%d" +rdma_mad_message(const char *title, size_t len, char *data) "mad %s (%ld):= %s" +rdma_backend_rc_qp_state_init(uint32_t qpn) "RC QP 0x%x switch to INIT" +rdma_backend_ud_qp_state_init(uint32_t qpn, uint32_t qkey) "UD QP 0x%x swi= tch to INIT, qkey=3D0x%x" +rdma_backend_rc_qp_state_rtr(uint32_t qpn, uint64_t subnet, uint64_t ifid,= uint8_t sgid_idx, uint32_t dqpn, uint32_t rq_psn) "RC QP 0x%x switch to RT= R, subnet =3D 0x%"PRIx64", ifid =3D 0x%"PRIx64 ", sgid_idx=3D%d, dqpn=3D0x%= x, rq_psn=3D0x%x" +rdma_backend_ud_qp_state_rtr(uint32_t qpn, uint32_t qkey) "UD QP 0x%x swit= ch to RTR, qkey=3D0x%x" +rdma_backend_rc_qp_state_rts(uint32_t qpn, uint32_t sq_psn) "RC QP 0x%x sw= itch to RTS, sq_psn=3D0x%x, " +rdma_backend_ud_qp_state_rts(uint32_t qpn, uint32_t sq_psn, uint32_t qkey)= "UD QP 0x%x switch to RTS, sq_psn=3D0x%x, qkey=3D0x%x" +rdma_backend_get_gid_index(uint64_t subnet, uint64_t ifid, int gid_idx) "s= ubnet=3D0x%"PRIx64", ifid=3D0x%"PRIx64 ", gid_idx=3D%d" +rdma_backend_gid_change(const char *op, uint64_t subnet, uint64_t ifid) "%= s subnet=3D0x%"PRIx64", ifid=3D0x%"PRIx64 + +# hw/rdma/rdma_rm.c +rdma_res_tbl_get(char *name, uint32_t handle) "tbl %s, handle %d" +rdma_res_tbl_alloc(char *name, uint32_t handle) "tbl %s, handle %d" +rdma_res_tbl_dealloc(char *name, uint32_t handle) "tbl %s, handle %d" +rdma_rm_alloc_mr(uint32_t mr_handle, void *host_virt, uint64_t guest_start= , size_t guest_length, int access_flags) "mr_handle=3D%d, host_virt=3D%p, g= uest_start=3D0x%"PRIx64", length=3D%ld, access_flags=3D0x%x" +rdma_rm_dealloc_mr(uint32_t mr_handle, uint64_t guest_start) "mr_handle=3D= %d, guest_start=3D0x%"PRIx64 +rdma_rm_alloc_qp(uint32_t rm_qpn, uint32_t backend_qpn, uint8_t qp_type) "= rm_qpn=3D%d, backend_qpn=3D0x%x, qp_type=3D%d" +rdma_rm_modify_qp(uint32_t qpn, uint32_t attr_mask, int qp_state, uint8_t = sgid_idx) "qpn=3D0x%x, attr_mask=3D0x%x, qp_state=3D%d, sgid_idx=3D%d" + +# hw/rdma/rdma_utils.c +rdma_pci_dma_map(uint64_t addr, void *vaddr, uint64_t len) "0x%"PRIx64" ->= %p (len=3D%" PRId64")" +rdma_pci_dma_unmap(void *vaddr) "%p" diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index ffae36986e..0879224957 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -127,6 +127,6 @@ static inline void post_interrupt(PVRDMADev *dev, unsig= ned vector) } } =20 -int execute_command(PVRDMADev *dev); +int pvrdma_exec_cmd(PVRDMADev *dev); =20 #endif diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index 89920887bf..21a55e225a 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -14,7 +14,6 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/error-report.h" #include "cpu.h" #include "hw/hw.h" #include "hw/pci/pci.h" @@ -24,6 +23,7 @@ #include "../rdma_rm.h" #include "../rdma_utils.h" =20 +#include "trace.h" #include "pvrdma.h" #include "standard-headers/rdma/vmw_pvrdma-abi.h" =20 @@ -35,40 +35,38 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64= _t pdir_dma, void *host_virt =3D NULL, *curr_page; =20 if (!nchunks) { - pr_dbg("nchunks=3D0\n"); + rdma_error_report("Got nchunks=3D0"); return NULL; } =20 dir =3D rdma_pci_dma_map(pdev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) { - error_report("PVRDMA: Failed to map to page directory"); + rdma_error_report("Failed to map to page directory"); return NULL; } =20 tbl =3D rdma_pci_dma_map(pdev, dir[0], TARGET_PAGE_SIZE); if (!tbl) { - error_report("PVRDMA: Failed to map to page table 0"); + rdma_error_report("Failed to map to page table 0"); goto out_unmap_dir; } =20 curr_page =3D rdma_pci_dma_map(pdev, (dma_addr_t)tbl[0], TARGET_PAGE_S= IZE); if (!curr_page) { - error_report("PVRDMA: Failed to map the first page"); + rdma_error_report("Failed to map the page 0"); goto out_unmap_tbl; } =20 host_virt =3D mremap(curr_page, 0, length, MREMAP_MAYMOVE); - pr_dbg("mremap %p -> %p\n", curr_page, host_virt); if (host_virt =3D=3D MAP_FAILED) { host_virt =3D NULL; - error_report("PVRDMA: Failed to remap memory for host_virt"); + rdma_error_report("Failed to remap memory for host_virt"); goto out_unmap_tbl; } + trace_pvrdma_map_to_pdir_host_virt(curr_page, host_virt); =20 rdma_pci_dma_unmap(pdev, curr_page, TARGET_PAGE_SIZE); =20 - pr_dbg("host_virt=3D%p\n", host_virt); - dir_idx =3D 0; tbl_idx =3D 1; addr_idx =3D 1; @@ -76,28 +74,28 @@ static void *pvrdma_map_to_pdir(PCIDevice *pdev, uint64= _t pdir_dma, if (tbl_idx =3D=3D TARGET_PAGE_SIZE / sizeof(uint64_t)) { tbl_idx =3D 0; dir_idx++; - pr_dbg("Mapping to table %d\n", dir_idx); rdma_pci_dma_unmap(pdev, tbl, TARGET_PAGE_SIZE); tbl =3D rdma_pci_dma_map(pdev, dir[dir_idx], TARGET_PAGE_SIZE); if (!tbl) { - error_report("PVRDMA: Failed to map to page table %d", dir= _idx); + rdma_error_report("Failed to map to page table %d", dir_id= x); goto out_unmap_host_virt; } } =20 - pr_dbg("guest_dma[%d]=3D0x%" PRIx64 "\n", addr_idx, tbl[tbl_idx]); - curr_page =3D rdma_pci_dma_map(pdev, (dma_addr_t)tbl[tbl_idx], TARGET_PAGE_SIZE); if (!curr_page) { - error_report("PVRDMA: Failed to map to page %d, dir %d", tbl_i= dx, - dir_idx); + rdma_error_report("Failed to map to page %d, dir %d", tbl_idx, + dir_idx); goto out_unmap_host_virt; } =20 mremap(curr_page, 0, TARGET_PAGE_SIZE, MREMAP_MAYMOVE | MREMAP_FIX= ED, host_virt + TARGET_PAGE_SIZE * addr_idx); =20 + trace_pvrdma_map_to_pdir_next_page(addr_idx, curr_page, host_virt + + TARGET_PAGE_SIZE * addr_idx); + rdma_pci_dma_unmap(pdev, curr_page, TARGET_PAGE_SIZE); =20 addr_idx++; @@ -127,7 +125,6 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_= req *req, struct pvrdma_cmd_query_port_resp *resp =3D &rsp->query_port_resp; struct pvrdma_port_attr attrs =3D {0}; =20 - pr_dbg("port=3D%d\n", cmd->port_num); if (cmd->port_num > MAX_PORTS) { return -EINVAL; } @@ -159,12 +156,10 @@ static int query_pkey(PVRDMADev *dev, union pvrdma_cm= d_req *req, struct pvrdma_cmd_query_pkey *cmd =3D &req->query_pkey; struct pvrdma_cmd_query_pkey_resp *resp =3D &rsp->query_pkey_resp; =20 - pr_dbg("port=3D%d\n", cmd->port_num); if (cmd->port_num > MAX_PORTS) { return -EINVAL; } =20 - pr_dbg("index=3D%d\n", cmd->index); if (cmd->index > MAX_PKEYS) { return -EINVAL; } @@ -172,7 +167,6 @@ static int query_pkey(PVRDMADev *dev, union pvrdma_cmd_= req *req, memset(resp, 0, sizeof(*resp)); =20 resp->pkey =3D PVRDMA_PKEY; - pr_dbg("pkey=3D0x%x\n", resp->pkey); =20 return 0; } @@ -184,8 +178,6 @@ static int create_pd(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, struct pvrdma_cmd_create_pd_resp *resp =3D &rsp->create_pd_resp; int rc; =20 - pr_dbg("context=3D0x%x\n", cmd->ctx_handle ? cmd->ctx_handle : 0); - memset(resp, 0, sizeof(*resp)); rc =3D rdma_rm_alloc_pd(&dev->rdma_dev_res, &dev->backend_dev, &resp->pd_handle, cmd->ctx_handle); @@ -198,8 +190,6 @@ static int destroy_pd(PVRDMADev *dev, union pvrdma_cmd_= req *req, { struct pvrdma_cmd_destroy_pd *cmd =3D &req->destroy_pd; =20 - pr_dbg("pd_handle=3D%d\n", cmd->pd_handle); - rdma_rm_dealloc_pd(&dev->rdma_dev_res, cmd->pd_handle); =20 return 0; @@ -216,15 +206,11 @@ static int create_mr(PVRDMADev *dev, union pvrdma_cmd= _req *req, =20 memset(resp, 0, sizeof(*resp)); =20 - pr_dbg("pd_handle=3D%d\n", cmd->pd_handle); - pr_dbg("access_flags=3D0x%x\n", cmd->access_flags); - pr_dbg("flags=3D0x%x\n", cmd->flags); - if (!(cmd->flags & PVRDMA_MR_FLAG_DMA)) { host_virt =3D pvrdma_map_to_pdir(pci_dev, cmd->pdir_dma, cmd->nchu= nks, cmd->length); if (!host_virt) { - pr_dbg("Failed to map to pdir\n"); + rdma_error_report("Failed to map to pdir"); return -EINVAL; } } @@ -244,8 +230,6 @@ static int destroy_mr(PVRDMADev *dev, union pvrdma_cmd_= req *req, { struct pvrdma_cmd_destroy_mr *cmd =3D &req->destroy_mr; =20 - pr_dbg("mr_handle=3D%d\n", cmd->mr_handle); - rdma_rm_dealloc_mr(&dev->rdma_dev_res, cmd->mr_handle); =20 return 0; @@ -260,20 +244,19 @@ static int create_cq_ring(PCIDevice *pci_dev , Pvrdma= Ring **ring, char ring_name[MAX_RING_NAME_SZ]; =20 if (!nchunks || nchunks > PVRDMA_MAX_FAST_REG_PAGES) { - pr_dbg("invalid nchunks: %d\n", nchunks); + rdma_error_report("Got invalid nchunks: %d", nchunks); return rc; } =20 - pr_dbg("pdir_dma=3D0x%llx\n", (long long unsigned int)pdir_dma); dir =3D rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) { - pr_dbg("Failed to map to CQ page directory\n"); + rdma_error_report("Failed to map to CQ page directory"); goto out; } =20 tbl =3D rdma_pci_dma_map(pci_dev, dir[0], TARGET_PAGE_SIZE); if (!tbl) { - pr_dbg("Failed to map to CQ page table\n"); + rdma_error_report("Failed to map to CQ page table"); goto out; } =20 @@ -284,7 +267,7 @@ static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRi= ng **ring, rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); =20 if (!r->ring_state) { - pr_dbg("Failed to map to CQ ring state\n"); + rdma_error_report("Failed to map to CQ ring state"); goto out_free_ring; } =20 @@ -339,8 +322,6 @@ static int create_cq(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, return rc; } =20 - pr_dbg("ring=3D%p\n", ring); - rc =3D rdma_rm_alloc_cq(&dev->rdma_dev_res, &dev->backend_dev, cmd->cq= e, &resp->cq_handle, ring); if (rc) { @@ -359,11 +340,9 @@ static int destroy_cq(PVRDMADev *dev, union pvrdma_cmd= _req *req, RdmaRmCQ *cq; PvrdmaRing *ring; =20 - pr_dbg("cq_handle=3D%d\n", cmd->cq_handle); - cq =3D rdma_rm_get_cq(&dev->rdma_dev_res, cmd->cq_handle); if (!cq) { - pr_dbg("Invalid CQ handle\n"); + rdma_error_report("Got invalid CQ handle"); return -EINVAL; } =20 @@ -388,42 +367,33 @@ static int create_qp_rings(PCIDevice *pci_dev, uint64= _t pdir_dma, =20 if (!spages || spages > PVRDMA_MAX_FAST_REG_PAGES || !rpages || rpages > PVRDMA_MAX_FAST_REG_PAGES) { - pr_dbg("invalid pages: %d, %d\n", spages, rpages); + rdma_error_report("Got invalid page count for QP ring: %d, %d", sp= ages, + rpages); return rc; } =20 - pr_dbg("pdir_dma=3D0x%llx\n", (long long unsigned int)pdir_dma); dir =3D rdma_pci_dma_map(pci_dev, pdir_dma, TARGET_PAGE_SIZE); if (!dir) { - pr_dbg("Failed to map to CQ page directory\n"); + rdma_error_report("Failed to map to CQ page directory"); goto out; } =20 tbl =3D rdma_pci_dma_map(pci_dev, dir[0], TARGET_PAGE_SIZE); if (!tbl) { - pr_dbg("Failed to map to CQ page table\n"); + rdma_error_report("Failed to map to CQ page table"); goto out; } =20 sr =3D g_malloc(2 * sizeof(*rr)); rr =3D &sr[1]; - pr_dbg("sring=3D%p\n", sr); - pr_dbg("rring=3D%p\n", rr); =20 *rings =3D sr; =20 - pr_dbg("scqe=3D%d\n", scqe); - pr_dbg("smax_sge=3D%d\n", smax_sge); - pr_dbg("spages=3D%d\n", spages); - pr_dbg("rcqe=3D%d\n", rcqe); - pr_dbg("rmax_sge=3D%d\n", rmax_sge); - pr_dbg("rpages=3D%d\n", rpages); - /* Create send ring */ sr->ring_state =3D (struct pvrdma_ring *) rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); if (!sr->ring_state) { - pr_dbg("Failed to map to CQ ring state\n"); + rdma_error_report("Failed to map to CQ ring state"); goto out_free_sr_mem; } =20 @@ -468,9 +438,7 @@ out: =20 static void destroy_qp_rings(PvrdmaRing *ring) { - pr_dbg("sring=3D%p\n", &ring[0]); pvrdma_ring_free(&ring[0]); - pr_dbg("rring=3D%p\n", &ring[1]); pvrdma_ring_free(&ring[1]); =20 rdma_pci_dma_unmap(ring->dev, ring->ring_state, TARGET_PAGE_SIZE); @@ -487,9 +455,6 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, =20 memset(resp, 0, sizeof(*resp)); =20 - pr_dbg("total_chunks=3D%d\n", cmd->total_chunks); - pr_dbg("send_chunks=3D%d\n", cmd->send_chunks); - rc =3D create_qp_rings(PCI_DEVICE(dev), cmd->pdir_dma, &rings, cmd->max_send_wr, cmd->max_send_sge, cmd->send_ch= unks, cmd->max_recv_wr, cmd->max_recv_sge, @@ -498,8 +463,6 @@ static int create_qp(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, return rc; } =20 - pr_dbg("rings=3D%p\n", rings); - rc =3D rdma_rm_alloc_qp(&dev->rdma_dev_res, cmd->pd_handle, cmd->qp_ty= pe, cmd->max_send_wr, cmd->max_send_sge, cmd->send_cq_handle, cmd->max_recv_wr, @@ -525,8 +488,6 @@ static int modify_qp(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, struct pvrdma_cmd_modify_qp *cmd =3D &req->modify_qp; int rc; =20 - pr_dbg("qp_handle=3D%d\n", cmd->qp_handle); - memset(rsp, 0, sizeof(*rsp)); =20 /* No need to verify sgid_index since it is u8 */ @@ -551,9 +512,6 @@ static int query_qp(PVRDMADev *dev, union pvrdma_cmd_re= q *req, struct ibv_qp_init_attr init_attr; int rc; =20 - pr_dbg("qp_handle=3D%d\n", cmd->qp_handle); - pr_dbg("attr_mask=3D0x%x\n", cmd->attr_mask); - memset(rsp, 0, sizeof(*rsp)); =20 rc =3D rdma_rm_query_qp(&dev->rdma_dev_res, &dev->backend_dev, cmd->qp= _handle, @@ -572,7 +530,6 @@ static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_= req *req, =20 qp =3D rdma_rm_get_qp(&dev->rdma_dev_res, cmd->qp_handle); if (!qp) { - pr_dbg("Invalid QP handle\n"); return -EINVAL; } =20 @@ -591,16 +548,10 @@ static int create_bind(PVRDMADev *dev, union pvrdma_c= md_req *req, int rc; union ibv_gid *gid =3D (union ibv_gid *)&cmd->new_gid; =20 - pr_dbg("index=3D%d\n", cmd->index); - if (cmd->index >=3D MAX_PORT_GIDS) { return -EINVAL; } =20 - pr_dbg("gid[%d]=3D0x%llx,0x%llx\n", cmd->index, - (long long unsigned int)be64_to_cpu(gid->global.subnet_prefix), - (long long unsigned int)be64_to_cpu(gid->global.interface_id)); - rc =3D rdma_rm_add_gid(&dev->rdma_dev_res, &dev->backend_dev, dev->backend_eth_device_name, gid, cmd->index); =20 @@ -614,8 +565,6 @@ static int destroy_bind(PVRDMADev *dev, union pvrdma_cm= d_req *req, =20 struct pvrdma_cmd_destroy_bind *cmd =3D &req->destroy_bind; =20 - pr_dbg("index=3D%d\n", cmd->index); - if (cmd->index >=3D MAX_PORT_GIDS) { return -EINVAL; } @@ -633,8 +582,6 @@ static int create_uc(PVRDMADev *dev, union pvrdma_cmd_r= eq *req, struct pvrdma_cmd_create_uc_resp *resp =3D &rsp->create_uc_resp; int rc; =20 - pr_dbg("pfn=3D%d\n", cmd->pfn); - memset(resp, 0, sizeof(*resp)); rc =3D rdma_rm_alloc_uc(&dev->rdma_dev_res, cmd->pfn, &resp->ctx_handl= e); =20 @@ -646,8 +593,6 @@ static int destroy_uc(PVRDMADev *dev, union pvrdma_cmd_= req *req, { struct pvrdma_cmd_destroy_uc *cmd =3D &req->destroy_uc; =20 - pr_dbg("ctx_handle=3D%d\n", cmd->ctx_handle); - rdma_rm_dealloc_uc(&dev->rdma_dev_res, cmd->ctx_handle); =20 return 0; @@ -680,22 +625,21 @@ static struct cmd_handler cmd_handlers[] =3D { {PVRDMA_CMD_DESTROY_BIND, PVRDMA_CMD_DESTROY_BIND_RESP_NOOP, destroy_b= ind}, }; =20 -int execute_command(PVRDMADev *dev) +int pvrdma_exec_cmd(PVRDMADev *dev) { int err =3D 0xFFFF; DSRInfo *dsr_info; =20 dsr_info =3D &dev->dsr_info; =20 - pr_dbg("cmd=3D%d\n", dsr_info->req->hdr.cmd); if (dsr_info->req->hdr.cmd >=3D sizeof(cmd_handlers) / sizeof(struct cmd_handler)) { - pr_dbg("Unsupported command\n"); + rdma_error_report("Unsupported command"); goto out; } =20 if (!cmd_handlers[dsr_info->req->hdr.cmd].exec) { - pr_dbg("Unsupported command (not implemented yet)\n"); + rdma_error_report("Unsupported command (not implemented yet)"); goto out; } =20 @@ -704,7 +648,8 @@ int execute_command(PVRDMADev *dev) dsr_info->rsp->hdr.response =3D dsr_info->req->hdr.response; dsr_info->rsp->hdr.ack =3D cmd_handlers[dsr_info->req->hdr.cmd].ack; dsr_info->rsp->hdr.err =3D err < 0 ? -err : 0; - pr_dbg("rsp->hdr.err=3D%d\n", dsr_info->rsp->hdr.err); + + trace_pvrdma_exec_cmd(dsr_info->req->hdr.cmd, dsr_info->rsp->hdr.err); =20 out: set_reg_val(dev, PVRDMA_REG_ERR, err); diff --git a/hw/rdma/vmw/pvrdma_dev_ring.c b/hw/rdma/vmw/pvrdma_dev_ring.c index e8e5b502f6..d7bc7f5ccc 100644 --- a/hw/rdma/vmw/pvrdma_dev_ring.c +++ b/hw/rdma/vmw/pvrdma_dev_ring.c @@ -17,6 +17,8 @@ #include "hw/pci/pci.h" #include "cpu.h" =20 +#include "trace.h" + #include "../rdma_utils.h" #include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h" #include "pvrdma_dev_ring.h" @@ -30,13 +32,10 @@ int pvrdma_ring_init(PvrdmaRing *ring, const char *name= , PCIDevice *dev, =20 strncpy(ring->name, name, MAX_RING_NAME_SZ); ring->name[MAX_RING_NAME_SZ - 1] =3D 0; - pr_dbg("Initializing %s ring\n", ring->name); ring->dev =3D dev; ring->ring_state =3D ring_state; ring->max_elems =3D max_elems; ring->elem_sz =3D elem_sz; - pr_dbg("ring->elem_sz=3D%zu\n", ring->elem_sz); - pr_dbg("npages=3D%d\n", npages); /* TODO: Give a moment to think if we want to redo driver settings atomic_set(&ring->ring_state->prod_tail, 0); atomic_set(&ring->ring_state->cons_head, 0); @@ -46,14 +45,14 @@ int pvrdma_ring_init(PvrdmaRing *ring, const char *name= , PCIDevice *dev, =20 for (i =3D 0; i < npages; i++) { if (!tbl[i]) { - pr_err("npages=3D%ld but tbl[%d] is NULL\n", (long)npages, i); + rdma_error_report("npages=3D%d but tbl[%d] is NULL", npages, i= ); continue; } =20 ring->pages[i] =3D rdma_pci_dma_map(dev, tbl[i], TARGET_PAGE_SIZE); if (!ring->pages[i]) { rc =3D -ENOMEM; - pr_dbg("Failed to map to page %d\n", i); + rdma_error_report("Failed to map to page %d in ring %s", i, na= me); goto out_free; } memset(ring->pages[i], 0, TARGET_PAGE_SIZE); @@ -78,7 +77,7 @@ void *pvrdma_ring_next_elem_read(PvrdmaRing *ring) =20 e =3D pvrdma_idx_ring_has_data(ring->ring_state, ring->max_elems, &idx= ); if (e <=3D 0) { - pr_dbg("No more data in ring\n"); + trace_pvrdma_ring_next_elem_read_no_data(ring->name); return NULL; } =20 @@ -89,11 +88,6 @@ void *pvrdma_ring_next_elem_read(PvrdmaRing *ring) void pvrdma_ring_read_inc(PvrdmaRing *ring) { pvrdma_idx_ring_inc(&ring->ring_state->cons_head, ring->max_elems); - /* - pr_dbg("%s: t=3D%d, h=3D%d, m=3D%ld\n", ring->name, - ring->ring_state->prod_tail, ring->ring_state->cons_head, - ring->max_elems); - */ } =20 void *pvrdma_ring_next_elem_write(PvrdmaRing *ring) @@ -103,13 +97,13 @@ void *pvrdma_ring_next_elem_write(PvrdmaRing *ring) =20 idx =3D pvrdma_idx_ring_has_space(ring->ring_state, ring->max_elems, &= tail); if (idx <=3D 0) { - pr_dbg("CQ is full\n"); + rdma_error_report("CQ is full"); return NULL; } =20 idx =3D pvrdma_idx(&ring->ring_state->prod_tail, ring->max_elems); if (idx < 0 || tail !=3D idx) { - pr_dbg("invalid idx\n"); + rdma_error_report("Invalid idx %d", idx); return NULL; } =20 @@ -120,11 +114,6 @@ void *pvrdma_ring_next_elem_write(PvrdmaRing *ring) void pvrdma_ring_write_inc(PvrdmaRing *ring) { pvrdma_idx_ring_inc(&ring->ring_state->prod_tail, ring->max_elems); - /* - pr_dbg("%s: t=3D%d, h=3D%d, m=3D%ld\n", ring->name, - ring->ring_state->prod_tail, ring->ring_state->cons_head, - ring->max_elems); - */ } =20 void pvrdma_ring_free(PvrdmaRing *ring) @@ -137,7 +126,6 @@ void pvrdma_ring_free(PvrdmaRing *ring) return; } =20 - pr_dbg("ring->npages=3D%d\n", ring->npages); while (ring->npages--) { rdma_pci_dma_unmap(ring->dev, ring->pages[ring->npages], TARGET_PAGE_SIZE); diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index d2bdb5ba8c..b6061f4b6e 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -69,25 +69,22 @@ static int init_dev_ring(PvrdmaRing *ring, struct pvrdm= a_ring **ring_state, uint64_t *dir, *tbl; int rc =3D 0; =20 - pr_dbg("Initializing device ring %s\n", name); - pr_dbg("pdir_dma=3D0x%llx\n", (long long unsigned int)dir_addr); - pr_dbg("num_pages=3D%d\n", num_pages); dir =3D rdma_pci_dma_map(pci_dev, dir_addr, TARGET_PAGE_SIZE); if (!dir) { - pr_err("Failed to map to page directory\n"); + rdma_error_report("Failed to map to page directory (ring %s)", nam= e); rc =3D -ENOMEM; goto out; } tbl =3D rdma_pci_dma_map(pci_dev, dir[0], TARGET_PAGE_SIZE); if (!tbl) { - pr_err("Failed to map to page table\n"); + rdma_error_report("Failed to map to page table (ring %s)", name); rc =3D -ENOMEM; goto out_free_dir; } =20 *ring_state =3D rdma_pci_dma_map(pci_dev, tbl[0], TARGET_PAGE_SIZE); if (!*ring_state) { - pr_err("Failed to map to ring state\n"); + rdma_error_report("Failed to map to ring state (ring %s)", name); rc =3D -ENOMEM; goto out_free_tbl; } @@ -100,7 +97,6 @@ static int init_dev_ring(PvrdmaRing *ring, struct pvrdma= _ring **ring_state, sizeof(struct pvrdma_cqne), (dma_addr_t *)&tbl[1], (dma_addr_t)num_pages - 1= ); if (rc) { - pr_err("Failed to initialize ring\n"); rc =3D -ENOMEM; goto out_free_ring_state; } @@ -155,11 +151,10 @@ static int load_dsr(PVRDMADev *dev) free_dsr(dev); =20 /* Map to DSR */ - pr_dbg("dsr_dma=3D0x%llx\n", (long long unsigned int)dev->dsr_info.dma= ); dev->dsr_info.dsr =3D rdma_pci_dma_map(pci_dev, dev->dsr_info.dma, sizeof(struct pvrdma_device_shared_region)); if (!dev->dsr_info.dsr) { - pr_err("Failed to map to DSR\n"); + rdma_error_report("Failed to map to DSR"); rc =3D -ENOMEM; goto out; } @@ -169,21 +164,19 @@ static int load_dsr(PVRDMADev *dev) dsr =3D dsr_info->dsr; =20 /* Map to command slot */ - pr_dbg("cmd_dma=3D0x%llx\n", (long long unsigned int)dsr->cmd_slot_dma= ); dsr_info->req =3D rdma_pci_dma_map(pci_dev, dsr->cmd_slot_dma, sizeof(union pvrdma_cmd_req)); if (!dsr_info->req) { - pr_err("Failed to map to command slot address\n"); + rdma_error_report("Failed to map to command slot address"); rc =3D -ENOMEM; goto out_free_dsr; } =20 /* Map to response slot */ - pr_dbg("rsp_dma=3D0x%llx\n", (long long unsigned int)dsr->resp_slot_dm= a); dsr_info->rsp =3D rdma_pci_dma_map(pci_dev, dsr->resp_slot_dma, sizeof(union pvrdma_cmd_resp)); if (!dsr_info->rsp) { - pr_err("Failed to map to response slot address\n"); + rdma_error_report("Failed to map to response slot address"); rc =3D -ENOMEM; goto out_free_req; } @@ -193,7 +186,6 @@ static int load_dsr(PVRDMADev *dev) pci_dev, dsr->cq_ring_pages.pdir_dma, dsr->cq_ring_pages.num_pages); if (rc) { - pr_err("Failed to map to initialize CQ ring\n"); rc =3D -ENOMEM; goto out_free_rsp; } @@ -203,7 +195,6 @@ static int load_dsr(PVRDMADev *dev) "dev_async", pci_dev, dsr->async_ring_pages.pdir_dm= a, dsr->async_ring_pages.num_pages); if (rc) { - pr_err("Failed to map to initialize event ring\n"); rc =3D -ENOMEM; goto out_free_rsp; } @@ -230,24 +221,15 @@ static void init_dsr_dev_caps(PVRDMADev *dev) struct pvrdma_device_shared_region *dsr; =20 if (dev->dsr_info.dsr =3D=3D NULL) { - pr_err("Can't initialized DSR\n"); + rdma_error_report("Can't initialized DSR"); return; } =20 dsr =3D dev->dsr_info.dsr; - dsr->caps.fw_ver =3D PVRDMA_FW_VERSION; - pr_dbg("fw_ver=3D0x%" PRIx64 "\n", dsr->caps.fw_ver); - dsr->caps.mode =3D PVRDMA_DEVICE_MODE_ROCE; - pr_dbg("mode=3D%d\n", dsr->caps.mode); - dsr->caps.gid_types |=3D PVRDMA_GID_TYPE_FLAG_ROCE_V1; - pr_dbg("gid_types=3D0x%x\n", dsr->caps.gid_types); - dsr->caps.max_uar =3D RDMA_BAR2_UAR_SIZE; - pr_dbg("max_uar=3D%d\n", dsr->caps.max_uar); - dsr->caps.max_mr_size =3D dev->dev_attr.max_mr_size; dsr->caps.max_qp =3D dev->dev_attr.max_qp; dsr->caps.max_qp_wr =3D dev->dev_attr.max_qp_wr; @@ -257,23 +239,11 @@ static void init_dsr_dev_caps(PVRDMADev *dev) dsr->caps.max_mr =3D dev->dev_attr.max_mr; dsr->caps.max_pd =3D dev->dev_attr.max_pd; dsr->caps.max_ah =3D dev->dev_attr.max_ah; - dsr->caps.gid_tbl_len =3D MAX_GIDS; - pr_dbg("gid_tbl_len=3D%d\n", dsr->caps.gid_tbl_len); - dsr->caps.sys_image_guid =3D 0; - pr_dbg("sys_image_guid=3D%" PRIx64 "\n", dsr->caps.sys_image_guid); - dsr->caps.node_guid =3D dev->node_guid; - pr_dbg("node_guid=3D%" PRIx64 "\n", be64_to_cpu(dsr->caps.node_guid)); - dsr->caps.phys_port_cnt =3D MAX_PORTS; - pr_dbg("phys_port_cnt=3D%d\n", dsr->caps.phys_port_cnt); - dsr->caps.max_pkeys =3D MAX_PKEYS; - pr_dbg("max_pkeys=3D%d\n", dsr->caps.max_pkeys); - - pr_dbg("Initialized\n"); } =20 static void uninit_msix(PCIDevice *pdev, int used_vectors) @@ -319,9 +289,6 @@ static void pvrdma_fini(PCIDevice *pdev) { PVRDMADev *dev =3D PVRDMA_DEV(pdev); =20 - pr_dbg("Closing device %s %x.%x\n", pdev->name, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); - pvrdma_qp_ops_fini(); =20 rdma_rm_fini(&dev->rdma_dev_res, &dev->backend_dev, @@ -335,8 +302,8 @@ static void pvrdma_fini(PCIDevice *pdev) uninit_msix(pdev, RDMA_MAX_INTRS); } =20 - pr_dbg("Device %s %x.%x is down\n", pdev->name, PCI_SLOT(pdev->devfn), - PCI_FUNC(pdev->devfn)); + rdma_info_report("Device %s %x.%x is down", pdev->name, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); } =20 static void pvrdma_stop(PVRDMADev *dev) @@ -353,32 +320,26 @@ static void activate_device(PVRDMADev *dev) { pvrdma_start(dev); set_reg_val(dev, PVRDMA_REG_ERR, 0); - pr_dbg("Device activated\n"); } =20 static int unquiesce_device(PVRDMADev *dev) { - pr_dbg("Device unquiesced\n"); return 0; } =20 static void reset_device(PVRDMADev *dev) { pvrdma_stop(dev); - - pr_dbg("Device reset complete\n"); } =20 -static uint64_t regs_read(void *opaque, hwaddr addr, unsigned size) +static uint64_t pvrdma_regs_read(void *opaque, hwaddr addr, unsigned size) { PVRDMADev *dev =3D opaque; uint32_t val; =20 - /* pr_dbg("addr=3D0x%lx, size=3D%d\n", addr, size); */ - if (get_reg_val(dev, addr, &val)) { - pr_dbg("Error trying to read REG value from address 0x%x\n", - (uint32_t)addr); + rdma_error_report("Failed to read REG value from address 0x%x", + (uint32_t)addr); return -EINVAL; } =20 @@ -387,25 +348,24 @@ static uint64_t regs_read(void *opaque, hwaddr addr, = unsigned size) return val; } =20 -static void regs_write(void *opaque, hwaddr addr, uint64_t val, unsigned s= ize) +static void pvrdma_regs_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) { PVRDMADev *dev =3D opaque; =20 - /* pr_dbg("addr=3D0x%lx, val=3D0x%x, size=3D%d\n", addr, (uint32_t)val= , size); */ - if (set_reg_val(dev, addr, val)) { - pr_err("Fail to set REG value, addr=3D0x%" PRIx64 ", val=3D0x%" PR= Ix64 "\n", - addr, val); + rdma_error_report("Failed to set REG value, addr=3D0x%"PRIx64 ", v= al=3D0x%"PRIx64, + addr, val); return; } =20 - trace_pvrdma_regs_write(addr, val); - switch (addr) { case PVRDMA_REG_DSRLOW: + trace_pvrdma_regs_write(addr, val, "DSRLOW", ""); dev->dsr_info.dma =3D val; break; case PVRDMA_REG_DSRHIGH: + trace_pvrdma_regs_write(addr, val, "DSRHIGH", ""); dev->dsr_info.dma |=3D val << 32; load_dsr(dev); init_dsr_dev_caps(dev); @@ -413,23 +373,27 @@ static void regs_write(void *opaque, hwaddr addr, uin= t64_t val, unsigned size) case PVRDMA_REG_CTL: switch (val) { case PVRDMA_DEVICE_CTL_ACTIVATE: + trace_pvrdma_regs_write(addr, val, "CTL", "ACTIVATE"); activate_device(dev); break; case PVRDMA_DEVICE_CTL_UNQUIESCE: + trace_pvrdma_regs_write(addr, val, "CTL", "UNQUIESCE"); unquiesce_device(dev); break; case PVRDMA_DEVICE_CTL_RESET: + trace_pvrdma_regs_write(addr, val, "CTL", "URESET"); reset_device(dev); break; } break; case PVRDMA_REG_IMR: - pr_dbg("Interrupt mask=3D0x%" PRIx64 "\n", val); + trace_pvrdma_regs_write(addr, val, "INTR_MASK", ""); dev->interrupt_mask =3D val; break; case PVRDMA_REG_REQUEST: if (val =3D=3D 0) { - execute_command(dev); + trace_pvrdma_regs_write(addr, val, "REQUEST", ""); + pvrdma_exec_cmd(dev); } break; default: @@ -438,8 +402,8 @@ static void regs_write(void *opaque, hwaddr addr, uint6= 4_t val, unsigned size) } =20 static const MemoryRegionOps regs_ops =3D { - .read =3D regs_read, - .write =3D regs_write, + .read =3D pvrdma_regs_read, + .write =3D pvrdma_regs_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .impl =3D { .min_access_size =3D sizeof(uint32_t), @@ -447,54 +411,58 @@ static const MemoryRegionOps regs_ops =3D { }, }; =20 -static uint64_t uar_read(void *opaque, hwaddr addr, unsigned size) +static uint64_t pvrdma_uar_read(void *opaque, hwaddr addr, unsigned size) { return 0xffffffff; } =20 -static void uar_write(void *opaque, hwaddr addr, uint64_t val, unsigned si= ze) +static void pvrdma_uar_write(void *opaque, hwaddr addr, uint64_t val, + unsigned size) { PVRDMADev *dev =3D opaque; =20 - /* pr_dbg("addr=3D0x%lx, val=3D0x%x, size=3D%d\n", addr, (uint32_t)val= , size); */ - switch (addr & 0xFFF) { /* Mask with 0xFFF as each UC gets page */ case PVRDMA_UAR_QP_OFFSET: - pr_dbg("UAR QP command, addr=3D0x%" PRIx64 ", val=3D0x%" PRIx64 "\= n", - (uint64_t)addr, val); if (val & PVRDMA_UAR_QP_SEND) { + trace_pvrdma_uar_write(addr, val, "QP", "SEND", + val & PVRDMA_UAR_HANDLE_MASK, 0); pvrdma_qp_send(dev, val & PVRDMA_UAR_HANDLE_MASK); } if (val & PVRDMA_UAR_QP_RECV) { + trace_pvrdma_uar_write(addr, val, "QP", "RECV", + val & PVRDMA_UAR_HANDLE_MASK, 0); pvrdma_qp_recv(dev, val & PVRDMA_UAR_HANDLE_MASK); } break; case PVRDMA_UAR_CQ_OFFSET: - /* pr_dbg("UAR CQ cmd, addr=3D0x%x, val=3D0x%lx\n", (uint32_t)addr= , val); */ if (val & PVRDMA_UAR_CQ_ARM) { + trace_pvrdma_uar_write(addr, val, "CQ", "ARM", + val & PVRDMA_UAR_HANDLE_MASK, + !!(val & PVRDMA_UAR_CQ_ARM_SOL)); rdma_rm_req_notify_cq(&dev->rdma_dev_res, val & PVRDMA_UAR_HANDLE_MASK, !!(val & PVRDMA_UAR_CQ_ARM_SOL)); } if (val & PVRDMA_UAR_CQ_ARM_SOL) { - pr_dbg("UAR_CQ_ARM_SOL (%" PRIx64 ")\n", - val & PVRDMA_UAR_HANDLE_MASK); + trace_pvrdma_uar_write(addr, val, "CQ", "ARMSOL - not supporte= d", 0, + 0); } if (val & PVRDMA_UAR_CQ_POLL) { - pr_dbg("UAR_CQ_POLL (%" PRIx64 ")\n", val & PVRDMA_UAR_HANDLE_= MASK); + trace_pvrdma_uar_write(addr, val, "CQ", "POLL", + val & PVRDMA_UAR_HANDLE_MASK, 0); pvrdma_cq_poll(&dev->rdma_dev_res, val & PVRDMA_UAR_HANDLE_MAS= K); } break; default: - pr_err("Unsupported command, addr=3D0x%" PRIx64 ", val=3D0x%" PRIx= 64 "\n", - addr, val); + rdma_error_report("Unsupported command, addr=3D0x%"PRIx64", val=3D= 0x%"PRIx64, + addr, val); break; } } =20 static const MemoryRegionOps uar_ops =3D { - .read =3D uar_read, - .write =3D uar_write, + .read =3D pvrdma_uar_read, + .write =3D pvrdma_uar_write, .endianness =3D DEVICE_LITTLE_ENDIAN, .impl =3D { .min_access_size =3D sizeof(uint32_t), @@ -551,11 +519,9 @@ static void init_dev_caps(PVRDMADev *dev) (wr_sz + sizeof(struct pvrdma_sge) * dev->dev_attr.max_sge) - TARGET_PAGE_SIZE; /* First page is ring state ^^^^ */ - pr_dbg("max_qp_wr=3D%d\n", dev->dev_attr.max_qp_wr); =20 dev->dev_attr.max_cqe =3D pg_tbl_bytes / sizeof(struct pvrdma_cqe) - TARGET_PAGE_SIZE; /* First page is ring state = */ - pr_dbg("max_cqe=3D%d\n", dev->dev_attr.max_cqe); } =20 static int pvrdma_check_ram_shared(Object *obj, void *opaque) @@ -585,10 +551,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **er= rp) bool ram_shared =3D false; PCIDevice *func0; =20 - init_pr_dbg(); - - pr_dbg("Initializing device %s %x.%x\n", pdev->name, - PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); + rdma_info_report("Initializing device %s %x.%x", pdev->name, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); =20 if (TARGET_PAGE_SIZE !=3D getpagesize()) { error_setg(errp, "Target page size must be the same as host page s= ize"); @@ -598,8 +562,6 @@ static void pvrdma_realize(PCIDevice *pdev, Error **err= p) func0 =3D pci_get_function_0(pdev); /* Break if not vmxnet3 device in slot 0 */ if (strcmp(object_get_typename(&func0->qdev.parent_obj), TYPE_VMXNET3)= ) { - pr_dbg("func0 type is %s\n", - object_get_typename(&func0->qdev.parent_obj)); error_setg(errp, "Device on %x.0 must be %s", PCI_SLOT(pdev->devfn= ), TYPE_VMXNET3); return; @@ -656,7 +618,7 @@ static void pvrdma_realize(PCIDevice *pdev, Error **err= p) out: if (rc) { pvrdma_fini(pdev); - error_append_hint(errp, "Device fail to load\n"); + error_append_hint(errp, "Device failed to load\n"); } } =20 diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index ce5a60e184..16db726dac 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -19,6 +19,8 @@ #include "../rdma_rm.h" #include "../rdma_backend.h" =20 +#include "trace.h" + #include "pvrdma.h" #include "standard-headers/rdma/vmw_pvrdma-abi.h" #include "pvrdma_qp_ops.h" @@ -55,18 +57,14 @@ static int pvrdma_post_cqe(PVRDMADev *dev, uint32_t cq_= handle, RdmaRmCQ *cq =3D rdma_rm_get_cq(&dev->rdma_dev_res, cq_handle); =20 if (unlikely(!cq)) { - pr_dbg("Invalid cqn %d\n", cq_handle); return -EINVAL; } =20 ring =3D (PvrdmaRing *)cq->opaque; - pr_dbg("ring=3D%p\n", ring); =20 /* Step #1: Put CQE on CQ ring */ - pr_dbg("Writing CQE\n"); cqe1 =3D pvrdma_ring_next_elem_write(ring); if (unlikely(!cqe1)) { - pr_dbg("No CQEs in ring\n"); return -EINVAL; } =20 @@ -80,19 +78,13 @@ static int pvrdma_post_cqe(PVRDMADev *dev, uint32_t cq_= handle, cqe1->wc_flags =3D wc->wc_flags; cqe1->vendor_err =3D wc->vendor_err; =20 - pr_dbg("wr_id=3D%" PRIx64 "\n", cqe1->wr_id); - pr_dbg("qp=3D0x%lx\n", cqe1->qp); - pr_dbg("opcode=3D%d\n", cqe1->opcode); - pr_dbg("status=3D%d\n", cqe1->status); - pr_dbg("byte_len=3D%d\n", cqe1->byte_len); - pr_dbg("src_qp=3D%d\n", cqe1->src_qp); - pr_dbg("wc_flags=3D%d\n", cqe1->wc_flags); - pr_dbg("vendor_err=3D%d\n", cqe1->vendor_err); + trace_pvrdma_post_cqe(cq_handle, cq->notify, cqe1->wr_id, cqe1->qp, + cqe1->opcode, cqe1->status, cqe1->byte_len, + cqe1->src_qp, cqe1->wc_flags, cqe1->vendor_err); =20 pvrdma_ring_write_inc(ring); =20 /* Step #2: Put CQ number on dsr completion ring */ - pr_dbg("Writing CQNE\n"); cqne =3D pvrdma_ring_next_elem_write(&dev->dsr_info.cq); if (unlikely(!cqne)) { return -EINVAL; @@ -101,7 +93,6 @@ static int pvrdma_post_cqe(PVRDMADev *dev, uint32_t cq_h= andle, cqne->info =3D cq_handle; pvrdma_ring_write_inc(&dev->dsr_info.cq); =20 - pr_dbg("cq->notify=3D%d\n", cq->notify); if (cq->notify !=3D CNT_CLEAR) { if (cq->notify =3D=3D CNT_ARM) { cq->notify =3D CNT_CLEAR; @@ -151,23 +142,17 @@ void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handl= e) int sgid_idx; union ibv_gid *sgid; =20 - pr_dbg("qp_handle=3D0x%x\n", qp_handle); - qp =3D rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { - pr_dbg("Invalid qpn\n"); return; } =20 ring =3D (PvrdmaRing *)qp->opaque; - pr_dbg("sring=3D%p\n", ring); =20 wqe =3D (struct PvrdmaSqWqe *)pvrdma_ring_next_elem_read(ring); while (wqe) { CompHandlerCtx *comp_ctx; =20 - pr_dbg("wr_id=3D%" PRIx64 "\n", wqe->hdr.wr_id); - /* Prepare CQE */ comp_ctx =3D g_malloc(sizeof(CompHandlerCtx)); comp_ctx->dev =3D dev; @@ -178,26 +163,25 @@ void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handl= e) =20 sgid =3D rdma_rm_get_gid(&dev->rdma_dev_res, wqe->hdr.wr.ud.av.gid= _index); if (!sgid) { - pr_dbg("Fail to get gid for idx %d\n", wqe->hdr.wr.ud.av.gid_i= ndex); + rdma_error_report("Failed to get gid for idx %d", + wqe->hdr.wr.ud.av.gid_index); complete_with_error(VENDOR_ERR_INV_GID_IDX, comp_ctx); continue; } - pr_dbg("sgid_id=3D%d, sgid=3D0x%llx\n", wqe->hdr.wr.ud.av.gid_inde= x, - sgid->global.interface_id); =20 sgid_idx =3D rdma_rm_get_backend_gid_index(&dev->rdma_dev_res, &dev->backend_dev, wqe->hdr.wr.ud.av.gid_ind= ex); if (sgid_idx <=3D 0) { - pr_dbg("Fail to get bk sgid_idx for sgid_idx %d\n", - wqe->hdr.wr.ud.av.gid_index); + rdma_error_report("Failed to get bk sgid_idx for sgid_idx %d", + wqe->hdr.wr.ud.av.gid_index); complete_with_error(VENDOR_ERR_INV_GID_IDX, comp_ctx); continue; } =20 if (wqe->hdr.num_sge > dev->dev_attr.max_sge) { - pr_dbg("Invalid num_sge=3D%d (max %d)\n", wqe->hdr.num_sge, - dev->dev_attr.max_sge); + rdma_error_report("Invalid num_sge=3D%d (max %d)", wqe->hdr.nu= m_sge, + dev->dev_attr.max_sge); complete_with_error(VENDOR_ERR_INV_NUM_SGE, comp_ctx); continue; } @@ -221,23 +205,17 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handl= e) PvrdmaRqWqe *wqe; PvrdmaRing *ring; =20 - pr_dbg("qp_handle=3D0x%x\n", qp_handle); - qp =3D rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { - pr_dbg("Invalid qpn\n"); return; } =20 ring =3D &((PvrdmaRing *)qp->opaque)[1]; - pr_dbg("rring=3D%p\n", ring); =20 wqe =3D (struct PvrdmaRqWqe *)pvrdma_ring_next_elem_read(ring); while (wqe) { CompHandlerCtx *comp_ctx; =20 - pr_dbg("wr_id=3D%" PRIx64 "\n", wqe->hdr.wr_id); - /* Prepare CQE */ comp_ctx =3D g_malloc(sizeof(CompHandlerCtx)); comp_ctx->dev =3D dev; @@ -247,8 +225,8 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) comp_ctx->cqe.opcode =3D IBV_WC_RECV; =20 if (wqe->hdr.num_sge > dev->dev_attr.max_sge) { - pr_dbg("Invalid num_sge=3D%d (max %d)\n", wqe->hdr.num_sge, - dev->dev_attr.max_sge); + rdma_error_report("Invalid num_sge=3D%d (max %d)", wqe->hdr.nu= m_sge, + dev->dev_attr.max_sge); complete_with_error(VENDOR_ERR_INV_NUM_SGE, comp_ctx); continue; } @@ -270,7 +248,6 @@ void pvrdma_cq_poll(RdmaDeviceResources *dev_res, uint3= 2_t cq_handle) =20 cq =3D rdma_rm_get_cq(dev_res, cq_handle); if (!cq) { - pr_dbg("Invalid CQ# %d\n", cq_handle); return; } =20 diff --git a/hw/rdma/vmw/trace-events b/hw/rdma/vmw/trace-events index b3f9e2b19f..0122266ad7 100644 --- a/hw/rdma/vmw/trace-events +++ b/hw/rdma/vmw/trace-events @@ -1,5 +1,17 @@ # See docs/tracing.txt for syntax documentation. =20 # hw/rdma/vmw/pvrdma_main.c -pvrdma_regs_read(uint64_t addr, uint64_t val) "regs[0x%"PRIx64"] =3D 0x%"P= RIx64 -pvrdma_regs_write(uint64_t addr, uint64_t val) "regs[0x%"PRIx64"] =3D 0x%"= PRIx64 +pvrdma_regs_read(uint64_t addr, uint64_t val) "pvrdma.regs[0x%"PRIx64"]=3D= 0x%"PRIx64 +pvrdma_regs_write(uint64_t addr, uint64_t val, const char *reg_name, const= char *val_name) "pvrdma.regs[0x%"PRIx64"]=3D0x%"PRIx64" (%s %s)" +pvrdma_uar_write(uint64_t addr, uint64_t val, const char *reg_name, const = char *val_name, int val1, int val2) "uar[0x%"PRIx64"]=3D0x%"PRIx64" (cls=3D= %s, op=3D%s, obj=3D%d, val=3D%d)" + +# hw/rdma/vmw/pvrdma_cmd.c +pvrdma_map_to_pdir_host_virt(void *vfirst, void *vremaped) "mremap %p -> %= p" +pvrdma_map_to_pdir_next_page(int page_idx, void *vnext, void *vremaped) "m= remap [%d] %p -> %p" +pvrdma_exec_cmd(int cmd, int err) "cmd=3D%d, err=3D%d" + +# hw/rdma/vmw/pvrdma_dev_ring.c +pvrdma_ring_next_elem_read_no_data(char *ring_name) "pvrdma_ring %s is emp= ty" + +# hw/rdma/vmw/pvrdma_qp_ops.c +pvrdma_post_cqe(uint32_t cq_handle, int notify, uint64_t wr_id, uint64_t q= pn, uint32_t op_code, uint32_t status, uint32_t byte_len, uint32_t src_qp, = uint32_t wc_flags, uint32_t vendor_err) "cq_handle=3D%d, notify=3D%d, wr_id= =3D0x%"PRIx64", qpn=3D0x%"PRIx64", opcode=3D%d, status=3D%d, byte_len=3D%d,= src_qp=3D%d, wc_flags=3D%d, vendor_err=3D%d" --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154894052316574.59867342367227; Thu, 31 Jan 2019 05:15:23 -0800 (PST) Received: from localhost ([127.0.0.1]:54597 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCBZ-0003kx-11 for importer@patchew.org; Thu, 31 Jan 2019 08:15:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48074) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5b-00076n-1M for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5Z-0000HO-W3 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:07 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:53816) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5Z-0000H8-OH for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:05 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4BT7164992; Thu, 31 Jan 2019 13:09:04 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2130.oracle.com with ESMTP id 2q8eyurm1s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:03 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD93pa031920 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:03 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD93oI027592; Thu, 31 Jan 2019 13:09:03 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:02 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=ZDaGt8Jm1RccJffYUjL4UMx8RohYX54nfkp7TUV3sdQ=; b=jzKd3aWTXGhBl8OSI4VdJS3/HirNM7EHCtKr27AQ67TKtWdBKq4bXo9zBhu69GcwMXnR BcP+54U2R63dVVCaYm1LWNgyyHOHBAdMZZBWreozXRq/lqUkueazcBdco1//wXtXLsDJ C/GC7YjGJyr4nRPsdI2FqDEPZxlfX4fBfUIdLJ737qfm2hZV5WWWLUkyHmdQxBqqgbMT PEQEGcVFKLA5jcRS57XQmp2LauXYqfUXHJ++UI6XLDXyZ2MmVxGN2y0PPJsQcuz6R3F0 FJYRhKRvGynPnX7IcVn/d/JpTcYwlETa0lpUs+PVcJQQ0vd4sWGAa6R5o+vOFWFqyjEj Ig== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:42 +0200 Message-Id: <20190131130850.6850-3-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH 02/10] hw/rdma: Introduce locked qlist X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To make code more readable move handling of locked list to a generic functions. Signed-off-by: Yuval Shaia --- hw/rdma/rdma_backend.c | 20 +++++-------------- hw/rdma/rdma_backend_defs.h | 8 ++------ hw/rdma/rdma_utils.c | 39 +++++++++++++++++++++++++++++++++++++ hw/rdma/rdma_utils.h | 9 +++++++++ 4 files changed, 55 insertions(+), 21 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 5f60856d19..2f6372f8f0 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -527,9 +527,7 @@ static unsigned int save_mad_recv_buffer(RdmaBackendDev= *backend_dev, bctx->up_ctx =3D ctx; bctx->sge =3D *sge; =20 - qemu_mutex_lock(&backend_dev->recv_mads_list.lock); - qlist_append_int(backend_dev->recv_mads_list.list, bctx_id); - qemu_mutex_unlock(&backend_dev->recv_mads_list.lock); + rdma_locked_list_append_int64(&backend_dev->recv_mads_list, bctx_id); =20 return 0; } @@ -913,23 +911,19 @@ static inline void build_mad_hdr(struct ibv_grh *grh,= union ibv_gid *sgid, static void process_incoming_mad_req(RdmaBackendDev *backend_dev, RdmaCmMuxMsg *msg) { - QObject *o_ctx_id; unsigned long cqe_ctx_id; BackendCtx *bctx; char *mad; =20 trace_mad_message("recv", msg->umad.mad, msg->umad_len); =20 - qemu_mutex_lock(&backend_dev->recv_mads_list.lock); - o_ctx_id =3D qlist_pop(backend_dev->recv_mads_list.list); - qemu_mutex_unlock(&backend_dev->recv_mads_list.lock); - if (!o_ctx_id) { + cqe_ctx_id =3D rdma_locked_list_pop_int64(&backend_dev->recv_mads_list= ); + if (cqe_ctx_id =3D=3D -ENOENT) { rdma_warn_report("No more free MADs buffers, waiting for a while"); sleep(THR_POLL_TO); return; } =20 - cqe_ctx_id =3D qnum_get_uint(qobject_to(QNum, o_ctx_id)); bctx =3D rdma_rm_get_cqe_ctx(backend_dev->rdma_dev_res, cqe_ctx_id); if (unlikely(!bctx)) { rdma_error_report("No matching ctx for req %ld", cqe_ctx_id); @@ -994,8 +988,7 @@ static int mad_init(RdmaBackendDev *backend_dev, CharBa= ckend *mad_chr_be) return -EIO; } =20 - qemu_mutex_init(&backend_dev->recv_mads_list.lock); - backend_dev->recv_mads_list.list =3D qlist_new(); + rdma_locked_list_init(&backend_dev->recv_mads_list); =20 enable_rdmacm_mux_async(backend_dev); =20 @@ -1010,10 +1003,7 @@ static void mad_fini(RdmaBackendDev *backend_dev) { disable_rdmacm_mux_async(backend_dev); qemu_chr_fe_disconnect(backend_dev->rdmacm_mux.chr_be); - if (backend_dev->recv_mads_list.list) { - qlist_destroy_obj(QOBJECT(backend_dev->recv_mads_list.list)); - qemu_mutex_destroy(&backend_dev->recv_mads_list.lock); - } + rdma_locked_list_destroy(&backend_dev->recv_mads_list); } =20 int rdma_backend_get_gid_index(RdmaBackendDev *backend_dev, diff --git a/hw/rdma/rdma_backend_defs.h b/hw/rdma/rdma_backend_defs.h index 15ae8b970e..bec0457f25 100644 --- a/hw/rdma/rdma_backend_defs.h +++ b/hw/rdma/rdma_backend_defs.h @@ -20,6 +20,7 @@ #include "chardev/char-fe.h" #include #include "contrib/rdmacm-mux/rdmacm-mux.h" +#include "rdma_utils.h" =20 typedef struct RdmaDeviceResources RdmaDeviceResources; =20 @@ -30,11 +31,6 @@ typedef struct RdmaBackendThread { bool is_running; /* Set by the thread to report its status */ } RdmaBackendThread; =20 -typedef struct RecvMadList { - QemuMutex lock; - QList *list; -} RecvMadList; - typedef struct RdmaCmMux { CharBackend *chr_be; int can_receive; @@ -48,7 +44,7 @@ typedef struct RdmaBackendDev { struct ibv_context *context; struct ibv_comp_channel *channel; uint8_t port_num; - RecvMadList recv_mads_list; + LockedList recv_mads_list; RdmaCmMux rdmacm_mux; } RdmaBackendDev; =20 diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c index f1c980c6be..a2a4ea2a15 100644 --- a/hw/rdma/rdma_utils.c +++ b/hw/rdma/rdma_utils.c @@ -14,6 +14,8 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qnum.h" #include "trace.h" #include "rdma_utils.h" =20 @@ -55,3 +57,40 @@ void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dm= a_addr_t len) pci_dma_unmap(dev, buffer, len, DMA_DIRECTION_TO_DEVICE, 0); } } + +void rdma_locked_list_init(LockedList *list) +{ + qemu_mutex_init(&list->lock); + list->list =3D qlist_new(); +} + +void rdma_locked_list_destroy(LockedList *list) +{ + if (list->list) { + qlist_destroy_obj(QOBJECT(list->list)); + qemu_mutex_destroy(&list->lock); + list->list =3D NULL; + } +} + +void rdma_locked_list_append_int64(LockedList *list, int64_t value) +{ + qemu_mutex_lock(&list->lock); + qlist_append_int(list->list, value); + qemu_mutex_unlock(&list->lock); +} + +int64_t rdma_locked_list_pop_int64(LockedList *list) +{ + QObject *obj; + + qemu_mutex_lock(&list->lock); + obj =3D qlist_pop(list->list); + qemu_mutex_unlock(&list->lock); + + if (!obj) { + return -ENOENT; + } + + return qnum_get_uint(qobject_to(QNum, obj)); +} diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h index acd148837f..4ba9956f81 100644 --- a/hw/rdma/rdma_utils.h +++ b/hw/rdma/rdma_utils.h @@ -29,8 +29,17 @@ #define rdma_info_report(fmt, ...) \ info_report("%s: " fmt, "rdma", ## __VA_ARGS__) =20 +typedef struct LockedList { + QemuMutex lock; + QList *list; +} LockedList; + void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen); void rdma_pci_dma_unmap(PCIDevice *dev, void *buffer, dma_addr_t len); +void rdma_locked_list_init(LockedList *list); +void rdma_locked_list_destroy(LockedList *list); +void rdma_locked_list_append_int64(LockedList *list, int64_t value); +int64_t rdma_locked_list_pop_int64(LockedList *list); =20 static inline void addrconf_addr_eui48(uint8_t *eui, const char *addr) { --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15489402794671006.2094547494244; Thu, 31 Jan 2019 05:11:19 -0800 (PST) Received: from localhost ([127.0.0.1]:54548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC7c-0008P1-43 for importer@patchew.org; Thu, 31 Jan 2019 08:11:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5d-00078k-Nj for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5c-0000Hs-Ht for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:09 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:60936) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5c-0000Hb-9O for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:08 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4KAx110834; Thu, 31 Jan 2019 13:09:06 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp2130.oracle.com with ESMTP id 2q8d2egu4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:06 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD95Pu032000 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:05 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD95sR027603; Thu, 31 Jan 2019 13:09:05 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:04 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=K14VvJGXhp7dxO/Qj0i1d8HWJH1PQ0nJY8F1OeB2qjk=; b=MVaw/KeKZyTaqy6nVp5bBmN0YFuOg9tyc54y1SsGHq+aZPkjQb2Hw5dX4ylrB7mLXv9C ctpJd0P1bEtKxMksW1J2A4beCcOSnmkfMa5i1R8gXVu1vwqvAWVF9TfscMJcYUkhtkW3 T9GQlno9FzcUSXEzkEigfpFWUG+0x15vNNGeIwfjd8tv3+pya6VnsrsN7dCGvByp3hH8 Rjy470N3fALFLqMWLN+P8EYF2BlfeXwm/nJ1sxOO8zG8RyBs+jMdD2oCLmvKG08qD85I HjETvpTkNtMoXudQmOL1H3y7cUUv0UmQZ/QSL1Gf8QR37hvX1fqmLWnuVq2wC1n4Cask OQ== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:43 +0200 Message-Id: <20190131130850.6850-4-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH 03/10] hw/rdma: Warn when too many consecutive poll CQ triggered on an empty CQ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To protect against CPU over utilization when guest performs unneeded busy waiting loop on an empty CQ. Signed-off-by: Yuval Shaia --- hw/rdma/rdma_backend.c | 11 +++++++---- hw/rdma/rdma_backend.h | 2 +- hw/rdma/rdma_rm.c | 1 + hw/rdma/rdma_rm_defs.h | 6 +++++- hw/rdma/vmw/pvrdma_qp_ops.c | 24 +++++++++++++++++++++++- 5 files changed, 37 insertions(+), 7 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 2f6372f8f0..b7d6afb5da 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -64,9 +64,9 @@ static inline void complete_work(enum ibv_wc_status statu= s, uint32_t vendor_err, comp_handler(ctx, &wc); } =20 -static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq = *ibcq) +static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *= ibcq) { - int i, ne; + int i, ne, total_ne =3D 0; BackendCtx *bctx; struct ibv_wc wc[2]; =20 @@ -76,6 +76,7 @@ static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_re= s, struct ibv_cq *ibcq) trace_rdma_poll_cq(ne, ibcq); =20 for (i =3D 0; i < ne; i++) { + total_ne++; bctx =3D rdma_rm_get_cqe_ctx(rdma_dev_res, wc[i].wr_id); if (unlikely(!bctx)) { rdma_error_report("No matching ctx for req %"PRId64, @@ -93,6 +94,8 @@ static void rdma_poll_cq(RdmaDeviceResources *rdma_dev_re= s, struct ibv_cq *ibcq) if (ne < 0) { rdma_error_report("ibv_poll_cq fail, rc=3D%d, errno=3D%d", ne, err= no); } + + return total_ne; } =20 static void *comp_handler_thread(void *arg) @@ -267,9 +270,9 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, return 0; } =20 -void rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ= *cq) +int rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ = *cq) { - rdma_poll_cq(rdma_dev_res, cq->ibcq); + return rdma_poll_cq(rdma_dev_res, cq->ibcq); } =20 static GHashTable *ah_hash; diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 5114c90e67..36305cd148 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -85,7 +85,7 @@ void rdma_backend_destroy_mr(RdmaBackendMR *mr); int rdma_backend_create_cq(RdmaBackendDev *backend_dev, RdmaBackendCQ *cq, int cqe); void rdma_backend_destroy_cq(RdmaBackendCQ *cq); -void rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ= *cq); +int rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ = *cq); =20 int rdma_backend_create_qp(RdmaBackendQP *qp, uint8_t qp_type, RdmaBackendPD *pd, RdmaBackendCQ *scq, diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 64c6ea1a4e..1ba77ac42c 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -261,6 +261,7 @@ int rdma_rm_alloc_cq(RdmaDeviceResources *dev_res, Rdma= BackendDev *backend_dev, if (!cq) { return -ENOMEM; } + atomic_set(&cq->missing_cqe, 0); =20 cq->opaque =3D opaque; cq->notify =3D CNT_CLEAR; diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 0ba61d1838..08692e87d4 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -34,7 +34,9 @@ #define MAX_QP_INIT_RD_ATOM 16 #define MAX_AH 64 =20 -#define MAX_RM_TBL_NAME 16 +#define MAX_RM_TBL_NAME 16 +#define MAX_CONSEQ_EMPTY_POLL_CQ 2048 /* considered as error above this= */ + typedef struct RdmaRmResTbl { char name[MAX_RM_TBL_NAME]; QemuMutex lock; @@ -59,6 +61,8 @@ typedef struct RdmaRmCQ { RdmaBackendCQ backend_cq; void *opaque; CQNotificationType notify; + int missing_cqe; + int conseq_empty_poll; } RdmaRmCQ; =20 /* MR (DMA region) */ diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 16db726dac..5d650a4943 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -60,6 +60,8 @@ static int pvrdma_post_cqe(PVRDMADev *dev, uint32_t cq_ha= ndle, return -EINVAL; } =20 + atomic_dec(&cq->missing_cqe); + ring =3D (PvrdmaRing *)cq->opaque; =20 /* Step #1: Put CQE on CQ ring */ @@ -141,12 +143,15 @@ void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handl= e) PvrdmaRing *ring; int sgid_idx; union ibv_gid *sgid; + RdmaRmCQ *cq; =20 qp =3D rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { return; } =20 + cq =3D rdma_rm_get_cq(&dev->rdma_dev_res, qp->send_cq_handle); + ring =3D (PvrdmaRing *)qp->opaque; =20 wqe =3D (struct PvrdmaSqWqe *)pvrdma_ring_next_elem_read(ring); @@ -186,6 +191,7 @@ void pvrdma_qp_send(PVRDMADev *dev, uint32_t qp_handle) continue; } =20 + atomic_inc(&cq->missing_cqe); rdma_backend_post_send(&dev->backend_dev, &qp->backend_qp, qp->qp_= type, (struct ibv_sge *)&wqe->sge[0], wqe->hdr.nu= m_sge, sgid_idx, sgid, @@ -204,12 +210,15 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handl= e) RdmaRmQP *qp; PvrdmaRqWqe *wqe; PvrdmaRing *ring; + RdmaRmCQ *cq; =20 qp =3D rdma_rm_get_qp(&dev->rdma_dev_res, qp_handle); if (unlikely(!qp)) { return; } =20 + cq =3D rdma_rm_get_cq(&dev->rdma_dev_res, qp->recv_cq_handle); + ring =3D &((PvrdmaRing *)qp->opaque)[1]; =20 wqe =3D (struct PvrdmaRqWqe *)pvrdma_ring_next_elem_read(ring); @@ -231,6 +240,7 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) continue; } =20 + atomic_inc(&cq->missing_cqe); rdma_backend_post_recv(&dev->backend_dev, &dev->rdma_dev_res, &qp->backend_qp, qp->qp_type, (struct ibv_sge *)&wqe->sge[0], wqe->hdr.nu= m_sge, @@ -245,11 +255,23 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handl= e) void pvrdma_cq_poll(RdmaDeviceResources *dev_res, uint32_t cq_handle) { RdmaRmCQ *cq; + int polled; =20 cq =3D rdma_rm_get_cq(dev_res, cq_handle); if (!cq) { return; } =20 - rdma_backend_poll_cq(dev_res, &cq->backend_cq); + polled =3D rdma_backend_poll_cq(dev_res, &cq->backend_cq); + if (!polled) { + if (cq->conseq_empty_poll =3D=3D MAX_CONSEQ_EMPTY_POLL_CQ) { + rdma_warn_report("%d consequtive empty polls from CQ %d, missi= ng cqe %d", + cq->conseq_empty_poll, cq_handle, + atomic_read(&cq->missing_cqe)); + cq->conseq_empty_poll =3D 0; + } + cq->conseq_empty_poll++; + } else { + cq->conseq_empty_poll =3D 0; + } } --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154894028707232.025559314132806; Thu, 31 Jan 2019 05:11:27 -0800 (PST) Received: from localhost ([127.0.0.1]:54550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC7n-00006r-TF for importer@patchew.org; Thu, 31 Jan 2019 08:11:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5e-00079H-IJ for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5d-0000IV-R5 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:10 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:39066) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5d-0000I7-Iy for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:09 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4K1s128561; Thu, 31 Jan 2019 13:09:08 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2q8g6rghgk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:07 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD97wp032083 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:07 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0VD97WR010869; Thu, 31 Jan 2019 13:09:07 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:06 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=EPW+KIg7BcZbXs4NSIqtc7WIE7BlkW2K9O8HwxvB6lQ=; b=p31C9/jMyA1B+8Fgvbb4mQd3e3DY/3D0FuSgFBIb0jXXp06ZqE5gfRPDnYTkjslhYvsY uIurGAW+5bpOZIw1NYrzicQu8Zt1LWyWrghT72g8P4Tu78VVLqyIqMS//6M/WaXc3lME wQV9eEH/zgGL6Q6UqHV1xFq4tUEBOCLXAanvxMl6kC9hDTzEz9tmDfmCv+5RcY7wp527 46hKWZTh7FszrxXuN+Okcc9cr86ClKDV1e5q2FKlx2J+lfcBJJIgMBKQhGBKG0C3IYwl wEyAeageWsb5ZhVdXD8I3wySLisEn7ELlOsxOlpYtNZAHoYbcXpnfjknx4xA1Zd6f549 mg== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:44 +0200 Message-Id: <20190131130850.6850-5-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 04/10] hw/rdma: Protect against concurrent execution of poll_cq X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 2 ++ hw/rdma/rdma_rm.c | 4 ++++ hw/rdma/rdma_rm_defs.h | 1 + 3 files changed, 7 insertions(+) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index b7d6afb5da..bf8e889144 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -70,6 +70,7 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res= , struct ibv_cq *ibcq) BackendCtx *bctx; struct ibv_wc wc[2]; =20 + qemu_mutex_lock(&rdma_dev_res->lock); do { ne =3D ibv_poll_cq(ibcq, ARRAY_SIZE(wc), wc); =20 @@ -90,6 +91,7 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res= , struct ibv_cq *ibcq) g_free(bctx); } } while (ne > 0); + qemu_mutex_unlock(&rdma_dev_res->lock); =20 if (ne < 0) { rdma_error_report("ibv_poll_cq fail, rc=3D%d, errno=3D%d", ne, err= no); diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 1ba77ac42c..9408bfb751 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -619,12 +619,16 @@ int rdma_rm_init(RdmaDeviceResources *dev_res, struct= ibv_device_attr *dev_attr, =20 init_ports(dev_res); =20 + qemu_mutex_init(&dev_res->lock); + return 0; } =20 void rdma_rm_fini(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_de= v, const char *ifname) { + qemu_mutex_destroy(&dev_res->lock); + fini_ports(dev_res, backend_dev, ifname); =20 res_tbl_free(&dev_res->uc_tbl); diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 08692e87d4..9e98565a28 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -109,6 +109,7 @@ typedef struct RdmaDeviceResources { RdmaRmResTbl cq_tbl; RdmaRmResTbl cqe_ctx_tbl; GHashTable *qp_hash; /* Keeps mapping between real and emulated */ + QemuMutex lock; } RdmaDeviceResources; =20 #endif --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940436004751.3903515239862; Thu, 31 Jan 2019 05:13:56 -0800 (PST) Received: from localhost ([127.0.0.1]:54574 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCA9-0002Jn-Q2 for importer@patchew.org; Thu, 31 Jan 2019 08:13:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5i-0007EL-VY for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5g-0000JW-Fd for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:14 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:32776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5g-0000JJ-6M for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:12 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4Nws110877; Thu, 31 Jan 2019 13:09:10 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2130.oracle.com with ESMTP id 2q8d2egu55-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:10 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD99OT029180 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:09 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD99rn027616; Thu, 31 Jan 2019 13:09:09 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:08 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=w6ImJhwS9LbBDGSKEarH3uGtJS0/eusl/4UPoUtZWFI=; b=Gw6IHZ3AUEkHzXitE3ZH7cQa4SH4DTMjMAZvkAzjddUInptwV7h+XUeput2JfQ/irIXS n7H+dsV+XQMe2pfFIzOZ0jwjk5r2ugYZxQQwGNrR0Z/azRmm4X/dDzF6Ddw+xkVsijyj ucjNTCl5+8kKnHxq4rSXv9qd6OsYVbTV6dpoTN6v+b5Ta42Vq1om4kz3C7nIahr+VWzU Zy6khZVd8YpbZwJcuRSXSIPfAZed+TYSCX6aqVYKL8YzHHy3kFMHSuuI/2ZdAJuFNtu6 0HmowQYwEBdxylNNPffzw13xGMMrOyWAszAu/gHujN3+uJQaqzGjyiYWK/CyyUrYuf2h JA== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:45 +0200 Message-Id: <20190131130850.6850-6-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH 05/10] hw/pvrdma: Add device statistics counters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 53 ++++++++++++++++++++++++++++----------- hw/rdma/rdma_rm.c | 6 +++++ hw/rdma/rdma_rm_defs.h | 21 ++++++++++++++++ hw/rdma/vmw/pvrdma.h | 5 ++++ hw/rdma/vmw/pvrdma_main.c | 3 +++ 5 files changed, 74 insertions(+), 14 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index bf8e889144..d43fb1e677 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -97,6 +97,8 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res= , struct ibv_cq *ibcq) rdma_error_report("ibv_poll_cq fail, rc=3D%d, errno=3D%d", ne, err= no); } =20 + rdma_dev_res->stats.completions +=3D total_ne; + return total_ne; } =20 @@ -125,6 +127,9 @@ static void *comp_handler_thread(void *arg) while (backend_dev->comp_thread.run) { do { rc =3D qemu_poll_ns(pfds, 1, THR_POLL_TO * (int64_t)SCALE_MS); + if (!rc) { + backend_dev->rdma_dev_res->stats.poll_cq_ppoll_to++; + } } while (!rc && backend_dev->comp_thread.run); =20 if (backend_dev->comp_thread.run) { @@ -141,6 +146,7 @@ static void *comp_handler_thread(void *arg) errno); } =20 + backend_dev->rdma_dev_res->stats.poll_cq_from_bk++; rdma_poll_cq(backend_dev->rdma_dev_res, ev_cq); =20 ibv_ack_cq_events(ev_cq, 1); @@ -274,6 +280,7 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, =20 int rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ = *cq) { + rdma_dev_res->stats.poll_cq_from_guest++; return rdma_poll_cq(rdma_dev_res, cq->ibcq); } =20 @@ -336,7 +343,7 @@ static void ah_cache_init(void) =20 static int build_host_sge_array(RdmaDeviceResources *rdma_dev_res, struct ibv_sge *dsge, struct ibv_sge *ssge, - uint8_t num_sge) + uint8_t num_sge, uint64_t *total_length) { RdmaRmMR *mr; int ssge_idx; @@ -352,6 +359,8 @@ static int build_host_sge_array(RdmaDeviceResources *rd= ma_dev_res, dsge->length =3D ssge[ssge_idx].length; dsge->lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); =20 + *total_length +=3D dsge->length; + dsge++; } =20 @@ -448,8 +457,10 @@ void rdma_backend_post_send(RdmaBackendDev *backend_de= v, rc =3D mad_send(backend_dev, sgid_idx, sgid, sge, num_sge); if (rc) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_MAD_SEND, ctx= ); + backend_dev->rdma_dev_res->stats.mad_tx_err++; } else { complete_work(IBV_WC_SUCCESS, 0, ctx); + backend_dev->rdma_dev_res->stats.mad_tx++; } } return; @@ -461,20 +472,21 @@ void rdma_backend_post_send(RdmaBackendDev *backend_d= ev, rc =3D rdma_rm_alloc_cqe_ctx(backend_dev->rdma_dev_res, &bctx_id, bctx= ); if (unlikely(rc)) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_NOMEM, ctx); - goto out_free_bctx; + goto err_free_bctx; } =20 - rc =3D build_host_sge_array(backend_dev->rdma_dev_res, new_sge, sge, n= um_sge); + rc =3D build_host_sge_array(backend_dev->rdma_dev_res, new_sge, sge, n= um_sge, + &backend_dev->rdma_dev_res->stats.tx_len); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); - goto out_dealloc_cqe_ctx; + goto err_dealloc_cqe_ctx; } =20 if (qp_type =3D=3D IBV_QPT_UD) { wr.wr.ud.ah =3D create_ah(backend_dev, qp->ibpd, sgid_idx, dgid); if (!wr.wr.ud.ah) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_FAIL_BACKEND, ctx= ); - goto out_dealloc_cqe_ctx; + goto err_dealloc_cqe_ctx; } wr.wr.ud.remote_qpn =3D dqpn; wr.wr.ud.remote_qkey =3D dqkey; @@ -491,15 +503,18 @@ void rdma_backend_post_send(RdmaBackendDev *backend_d= ev, rdma_error_report("ibv_post_send fail, qpn=3D0x%x, rc=3D%d, errno= =3D%d", qp->ibqp->qp_num, rc, errno); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_FAIL_BACKEND, ctx); - goto out_dealloc_cqe_ctx; + goto err_dealloc_cqe_ctx; } =20 + backend_dev->rdma_dev_res->stats.tx++; + return; =20 -out_dealloc_cqe_ctx: +err_dealloc_cqe_ctx: + backend_dev->rdma_dev_res->stats.tx_err++; rdma_rm_dealloc_cqe_ctx(backend_dev->rdma_dev_res, bctx_id); =20 -out_free_bctx: +err_free_bctx: g_free(bctx); } =20 @@ -557,6 +572,9 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, rc =3D save_mad_recv_buffer(backend_dev, sge, num_sge, ctx); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); + rdma_dev_res->stats.mad_rx_bufs_err++; + } else { + rdma_dev_res->stats.mad_rx_bufs++; } } return; @@ -568,13 +586,14 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_d= ev, rc =3D rdma_rm_alloc_cqe_ctx(rdma_dev_res, &bctx_id, bctx); if (unlikely(rc)) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_NOMEM, ctx); - goto out_free_bctx; + goto err_free_bctx; } =20 - rc =3D build_host_sge_array(rdma_dev_res, new_sge, sge, num_sge); + rc =3D build_host_sge_array(rdma_dev_res, new_sge, sge, num_sge, + &backend_dev->rdma_dev_res->stats.rx_bufs_le= n); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); - goto out_dealloc_cqe_ctx; + goto err_dealloc_cqe_ctx; } =20 wr.num_sge =3D num_sge; @@ -585,15 +604,18 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_d= ev, rdma_error_report("ibv_post_recv fail, qpn=3D0x%x, rc=3D%d, errno= =3D%d", qp->ibqp->qp_num, rc, errno); complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_FAIL_BACKEND, ctx); - goto out_dealloc_cqe_ctx; + goto err_dealloc_cqe_ctx; } =20 + rdma_dev_res->stats.rx_bufs++; + return; =20 -out_dealloc_cqe_ctx: +err_dealloc_cqe_ctx: + backend_dev->rdma_dev_res->stats.rx_bufs_err++; rdma_rm_dealloc_cqe_ctx(rdma_dev_res, bctx_id); =20 -out_free_bctx: +err_free_bctx: g_free(bctx); } =20 @@ -932,12 +954,14 @@ static void process_incoming_mad_req(RdmaBackendDev *= backend_dev, bctx =3D rdma_rm_get_cqe_ctx(backend_dev->rdma_dev_res, cqe_ctx_id); if (unlikely(!bctx)) { rdma_error_report("No matching ctx for req %ld", cqe_ctx_id); + backend_dev->rdma_dev_res->stats.mad_rx_err++; return; } =20 mad =3D rdma_pci_dma_map(backend_dev->dev, bctx->sge.addr, bctx->sge.length); if (!mad || bctx->sge.length < msg->umad_len + MAD_HDR_SIZE) { + backend_dev->rdma_dev_res->stats.mad_rx_err++; complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_INV_MAD_BUFF, bctx->up_ctx); } else { @@ -952,6 +976,7 @@ static void process_incoming_mad_req(RdmaBackendDev *ba= ckend_dev, wc.byte_len =3D msg->umad_len; wc.status =3D IBV_WC_SUCCESS; wc.wc_flags =3D IBV_WC_GRH; + backend_dev->rdma_dev_res->stats.mad_rx++; comp_handler(bctx->up_ctx, &wc); } =20 diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 9408bfb751..ff536e356b 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -37,6 +37,7 @@ static inline void res_tbl_init(const char *name, RdmaRmR= esTbl *tbl, tbl->bitmap =3D bitmap_new(tbl_sz); tbl->tbl_sz =3D tbl_sz; tbl->res_sz =3D res_sz; + tbl->used =3D 0; qemu_mutex_init(&tbl->lock); } =20 @@ -76,6 +77,8 @@ static inline void *rdma_res_tbl_alloc(RdmaRmResTbl *tbl,= uint32_t *handle) =20 set_bit(*handle, tbl->bitmap); =20 + tbl->used++; + qemu_mutex_unlock(&tbl->lock); =20 memset(tbl->tbl + *handle * tbl->res_sz, 0, tbl->res_sz); @@ -93,6 +96,7 @@ static inline void rdma_res_tbl_dealloc(RdmaRmResTbl *tbl= , uint32_t handle) =20 if (handle < tbl->tbl_sz) { clear_bit(handle, tbl->bitmap); + tbl->used--; } =20 qemu_mutex_unlock(&tbl->lock); @@ -621,6 +625,8 @@ int rdma_rm_init(RdmaDeviceResources *dev_res, struct i= bv_device_attr *dev_attr, =20 qemu_mutex_init(&dev_res->lock); =20 + memset(&dev_res->stats, 0, sizeof(dev_res->stats)); + return 0; } =20 diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 9e98565a28..49b0a59785 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -44,6 +44,7 @@ typedef struct RdmaRmResTbl { size_t tbl_sz; size_t res_sz; void *tbl; + uint32_t used; /* number of used entries in the table */ } RdmaRmResTbl; =20 typedef struct RdmaRmPD { @@ -100,6 +101,25 @@ typedef struct RdmaRmPort { enum ibv_port_state state; } RdmaRmPort; =20 +typedef struct RdmaRmStats { + uint64_t tx; + uint64_t tx_len; + uint64_t tx_err; + uint64_t rx_bufs; + uint64_t rx_bufs_len; + uint64_t rx_bufs_err; + uint64_t completions; + uint64_t mad_tx; + uint64_t mad_tx_err; + uint64_t mad_rx; + uint64_t mad_rx_err; + uint64_t mad_rx_bufs; + uint64_t mad_rx_bufs_err; + uint64_t poll_cq_from_bk; + uint64_t poll_cq_from_guest; + uint64_t poll_cq_ppoll_to; +} RdmaRmStats; + typedef struct RdmaDeviceResources { RdmaRmPort port; RdmaRmResTbl pd_tbl; @@ -110,6 +130,7 @@ typedef struct RdmaDeviceResources { RdmaRmResTbl cqe_ctx_tbl; GHashTable *qp_hash; /* Keeps mapping between real and emulated */ QemuMutex lock; + RdmaRmStats stats; } RdmaDeviceResources; =20 #endif diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index 0879224957..167706ec2c 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -70,6 +70,10 @@ typedef struct DSRInfo { PvrdmaRing cq; } DSRInfo; =20 +typedef struct PVRDMADevStats { + uint64_t commands; +} PVRDMADevStats; + typedef struct PVRDMADev { PCIDevice parent_obj; MemoryRegion msix; @@ -89,6 +93,7 @@ typedef struct PVRDMADev { CharBackend mad_chr; VMXNET3State *func0; Notifier shutdown_notifier; + PVRDMADevStats stats; } PVRDMADev; #define PVRDMA_DEV(dev) OBJECT_CHECK(PVRDMADev, (dev), PVRDMA_HW_NAME) =20 diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index b6061f4b6e..cf82e78f08 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -394,6 +394,7 @@ static void pvrdma_regs_write(void *opaque, hwaddr addr= , uint64_t val, if (val =3D=3D 0) { trace_pvrdma_regs_write(addr, val, "REQUEST", ""); pvrdma_exec_cmd(dev); + dev->stats.commands++; } break; default: @@ -612,6 +613,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **err= p) goto out; } =20 + memset(&dev->stats, 0, sizeof(dev->stats)); + dev->shutdown_notifier.notify =3D pvrdma_shutdown_notifier; qemu_register_shutdown_notifier(&dev->shutdown_notifier); =20 --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940756884113.85738103950973; Thu, 31 Jan 2019 05:19:16 -0800 (PST) Received: from localhost ([127.0.0.1]:54657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCFK-0006bp-MC for importer@patchew.org; Thu, 31 Jan 2019 08:19:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48217) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5o-0007Iy-2i for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5m-0000Lz-VH for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:20 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:39254) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5m-0000Lf-MG for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:18 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4LYk128567; Thu, 31 Jan 2019 13:09:16 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2q8g6rghh8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:16 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9Bwf032228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:11 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9Bqo027622; Thu, 31 Jan 2019 13:09:11 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:10 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=9vRoJetCPpzksGL6EaIFT9gG9n5wNYgUd0Pv1UWrYLw=; b=SRq4lzAFbyfZrl8SYmX0Bg4Nn9tHqgmpjDJgydTfUugzrnuIGpk/3obKqmnVygQxBm/Z NXa3iFO16RYeKa/K0SnWDQNqRYZxkr/FQWPixVB644i8LAJZUzyjsg5zLRJCi/g2mZSQ WpdQRNJ/8cREoEyIezXjVgRc/PL9BpJEROEBWMfagN/zZDw4y9XV/ymJzCr4DpsZ9xzJ ykSiydsw4MBxkZ95GHyJLdlL14v/lb9l7wF3F/qX5eU+LMASoQMrG7EWbNhEAQUNwWvR 6F9b/x/iaTZ7wpFnUKfbvZc+X2Z5re5zUhLYYPb0/fzAuJfbv0/V2PRKN5GW833wBphW Og== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:46 +0200 Message-Id: <20190131130850.6850-7-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 06/10] hw/pvrdma: Dump device statistics counters to file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Yuval Shaia --- hw/rdma/vmw/pvrdma.h | 1 + hw/rdma/vmw/pvrdma_main.c | 72 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/hw/rdma/vmw/pvrdma.h b/hw/rdma/vmw/pvrdma.h index 167706ec2c..dc10f21ca0 100644 --- a/hw/rdma/vmw/pvrdma.h +++ b/hw/rdma/vmw/pvrdma.h @@ -133,5 +133,6 @@ static inline void post_interrupt(PVRDMADev *dev, unsig= ned vector) } =20 int pvrdma_exec_cmd(PVRDMADev *dev); +void pvrdma_dump_statistics(FILE *f, fprintf_function fprintf_func); =20 #endif diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index cf82e78f08..79900076ec 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -14,6 +14,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/units.h" #include "qapi/error.h" #include "hw/hw.h" #include "hw/pci/pci.h" @@ -36,6 +37,8 @@ #include "standard-headers/drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api= .h" #include "pvrdma_qp_ops.h" =20 +GSList *devices; + static Property pvrdma_dev_properties[] =3D { DEFINE_PROP_STRING("netdev", PVRDMADev, backend_eth_device_name), DEFINE_PROP_STRING("ibdev", PVRDMADev, backend_device_name), @@ -55,6 +58,72 @@ static Property pvrdma_dev_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 +static void pvrdma_dump_device_statistics(gpointer data, gpointer user_dat= a) +{ + CPUListState *s =3D user_data; + PCIDevice *pdev =3D data; + PVRDMADev *dev =3D PVRDMA_DEV(pdev); + + (*s->cpu_fprintf)(s->file, "%s_%x.%x\n", pdev->name, + PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); + (*s->cpu_fprintf)(s->file, "\tcommands : %" PRId64 "\n", + dev->stats.commands); + (*s->cpu_fprintf)(s->file, "\ttx : %" PRId64 "\n", + dev->rdma_dev_res.stats.tx); + (*s->cpu_fprintf)(s->file, "\ttx_len : %" PRId64 "\n", + dev->rdma_dev_res.stats.tx_len); + (*s->cpu_fprintf)(s->file, "\ttx_err : %" PRId64 "\n", + dev->rdma_dev_res.stats.tx_err); + (*s->cpu_fprintf)(s->file, "\trx_bufs : %" PRId64 "\n", + dev->rdma_dev_res.stats.rx_bufs); + (*s->cpu_fprintf)(s->file, "\trx_bufs_len : %" PRId64 "\n", + dev->rdma_dev_res.stats.rx_bufs_len); + (*s->cpu_fprintf)(s->file, "\trx_bufs_err : %" PRId64 "\n", + dev->rdma_dev_res.stats.rx_bufs_err); + (*s->cpu_fprintf)(s->file, "\tcompletions : %" PRId64 "\n", + dev->rdma_dev_res.stats.completions); + (*s->cpu_fprintf)(s->file, "\tpoll_cq (bk) : %" PRId64 "\n", + dev->rdma_dev_res.stats.poll_cq_from_bk); + (*s->cpu_fprintf)(s->file, "\tpoll_cq_ppoll_to : %" PRId64 "\n", + dev->rdma_dev_res.stats.poll_cq_ppoll_to); + (*s->cpu_fprintf)(s->file, "\tpoll_cq (fe) : %" PRId64 "\n", + dev->rdma_dev_res.stats.poll_cq_from_guest); + (*s->cpu_fprintf)(s->file, "\tmad_tx : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_tx); + (*s->cpu_fprintf)(s->file, "\tmad_tx_err : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_tx_err); + (*s->cpu_fprintf)(s->file, "\tmad_rx : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_rx); + (*s->cpu_fprintf)(s->file, "\tmad_rx_err : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_rx_err); + (*s->cpu_fprintf)(s->file, "\tmad_rx_bufs : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_rx_bufs); + (*s->cpu_fprintf)(s->file, "\tmad_rx_bufs_err : %" PRId64 "\n", + dev->rdma_dev_res.stats.mad_rx_bufs_err); + (*s->cpu_fprintf)(s->file, "\tPDs : %" PRId32 "\n", + dev->rdma_dev_res.pd_tbl.used); + (*s->cpu_fprintf)(s->file, "\tMRs : %" PRId32 "\n", + dev->rdma_dev_res.mr_tbl.used); + (*s->cpu_fprintf)(s->file, "\tUCs : %" PRId32 "\n", + dev->rdma_dev_res.uc_tbl.used); + (*s->cpu_fprintf)(s->file, "\tQPs : %" PRId32 "\n", + dev->rdma_dev_res.qp_tbl.used); + (*s->cpu_fprintf)(s->file, "\tCQs : %" PRId32 "\n", + dev->rdma_dev_res.cq_tbl.used); + (*s->cpu_fprintf)(s->file, "\tCEQ_CTXs : %" PRId32 "\n", + dev->rdma_dev_res.cqe_ctx_tbl.used); +} + +void pvrdma_dump_statistics(FILE *f, fprintf_function fprintf_func) +{ + CPUListState s =3D { + .file =3D f, + .cpu_fprintf =3D fprintf_func, + }; + + g_slist_foreach(devices, pvrdma_dump_device_statistics, &s); +} + static void free_dev_ring(PCIDevice *pci_dev, PvrdmaRing *ring, void *ring_state) { @@ -618,6 +687,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **err= p) dev->shutdown_notifier.notify =3D pvrdma_shutdown_notifier; qemu_register_shutdown_notifier(&dev->shutdown_notifier); =20 + devices =3D g_slist_append(devices, pdev); + out: if (rc) { pvrdma_fini(pdev); @@ -627,6 +698,7 @@ out: =20 static void pvrdma_exit(PCIDevice *pdev) { + devices =3D g_slist_remove(devices, pdev); pvrdma_fini(pdev); } =20 --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940443802746.4511397751635; Thu, 31 Jan 2019 05:14:03 -0800 (PST) Received: from localhost ([127.0.0.1]:54576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCAH-0002Rk-MT for importer@patchew.org; Thu, 31 Jan 2019 08:13:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5l-0007Gz-Vd for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5k-0000Ko-61 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:17 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:39192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5j-0000KR-U2 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:16 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4Iqd128430; Thu, 31 Jan 2019 13:09:14 GMT Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp2120.oracle.com with ESMTP id 2q8g6rghgx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:14 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9DbP032288 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:13 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0VD9Db0015429; Thu, 31 Jan 2019 13:09:13 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:12 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=tftgPfxnFHKh8t8MqRoy4CtSUsgmcIqkWfFDo3gPFEU=; b=IxTnBhnKAQt637/11ug4DVPxQDtYjgsZpYgHCFrvtVjuGT+ZdndcPE0dTdVHf6EL3WDE VRJj6E+KUF0Mf3AS7uVd/icClH3/xzlLok8CgjMFpOeZnUeYKOZft8nbwKeNM0lsDAoV jwPFUtdI9rHi4hGE+YggrfcE/hUuE5mTx/qO/0jpYcYMfeic8phIlX76XaAgG/zLi1vN Awhxzac2O6GLnGmWn6Vfy3vdJuWZerf1nynPrdogRFWYvvjH4lX2d5RRtXCVcl0ZLC5r snDCuvLpIhDaQSp74ttUfwFu5pjJkqMQiV2Z8z8E52Z3vZ/bnz39JHXp92HJfPc66Zv3 Ig== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:47 +0200 Message-Id: <20190131130850.6850-8-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 07/10] monitor: Expose pvrdma device statistics counters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Yuval Shaia --- hmp-commands-info.hx | 14 ++++++++++++++ monitor.c | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index cbee8b944d..32f6215619 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -522,6 +522,20 @@ STEXI @item info cpustats @findex info cpustats Show CPU statistics. +ETEXI + + { + .name =3D "pvrdmastats", + .args_type =3D "", + .params =3D "", + .help =3D "show pvrdma device statistics", + .cmd =3D hmp_info_pvrdmastats, + }, + +STEXI +@item info pvrdmastats +@findex info pvrdmastats +Show pvrdma device statistics. ETEXI =20 #if defined(CONFIG_SLIRP) diff --git a/monitor.c b/monitor.c index eb39fb015b..7a96c02438 100644 --- a/monitor.c +++ b/monitor.c @@ -84,6 +84,7 @@ #include "sysemu/iothread.h" #include "qemu/cutils.h" #include "tcg/tcg.h" +#include "hw/rdma/vmw/pvrdma.h" =20 #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" @@ -1399,6 +1400,11 @@ static void hmp_info_cpustats(Monitor *mon, const QD= ict *qdict) cpu_dump_statistics(cs, (FILE *)mon, &monitor_fprintf, 0); } =20 +static void hmp_info_pvrdmastats(Monitor *mon, const QDict *qdict) +{ + pvrdma_dump_statistics((FILE *)mon, &monitor_fprintf); +} + static void hmp_info_trace_events(Monitor *mon, const QDict *qdict) { const char *name =3D qdict_get_try_str(qdict, "name"); --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548940566731741.6353090051701; Thu, 31 Jan 2019 05:16:06 -0800 (PST) Received: from localhost ([127.0.0.1]:54629 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCCG-0004GB-Fi for importer@patchew.org; Thu, 31 Jan 2019 08:16:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5n-0007IE-AY for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5m-0000Ln-I6 for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:19 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:32920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5m-0000LM-9M for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:18 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4SoW110944; Thu, 31 Jan 2019 13:09:16 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2q8d2egu5h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:16 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9FQi012634 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:15 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x0VD9FJD015441; Thu, 31 Jan 2019 13:09:15 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:14 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=Rxde+GeTtcuRBenim2igcfh8+tUwzlZxIhu1Cthx2tI=; b=mxI10hqEb2HFV4RYBcsLSqkglJ747//1FwuAcO0qXaYcgYphoUuKOD9lU84f0YeW3ZOn wQ3u27NnQfK9GFgEjK5iRs6It16mJFva+BdakVyWRqHdxhdTdpwfZrUKv3qNrpJVLUr0 6kVO9vZbrfTrBBK3HveDdFnFGHimzxtmJYuK5148Uumcmw6uAztstcPXtTKGC6EUqB2N fuEtGb9pMCpB8bL2m+bXfRRgrupiOIWD2CdGpYvQQFSzQxsqD9heaOlZQVgRYCcqx0tK oYEEGsVkEwCp6ptv/tLVD8BsUFpKT6GA/Wd0zdLouCYGvaEfMYF3CaNbhTMmKZA7SdqX vQ== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:48 +0200 Message-Id: <20190131130850.6850-9-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH 08/10] hw/rdma: Free all MAD receive buffers when device is closed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When device is going down free all saved MAD buffers. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 32 ++++++++++++++++++++++++++++++++ hw/rdma/rdma_backend.h | 1 + 2 files changed, 33 insertions(+) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index d43fb1e677..65b28aa5b2 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -64,6 +64,32 @@ static inline void complete_work(enum ibv_wc_status stat= us, uint32_t vendor_err, comp_handler(ctx, &wc); } =20 +static void free_cqe_ctx(gpointer data, gpointer user_data) +{ + BackendCtx *bctx; + RdmaDeviceResources *rdma_dev_res =3D user_data; + unsigned long cqe_ctx_id =3D GPOINTER_TO_INT(data); + + bctx =3D rdma_rm_get_cqe_ctx(rdma_dev_res, cqe_ctx_id); + if (bctx) { + rdma_rm_dealloc_cqe_ctx(rdma_dev_res, cqe_ctx_id); + } + g_free(bctx); +} + +static void clean_recv_mads(RdmaBackendDev *backend_dev) +{ + unsigned long cqe_ctx_id; + + do { + cqe_ctx_id =3D rdma_locked_list_pop_int64(&backend_dev->recv_mads_= list); + if (cqe_ctx_id !=3D -ENOENT) { + free_cqe_ctx(GINT_TO_POINTER(cqe_ctx_id), + backend_dev->rdma_dev_res); + } + } while (cqe_ctx_id !=3D -ENOENT); +} + static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *= ibcq) { int i, ne, total_ne =3D 0; @@ -1029,6 +1055,11 @@ static int mad_init(RdmaBackendDev *backend_dev, Cha= rBackend *mad_chr_be) return 0; } =20 +static void mad_stop(RdmaBackendDev *backend_dev) +{ + clean_recv_mads(backend_dev); +} + static void mad_fini(RdmaBackendDev *backend_dev) { disable_rdmacm_mux_async(backend_dev); @@ -1216,6 +1247,7 @@ void rdma_backend_start(RdmaBackendDev *backend_dev) =20 void rdma_backend_stop(RdmaBackendDev *backend_dev) { + mad_stop(backend_dev); stop_backend_thread(&backend_dev->comp_thread); } =20 diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 36305cd148..6abc367a52 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -33,6 +33,7 @@ #define VENDOR_ERR_MR_SMALL 0x208 #define VENDOR_ERR_INV_MAD_BUFF 0x209 #define VENDOR_ERR_INV_GID_IDX 0x210 +#define VENDOR_ERR_DEV_GOING_DOWN 0x211 =20 /* Add definition for QP0 and QP1 as there is no userspace enums for them = */ enum ibv_special_qp_type { --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154894035159597.023497628992; Thu, 31 Jan 2019 05:12:31 -0800 (PST) Received: from localhost ([127.0.0.1]:54556 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC8n-000113-BD for importer@patchew.org; Thu, 31 Jan 2019 08:12:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5p-0007Jq-2x for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5o-0000MP-1A for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:21 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:39282) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5n-0000M7-Oy for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:19 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4Iqe128430; Thu, 31 Jan 2019 13:09:18 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2q8g6rghha-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:18 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9HoE032368 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:17 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9Hmw003991; Thu, 31 Jan 2019 13:09:17 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:16 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=mA5z3rb6UcVrtkz73U6JqySwGlTLGxO6YyIQARXwAqY=; b=yqp6lXf/xFwZG+OPpGUQHVrdjQ7H4q38YFgNTm8fdvhRgj3baN4U2MHxT6OAyHoQV64s DyUG3iteoLKi6GQcWX/+hhV2WNXXFVb1y6KLWN/Tz+O1bNXMZfp0baJseNPZ5izJgimf rc011Zk+gA7qcSXqfKXnH8CurLu6/qPp2zuVlvmuhn0rhA+saBQRW9TnONLdriKz6n7i TxXOu7QOiyzb4Esy9ZKfc6dOzwQdrvDlEfEQqAuEI8cMVtF3+S97rJhMNMMns7OKMPUN El86SJyf0411YOOhmHQEs4hNq1Tr3ONz0pvKegPtW98gHHCaZO0khE7DpbOjs17R+Cmb VQ== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:49 +0200 Message-Id: <20190131130850.6850-10-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH 09/10] hw/rdma: Free all receive buffers when QP is destroyed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When QP is destroyed the backend QP is destroyed as well. This ensures we clean all received buffer we posted to it. However, a contexts of these buffers are still remain in the device. Fix it by maintaining a list of buffer's context and free them when QP is destroyed. Signed-off-by: Yuval Shaia --- hw/rdma/rdma_backend.c | 25 +++++++++++++++++++------ hw/rdma/rdma_backend.h | 2 +- hw/rdma/rdma_backend_defs.h | 1 + hw/rdma/rdma_rm.c | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 65b28aa5b2..3283461b15 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -39,6 +39,7 @@ typedef struct BackendCtx { void *up_ctx; struct ibv_sge sge; /* Used to save MAD recv buffer */ + RdmaBackendQP *backend_qp; /* To maintain recv buffers */ } BackendCtx; =20 struct backend_umad { @@ -90,7 +91,8 @@ static void clean_recv_mads(RdmaBackendDev *backend_dev) } while (cqe_ctx_id !=3D -ENOENT); } =20 -static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_res, struct ibv_cq *= ibcq) +static int rdma_poll_cq(RdmaBackendDev *backend_dev, + RdmaDeviceResources *rdma_dev_res, struct ibv_cq *= ibcq) { int i, ne, total_ne =3D 0; BackendCtx *bctx; @@ -113,6 +115,9 @@ static int rdma_poll_cq(RdmaDeviceResources *rdma_dev_r= es, struct ibv_cq *ibcq) =20 comp_handler(bctx->up_ctx, &wc[i]); =20 + bctx->backend_qp->cqe_ctx_list =3D + g_slist_remove(bctx->backend_qp->cqe_ctx_list, + GINT_TO_POINTER(wc[i].wr_id)); rdma_rm_dealloc_cqe_ctx(rdma_dev_res, wc[i].wr_id); g_free(bctx); } @@ -173,14 +178,12 @@ static void *comp_handler_thread(void *arg) } =20 backend_dev->rdma_dev_res->stats.poll_cq_from_bk++; - rdma_poll_cq(backend_dev->rdma_dev_res, ev_cq); + rdma_poll_cq(backend_dev, backend_dev->rdma_dev_res, ev_cq); =20 ibv_ack_cq_events(ev_cq, 1); } } =20 - /* TODO: Post cqe for all remaining buffs that were posted */ - backend_dev->comp_thread.is_running =3D false; =20 qemu_thread_exit(0); @@ -307,7 +310,7 @@ int rdma_backend_query_port(RdmaBackendDev *backend_dev, int rdma_backend_poll_cq(RdmaDeviceResources *rdma_dev_res, RdmaBackendCQ = *cq) { rdma_dev_res->stats.poll_cq_from_guest++; - return rdma_poll_cq(rdma_dev_res, cq->ibcq); + return rdma_poll_cq(cq->backend_dev, rdma_dev_res, cq->ibcq); } =20 static GHashTable *ah_hash; @@ -494,6 +497,7 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, =20 bctx =3D g_malloc0(sizeof(*bctx)); bctx->up_ctx =3D ctx; + bctx->backend_qp =3D qp; =20 rc =3D rdma_rm_alloc_cqe_ctx(backend_dev->rdma_dev_res, &bctx_id, bctx= ); if (unlikely(rc)) { @@ -501,6 +505,9 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, goto err_free_bctx; } =20 + qp->cqe_ctx_list =3D g_slist_append(qp->cqe_ctx_list, + GINT_TO_POINTER(bctx_id)); + rc =3D build_host_sge_array(backend_dev->rdma_dev_res, new_sge, sge, n= um_sge, &backend_dev->rdma_dev_res->stats.tx_len); if (rc) { @@ -608,6 +615,7 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, =20 bctx =3D g_malloc0(sizeof(*bctx)); bctx->up_ctx =3D ctx; + bctx->backend_qp =3D qp; =20 rc =3D rdma_rm_alloc_cqe_ctx(rdma_dev_res, &bctx_id, bctx); if (unlikely(rc)) { @@ -615,6 +623,9 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, goto err_free_bctx; } =20 + qp->cqe_ctx_list =3D g_slist_append(qp->cqe_ctx_list, + GINT_TO_POINTER(bctx_id)); + rc =3D build_host_sge_array(rdma_dev_res, new_sge, sge, num_sge, &backend_dev->rdma_dev_res->stats.rx_bufs_le= n); if (rc) { @@ -910,11 +921,13 @@ int rdma_backend_query_qp(RdmaBackendQP *qp, struct i= bv_qp_attr *attr, return ibv_query_qp(qp->ibqp, attr, attr_mask, init_attr); } =20 -void rdma_backend_destroy_qp(RdmaBackendQP *qp) +void rdma_backend_destroy_qp(RdmaBackendQP *qp, RdmaDeviceResources *dev_r= es) { if (qp->ibqp) { ibv_destroy_qp(qp->ibqp); } + g_slist_foreach(qp->cqe_ctx_list, free_cqe_ctx, dev_res); + g_slist_free(qp->cqe_ctx_list); } =20 #define CHK_ATTR(req, dev, member, fmt) ({ \ diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 6abc367a52..798a12f28f 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -103,7 +103,7 @@ int rdma_backend_qp_state_rts(RdmaBackendQP *qp, uint8_= t qp_type, uint32_t sq_psn, uint32_t qkey, bool use_qke= y); int rdma_backend_query_qp(RdmaBackendQP *qp, struct ibv_qp_attr *attr, int attr_mask, struct ibv_qp_init_attr *init_att= r); -void rdma_backend_destroy_qp(RdmaBackendQP *qp); +void rdma_backend_destroy_qp(RdmaBackendQP *qp, RdmaDeviceResources *dev_r= es); =20 void rdma_backend_post_send(RdmaBackendDev *backend_dev, RdmaBackendQP *qp, uint8_t qp_type, diff --git a/hw/rdma/rdma_backend_defs.h b/hw/rdma/rdma_backend_defs.h index bec0457f25..2306bbd18e 100644 --- a/hw/rdma/rdma_backend_defs.h +++ b/hw/rdma/rdma_backend_defs.h @@ -66,6 +66,7 @@ typedef struct RdmaBackendQP { struct ibv_pd *ibpd; struct ibv_qp *ibqp; uint8_t sgid_idx; + GSList *cqe_ctx_list; } RdmaBackendQP; =20 #endif diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index ff536e356b..c7b9ef17f8 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -485,7 +485,7 @@ void rdma_rm_dealloc_qp(RdmaDeviceResources *dev_res, u= int32_t qp_handle) return; } =20 - rdma_backend_destroy_qp(&qp->backend_qp); + rdma_backend_destroy_qp(&qp->backend_qp, dev_res); =20 rdma_res_tbl_dealloc(&dev_res->qp_tbl, qp->qpn); } --=20 2.17.2 From nobody Sat May 4 02:55:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154894094459084.2786141640222; Thu, 31 Jan 2019 05:22:24 -0800 (PST) Received: from localhost ([127.0.0.1]:54720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpCIP-0000rT-At for importer@patchew.org; Thu, 31 Jan 2019 08:22:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpC5r-0007MM-Dj for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpC5q-0000N6-FE for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:23 -0500 Received: from aserp2130.oracle.com ([141.146.126.79]:32998) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpC5q-0000Mz-6X for qemu-devel@nongnu.org; Thu, 31 Jan 2019 08:09:22 -0500 Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id x0VD4OOs110902; Thu, 31 Jan 2019 13:09:20 GMT Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by aserp2130.oracle.com with ESMTP id 2q8d2egu5r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:20 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9JGA012799 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 31 Jan 2019 13:09:19 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id x0VD9JEM027750; Thu, 31 Jan 2019 13:09:19 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 31 Jan 2019 05:09:18 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id : in-reply-to : references; s=corp-2018-07-02; bh=nEIW0C9HtzIQtwmzYtAEnwE1lBYxQ/8AsUKHaCACqQM=; b=B4+HXrSg4O4e9rXpkudMV3dJfGVJqnj+GpWVAflw0pKM/38ZBiAHZbhqgI75xjzzotjV pUfvcgFhzUmHqbO60TdQMchQc9GhyuIv2OnITWUi9Zu29VG0CQ8I0BRVYyqdB4ili+Tf IN0lK0BvgJIK85eJJE8gIrBqlS7IqOQyYXEXDqwuK1opLRkt3n4NtyjH0//zreGN/ccQ ZG2NPabSxccI1jav9BkL2OnX7OeovDw9oILv3UfY8/h80F2gXPoI+gV2QRXav+YX3dVg aF39fbumIPAMrRpiOWHqnBCianlDsrxNAmINdjLiZFtx5/jHfJQJqSLb1TzbGNYvAI6g rw== From: Yuval Shaia To: dgilbert@redhat.com, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org Date: Thu, 31 Jan 2019 15:08:50 +0200 Message-Id: <20190131130850.6850-11-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190131130850.6850-1-yuval.shaia@oracle.com> References: <20190131130850.6850-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9152 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1901310103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.79 Subject: [Qemu-devel] [PATCH 10/10] hw/pvrdma: Delete unneeded function argument X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The function argument rdma_dev_res is not needed as it is stored in the backend_dev object at init. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 13 ++++++------- hw/rdma/rdma_backend.h | 1 - hw/rdma/vmw/pvrdma_qp_ops.c | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 3283461b15..544b7d6148 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -586,7 +586,6 @@ static unsigned int save_mad_recv_buffer(RdmaBackendDev= *backend_dev, } =20 void rdma_backend_post_recv(RdmaBackendDev *backend_dev, - RdmaDeviceResources *rdma_dev_res, RdmaBackendQP *qp, uint8_t qp_type, struct ibv_sge *sge, uint32_t num_sge, void *c= tx) { @@ -605,9 +604,9 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, rc =3D save_mad_recv_buffer(backend_dev, sge, num_sge, ctx); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); - rdma_dev_res->stats.mad_rx_bufs_err++; + backend_dev->rdma_dev_res->stats.mad_rx_bufs_err++; } else { - rdma_dev_res->stats.mad_rx_bufs++; + backend_dev->rdma_dev_res->stats.mad_rx_bufs++; } } return; @@ -617,7 +616,7 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, bctx->up_ctx =3D ctx; bctx->backend_qp =3D qp; =20 - rc =3D rdma_rm_alloc_cqe_ctx(rdma_dev_res, &bctx_id, bctx); + rc =3D rdma_rm_alloc_cqe_ctx(backend_dev->rdma_dev_res, &bctx_id, bctx= ); if (unlikely(rc)) { complete_work(IBV_WC_GENERAL_ERR, VENDOR_ERR_NOMEM, ctx); goto err_free_bctx; @@ -626,7 +625,7 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, qp->cqe_ctx_list =3D g_slist_append(qp->cqe_ctx_list, GINT_TO_POINTER(bctx_id)); =20 - rc =3D build_host_sge_array(rdma_dev_res, new_sge, sge, num_sge, + rc =3D build_host_sge_array(backend_dev->rdma_dev_res, new_sge, sge, n= um_sge, &backend_dev->rdma_dev_res->stats.rx_bufs_le= n); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); @@ -644,13 +643,13 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_d= ev, goto err_dealloc_cqe_ctx; } =20 - rdma_dev_res->stats.rx_bufs++; + backend_dev->rdma_dev_res->stats.rx_bufs++; =20 return; =20 err_dealloc_cqe_ctx: backend_dev->rdma_dev_res->stats.rx_bufs_err++; - rdma_rm_dealloc_cqe_ctx(rdma_dev_res, bctx_id); + rdma_rm_dealloc_cqe_ctx(backend_dev->rdma_dev_res, bctx_id); =20 err_free_bctx: g_free(bctx); diff --git a/hw/rdma/rdma_backend.h b/hw/rdma/rdma_backend.h index 798a12f28f..160b9e74db 100644 --- a/hw/rdma/rdma_backend.h +++ b/hw/rdma/rdma_backend.h @@ -112,7 +112,6 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, union ibv_gid *dgid, uint32_t dqpn, uint32_t d= qkey, void *ctx); void rdma_backend_post_recv(RdmaBackendDev *backend_dev, - RdmaDeviceResources *rdma_dev_res, RdmaBackendQP *qp, uint8_t qp_type, struct ibv_sge *sge, uint32_t num_sge, void *c= tx); =20 diff --git a/hw/rdma/vmw/pvrdma_qp_ops.c b/hw/rdma/vmw/pvrdma_qp_ops.c index 5d650a4943..4ec1dacfd1 100644 --- a/hw/rdma/vmw/pvrdma_qp_ops.c +++ b/hw/rdma/vmw/pvrdma_qp_ops.c @@ -241,8 +241,7 @@ void pvrdma_qp_recv(PVRDMADev *dev, uint32_t qp_handle) } =20 atomic_inc(&cq->missing_cqe); - rdma_backend_post_recv(&dev->backend_dev, &dev->rdma_dev_res, - &qp->backend_qp, qp->qp_type, + rdma_backend_post_recv(&dev->backend_dev, &qp->backend_qp, qp->qp_= type, (struct ibv_sge *)&wqe->sge[0], wqe->hdr.nu= m_sge, comp_ctx); =20 --=20 2.17.2