From patchwork Thu May 3 18:21:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 908156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=208.118.235.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="k2BIosRZ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40cNtD3WRXz9s02 for ; Fri, 4 May 2018 04:27:48 +1000 (AEST) Received: from localhost ([::1]:58208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIxG-0008Op-6Y for incoming@patchwork.ozlabs.org; Thu, 03 May 2018 14:27:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fEIqY-00024k-Ad for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fEIqX-0008I1-IB for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:50 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:37978) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fEIqX-0008HN-AL for qemu-devel@nongnu.org; Thu, 03 May 2018 14:20:49 -0400 Received: by mail-wm0-x241.google.com with SMTP id i3-v6so480003wmf.3 for ; Thu, 03 May 2018 11:20:49 -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=Fx6ht28VSOW1ci8efiZ0T7GyjEoNDlAEZ+SDrJX4+Ik=; b=k2BIosRZtGDnfIo4PmsJKshkfayodEblfI7RMmgSgaz+WzbvHVaazdwHZ3Yu8MewF+ Z0gm2S/oOxRslF+xHG31LBqSBN6CjXQHrb9yZwcql842Rd2vaOMY1X7foXnvHZ+E9lRQ J0izPzk9QkuJEBNEe52ewL73tTacnFo7c0EYZwDbQBlXY/Dv777TIKhUdZlXEyQJQhoK 1S9AWozlddH/o+57aZLy/AVVyRgquNHBTb6eOCvjD3RCj9wfccGwRld6NIgWBZQJMkpT E9zHbT7bCWtcypLrGjPps5J2YI2iSgT6ajBlYXi9GBxSQ5dT//xipp4uRZD7Td4DIsCb ycKw== 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=Fx6ht28VSOW1ci8efiZ0T7GyjEoNDlAEZ+SDrJX4+Ik=; b=tPUWCj1oEYdRK9gMo4cMhUd5FucQK+ec6SFGoQDWhEtJJSs672+i4+1gPsulILhzKb 7HWyCVGgpz1DK5LqcMZbGvqYuoy3lp9QLlz2mZzgvUKdui+t2c8gtoM3vT9DtIvBMjXv mG4N8ij+AbUEv4qDUQkZzpMrlkk9Ge41QcBB7LlWul95RRFR2sIzLMJs2ZhXKNjxfmzd P+MAZbjjy9C5jklf918Drm5MC+Z+GhuYQ2D+GzfzOyE00Wna7TFNnaRZmb/+St0xCYe0 9d0R/tItGomf2ZVCOzmbemjvmp9vuHT/X6RzQC2/DQTy6DlIX6XTyn9+JtpghCbYf2Sx T8fw== X-Gm-Message-State: ALQs6tCDEfsdF+Nqn0ZLhNfeR40TSy4EtvvfFC3M+UI4yMLJCK7atL6j J8KBzHc7IDHrXxmPF4PBQFQbCg== X-Google-Smtp-Source: AB8JxZqn0tRL2N5k8NuBUAs7vZ0nEd/AVhirDchl4tCOQO8fcxqipJFJ3m255XjoZ4cA/OP4pR0kQQ== X-Received: by 10.28.139.136 with SMTP id n130mr15099639wmd.8.1525371648099; Thu, 03 May 2018 11:20:48 -0700 (PDT) Received: from localhost.localdomain ([176.228.154.53]) by smtp.gmail.com with ESMTPSA id w40-v6sm24388801wrc.69.2018.05.03.11.20.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 11:20:47 -0700 (PDT) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 3 May 2018 21:21:20 +0300 Message-Id: <20180503182125.20310-4-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180503182125.20310-1-marcel.apfelbaum@gmail.com> References: <20180503182125.20310-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::241 Subject: [Qemu-devel] [PULL 3/8] hw/rdma: Delete port's pkey table 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: peter.maydell@linaro.org, yuval.shaia@oracle.com, f4bug@amsat.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia Support for PKEY is not yet implemented. Removing the unneeded table until a support will be added. Signed-off-by: Yuval Shaia Reviewed-by: Marcel Apfelbaum Message-Id: <20180430200223.4119-4-marcel.apfelbaum@gmail.com> --- hw/rdma/rdma_rm_defs.h | 3 +-- hw/rdma/vmw/pvrdma_main.c | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/hw/rdma/rdma_rm_defs.h b/hw/rdma/rdma_rm_defs.h index fc646da61f..45503f14e0 100644 --- a/hw/rdma/rdma_rm_defs.h +++ b/hw/rdma/rdma_rm_defs.h @@ -21,7 +21,7 @@ #define MAX_PORTS 1 #define MAX_PORT_GIDS 1 #define MAX_PORT_PKEYS 1 -#define MAX_PKEYS 1 +#define MAX_PKEYS MAX_PORT_PKEYS #define MAX_GIDS 2048 #define MAX_UCS 512 #define MAX_MR_SIZE (1UL << 27) @@ -87,7 +87,6 @@ typedef struct RdmaRmQP { typedef struct RdmaRmPort { union ibv_gid gid_tbl[MAX_PORT_GIDS]; enum ibv_port_state state; - int *pkey_tbl; /* TODO: Not yet supported */ } RdmaRmPort; typedef struct RdmaDeviceResources { diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c index c552248c90..994220b58e 100644 --- a/hw/rdma/vmw/pvrdma_main.c +++ b/hw/rdma/vmw/pvrdma_main.c @@ -275,15 +275,6 @@ static void init_dsr_dev_caps(PVRDMADev *dev) pr_dbg("Initialized\n"); } -static void free_ports(PVRDMADev *dev) -{ - int i; - - for (i = 0; i < MAX_PORTS; i++) { - g_free(dev->rdma_dev_res.ports[i].gid_tbl); - } -} - static void init_ports(PVRDMADev *dev, Error **errp) { int i; @@ -292,10 +283,6 @@ static void init_ports(PVRDMADev *dev, Error **errp) for (i = 0; i < MAX_PORTS; i++) { dev->rdma_dev_res.ports[i].state = IBV_PORT_DOWN; - - dev->rdma_dev_res.ports[i].pkey_tbl = - g_malloc0(sizeof(*dev->rdma_dev_res.ports[i].pkey_tbl) * - MAX_PORT_PKEYS); } } @@ -622,8 +609,6 @@ static void pvrdma_exit(PCIDevice *pdev) pvrdma_qp_ops_fini(); - free_ports(dev); - rdma_rm_fini(&dev->rdma_dev_res); rdma_backend_fini(&dev->backend_dev);