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
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 3b1e3e4e362453df8cecbc6d481444be8b84326e Mon Sep 17 00:00:00 2001
|
|
From: Huawei Xie <huawei.xie@intel.com>
|
|
Date: Fri, 11 Dec 2015 00:07:32 +0800
|
|
Subject: [PATCH] virtio: fix descriptors pointing to the same buffer
|
|
|
|
The virtio_net_hdr desc all pointed to the same buffer. It doesn't cause
|
|
issue because in the simple TX mode we don't use the header. This patch
|
|
makes the header desc point to different buffer.
|
|
|
|
Fixes: b4ae9c505f2e ("virtio: optimize ring layout")
|
|
|
|
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
|
|
Acked-by: Jianfeng Tan <jianfeng.tan@intel.com>
|
|
Acked-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
|
|
---
|
|
drivers/net/virtio/virtio_rxtx.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c
|
|
index e96352c..a7a58be 100644
|
|
--- a/drivers/net/virtio/virtio_rxtx.c
|
|
+++ b/drivers/net/virtio/virtio_rxtx.c
|
|
@@ -353,7 +353,7 @@ virtio_dev_vring_start(struct virtqueue *vq, int queue_type)
|
|
vq->vq_ring.desc[i + mid_idx].next = i;
|
|
vq->vq_ring.desc[i + mid_idx].addr =
|
|
vq->virtio_net_hdr_mem +
|
|
- mid_idx * vq->hw->vtnet_hdr_size;
|
|
+ i * vq->hw->vtnet_hdr_size;
|
|
vq->vq_ring.desc[i + mid_idx].len =
|
|
vq->hw->vtnet_hdr_size;
|
|
vq->vq_ring.desc[i + mid_idx].flags =
|
|
--
|
|
2.6.2
|
|
|