summaryrefslogtreecommitdiffstats
path: root/src/vnet/devices/tap
diff options
context:
space:
mode:
authorMohsin Kazmi <sykazmi@cisco.com>2019-05-27 15:53:25 +0200
committerDamjan Marion <dmarion@me.com>2019-05-28 08:14:48 +0000
commit3f340175aebaf84ed3994799e819e0801c7e3212 (patch)
tree69c9ea1ac1405bcc0cea004891b449212c28cc99 /src/vnet/devices/tap
parent8cd5bd8e34eb72ee5dccc2fb0733db9da03af5c8 (diff)
tap: crash in multi-thread environment
In tap tx routine, virtio_interface_tx_inline, there used to be an interface spinlock to ensure packets are processed in an orderly fashion clib_spinlock_lock_if_init (&vif->lockp); When virtio code was introduced in 19.04, that line is changed to clib_spinlock_lock_if_init (&vring->lockp); to accommodate multi-queues. Unfortunately, althrough the spinlock exists in the vring, it was never initialized for tap, only for virtio. As a result, many nasty things can happen when running tap interface in multi-thread environment. Crash is inevitable. The fix is to initialize vring->lockp for tap and remove vif->lockp as it is not used anymore. Change-Id: I82b15d3e9b0fb6add9b9ac49bf602a538946634a Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com> (cherry picked from commit c2c89782d34df0dc7197b18b042b4c2464a101ef)
Diffstat (limited to 'src/vnet/devices/tap')
-rw-r--r--src/vnet/devices/tap/tap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c
index a1a9fee2d77..35f1f2a3451 100644
--- a/src/vnet/devices/tap/tap.c
+++ b/src/vnet/devices/tap/tap.c
@@ -113,7 +113,6 @@ void
tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
{
vnet_main_t *vnm = vnet_get_main ();
- vlib_thread_main_t *thm = vlib_get_thread_main ();
virtio_main_t *vim = &virtio_main;
tap_main_t *tm = &tap_main;
vnet_sw_interface_t *sw;
@@ -448,8 +447,6 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
vif->sw_if_index, vif->tap_fd);
vif->tap_file_index = clib_file_add (&file_main, &t);
- if (thm->n_vlib_mains > 1)
- clib_spinlock_init (&vif->lockp);
goto done;
error:
@@ -526,7 +523,6 @@ tap_delete_if (vlib_main_t * vm, u32 sw_if_index)
vec_free (vif->txq_vrings);
tm->tap_ids = clib_bitmap_set (tm->tap_ids, vif->id, 0);
- clib_spinlock_free (&vif->lockp);
clib_memset (vif, 0, sizeof (*vif));
pool_put (mm->interfaces, vif);