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
75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From fa11a8a7251e14eca0a4190128732386f13551bd Mon Sep 17 00:00:00 2001
|
|
From: Jasvinder Singh <jasvinder.singh@intel.com>
|
|
Date: Wed, 2 Mar 2016 21:19:58 +0000
|
|
Subject: [PATCH] port: fix crash for ring writer nodrop
|
|
|
|
Error log:
|
|
[APP] Initializing PIPELINE0 ...
|
|
pipeline> [APP] Initializing PIPELINE1 ...
|
|
[PIPELINE1] Pass-through
|
|
[APP] Initializing PIPELINE2 ...
|
|
[PIPELINE2] Pass-through
|
|
Segmentation fault (core dumped)
|
|
|
|
Fixes: 5f4cd47309d6 ("port: add ring writer nodrop")
|
|
Fixes: d58f69c54172 ("port: add ring multi reader or writer")
|
|
|
|
Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
|
|
---
|
|
lib/librte_port/rte_port_ring.c | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c
|
|
index 755dfc1..b847fea 100644
|
|
--- a/lib/librte_port/rte_port_ring.c
|
|
+++ b/lib/librte_port/rte_port_ring.c
|
|
@@ -520,16 +520,20 @@ send_burst_nodrop(struct rte_port_ring_writer_nodrop *p)
|
|
p->tx_buf_count);
|
|
|
|
/* We sent all the packets in a first try */
|
|
- if (nb_tx >= p->tx_buf_count)
|
|
+ if (nb_tx >= p->tx_buf_count) {
|
|
+ p->tx_buf_count = 0;
|
|
return;
|
|
+ }
|
|
|
|
for (i = 0; i < p->n_retries; i++) {
|
|
nb_tx += rte_ring_sp_enqueue_burst(p->ring,
|
|
(void **) (p->tx_buf + nb_tx), p->tx_buf_count - nb_tx);
|
|
|
|
/* We sent all the packets in more than one try */
|
|
- if (nb_tx >= p->tx_buf_count)
|
|
+ if (nb_tx >= p->tx_buf_count) {
|
|
+ p->tx_buf_count = 0;
|
|
return;
|
|
+ }
|
|
}
|
|
|
|
/* We didn't send the packets in maximum allowed attempts */
|
|
@@ -549,16 +553,20 @@ send_burst_mp_nodrop(struct rte_port_ring_writer_nodrop *p)
|
|
p->tx_buf_count);
|
|
|
|
/* We sent all the packets in a first try */
|
|
- if (nb_tx >= p->tx_buf_count)
|
|
+ if (nb_tx >= p->tx_buf_count) {
|
|
+ p->tx_buf_count = 0;
|
|
return;
|
|
+ }
|
|
|
|
for (i = 0; i < p->n_retries; i++) {
|
|
nb_tx += rte_ring_mp_enqueue_burst(p->ring,
|
|
(void **) (p->tx_buf + nb_tx), p->tx_buf_count - nb_tx);
|
|
|
|
/* We sent all the packets in more than one try */
|
|
- if (nb_tx >= p->tx_buf_count)
|
|
+ if (nb_tx >= p->tx_buf_count) {
|
|
+ p->tx_buf_count = 0;
|
|
return;
|
|
+ }
|
|
}
|
|
|
|
/* We didn't send the packets in maximum allowed attempts */
|
|
--
|
|
2.6.2
|
|
|