From nobody Wed Nov 5 12:20:50 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=fail; 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=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534769644798958.5566130548755; Mon, 20 Aug 2018 05:54:04 -0700 (PDT) Received: from localhost ([::1]:46921 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjgw-0006d8-Iq for importer@patchew.org; Mon, 20 Aug 2018 08:53:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYj-00007o-9Z for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYd-0000ev-Ff for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:23 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:50322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYd-0000eS-0c for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:19 -0400 Received: by mail-wm0-x230.google.com with SMTP id s12-v6so14181816wmc.0 for ; Mon, 20 Aug 2018 05:45:18 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id g2-v6sm26704613wrd.71.2018.08.20.05.45.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6QVpTkEl5vZB8/utMCswD6LYWImXsK41NJMfgBpVSXQ=; b=RbULvdMmypz8ygKEbReYj44oq+mSteohL9isqzvzWYhWLeH0fqQZh9R7LPT6CeGUdg 55Yt5L4tx1XGHg8KLE5bdQZ9Pumbz+ypG1+n3r446a0SXqv/phwtxDUgIrUJVLk6sVUM MAG2NqIAJ9JmBiM+Q3QF9aBPx2wq5eCZhMzB+uBLdsXWhYnfncBgnxUdcyxR8Ktsqr0p kQ2Cn8rif7N30Jjt+LdGwzyVD4GI7bMxaQBcnp41ITImOeyOfZQhvfd2mOm6l3HAPDwZ sSfPiPjKOpZ9MNcW3i1VbA8ts1GPXhQ6JLxmKqfc54w0Zk8iM+o0XoXeVOJ6/4Zyv0R8 IbCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6QVpTkEl5vZB8/utMCswD6LYWImXsK41NJMfgBpVSXQ=; b=tAQPkuhUhNqRcbQOtsCUzGoAs/DjxhkNgRs4T+DRILsZNVCj404TlYO0X/xCZAwi2m /9L+Dof7VTJxIjzj0YfJXiZo+WmB0rH2U1Z8KAmdvsr9GIa2ylF/qJKwlMR27a267rXu yn3B2dKbrLl342O+reZPax8xF7BHTBc8mPJOvyirqKDGUSiUDojSUzIZkuMcavTox/tL SjJhyajwvDhRu8hbSVd8qPhNCM6tS/1rJwfcxpuJoMz9JaqW8aRgyucDU7LtLEZB+Lzs tEmfubW3DF8wx0hf4J0PrsntDUPzobjHzOMBnttmKYkptMjDFGIW/QXIGvvip8Arvy+r Ji4A== X-Gm-Message-State: AOUpUlGNhai5coQlQ2oXS4zJ1EtkjGfA+9exz0SfL0XCtFJJtpAPBU9F nI2rkQb724L6r12coSasJramdk2E X-Google-Smtp-Source: AA+uWPwYOS6uWGyBxRKhZY7S+RPmSNOG8/xQ0JoDVp3hDLj7jzxybJeRJfcJGPIWrM67PjLRYk0C8Q== X-Received: by 2002:a1c:3503:: with SMTP id c3-v6mr22872496wma.46.1534769117775; Mon, 20 Aug 2018 05:45:17 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:52 +0300 Message-Id: <20180819202300.10590-8-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> References: <20180819202300.10590-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PATCH PULL 07/15] 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: , Cc: thuth@redhat.com, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yuval Shaia There is no use in the memory allocated for non-dma MR. Delete the code that allocates it. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180805153518.2983-8-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- 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); + mr->length =3D guest_length; =20 - length =3D mr->length; - addr =3D mr->virt; + 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 - 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; - } - - 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