summaryrefslogtreecommitdiffstats
path: root/src/vnet/bonding/node.c
diff options
context:
space:
mode:
authorSteven <sluong@cisco.com>2018-03-28 17:59:00 -0700
committerDamjan Marion <dmarion.lists@gmail.com>2018-03-30 20:43:49 +0000
commit70488ab7f87096534aaadd7eab30e8515ac3d60d (patch)
treea6aa6bfeb5d3b078f934273101e69ff36955daab /src/vnet/bonding/node.c
parentc1613a72a7ef5443319a868879804bb53714068d (diff)
bond: show trace causes a crash if the interface is deleted
For the debug image, if the interface is removed and the trace was collected prior to the interface delete, show trace may cause a crash. This is because vnet_get_sw_interface_name and vnet_get_sup_hw_interface are not safe if the interface is deleted. The fix is to use format_vnet_sw_if_index_name if all we need is to get the interface name in the trace to display. It would show "DELETED" which is better than a crash. Change-Id: I912402d3e71592ece9f49d36c8a6b7af97f3b69e Signed-off-by: Steven <sluong@cisco.com>
Diffstat (limited to 'src/vnet/bonding/node.c')
-rw-r--r--src/vnet/bonding/node.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/vnet/bonding/node.c b/src/vnet/bonding/node.c
index 4deec829195..b831d40540e 100644
--- a/src/vnet/bonding/node.c
+++ b/src/vnet/bonding/node.c
@@ -50,15 +50,14 @@ format_bond_input_trace (u8 * s, va_list * args)
CLIB_UNUSED (vlib_main_t * vm) = va_arg (*args, vlib_main_t *);
CLIB_UNUSED (vlib_node_t * node) = va_arg (*args, vlib_node_t *);
bond_packet_trace_t *t = va_arg (*args, bond_packet_trace_t *);
- vnet_hw_interface_t *hw, *hw1;
- vnet_main_t *vnm = vnet_get_main ();
- hw = vnet_get_sup_hw_interface (vnm, t->sw_if_index);
- hw1 = vnet_get_sup_hw_interface (vnm, t->bond_sw_if_index);
- s = format (s, "src %U, dst %U, %s -> %s",
+ s = format (s, "src %U, dst %U, %U -> %U",
format_ethernet_address, t->ethernet.src_address,
format_ethernet_address, t->ethernet.dst_address,
- hw->name, hw1->name);
+ format_vnet_sw_if_index_name, vnet_get_main (),
+ t->sw_if_index,
+ format_vnet_sw_if_index_name, vnet_get_main (),
+ t->bond_sw_if_index);
return s;
}
@@ -382,6 +381,17 @@ bond_input_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
sif = bond_get_slave_by_sw_if_index (sw_if_index);
bond_sw_if_index_rewrite (vm, node, sif, eth, b0);
+ if (PREDICT_FALSE (n_trace > 0))
+ {
+ vlib_trace_buffer (vm, node, next0, b0, 0 /* follow_chain */ );
+ vlib_set_trace_count (vm, node, --n_trace);
+ t0 = vlib_add_trace (vm, node, b0, sizeof (*t0));
+ t0->ethernet = *eth;
+ t0->sw_if_index = sw_if_index;
+ t0->bond_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_RX];
+
+ }
+
VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0);
/* verify speculative enqueue, maybe switch current next frame */