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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534769272256645.427363901314; Mon, 20 Aug 2018 05:47:52 -0700 (PDT) Received: from localhost ([::1]:46893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjaw-0001Fb-0r for importer@patchew.org; Mon, 20 Aug 2018 08:47:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43919) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frjYc-0008U8-Je for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frjYb-0000eB-Sr for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:18 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:40580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frjYb-0000df-MX for qemu-devel@nongnu.org; Mon, 20 Aug 2018 08:45:17 -0400 Received: by mail-wm0-x235.google.com with SMTP id y9-v6so13813068wma.5 for ; Mon, 20 Aug 2018 05:45:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Aug 2018 05:45:16 -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=w5uYoy4cIau0f49tvCyP6EMTQ+YJwdKZYxbtRW166HU=; b=pc+VxItXvlIpQ9TRoN25IE7EekSISx4HBVpuzmjH+u5WKzD3fUROaO/tfhESj/gYFu YcLDcxzR0MZEeLVmzBtdm0XMIugmJc14zY4ohodenitDFpWVOY1YF+CEcLg94WoF06Ky hR8O0v/1zUMVO/01PoNLjY5j5jegEQnFCCR3OgFsvMR+Q+sG1rYuGeX5RsUUS5zXp3+y JaEpCfN0K2yexzrWBIw3Cnkm5vW9HgFHQkNbgZarp9t+VnLtObjXx+XdGCh/NLJ+CHUJ GhMcG7MqAWuhnG77Ke6jKg5qDR/BpwlvlVbyI5k3I4RtONb8Z05+TMQOrlmfispBDeMk LoYw== 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=w5uYoy4cIau0f49tvCyP6EMTQ+YJwdKZYxbtRW166HU=; b=DL60/l4V88C/9O7lf5KOX4OCCUrUdMvNN+LEdwEG8QDQMPuoxHGVs9CLjLCFomrAb7 yQtd8x7CB+RsI/Mp9se+XCzqxJoe5pP8A/e7jhkJZOgV1542A4sgSncePTgOiesX/Yhq jgZhMWu2wq21HLiyHdF1OnTCyaDNsBsWmPbQkV2sw68bh9B7F4Z2k9dxYaTV5PELcpiq vY3xrEIv4F9/LaKF7eSh4RjntzNtQhL7xfAP8hyMv6M7uVOtoAF+hqCaxQ6YSfMf8NBA aOHM67xutt+Pj8+ziaeGOmFpS5E9QXByjdULzN+QECyUHvPbVso5nU0wo6ogEfgJQhku ARnQ== X-Gm-Message-State: AOUpUlFBzYN8mEKJwiUvd8V5/pC2mX9iFWZ4LpgBPNo5E6jeAx2YUgsy VxRtiWh/16KAIlXUFl+HHt3gLjst X-Google-Smtp-Source: AA+uWPyO3dGxVkHPSYcE//t/blfXIxAfcdT0B5CK8FsfwJoLJ+juJ7FGUl/knDgUl6m/Ajo7We3niw== X-Received: by 2002:a1c:c1c8:: with SMTP id r191-v6mr15373700wmf.103.1534769116498; Mon, 20 Aug 2018 05:45:16 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sun, 19 Aug 2018 23:22:51 +0300 Message-Id: <20180819202300.10590-7-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::235 Subject: [Qemu-devel] [PATCH PULL 06/15] hw/rdma: Delete useless structure RdmaRmUserMR 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 The structure RdmaRmUserMR has no benefits, remove it an move all its fields to struct RdmaRmMR. Reviewed-by: Marcel Apfelbaum Signed-off-by: Yuval Shaia Message-Id: <20180805153518.2983-7-yuval.shaia@oracle.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 3 +-- hw/rdma/rdma_rm.c | 16 ++++++++-------- hw/rdma/rdma_rm_defs.h | 10 +++------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index 647e16399f..52981d652d 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -271,8 +271,7 @@ static int build_host_sge_array(RdmaDeviceResources *rd= ma_dev_res, return VENDOR_ERR_INVLKEY | ssge[ssge_idx].lkey; } =20 - dsge->addr =3D (uintptr_t)mr->user_mr.host_virt + ssge[ssge_idx].a= ddr - - mr->user_mr.guest_start; + dsge->addr =3D (uintptr_t)mr->virt + ssge[ssge_idx].addr - mr->sta= rt; dsge->length =3D ssge[ssge_idx].length; dsge->lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); =20 diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c index 415da15efe..7403d24674 100644 --- a/hw/rdma/rdma_rm.c +++ b/hw/rdma/rdma_rm.c @@ -165,15 +165,15 @@ int rdma_rm_alloc_mr(RdmaDeviceResources *dev_res, ui= nt32_t pd_handle, length =3D TARGET_PAGE_SIZE; addr =3D g_malloc(length); } else { - mr->user_mr.host_virt =3D host_virt; - pr_dbg("host_virt=3D0x%p\n", mr->user_mr.host_virt); - mr->user_mr.length =3D guest_length; + 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->user_mr.guest_start =3D guest_start; - pr_dbg("guest_start=3D0x%" PRIx64 "\n", mr->user_mr.guest_start); + mr->start =3D guest_start; + pr_dbg("guest_start=3D0x%" PRIx64 "\n", mr->start); =20 - length =3D mr->user_mr.length; - addr =3D mr->user_mr.host_virt; + length =3D mr->length; + addr =3D mr->virt; } =20 ret =3D rdma_backend_create_mr(&mr->backend_mr, &pd->backend_pd, addr,= length, @@ -214,7 +214,7 @@ void rdma_rm_dealloc_mr(RdmaDeviceResources *dev_res, u= int32_t mr_handle) =20 if (mr) { rdma_backend_destroy_mr(&mr->backend_mr); - munmap(mr->user_mr.host_virt, mr->user_mr.length); + munmap(mr->virt, mr->length); res_tbl_dealloc(&dev_res->mr_tbl, mr_handle); } } diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index 226011176d..7228151239 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -55,16 +55,12 @@ typedef struct RdmaRmCQ { bool notify; } RdmaRmCQ; =20 -typedef struct RdmaRmUserMR { - void *host_virt; - uint64_t guest_start; - size_t length; -} RdmaRmUserMR; - /* MR (DMA region) */ typedef struct RdmaRmMR { RdmaBackendMR backend_mr; - RdmaRmUserMR user_mr; + void *virt; + uint64_t start; + size_t length; uint32_t pd_handle; uint32_t lkey; uint32_t rkey; --=20 2.17.1