zebra: add some debugging for PBR events in zebra

Add some debugging for PBR events internal to zebra,
specifically ADD/UPDATE/DELETE of pbr rules.

Signed-off-by: Stephen Worley <sworley@nvidia.com>
This commit is contained in:
Stephen Worley 2021-01-11 17:28:39 -05:00
parent e6b00e3fb9
commit 8eeca5a201
3 changed files with 63 additions and 1 deletions

View File

@ -41,6 +41,7 @@ unsigned long zebra_debug_dplane;
unsigned long zebra_debug_mlag;
unsigned long zebra_debug_nexthop;
unsigned long zebra_debug_evpn_mh;
unsigned long zebra_debug_pbr;
DEFINE_HOOK(zebra_debug_show_debugging, (struct vty *vty), (vty));
@ -122,6 +123,9 @@ DEFUN_NOSH (show_debugging_zebra,
if (IS_ZEBRA_DEBUG_EVPN_MH_NEIGH)
vty_out(vty, " Zebra EVPN-MH Neigh debugging is on\n");
if (IS_ZEBRA_DEBUG_PBR)
vty_out(vty, " Zebra PBR debugging is on\n");
hook_call(zebra_debug_show_debugging, vty);
return CMD_SUCCESS;
}
@ -318,6 +322,17 @@ DEFUN (debug_zebra_dplane,
return CMD_SUCCESS;
}
DEFUN (debug_zebra_pbr,
debug_zebra_pbr_cmd,
"debug zebra pbr",
DEBUG_STR
"Zebra configuration\n"
"Debug zebra pbr events\n")
{
SET_FLAG(zebra_debug_pbr, ZEBRA_DEBUG_PBR);
return CMD_SUCCESS;
}
DEFPY (debug_zebra_mlag,
debug_zebra_mlag_cmd,
"[no$no] debug zebra mlag",
@ -508,6 +523,18 @@ DEFUN (no_debug_zebra_dplane,
return CMD_SUCCESS;
}
DEFUN (no_debug_zebra_pbr,
no_debug_zebra_pbr_cmd,
"no debug zebra pbr",
NO_STR
DEBUG_STR
"Zebra configuration\n"
"Debug zebra pbr events\n")
{
zebra_debug_pbr = 0;
return CMD_SUCCESS;
}
DEFPY (debug_zebra_nexthop,
debug_zebra_nexthop_cmd,
"[no$no] debug zebra nexthop [detail$detail]",
@ -650,6 +677,11 @@ static int config_write_debug(struct vty *vty)
write++;
}
if (IS_ZEBRA_DEBUG_PBR) {
vty_out(vty, "debug zebra pbr\n");
write++;
}
return write;
}
@ -668,6 +700,7 @@ void zebra_debug_init(void)
zebra_debug_evpn_mh = 0;
zebra_debug_nht = 0;
zebra_debug_nexthop = 0;
zebra_debug_pbr = 0;
install_node(&debug_node);
@ -686,6 +719,7 @@ void zebra_debug_init(void)
install_element(ENABLE_NODE, &debug_zebra_dplane_cmd);
install_element(ENABLE_NODE, &debug_zebra_mlag_cmd);
install_element(ENABLE_NODE, &debug_zebra_nexthop_cmd);
install_element(ENABLE_NODE, &debug_zebra_pbr_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_events_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_nht_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_mpls_cmd);
@ -696,6 +730,7 @@ void zebra_debug_init(void)
install_element(ENABLE_NODE, &no_debug_zebra_rib_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_fpm_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_dplane_cmd);
install_element(ENABLE_NODE, &no_debug_zebra_pbr_cmd);
install_element(ENABLE_NODE, &debug_zebra_evpn_mh_cmd);
install_element(CONFIG_NODE, &debug_zebra_events_cmd);
@ -710,6 +745,8 @@ void zebra_debug_init(void)
install_element(CONFIG_NODE, &debug_zebra_fpm_cmd);
install_element(CONFIG_NODE, &debug_zebra_dplane_cmd);
install_element(CONFIG_NODE, &debug_zebra_nexthop_cmd);
install_element(CONFIG_NODE, &debug_zebra_pbr_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_events_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_nht_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_mpls_cmd);
@ -720,6 +757,7 @@ void zebra_debug_init(void)
install_element(CONFIG_NODE, &no_debug_zebra_rib_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_fpm_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_dplane_cmd);
install_element(CONFIG_NODE, &no_debug_zebra_pbr_cmd);
install_element(CONFIG_NODE, &debug_zebra_mlag_cmd);
install_element(CONFIG_NODE, &debug_zebra_evpn_mh_cmd);
}

