54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
Description: backport of dpdk 16.04-rc1 fix for LP: #1559981
|
|
|
|
Forwarded: n/a (already upstream)
|
|
Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
|
|
Last-Update: 2016-03-23
|
|
|
|
From c680a4a88c4312068f60937a7ba51eac8211c9a6 Mon Sep 17 00:00:00 2001
|
|
From: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Date: Wed, 23 Dec 2015 09:45:19 +0000
|
|
Subject: [PATCH] virtio: fix crash in statistics functions
|
|
|
|
This initialisation of nb_rx_queues and nb_tx_queues has been removed
|
|
from eth_virtio_dev_init.
|
|
|
|
The nb_rx_queues and nb_tx_queues were being initialised in
|
|
eth_virtio_dev_init before the tx_queues and rx_queues arrays were
|
|
allocated.
|
|
|
|
The arrays are allocated when the ethdev port is configured and the
|
|
nb_tx_queues and nb_rx_queues are initialised.
|
|
|
|
If any of the following functions were called before the ethdev
|
|
port was configured there was a segmentation fault because
|
|
rx_queues and tx_queues were NULL:
|
|
|
|
rte_eth_stats_get
|
|
rte_eth_stats_reset
|
|
rte_eth_xstats_get
|
|
rte_eth_xstats_reset
|
|
|
|
Fixes: 823ad647950a ("virtio: support multiple queues")
|
|
|
|
Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
|
|
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
|
|
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
|
|
---
|
|
drivers/net/virtio/virtio_ethdev.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
Index: dpdk/drivers/net/virtio/virtio_ethdev.c
|
|
===================================================================
|
|
--- dpdk.orig/drivers/net/virtio/virtio_ethdev.c
|
|
+++ dpdk/drivers/net/virtio/virtio_ethdev.c
|
|
@@ -1378,9 +1378,6 @@ eth_virtio_dev_init(struct rte_eth_dev *
|
|
hw->max_tx_queues = 1;
|
|
}
|
|
|
|
- eth_dev->data->nb_rx_queues = hw->max_rx_queues;
|
|
- eth_dev->data->nb_tx_queues = hw->max_tx_queues;
|
|
-
|
|
PMD_INIT_LOG(DEBUG, "hw->max_rx_queues=%d hw->max_tx_queues=%d",
|
|
hw->max_rx_queues, hw->max_tx_queues);
|
|
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x",
|