From patchwork Thu Dec 17 17:23:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Iremonger, Bernard" X-Patchwork-Id: 9593 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 B1EF68D8F; Thu, 17 Dec 2015 18:23:43 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 7DAEC7E23 for ; Thu, 17 Dec 2015 18:23:42 +0100 (CET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP; 17 Dec 2015 09:23:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,442,1444719600"; d="scan'208";a="873652937" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga002.jf.intel.com with ESMTP; 17 Dec 2015 09:23:40 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id tBHHNdAf030497; Thu, 17 Dec 2015 17:23:39 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id tBHHNdUK016394; Thu, 17 Dec 2015 17:23:39 GMT Received: (from bairemon@localhost) by sivswdev01.ir.intel.com with id tBHHNdNi016390; Thu, 17 Dec 2015 17:23:39 GMT From: Bernard Iremonger To: dev@dpdk.org Date: Thu, 17 Dec 2015 17:23:36 +0000 Message-Id: <1450373016-16356-1-git-send-email-bernard.iremonger@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] librte_ether: fix crashes in rte_ethdev functions. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The nb_rx_queues and nb_tx_queues are initialised before the tx_queue and rx_queue arrays are allocated. The arrays are allocated when the ethdev port is started. If any of the following functions are called before the ethdev port is started there is a segmentation fault: rte_eth_stats_get rte_eth_stats_reset rte_eth_xstats_get rte_eth_xstats_reset Fixes: af75078fece3 ("first public release") Fixes: ce757f5c9a4d ("ethdev: new method to retrieve extended statistics") Fixes: d4fef8b0d5e5 ("ethdev: expose generic and driver specific stats in xstats") Signed-off-by: Bernard Iremonger --- lib/librte_ether/rte_ethdev.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c index ed971b4..a0ee84d 100644 --- a/lib/librte_ether/rte_ethdev.c +++ b/lib/librte_ether/rte_ethdev.c @@ -1441,7 +1441,10 @@ rte_eth_stats_get(uint8_t port_id, struct rte_eth_stats *stats) memset(stats, 0, sizeof(*stats)); RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->stats_get, -ENOTSUP); - (*dev->dev_ops->stats_get)(dev, stats); + + if (dev->data->dev_started) + (*dev->dev_ops->stats_get)(dev, stats); + stats->rx_nombuf = dev->data->rx_mbuf_alloc_failed; return 0; } @@ -1455,7 +1458,10 @@ rte_eth_stats_reset(uint8_t port_id) dev = &rte_eth_devices[port_id]; RTE_FUNC_PTR_OR_RET(*dev->dev_ops->stats_reset); - (*dev->dev_ops->stats_reset)(dev); + + if (dev->data->dev_started) + (*dev->dev_ops->stats_reset)(dev); + dev->data->rx_mbuf_alloc_failed = 0; } @@ -1479,7 +1485,8 @@ rte_eth_xstats_get(uint8_t port_id, struct rte_eth_xstats *xstats, (dev->data->nb_tx_queues * RTE_NB_TXQ_STATS); /* implemented by the driver */ - if (dev->dev_ops->xstats_get != NULL) { + if ((dev->dev_ops->xstats_get != NULL) && + (dev->data->dev_started)) { /* Retrieve the xstats from the driver at the end of the * xstats struct. */ @@ -1548,7 +1555,8 @@ rte_eth_xstats_reset(uint8_t port_id) dev = &rte_eth_devices[port_id]; /* implemented by the driver */ - if (dev->dev_ops->xstats_reset != NULL) { + if ((dev->dev_ops->xstats_reset != NULL) && + (dev->data->dev_started)) { (*dev->dev_ops->xstats_reset)(dev); return; }