View File

@ -67,6 +67,8 @@ extern "C" {
#define ZEBRA_DEBUG_EVPN_MH_MAC 0x04
#define ZEBRA_DEBUG_EVPN_MH_NEIGH 0x08
#define ZEBRA_DEBUG_PBR 0x01
/* Debug related macro. */
#define IS_ZEBRA_DEBUG_EVENT (zebra_debug_event & ZEBRA_DEBUG_EVENT)
@ -114,6 +116,8 @@ extern "C" {
#define IS_ZEBRA_DEBUG_EVPN_MH_NEIGH \
(zebra_debug_evpn_mh & ZEBRA_DEBUG_EVPN_MH_NEIGH)
#define IS_ZEBRA_DEBUG_PBR (zebra_debug_pbr & ZEBRA_DEBUG_PBR)
extern unsigned long zebra_debug_event;
extern unsigned long zebra_debug_packet;
extern unsigned long zebra_debug_kernel;
@ -127,6 +131,7 @@ extern unsigned long zebra_debug_dplane;
extern unsigned long zebra_debug_mlag;
extern unsigned long zebra_debug_nexthop;
extern unsigned long zebra_debug_evpn_mh;
extern unsigned long zebra_debug_pbr;
extern void zebra_debug_init(void);

View File

@ -32,6 +32,7 @@
#include "zebra/zapi_msg.h"
#include "zebra/zebra_memory.h"
#include "zebra/zserv.h"
#include "zebra/debug.h"
/* definitions */
DEFINE_MTYPE_STATIC(ZEBRA, PBR_IPTABLE_IFNAME, "PBR interface list")
@ -503,6 +504,12 @@ void zebra_pbr_add_rule(struct zebra_pbr_rule *rule)
/* If found, this is an update */
if (found) {
if (IS_ZEBRA_DEBUG_PBR)
zlog_debug(
"%s: seq: %d, prior: %d, unique: %d, ifname: %s -- update",
__func__, rule->rule.seq, rule->rule.priority,
rule->rule.unique, rule->rule.ifname);
(void)dplane_pbr_rule_update(found, rule);
if (pbr_rule_release(found))
@ -510,12 +517,24 @@ void zebra_pbr_add_rule(struct zebra_pbr_rule *rule)
"%s: Rule being updated we know nothing about",
__PRETTY_FUNCTION__);
} else
} else {
if (IS_ZEBRA_DEBUG_PBR)
zlog_debug(
"%s: seq: %d, prior: %d, unique: %d, ifname: %s -- new",
__func__, rule->rule.seq, rule->rule.priority,
rule->rule.unique, rule->rule.ifname);
(void)dplane_pbr_rule_add(rule);
}
}
void zebra_pbr_del_rule(struct zebra_pbr_rule *rule)
{
if (IS_ZEBRA_DEBUG_PBR)
zlog_debug("%s: seq: %d, prior: %d, unique: %d, ifname: %s",
__func__, rule->rule.seq, rule->rule.priority,
rule->rule.unique, rule->rule.ifname);
(void)dplane_pbr_rule_delete(rule);
if (pbr_rule_release(rule))