From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNzdC-0003lF-IC for qemu-devel@nongnu.org; Sat, 17 Nov 2018 07:23:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNzd8-0000gP-KM for qemu-devel@nongnu.org; Sat, 17 Nov 2018 07:23:22 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNzd8-0000dd-Bw for qemu-devel@nongnu.org; Sat, 17 Nov 2018 07:23:18 -0500 Received: by mail-wr1-x443.google.com with SMTP id b13so27438765wrx.6 for ; Sat, 17 Nov 2018 04:23:18 -0800 (PST) References: <20181113071336.6242-1-yuval.shaia@oracle.com> <20181113071336.6242-19-yuval.shaia@oracle.com> From: Marcel Apfelbaum Message-ID: <91b0ccc5-3d66-c12a-8493-ce06ce2655a9@gmail.com> Date: Sat, 17 Nov 2018 14:23:14 +0200 MIME-Version: 1.0 In-Reply-To: <20181113071336.6242-19-yuval.shaia@oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH v3 18/23] hw/rdma: Remove unneeded code that handles more that one port List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yuval Shaia , dmitry.fleytman@gmail.com, jasowang@redhat.com, eblake@redhat.com, armbru@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, shamir.rabinovitch@oracle.com, cohuck@redhat.com On 11/13/18 9:13 AM, Yuval Shaia wrote: > Device supports only one port, let's remove a dead code that handles > more than one port. > > Signed-off-by: Yuval Shaia > --- > hw/rdma/rdma_rm.c | 34 ++++++++++++++++------------------ > hw/rdma/rdma_rm.h | 2 +- > hw/rdma/rdma_rm_defs.h | 4 ++-- > 3 files changed, 19 insertions(+), 21 deletions(-) > > diff --git a/hw/rdma/rdma_rm.c b/hw/rdma/rdma_rm.c > index fe0979415d..0a5ab8935a 100644 > --- a/hw/rdma/rdma_rm.c > +++ b/hw/rdma/rdma_rm.c > @@ -545,7 +545,7 @@ int rdma_rm_add_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, > return -EINVAL; > } > > - memcpy(&dev_res->ports[0].gid_tbl[gid_idx].gid, gid, sizeof(*gid)); > + memcpy(&dev_res->port.gid_tbl[gid_idx].gid, gid, sizeof(*gid)); > > return 0; > } > @@ -556,15 +556,15 @@ int rdma_rm_del_gid(RdmaDeviceResources *dev_res, RdmaBackendDev *backend_dev, > int rc; > > rc = rdma_backend_del_gid(backend_dev, ifname, > - &dev_res->ports[0].gid_tbl[gid_idx].gid); > + &dev_res->port.gid_tbl[gid_idx].gid); > if (rc < 0) { > pr_dbg("Fail to delete gid\n"); > return -EINVAL; > } > > - memset(dev_res->ports[0].gid_tbl[gid_idx].gid.raw, 0, > - sizeof(dev_res->ports[0].gid_tbl[gid_idx].gid)); > - dev_res->ports[0].gid_tbl[gid_idx].backend_gid_index = -1; > + memset(dev_res->port.gid_tbl[gid_idx].gid.raw, 0, > + sizeof(dev_res->port.gid_tbl[gid_idx].gid)); > + dev_res->port.gid_tbl[gid_idx].backend_gid_index = -1; > > return 0; > } > @@ -577,16 +577,16 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *dev_res, > return -EINVAL; > } > > - if (unlikely(dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index == -1)) { > - dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index = > + if (unlikely(dev_res->port.gid_tbl[sgid_idx].backend_gid_index == -1)) { > + dev_res->port.gid_tbl[sgid_idx].backend_gid_index = > rdma_backend_get_gid_index(backend_dev, > - &dev_res->ports[0].gid_tbl[sgid_idx].gid); > + &dev_res->port.gid_tbl[sgid_idx].gid); > } > > pr_dbg("backend_gid_index=%d\n", > - dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index); > + dev_res->port.gid_tbl[sgid_idx].backend_gid_index); > > - return dev_res->ports[0].gid_tbl[sgid_idx].backend_gid_index; > + return dev_res->port.gid_tbl[sgid_idx].backend_gid_index; > } > > static void destroy_qp_hash_key(gpointer data) > @@ -596,15 +596,13 @@ static void destroy_qp_hash_key(gpointer data) > > static void init_ports(RdmaDeviceResources *dev_res) > { > - int i, j; > + int i; > > - memset(dev_res->ports, 0, sizeof(dev_res->ports)); > + memset(&dev_res->port, 0, sizeof(dev_res->port)); > > - for (i = 0; i < MAX_PORTS; i++) { > - dev_res->ports[i].state = IBV_PORT_DOWN; > - for (j = 0; j < MAX_PORT_GIDS; j++) { > - dev_res->ports[i].gid_tbl[j].backend_gid_index = -1; > - } > + dev_res->port.state = IBV_PORT_DOWN; > + for (i = 0; i < MAX_PORT_GIDS; i++) { > + dev_res->port.gid_tbl[i].backend_gid_index = -1; > } > } > > @@ -613,7 +611,7 @@ static void fini_ports(RdmaDeviceResources *dev_res, > { > int i; > > - dev_res->ports[0].state = IBV_PORT_DOWN; > + dev_res->port.state = IBV_PORT_DOWN; > for (i = 0; i < MAX_PORT_GIDS; i++) { > rdma_rm_del_gid(dev_res, backend_dev, ifname, i); > } > diff --git a/hw/rdma/rdma_rm.h b/hw/rdma/rdma_rm.h > index a7169b4e89..3c602c04c0 100644 > --- a/hw/rdma/rdma_rm.h > +++ b/hw/rdma/rdma_rm.h > @@ -79,7 +79,7 @@ int rdma_rm_get_backend_gid_index(RdmaDeviceResources *dev_res, > static inline union ibv_gid *rdma_rm_get_gid(RdmaDeviceResources *dev_res, > int sgid_idx) > { > - return &dev_res->ports[0].gid_tbl[sgid_idx].gid; > + return &dev_res->port.gid_tbl[sgid_idx].gid; > } > > #endif > diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h > index 7b3435f991..0ba61d1838 100644 > --- a/hw/rdma/rdma_rm_defs.h > +++ b/hw/rdma/rdma_rm_defs.h > @@ -18,7 +18,7 @@ > > #include "rdma_backend_defs.h" > > -#define MAX_PORTS 1 > +#define MAX_PORTS 1 /* Do not change - we support only one port */ > #define MAX_PORT_GIDS 255 > #define MAX_GIDS MAX_PORT_GIDS > #define MAX_PORT_PKEYS 1 > @@ -97,7 +97,7 @@ typedef struct RdmaRmPort { > } RdmaRmPort; > > typedef struct RdmaDeviceResources { > - RdmaRmPort ports[MAX_PORTS]; > + RdmaRmPort port; > RdmaRmResTbl pd_tbl; > RdmaRmResTbl mr_tbl; > RdmaRmResTbl uc_tbl; Reviewed-by: Marcel Apfelbaum Thanks, Marcel