From: Yuanhan Liu <yuanhan.liu@linux.intel.com>
To: dev@dpdk.org
Cc: huawei.xie@intel.com, Yuanhan Liu <yuanhan.liu@linux.intel.com>
Subject: [dpdk-dev] [PATCH] examples/vhost: fix corrupted vdev tailq list
Date: Tue, 7 Jun 2016 11:32:56 +0800 [thread overview]
Message-ID: <1465270376-16560-1-git-send-email-yuanhan.liu@linux.intel.com> (raw)
There are two tailq lists, one for logging all vhost devices, another
one for logging vhost devices distributed on a specific core. However,
there is just one tailq entry, named "next", to chain the two list,
which is wrong and could result to a corrupted tailq list, that the
tailq list might always be non-empty: the entry is still there even
after you have invoked TAILQ_REMOVE several times.
Fix it by introducing two tailq entries, one for each list.
Fixes: 45657a5c6861 ("examples/vhost: use tailq to link vhost devices")
Signed-off-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
---
examples/vhost/main.c | 20 ++++++++++++--------
examples/vhost/main.h | 3 ++-
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/examples/vhost/main.c b/examples/vhost/main.c
index 665886e..48060df 100644
--- a/examples/vhost/main.c
+++ b/examples/vhost/main.c
@@ -691,7 +691,7 @@ find_vhost_dev(struct ether_addr *mac)
{
struct vhost_dev *vdev;
- TAILQ_FOREACH(vdev, &vhost_dev_list, next) {
+ TAILQ_FOREACH(vdev, &vhost_dev_list, global_vdev_entry) {
if (vdev->ready == DEVICE_RX &&
is_same_ether_addr(mac, &vdev->mac_address))
return vdev;
@@ -945,7 +945,7 @@ virtio_tx_route(struct vhost_dev *vdev, struct rte_mbuf *m, uint16_t vlan_tag)
if (unlikely(is_broadcast_ether_addr(&nh->d_addr))) {
struct vhost_dev *vdev2;
- TAILQ_FOREACH(vdev2, &vhost_dev_list, next) {
+ TAILQ_FOREACH(vdev2, &vhost_dev_list, global_vdev_entry) {
virtio_xmit(vdev2, vdev, m);
}
goto queue2nic;
@@ -1149,7 +1149,8 @@ switch_worker(void *arg __rte_unused)
/*
* Process vhost devices
*/
- TAILQ_FOREACH(vdev, &lcore_info[lcore_id].vdev_list, next) {
+ TAILQ_FOREACH(vdev, &lcore_info[lcore_id].vdev_list,
+ lcore_vdev_entry) {
if (unlikely(vdev->remove)) {
unlink_vmdq(vdev);
vdev->ready = DEVICE_SAFE_REMOVE;
@@ -1188,8 +1189,10 @@ destroy_device (volatile struct virtio_net *dev)
rte_pause();
}
- TAILQ_REMOVE(&lcore_info[vdev->coreid].vdev_list, vdev, next);
- TAILQ_REMOVE(&vhost_dev_list, vdev, next);
+ TAILQ_REMOVE(&lcore_info[vdev->coreid].vdev_list, vdev,
+ lcore_vdev_entry);
+ TAILQ_REMOVE(&vhost_dev_list, vdev, global_vdev_entry);
+
/* Set the dev_removal_flag on each lcore. */
RTE_LCORE_FOREACH_SLAVE(lcore)
@@ -1234,7 +1237,7 @@ new_device (struct virtio_net *dev)
vdev->dev = dev;
dev->priv = vdev;
- TAILQ_INSERT_TAIL(&vhost_dev_list, vdev, next);
+ TAILQ_INSERT_TAIL(&vhost_dev_list, vdev, global_vdev_entry);
vdev->vmdq_rx_q
= dev->device_fh * queues_per_pool + vmdq_queue_base;
@@ -1251,7 +1254,8 @@ new_device (struct virtio_net *dev)
}
vdev->coreid = core_add;
- TAILQ_INSERT_TAIL(&lcore_info[vdev->coreid].vdev_list, vdev, next);
+ TAILQ_INSERT_TAIL(&lcore_info[vdev->coreid].vdev_list, vdev,
+ lcore_vdev_entry);
lcore_info[vdev->coreid].device_num++;
/* Disable notifications. */
@@ -1294,7 +1298,7 @@ print_stats(void)
printf("%s%s\n", clr, top_left);
printf("Device statistics =================================\n");
- TAILQ_FOREACH(vdev, &vhost_dev_list, next) {
+ TAILQ_FOREACH(vdev, &vhost_dev_list, global_vdev_entry) {
tx_total = vdev->stats.tx_total;
tx = vdev->stats.tx;
tx_dropped = tx_total - tx;
diff --git a/examples/vhost/main.h b/examples/vhost/main.h
index c4591b4..bd7f1a3 100644
--- a/examples/vhost/main.h
+++ b/examples/vhost/main.h
@@ -67,7 +67,8 @@ struct vhost_dev {
volatile uint8_t remove;
struct device_statistics stats;
- TAILQ_ENTRY(vhost_dev) next;
+ TAILQ_ENTRY(vhost_dev) global_vdev_entry;
+ TAILQ_ENTRY(vhost_dev) lcore_vdev_entry;
} __rte_cache_aligned;
TAILQ_HEAD(vhost_dev_tailq_list, vhost_dev);
--
1.9.0
next reply other threads:[~2016-06-07 3:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-07 3:32 Yuanhan Liu [this message]
2016-06-13 9:53 ` Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465270376-16560-1-git-send-email-yuanhan.liu@linux.intel.com \
--to=yuanhan.liu@linux.intel.com \
--cc=dev@dpdk.org \
--cc=huawei.xie@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).