From patchwork Tue Jun 20 23:25:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Lara Guarch, Pablo" X-Patchwork-Id: 25541 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 103DB7CAA; Wed, 21 Jun 2017 09:26:28 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id B49C258CD for ; Wed, 21 Jun 2017 09:26:19 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP; 21 Jun 2017 00:26:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,368,1493708400"; d="scan'208";a="101899291" Received: from silpixa00399464.ir.intel.com (HELO silpixa00399464.ger.corp.intel.com) ([10.237.222.157]) by orsmga002.jf.intel.com with ESMTP; 21 Jun 2017 00:26:18 -0700 From: Pablo de Lara To: thomas@monjalon.net, declan.doherty@intel.com Cc: dev@dpdk.org, Pablo de Lara Date: Wed, 21 Jun 2017 00:25:55 +0100 Message-Id: <20170620232555.82244-6-pablo.de.lara.guarch@intel.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620232555.82244-1-pablo.de.lara.guarch@intel.com> References: <20170620232555.82244-1-pablo.de.lara.guarch@intel.com> Subject: [dpdk-dev] [PATCH 5/5] test/bonding: check if socket id has memory X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use new function to check if socket id has reserved memory, instead of implementing a local function that checks total number of sockets, to verify if selected socket id is beyond the range of sockets. Signed-off-by: Pablo de Lara --- test/test/virtual_pmd.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/test/test/virtual_pmd.c b/test/test/virtual_pmd.c index e9dd8ac..a874cd4 100644 --- a/test/test/virtual_pmd.c +++ b/test/test/virtual_pmd.c @@ -511,20 +511,6 @@ virtual_ethdev_get_mbufs_from_tx_queue(uint8_t port_id, burst_length, NULL); } -static uint8_t -get_number_of_sockets(void) -{ - int sockets = 0; - int i; - const struct rte_memseg *ms = rte_eal_get_physmem_layout(); - - for (i = 0; i < RTE_MAX_MEMSEG && ms[i].addr != NULL; i++) { - if (sockets < ms[i].socket_id) - sockets = ms[i].socket_id; - } - /* Number of sockets = maximum socket_id + 1 */ - return ++sockets; -} int virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, @@ -542,7 +528,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr, * and internal (dev_private) data */ - if (socket_id >= get_number_of_sockets()) + if (!rte_eal_has_memory_socket(socket_id)) goto err; pci_dev = rte_zmalloc_socket(name, sizeof(*pci_dev), 0, socket_id);