From patchwork Mon Nov 5 12:45:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Shaia X-Patchwork-Id: 993055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="oEMFZvKW"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42pXxK2C0pz9sCX for ; Tue, 6 Nov 2018 00:06:13 +1100 (AEDT) Received: from localhost ([::1]:35093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJea2-0002YO-UL for incoming@patchwork.ozlabs.org; Mon, 05 Nov 2018 08:06:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJeHU-0007jp-87 for qemu-devel@nongnu.org; Mon, 05 Nov 2018 07:47:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJeHT-0003Zm-8J for qemu-devel@nongnu.org; Mon, 05 Nov 2018 07:47:00 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:50752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gJeHS-0003ZN-Uh for qemu-devel@nongnu.org; Mon, 05 Nov 2018 07:46:59 -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 wA5CiI4i054232; Mon, 5 Nov 2018 12:46:57 GMT 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=5HsLpYGqUw4ifgZc45kuaqnv1VI2D3/D55P71qFyeRA=; b=oEMFZvKWqAviMddMznhzVJ5Eaxx1yvy0E9yVI9EmzSJ37TaHNScrEnuN8eLVo5r/ShrO Ltd5RrWPJY4d1BUD5nfW6jyADvidbtZmSpf8s8EtthRMu/0zZxA5dg1pFwbGkoZtvSsk OjRQgVI1JPZwS3ks/omDAuwuC4Bv+MZKXlpndZn7kYt4pLef+V1TkZCpua8ZpVnrDrcX ZygEsBLOPlbREAaxRMuh/vyoyQsvS7WOWyPN4IN6FxhY67DFRU8ZY5aBndj7FecFTJMG dGrikWHpolzxelQTbWvwcFXYKk0bgou+bTNApNNq8hFdT5ap5C1hLyNlJK//7PrGHbuG IA== Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2130.oracle.com with ESMTP id 2nh33tpg8p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 05 Nov 2018 12:46:57 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wA5CkuMw002017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 5 Nov 2018 12:46:56 GMT Received: from abhmp0020.oracle.com (abhmp0020.oracle.com [141.146.116.26]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id wA5Ckug2028122; Mon, 5 Nov 2018 12:46:56 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Nov 2018 04:46:56 -0800 From: Yuval Shaia To: yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com, dmitry.fleytman@gmail.com, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, shamir.rabinovitch@oracle.com, qemu-devel@nongnu.org Date: Mon, 5 Nov 2018 14:45:58 +0200 Message-Id: <20181105124559.21561-18-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181105124559.21561-1-yuval.shaia@oracle.com> References: <20181105124559.21561-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9067 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=2 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=814 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811050118 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.86 Subject: [Qemu-devel] [PATCH 17/18] hw/pvrdma: Fill error code in command's response 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Driver checks error code let's set it. Signed-off-by: Yuval Shaia --- hw/rdma/vmw/pvrdma_cmd.c | 67 ++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 19 deletions(-) diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c index a88d922932..a694faac8d 100644 --- a/hw/rdma/vmw/pvrdma_cmd.c +++ b/hw/rdma/vmw/pvrdma_cmd.c @@ -131,7 +131,8 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req, if (rdma_backend_query_port(&dev->backend_dev, (struct ibv_port_attr *)&attrs)) { - return -ENOMEM; + resp->hdr.err = -ENOMEM; + goto out; } memset(resp, 0, sizeof(*resp)); @@ -150,7 +151,9 @@ static int query_port(PVRDMADev *dev, union pvrdma_cmd_req *req, resp->attrs.active_width = 1; resp->attrs.active_speed = 1; - return 0; +out: + pr_dbg("ret=%d\n", resp->hdr.err); + return resp->hdr.err; } static int query_pkey(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -170,7 +173,7 @@ static int query_pkey(PVRDMADev *dev, union pvrdma_cmd_req *req, resp->pkey = PVRDMA_PKEY; pr_dbg("pkey=0x%x\n", resp->pkey); - return 0; + return resp->hdr.err; } static int create_pd(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -200,7 +203,9 @@ static int destroy_pd(PVRDMADev *dev, union pvrdma_cmd_req *req, rdma_rm_dealloc_pd(&dev->rdma_dev_res, cmd->pd_handle); - return 0; + rsp->hdr.err = 0; + + return rsp->hdr.err; } static int create_mr(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -251,7 +256,9 @@ static int destroy_mr(PVRDMADev *dev, union pvrdma_cmd_req *req, rdma_rm_dealloc_mr(&dev->rdma_dev_res, cmd->mr_handle); - return 0; + rsp->hdr.err = 0; + + return rsp->hdr.err; } static int create_cq_ring(PCIDevice *pci_dev , PvrdmaRing **ring, @@ -353,7 +360,8 @@ static int destroy_cq(PVRDMADev *dev, union pvrdma_cmd_req *req, cq = rdma_rm_get_cq(&dev->rdma_dev_res, cmd->cq_handle); if (!cq) { pr_dbg("Invalid CQ handle\n"); - return -EINVAL; + rsp->hdr.err = -EINVAL; + goto out; } ring = (PvrdmaRing *)cq->opaque; @@ -364,7 +372,11 @@ static int destroy_cq(PVRDMADev *dev, union pvrdma_cmd_req *req, rdma_rm_dealloc_cq(&dev->rdma_dev_res, cmd->cq_handle); - return 0; + rsp->hdr.err = 0; + +out: + pr_dbg("ret=%d\n", rsp->hdr.err); + return rsp->hdr.err; } static int create_qp_rings(PCIDevice *pci_dev, uint64_t pdir_dma, @@ -553,7 +565,8 @@ static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, qp = rdma_rm_get_qp(&dev->rdma_dev_res, cmd->qp_handle); if (!qp) { pr_dbg("Invalid QP handle\n"); - return -EINVAL; + rsp->hdr.err = -EINVAL; + goto out; } rdma_rm_dealloc_qp(&dev->rdma_dev_res, cmd->qp_handle); @@ -567,7 +580,11 @@ static int destroy_qp(PVRDMADev *dev, union pvrdma_cmd_req *req, rdma_pci_dma_unmap(PCI_DEVICE(dev), ring->ring_state, TARGET_PAGE_SIZE); g_free(ring); - return 0; + rsp->hdr.err = 0; + +out: + pr_dbg("ret=%d\n", rsp->hdr.err); + return rsp->hdr.err; } static int create_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -580,7 +597,8 @@ static int create_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, pr_dbg("index=%d\n", cmd->index); if (cmd->index >= MAX_PORT_GIDS) { - return -EINVAL; + rsp->hdr.err = -EINVAL; + goto out; } pr_dbg("gid[%d]=0x%llx,0x%llx\n", cmd->index, @@ -590,10 +608,15 @@ static int create_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, rc = rdma_rm_add_gid(&dev->rdma_dev_res, &dev->backend_dev, dev->backend_eth_device_name, gid, cmd->index); if (rc < 0) { - return -EINVAL; + rsp->hdr.err = rc; + goto out; } - return 0; + rsp->hdr.err = 0; + +out: + pr_dbg("ret=%d\n", rsp->hdr.err); + return rsp->hdr.err; } static int destroy_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -604,13 +627,18 @@ static int destroy_bind(PVRDMADev *dev, union pvrdma_cmd_req *req, pr_dbg("index=%d\n", cmd->index); if (cmd->index >= MAX_PORT_GIDS) { - return -EINVAL; + rsp->hdr.err = -EINVAL; + goto out; } rdma_rm_del_gid(&dev->rdma_dev_res, &dev->backend_dev, dev->backend_eth_device_name, cmd->index); - return 0; + rsp->hdr.err = 0; + +out: + pr_dbg("ret=%d\n", rsp->hdr.err); + return rsp->hdr.err; } static int create_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -627,9 +655,8 @@ static int create_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, resp->hdr.err = rdma_rm_alloc_uc(&dev->rdma_dev_res, cmd->pfn, &resp->ctx_handle); - pr_dbg("ret=%d\n", resp->hdr.err); - - return 0; + pr_dbg("ret=%d\n", rsp->hdr.err); + return rsp->hdr.err; } static int destroy_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, @@ -641,7 +668,9 @@ static int destroy_uc(PVRDMADev *dev, union pvrdma_cmd_req *req, rdma_rm_dealloc_uc(&dev->rdma_dev_res, cmd->ctx_handle); - return 0; + rsp->hdr.err = 0; + + return rsp->hdr.err; } struct cmd_handler { uint32_t cmd; @@ -689,7 +718,7 @@ int execute_command(PVRDMADev *dev) } err = cmd_handlers[dsr_info->req->hdr.cmd].exec(dev, dsr_info->req, - dsr_info->rsp); + dsr_info->rsp); out: set_reg_val(dev, PVRDMA_REG_ERR, err); post_interrupt(dev, INTR_VEC_CMD_RING);