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

bfd: add tracing support to bfd-process

Browse Source 
Outgoing packets can be now traced via:

trace add bfd-process <count>

Type: improvement
Change-Id: Ia19af6054289b18f55e518dbea251a2bee9b9457
Signed-off-by: Klement Sekera <klement.sekera@gmail.com>
This commit is contained in:
Klement Sekera
2022-09-20 15:10:10 +02:00
committed by Neale Ranns
parent 06abf23526
commit 617d429d2e
5 changed files with 160 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

167
src/vnet/bfd/bfd_main.c
View File

File diff suppressed because it is too large Load Diff

11
src/vnet/bfd/bfd_main.h
View File

@ -476,6 +476,17 @@ const char *bfd_poll_state_string (bfd_poll_state_e state);
*/
void bfd_register_listener (bfd_notify_fn_t fn);
typedef enum
{
BFD_TX_IP4_ARP,
BFD_TX_IP6_NDP,
BFD_TX_IP4_REWRITE,
BFD_TX_IP6_REWRITE,
BFD_TX_IP4_MIDCHAIN,
BFD_TX_IP6_MIDCHAIN,
BFD_TX_N_NEXT,
} bfd_tx_next_t;
#endif /* __included_bfd_main_h__ */
/*

78
src/vnet/bfd/bfd_udp.c
View File

@ -54,18 +54,6 @@ typedef struct
int echo_source_is_set;
/* loopback interface used to get echo source ip */
u32 echo_source_sw_if_index;
/* node index of "ip4-arp" node */
u32 ip4_arp_idx;
/* node index of "ip6-discover-neighbor" node */
u32 ip6_ndp_idx;
/* node index of "ip4-rewrite" node */
u32 ip4_rewrite_idx;
/* node index of "ip6-rewrite" node */
u32 ip6_rewrite_idx;
/* node index of "ip4-midchain" node */
u32 ip4_midchain_idx;
/* node index of "ip6-midchain" node */
u32 ip6_midchain_idx;
/* log class */
vlib_log_class_t log_class;
/* number of active udp4 sessions */
@ -384,16 +372,23 @@ bfd_add_udp6_transport (vlib_main_t * vm, u32 bi, const bfd_session_t * bs,
}
static void
bfd_create_frame_to_next_node (vlib_main_t *vm, bfd_main_t *bm,
const bfd_session_t *bs, u32 bi, u32 next_node,
bfd_create_frame_to_next_node (vlib_main_t *vm, vlib_node_runtime_t *rt,
u32 bi, const bfd_session_t *bs, u32 next,
vlib_combined_counter_main_t *tx_counter)
{
vlib_frame_t *f = vlib_get_frame_to_node (vm, next_node);
vlib_buffer_t *b = vlib_get_buffer (vm, bi);
vlib_node_t *from_node = vlib_get_node (vm, rt->node_index);
ASSERT (next < vec_len (from_node->next_nodes));
u32 to_node_index = from_node->next_nodes[next];
vlib_frame_t *f = vlib_get_frame_to_node (vm, to_node_index);
u32 *to_next = vlib_frame_vector_args (f);
to_next[0] = bi;
f->n_vectors = 1;
vlib_put_frame_to_node (vm, next_node, f);
vlib_buffer_t *b = vlib_get_buffer (vm, bi);
if (b->flags & VLIB_BUFFER_IS_TRACED)
{
f->frame_flags |= VLIB_NODE_FLAG_TRACE;
}
vlib_put_frame_to_node (vm, to_node_index, f);
vlib_increment_combined_counter (tx_counter, vm->thread_index, bs->bs_idx, 1,
vlib_buffer_length_in_chain (vm, b));
}
@ -415,10 +410,10 @@ bfd_udp_calc_next_node (const struct bfd_session_s *bs, u32 * next_node)
switch (bs->transport)
{
case BFD_TRANSPORT_UDP4:
*next_node = bfd_udp_main.ip4_arp_idx;
*next_node = BFD_TX_IP4_ARP;
return 1;
case BFD_TRANSPORT_UDP6:
*next_node = bfd_udp_main.ip6_ndp_idx;
*next_node = BFD_TX_IP6_NDP;
return 1;
}
break;
@ -426,10 +421,10 @@ bfd_udp_calc_next_node (const struct bfd_session_s *bs, u32 * next_node)
switch (bs->transport)
{
case BFD_TRANSPORT_UDP4:
*next_node = bfd_udp_main.ip4_rewrite_idx;
*next_node = BFD_TX_IP4_REWRITE;
return 1;
case BFD_TRANSPORT_UDP6:
*next_node = bfd_udp_main.ip6_rewrite_idx;
*next_node = BFD_TX_IP6_REWRITE;
return 1;
}
break;
@ -437,10 +432,10 @@ bfd_udp_calc_next_node (const struct bfd_session_s *bs, u32 * next_node)
switch (bs->transport)
{
case BFD_TRANSPORT_UDP4:
*next_node = bfd_udp_main.ip4_midchain_idx;
*next_node = BFD_TX_IP4_MIDCHAIN;
return 1;
case BFD_TRANSPORT_UDP6:
*next_node = bfd_udp_main.ip6_midchain_idx;
*next_node = BFD_TX_IP6_MIDCHAIN;
return 1;
}
break;
@ -452,33 +447,33 @@ bfd_udp_calc_next_node (const struct bfd_session_s *bs, u32 * next_node)
}
int
bfd_transport_udp4 (vlib_main_t *vm, u32 bi, const struct bfd_session_s *bs,
int is_echo)
bfd_transport_udp4 (vlib_main_t *vm, vlib_node_runtime_t *rt, u32 bi,
const struct bfd_session_s *bs, int is_echo)
{
u32 next_node;
int rv = bfd_udp_calc_next_node (bs, &next_node);
bfd_main_t *bm = bfd_udp_main.bfd_main;
if (rv)
{
bfd_create_frame_to_next_node (vm, bm, bs, bi, next_node,
bfd_create_frame_to_next_node (vm, rt, bi, bs, next_node,
is_echo ? &bm->tx_echo_counter :
&bm->tx_counter);
&bm->tx_counter);
}
return rv;
}
int
bfd_transport_udp6 (vlib_main_t *vm, u32 bi, const struct bfd_session_s *bs,
int is_echo)
bfd_transport_udp6 (vlib_main_t *vm, vlib_node_runtime_t *rt, u32 bi,
const struct bfd_session_s *bs, int is_echo)
{
u32 next_node;
int rv = bfd_udp_calc_next_node (bs, &next_node);
bfd_main_t *bm = bfd_udp_main.bfd_main;
if (rv)
{
bfd_create_frame_to_next_node (
vm, bfd_udp_main.bfd_main, bs, bi, next_node,
is_echo ? &bm->tx_echo_counter : &bm->tx_counter);
bfd_create_frame_to_next_node (vm, rt, bi, bs, next_node,
is_echo ? &bm->tx_echo_counter :
&bm->tx_counter);
}
return 1;
}
@ -1639,25 +1634,6 @@ bfd_udp_init (vlib_main_t * vm)
sizeof (bfd_udp_key_t));
bfd_udp_main.bfd_main = &bfd_main;
bfd_udp_main.vnet_main = vnet_get_main ();
vlib_node_t *node = vlib_get_node_by_name (vm, (u8 *) "ip4-arp");
ASSERT (node);
bfd_udp_main.ip4_arp_idx = node->index;
node = vlib_get_node_by_name (vm, (u8 *) "ip6-discover-neighbor");
ASSERT (node);
bfd_udp_main.ip6_ndp_idx = node->index;
node = vlib_get_node_by_name (vm, (u8 *) "ip4-rewrite");
ASSERT (node);
bfd_udp_main.ip4_rewrite_idx = node->index;
node = vlib_get_node_by_name (vm, (u8 *) "ip6-rewrite");
ASSERT (node);
bfd_udp_main.ip6_rewrite_idx = node->index;
node = vlib_get_node_by_name (vm, (u8 *) "ip4-midchain");
ASSERT (node);
bfd_udp_main.ip4_midchain_idx = node->index;
node = vlib_get_node_by_name (vm, (u8 *) "ip6-midchain");
ASSERT (node);
bfd_udp_main.ip6_midchain_idx = node->index;
bfd_udp_stats_init (&bfd_udp_main);
bfd_udp_main.log_class = vlib_log_register_class ("bfd", "udp");

