ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devices: vhost-user crashes displaying show trace for deleted interface

Browse Source 
After the trace is collected and if the interface is then deleted, show
trace may crash for the debug image. This is due to the additional check
in pool_elt_at_index() to make sure that the block is not free.

The fix is to do the check in vhost format trace and return "interface deleted"

Type: fix

Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: I0744f913ba6146609663443f408d784067880f93
(cherry picked from commit 5cd987dda679fe50b9cd7a834bb9162db39ade78)
This commit is contained in:
Steven Luong
2019-08-15 14:30:16 -07:00
committed by Andrew Yourtchenko
parent 1d74eceb1f
commit 69dd1f5bce
1 changed files with 10 additions and 6 deletions

16
src/vnet/devices/virtio/vhost_user_inline.h

@ -214,13 +214,17 @@ format_vhost_trace (u8 * s, va_list * va)
CLIB_UNUSED (vnet_main_t * vnm) = vnet_get_main ();
vhost_user_main_t *vum = &vhost_user_main;
vhost_trace_t *t = va_arg (*va, vhost_trace_t *);
vhost_user_intf_t *vui = pool_elt_at_index (vum->vhost_user_interfaces,
t->device_index);
vnet_sw_interface_t *sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
u32 indent = format_get_indent (s);
vhost_user_intf_t *vui = vum->vhost_user_interfaces + t->device_index;
vnet_sw_interface_t *sw;
u32 indent;
if (pool_is_free (vum->vhost_user_interfaces, vui))
{
s = format (s, "vhost-user interface is deleted");
return s;
}
sw = vnet_get_sw_interface (vnm, vui->sw_if_index);
indent = format_get_indent (s);
s = format (s, "%U %U queue %d\n", format_white_space, indent,
format_vnet_sw_interface_name, vnm, sw, t->qid);