d761fec5f6
- Applied all the fixes recommended by upstream for v2.2 stable release(bsc#981996). [+0008-app-testpmd-handle-SIGINT-and-SIGTERM.patch, +0009-bonding-copy-entire-config-structure-in-mode-4.patch, +0010-bonding-fix-active-slaves-with-no-primary.patch, +0011-bonding-do-not-ignore-multicast-in-mode-4.patch, +0012-bonding-do-not-activate-slave-twice.patch, +0013-bonding-fix-crash-when-no-slave-device.patch, +0014-bonding-fix-detach-of-bonded-device.patch, +0015-bonding-fix-detach-of-slave-devices.patch, +0016-eal-linux-support-built-in-kernel-modules.patch, +0017-examples-l3fwd-handle-SIGINT-and-SIGTERM.patch, +0018-fm10k-fix-VLAN-flag-in-scattered-Rx.patch, +0019-i40e-base-fix-driver-load-failure.patch, +0020-i40e-base-fix-missing-check-for-stopped-admin-queue.patch, +0021-i40e-fix-inverted-check-for-no-refcount.patch, +0022-i40e-fix-overflow.patch, +0023-i40e-fix-VLAN-filtering.patch, +0024-mempool-fix-leak-when-creation-fails.patch, +0025-pcap-fix-captured-frame-length.patch, +0026-port-fix-crash-for-ethdev-writer-nodrop.patch, +0027-port-fix-crash-for-ring-writer-nodrop.patch, +0028-tools-fix-unbinding-failure-handling.patch, +0029-tools-support-Python-3-in-bind-script.patch, +0030-tools-support-binding-to-built-in-kernel-modules.patch, +0031-vhost-fix-leak-of-fds-and-mmaps.patch, +0032-virtio-fix-crash-in-statistics-functions.patch, +0033-virtio-fix-descriptors-pointing-to-the-same-buffer.patch, +0034-virtio-fix-restart.patch] OBS-URL: https://build.opensuse.org/request/show/399089 OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=3
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
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(-)
|
|
|
|
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
|
|
index ec18fd0..ebefdb4 100644
|
|
--- a/drivers/net/virtio/virtio_ethdev.c
|
|
+++ b/drivers/net/virtio/virtio_ethdev.c
|
|
@@ -1131,9 +1131,6 @@ eth_virtio_dev_init(struct rte_eth_dev *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",
|
|
--
|
|
2.6.2
|
|
|