4
src/vnet/bfd/bfd_udp.h
View File

@ -82,7 +82,7 @@ int bfd_add_udp6_transport (vlib_main_t * vm, u32 bi,
*
* @return 1 on success, 0 on failure
*/
int bfd_transport_udp4 (vlib_main_t *vm, u32 bi,
int bfd_transport_udp4 (vlib_main_t *vm, vlib_node_runtime_t *rt, u32 bi,
const struct bfd_session_s *bs, int is_echo);
/**
@ -90,7 +90,7 @@ int bfd_transport_udp4 (vlib_main_t *vm, u32 bi,
*
* @return 1 on success, 0 on failure
*/
int bfd_transport_udp6 (vlib_main_t *vm, u32 bi,
int bfd_transport_udp6 (vlib_main_t *vm, vlib_node_runtime_t *rt, u32 bi,
const struct bfd_session_s *bs, int is_echo);
/**

2
test/test_bfd.py
View File

@ -774,6 +774,7 @@ def wait_for_bfd_packet(test, timeout=1, pcap_time_min=None, is_tunnel=False):
)
else:
break
test.logger.debug(test.vapi.ppcli("show trace"))
if is_tunnel:
# strip an IP layer and move to the next
p = p[IP].payload
@ -856,6 +857,7 @@ class BFD4TestCase(VppTestCase):
try:
self.bfd_udp4_sessions = self.statistics["/bfd/udp4/sessions"]
self.bfd_udp6_sessions = self.statistics["/bfd/udp6/sessions"]
self.vapi.cli("trace add bfd-process 500")
self.vpp_session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
self.vpp_session.add_vpp_config()
self.vpp_session.admin_up()