From nobody Tue Nov 4 23:50:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531727187844833.583771519055; Mon, 16 Jul 2018 00:46:27 -0700 (PDT) Received: from localhost ([::1]:49377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1feyDC-0004xf-PI for importer@patchew.org; Mon, 16 Jul 2018 03:46:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fey82-0001IU-Ll for qemu-devel@nongnu.org; Mon, 16 Jul 2018 03:41:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fey81-00074N-LY for qemu-devel@nongnu.org; Mon, 16 Jul 2018 03:41:06 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:55766) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fey81-00073Q-Cz for qemu-devel@nongnu.org; Mon, 16 Jul 2018 03:41:05 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w6G7ckuI125395; Mon, 16 Jul 2018 07:41:03 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2120.oracle.com with ESMTP id 2k7a33u60t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Jul 2018 07:41:03 +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 w6G7f312009286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Jul 2018 07:41:03 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w6G7f2ZT011132; Mon, 16 Jul 2018 07:41:03 GMT Received: from localhost.localdomain (/77.138.186.148) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 16 Jul 2018 00:41:02 -0700 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=vhCpWqdcBBjh28z5q+TUQn4o0W6D7pTEdXdISPGon5g=; b=wsV8IRYnoKhX+FbRgR7rdsBYDCvfdfKelyZ393BjLrQ8MD8e6S4riFaypcjLs8pCwLEu /AU2D3hL9qotE+QNNr6BE2J0G11CifrrF2OV4978YLjVNhrxQMe7tv365UmQ82ZxWY9B uCh3hsfTyxq5Q4Tu6hzKjSTyoepFdIHG7iZ9vtD11mEpRJmvtZze146cPr3V0qiEYMRS o3VHg087qjYxKsLQT0UJrIy8Gji6u6STsNNLHNg5COygaUCL8FzvBPh8HaCJKYeJGEJB cokmM421STKb2hD/lZqvpzN1XBMb/j28iETVasvod1MslQ3s7gvqVGKBw1j+zy0wp+/r 9Q== From: Yuval Shaia To: qemu-devel@nongnu.org, yuval.shaia@oracle.com, marcel.apfelbaum@gmail.com Date: Mon, 16 Jul 2018 10:40:32 +0300 Message-Id: <20180716074038.3364-8-yuval.shaia@oracle.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180716074038.3364-1-yuval.shaia@oracle.com> References: <20180716074038.3364-1-yuval.shaia@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8955 signatures=668706 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=823 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1806210000 definitions=main-1807160092 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 141.146.126.78 Subject: [Qemu-devel] [PATCH 07/13] hw/rdma: Do not allocate memory for non-dma MR 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: pass (identity @oracle.com) X-ZohoMail: RDKM_0 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" There is no use in the memory allocated for non-dma MR (one with host_virt equals to NULL). Delete the code that allocates it. Signed-off-by: Yuval Shaia --- hw/rdma/rdma_rm.c | 52 +++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 7403d24674..bf4a5c71b4 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -144,8 +144,6 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, uint= 32_t pd_handle, RdmaRmMR *mr; int ret =3D 0; RdmaRmPD *pd; - void *addr; - size_t length; =20 pd =3D rdma_rm_get_pd(dev_res, pd_handle); if (!pd) { @@ -158,40 +156,29 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, pr_dbg("Failed to allocate obj in table\n"); return -ENOMEM; } + pr_dbg("mr_handle=3D%d\n", *mr_handle); =20 - if (!host_virt) { - /* TODO: This is my guess but not so sure that this needs to be - * done */ - length =3D TARGET_PAGE_SIZE; - addr =3D g_malloc(length); - } else { + 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); + + if (host_virt) { mr->virt =3D host_virt; - pr_dbg("host_virt=3D0x%p\n", mr->virt); - mr->length =3D guest_length; - pr_dbg("length=3D%zu\n", guest_length); mr->start =3D guest_start; - pr_dbg("guest_start=3D0x%" PRIx64 "\n", mr->start); - - length =3D mr->length; - addr =3D mr->virt; - } + mr->length =3D guest_length; =20 - ret =3D rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, addr,= 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; + 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; + } } =20 - if (!host_virt) { - *lkey =3D mr->lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); - *rkey =3D mr->rkey =3D rdma_backend_mr_rkey(&mr->backend_mr); - } else { - /* We keep mr_handle in lkey so send and recv get get mr ptr */ - *lkey =3D *mr_handle; - *rkey =3D -1; - } + /* We keep mr_handle in lkey so send and recv get get mr ptr */ + *lkey =3D *mr_handle; + *rkey =3D -1; =20 mr->pd_handle =3D pd_handle; =20 @@ -214,7 +201,10 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, = uint32_t mr_handle) =20 if (mr) { rdma_backend_destroy_mr(&mr->backend_mr); - munmap(mr->virt, mr->length); + pr_dbg("start=3D0x%" PRIx64 "\n", mr->start); + if (mr->start) { + munmap(mr->virt, mr->length); + } res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); } } --=20 2.17.1