From nobody Mon Feb 9 09:52:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1584818160; cv=none; d=zohomail.com; s=zohoarc; b=lr2rGsWwzyYw1wF4dXMnok5gnkxpSCV318wTNdaQMfe+fa/ORkW83E7nj0rZTsoZQqvY/04gh4y8x8B8a8ylY+EM0lTAIIEwEMXcpkKpCaOTfelNI18Y7QDBWvbkS0qDZcWeAOoX2FQkhJPIm64gQFpsoZSPaZOA4ZqtRlmKi7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584818160; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=9WcigWUnLHfXhXyLoz7lUzEcGO8vLAxIfw1iSBHyvI4=; b=HWMIAbBYwF/OpsGipyLxqcx7y2yws8IX+nJdC85PLy259yWmlzKaDzKBHVZ3R3zkHiMIE9/iStqq+xq32ldtrxvneG66hO0xs+gp4xj6f0hzTqnvmZMzVUQ8anJcnsEkq68jy99XlkhzlqvP7XLiQ1Xq4bZQ0UyDlhUNKcbLwlI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584818160369116.58558354344427; Sat, 21 Mar 2020 12:16:00 -0700 (PDT) Received: from localhost ([::1]:39910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFjbD-0000IC-4m for importer@patchew.org; Sat, 21 Mar 2020 15:15:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39573) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFjYf-0005RE-Pg for qemu-devel@nongnu.org; Sat, 21 Mar 2020 15:13:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFjYe-0005nH-Em for qemu-devel@nongnu.org; Sat, 21 Mar 2020 15:13:21 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46943) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jFjYe-0005mk-8V for qemu-devel@nongnu.org; Sat, 21 Mar 2020 15:13:20 -0400 Received: by mail-wr1-x441.google.com with SMTP id j17so8194953wru.13 for ; Sat, 21 Mar 2020 12:13:20 -0700 (PDT) Received: from localhost.localdomain ([37.142.144.12]) by smtp.gmail.com with ESMTPSA id i1sm15226252wrs.18.2020.03.21.12.13.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 12:13:18 -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=9WcigWUnLHfXhXyLoz7lUzEcGO8vLAxIfw1iSBHyvI4=; b=Hj4pl9j4shIQnskpqwUaOjpWyPpISN3fijSdZLQBi+YhNggk3eyH2fRKVtA824ddNM Eg+c9wmAGbwAqXAibuaPM9Rfs4TLx9vzLfQDih3nwYG1wI0CNeD9d2MP2HHj4w+IYSDR YUfsDk/ZF11p7K/LDr1Y62e1K9rPZ1iKdYrhE2BmzJWNtQ7ATXGneP5n9RCjba3Ysoks YCkvb0X2bONM4c+BZ9rv2QaXgxWwm0YFNDR2wiQ6E6eldbr0p1uFStf6YjTun2fzSey9 PRRifPDtDbNzA4P3+R2tXyIyR5/pmTpdzdv1xg+XOt/Ahc7Qk12aSZrSDiJ6N4cAE1So zzhg== 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=9WcigWUnLHfXhXyLoz7lUzEcGO8vLAxIfw1iSBHyvI4=; b=qK5nmpnp2rkiK4JM3PAP2FEQKUELm7MfvYAjDLEXzrelbjMjAz04yTY4OtjQW4fKtV no5EQjTpmi0gryVK65SQ8bW5tgGN/u0rce2hHTACs6LYbQEnMN/u6Lm4MvOuf9Elc1i/ uUtF3q6/LSXWs7vBeVsvaMSDI+do4bLhD8CxLE5Ucd9LUGojKUlWpLPPRVs6x5QLK4Iv 2FY6NxNsOozaYXjwASwyzd8tqAsoD1NTyGjYG9Ky0vZ1EbZ31H+MG4sj6kztskQ6TU5X Ydx+UCJF5tK3DqaefadwMIUwcRiod44WBilx+lQUvUszOvn3F6gCYK8Gh3tAVr1CDn4v TXSg== X-Gm-Message-State: ANhLgQ39Vhl2hrB2FpvbwA2xFq854AfRO+7OSRaNw2MiIfm7uzMntkSa XLdfb1Hf6NsTeof6CDiaW+aqKhLn X-Google-Smtp-Source: ADFU+vs77amrZMIzWmc1ciNWrtCrZXTd3DzY20GTrnLqnKtZjogN4b8zqwktfxM4hDuV2gU4PxAY7w== X-Received: by 2002:adf:de8b:: with SMTP id w11mr3926356wrl.397.1584817998978; Sat, 21 Mar 2020 12:13:18 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH PULL 2/4] hw/rdma: Cosmetic change - no need for two sge arrays Date: Sat, 21 Mar 2020 21:13:09 +0200 Message-Id: <20200321191311.31537-3-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200321191311.31537-1-marcel.apfelbaum@gmail.com> References: <20200321191311.31537-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jusual@redhat.com, stefanha@redhat.com, yuval.shaia.ml@gmail.com, quintela@redhat.com 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" From: Yuval Shaia The function build_host_sge_array uses two sge arrays, one for input and one for output. Since the size of the two arrays is the same, the function can write directly to the given source array (i.e. input/output argument). Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20200320143429.9490-2-yuval.shaia.ml@gmail.com> Signed-off-by: Marcel Apfelbaum --- hw/rdma/rdma_backend.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index c346407cd3..b7ffbef9c0 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -378,30 +378,25 @@ 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, uint64_t *total_length) + struct ibv_sge *sge, uint8_t num_sge, + uint64_t *total_length) { RdmaRmMR *mr; - int ssge_idx; + int idx; =20 - for (ssge_idx =3D 0; ssge_idx < num_sge; ssge_idx++) { - mr =3D rdma_rm_get_mr(rdma_dev_res, ssge[ssge_idx].lkey); + for (idx =3D 0; idx < num_sge; idx++) { + mr =3D rdma_rm_get_mr(rdma_dev_res, sge[idx].lkey); if (unlikely(!mr)) { - rdma_error_report("Invalid lkey 0x%x", ssge[ssge_idx].lkey); - return VENDOR_ERR_INVLKEY | ssge[ssge_idx].lkey; + rdma_error_report("Invalid lkey 0x%x", sge[idx].lkey); + return VENDOR_ERR_INVLKEY | sge[idx].lkey; } =20 #ifdef LEGACY_RDMA_REG_MR - dsge->addr =3D (uintptr_t)mr->virt + ssge[ssge_idx].addr - mr->sta= rt; -#else - dsge->addr =3D ssge[ssge_idx].addr; + sge[idx].addr =3D (uintptr_t)mr->virt + sge[idx].addr - mr->start; #endif - dsge->length =3D ssge[ssge_idx].length; - dsge->lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); + sge[idx].lkey =3D rdma_backend_mr_lkey(&mr->backend_mr); =20 - *total_length +=3D dsge->length; - - dsge++; + *total_length +=3D sge[idx].length; } =20 return 0; @@ -484,7 +479,6 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, void *ctx) { BackendCtx *bctx; - struct ibv_sge new_sge[MAX_SGE]; uint32_t bctx_id; int rc; struct ibv_send_wr wr =3D {}, *bad_wr; @@ -518,7 +512,7 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, =20 rdma_protected_gslist_append_int32(&qp->cqe_ctx_list, bctx_id); =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, sge, num_sge, &backend_dev->rdma_dev_res->stats.tx_len); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); @@ -538,7 +532,7 @@ void rdma_backend_post_send(RdmaBackendDev *backend_dev, wr.num_sge =3D num_sge; wr.opcode =3D IBV_WR_SEND; wr.send_flags =3D IBV_SEND_SIGNALED; - wr.sg_list =3D new_sge; + wr.sg_list =3D sge; wr.wr_id =3D bctx_id; =20 rc =3D ibv_post_send(qp->ibqp, &wr, &bad_wr); @@ -601,7 +595,6 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, struct ibv_sge *sge, uint32_t num_sge, void *c= tx) { BackendCtx *bctx; - struct ibv_sge new_sge[MAX_SGE]; uint32_t bctx_id; int rc; struct ibv_recv_wr wr =3D {}, *bad_wr; @@ -635,7 +628,7 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, =20 rdma_protected_gslist_append_int32(&qp->cqe_ctx_list, bctx_id); =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, sge, num_sge, &backend_dev->rdma_dev_res->stats.rx_bufs_le= n); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); @@ -643,7 +636,7 @@ void rdma_backend_post_recv(RdmaBackendDev *backend_dev, } =20 wr.num_sge =3D num_sge; - wr.sg_list =3D new_sge; + wr.sg_list =3D sge; wr.wr_id =3D bctx_id; rc =3D ibv_post_recv(qp->ibqp, &wr, &bad_wr); if (rc) { @@ -671,7 +664,6 @@ void rdma_backend_post_srq_recv(RdmaBackendDev *backend= _dev, uint32_t num_sge, void *ctx) { BackendCtx *bctx; - struct ibv_sge new_sge[MAX_SGE]; uint32_t bctx_id; int rc; struct ibv_recv_wr wr =3D {}, *bad_wr; @@ -688,7 +680,7 @@ void rdma_backend_post_srq_recv(RdmaBackendDev *backend= _dev, =20 rdma_protected_gslist_append_int32(&srq->cqe_ctx_list, bctx_id); =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, sge, num_sge, &backend_dev->rdma_dev_res->stats.rx_bufs_le= n); if (rc) { complete_work(IBV_WC_GENERAL_ERR, rc, ctx); @@ -696,7 +688,7 @@ void rdma_backend_post_srq_recv(RdmaBackendDev *backend= _dev, } =20 wr.num_sge =3D num_sge; - wr.sg_list =3D new_sge; + wr.sg_list =3D sge; wr.wr_id =3D bctx_id; rc =3D ibv_post_srq_recv(srq->ibsrq, &wr, &bad_wr); if (rc) { --=20 2.17.2