bgpd: Move sticky, default_gw, router_flag into a single flags variable

Instead of using 3 uint8_t variables under struct attr, let's use a single
uint8_t as the flags. Saving 2-bytes. Not a big deal, but it's even easier to
track EVPN-related flags/variables.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 18c7b13535d04e9c05670ff00d2f90dc5aa677a5..3eb39d80094657014ef72bf311b949c6a8529b5c 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -2575,7 +2575,6 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
        struct peer *const peer = args->peer;
        struct attr *const attr = args->attr;
        const bgp_size_t length = args->length;
-       uint8_t sticky = 0;
        bool proxy = false;
        struct ecommunity *ecomm;
 
@@ -2605,21 +2604,20 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
        attr->df_pref = bgp_attr_df_pref_from_ec(attr, &attr->df_alg);
 
        /* Extract MAC mobility sequence number, if any. */
-       attr->mm_seqnum = bgp_attr_mac_mobility_seqnum(attr, &sticky);
-       attr->sticky = sticky;
+       attr->mm_seqnum = bgp_attr_mac_mobility_seqnum(attr);
 
        /* Check if this is a Gateway MAC-IP advertisement */
-       attr->default_gw = bgp_attr_default_gw(attr);
+       bgp_attr_default_gw(attr);
 
        /* Handle scenario where router flag ecommunity is not
         * set but default gw ext community is present.
         * Use default gateway, set and propogate R-bit.
         */
-       if (attr->default_gw)
-               attr->router_flag = 1;
+       if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW))
+               SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER);
 
        /* Check EVPN Neighbor advertisement flags, R-bit */
-       bgp_attr_evpn_na_flag(attr, &attr->router_flag, &proxy);
+       bgp_attr_evpn_na_flag(attr, &proxy);
        if (proxy)
                attr->es_flags |= ATTR_ES_PROXY_ADVERT;
 

diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index f353e76913a7db957e7a14ffff797b83861b2340..3519dc340102b0e179e2850d5e5e2201eff6e749 100644 (file)
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -197,9 +197,6 @@ struct attr {
 #define ATTR_ES_L3_NHG_ACTIVE (1 << 6)
 #define ATTR_ES_L3_NHG       (ATTR_ES_L3_NHG_USE | ATTR_ES_L3_NHG_ACTIVE)
 
-       /* NA router flag (R-bit) support in EVPN */
-       uint8_t router_flag;
-
        /* Distance as applied by Route map */
        uint8_t distance;
 
@@ -256,11 +253,12 @@ struct attr {
        /* MP Nexthop length */
        uint8_t mp_nexthop_len;
 
-       /* Static MAC for EVPN */
-       uint8_t sticky;
-
-       /* Flag for default gateway extended community in EVPN */
-       uint8_t default_gw;
+       /* EVPN flags */
+       uint8_t evpn_flags;
+#define ATTR_EVPN_FLAG_STICKY    (1 << 0)
+#define ATTR_EVPN_FLAG_DEFAULT_GW (1 << 1)
+/* NA router flag (R-bit) support in EVPN */
+#define ATTR_EVPN_FLAG_ROUTER (1 << 2)
 
        /* route tag */
        route_tag_t tag;

diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index bbc4ba9525d458543976ef51b9a10f15648a6e9a..086c36f36c7ad092ae711905fdc411d9efe8da37 100644 (file)
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -115,14 +115,14 @@ bool bgp_attr_rmac(struct attr *attr, struct ethaddr *rmac)
 /*
  * return true if attr contains default gw extended community
  */
-uint8_t bgp_attr_default_gw(struct attr *attr)
+void bgp_attr_default_gw(struct attr *attr)
 {
        struct ecommunity *ecom;
        uint32_t i;
 
        ecom = bgp_attr_get_ecommunity(attr);
        if (!ecom || !ecom->size)
-               return 0;
+               return;
 
        /* If there is a default gw extendd community return true otherwise
         * return 0 */
@@ -136,10 +136,9 @@ uint8_t bgp_attr_default_gw(struct attr *attr)
 
                if ((type == ECOMMUNITY_ENCODE_OPAQUE
                     && sub_type == ECOMMUNITY_EVPN_SUBTYPE_DEF_GW))
-                       return 1;
+                       SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
        }
-
-       return 0;
+       UNSET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
 }
 
 /*
@@ -183,7 +182,7 @@ uint16_t bgp_attr_df_pref_from_ec(struct attr *attr, uint8_t *alg)
  * Fetch and return the sequence number from MAC Mobility extended
  * community, if present, else 0.
  */
-uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr, uint8_t *sticky)
+uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr)
 {
        struct ecommunity *ecom;
        uint32_t i;
@@ -213,9 +212,9 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr, uint8_t *sticky)
                flags = *pnt++;
 
                if (flags & ECOMMUNITY_EVPN_SUBTYPE_MACMOBILITY_FLAG_STICKY)
-                       *sticky = 1;
+                       SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY);
                else
-                       *sticky = 0;
+                       UNSET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY);
 
                pnt++;
                pnt = ptr_get_be32(pnt, &seq_num);
@@ -229,8 +228,7 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr, uint8_t *sticky)
 /*
  * return true if attr contains router flag extended community
  */
-void bgp_attr_evpn_na_flag(struct attr *attr,
-               uint8_t *router_flag, bool *proxy)
+void bgp_attr_evpn_na_flag(struct attr *attr, bool *proxy)
 {
        struct ecommunity *ecom;
        uint32_t i;
@@ -254,7 +252,8 @@ void bgp_attr_evpn_na_flag(struct attr *attr,
                        val = *pnt++;
 
                        if (val & ECOMMUNITY_EVPN_SUBTYPE_ND_ROUTER_FLAG)
-                               *router_flag = 1;
+                               SET_FLAG(attr->evpn_flags,
+                                        ATTR_EVPN_FLAG_ROUTER);
 
                        if (val & ECOMMUNITY_EVPN_SUBTYPE_PROXY_FLAG)
                                *proxy = true;

diff --git a/bgpd/bgp_attr_evpn.h b/bgpd/bgp_attr_evpn.h
index f8d3978b960b80755a522402ade3bc440138a98f..e12fc3a86cc28e1e75b35aa6eceea47321111801 100644 (file)
--- a/bgpd/bgp_attr_evpn.h
+++ b/bgpd/bgp_attr_evpn.h
@@ -36,12 +36,10 @@ extern void bgp_add_routermac_ecom(struct attr *attr,
 extern int bgp_build_evpn_prefix(int type, uint32_t eth_tag,
                                 struct prefix *dst);
 extern bool bgp_attr_rmac(struct attr *attr, struct ethaddr *rmac);
-extern uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr,
-                                            uint8_t *sticky);
-extern uint8_t bgp_attr_default_gw(struct attr *attr);
+extern uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr);
+extern void bgp_attr_default_gw(struct attr *attr);
 
-extern void bgp_attr_evpn_na_flag(struct attr *attr, uint8_t *router_flag,
-               bool *proxy);
+extern void bgp_attr_evpn_na_flag(struct attr *attr, bool *proxy);
 extern uint16_t bgp_attr_df_pref_from_ec(struct attr *attr, uint8_t *alg);
 
 

diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index e5c7cb3801e81d7ca0ed7af99c7fc6e73885cada..75a7d85e88fcfe3441aa7afcf7b5928e091f2d41 100644 (file)
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1159,7 +1159,7 @@ static void build_evpn_route_extcomm(struct bgpevpn *vpn, struct attr *attr,
        }
 
        /* Add MAC mobility (sticky) if needed. */
-       if (attr->sticky) {
+       if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY)) {
                seqnum = 0;
                encode_mac_mobility_extcomm(1, seqnum, &eval_sticky);
                ecom_sticky.size = 1;
@@ -1178,7 +1178,7 @@ static void build_evpn_route_extcomm(struct bgpevpn *vpn, struct attr *attr,
        }
 
        /* Add default gateway, if needed. */
-       if (attr->default_gw) {
+       if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
                encode_default_gw_extcomm(&eval_default_gw);
                ecom_default_gw.size = 1;
                ecom_default_gw.unit_size = ECOMMUNITY_SIZE;
@@ -1189,8 +1189,11 @@ static void build_evpn_route_extcomm(struct bgpevpn *vpn, struct attr *attr,
        }
 
        proxy = !!(attr->es_flags & ATTR_ES_PROXY_ADVERT);
-       if (attr->router_flag || proxy) {
-               encode_na_flag_extcomm(&eval_na, attr->router_flag, proxy);
+       if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER) || proxy) {
+               encode_na_flag_extcomm(&eval_na,
+                                      CHECK_FLAG(attr->evpn_flags,
+                                                 ATTR_EVPN_FLAG_ROUTER),
+                                      proxy);
                ecom_na.size = 1;
                ecom_na.unit_size = ECOMMUNITY_SIZE;
                ecom_na.val = (uint8_t *)eval_na.val;
@@ -1275,12 +1278,15 @@ enum zclient_send_status evpn_zebra_install(struct bgp *bgp, struct bgpevpn *vpn
                flags = 0;
 
                if (pi->sub_type == BGP_ROUTE_IMPORTED) {
-                       if (pi->attr->sticky)
+                       if (CHECK_FLAG(pi->attr->evpn_flags,
+                                      ATTR_EVPN_FLAG_STICKY))
                                SET_FLAG(flags, ZEBRA_MACIP_TYPE_STICKY);
-                       if (pi->attr->default_gw)
+                       if (CHECK_FLAG(pi->attr->evpn_flags,
+                                      ATTR_EVPN_FLAG_DEFAULT_GW))
                                SET_FLAG(flags, ZEBRA_MACIP_TYPE_GW);
                        if (is_evpn_prefix_ipaddr_v6(p) &&
-                                       pi->attr->router_flag)
+                           CHECK_FLAG(pi->attr->evpn_flags,
+                                      ATTR_EVPN_FLAG_ROUTER))
                                SET_FLAG(flags, ZEBRA_MACIP_TYPE_ROUTER_FLAG);
 
                        seq = mac_mobility_seqnum(pi->attr);
@@ -1834,7 +1840,8 @@ static void bgp_evpn_get_sync_info(struct bgp *bgp, esi_t *esi,
                        *active_on_peer = true;
                }
 
-               if (second_best_path->attr->router_flag)
+               if (CHECK_FLAG(second_best_path->attr->evpn_flags,
+                              ATTR_EVPN_FLAG_ROUTER))
                        *peer_router = true;
 
                /* we use both proxy and non-proxy imports to
@@ -1934,7 +1941,6 @@ static int update_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
        struct attr local_attr;
        struct bgp_labels bgp_labels = {};
        int route_change = 1;
-       uint8_t sticky = 0;
        const struct prefix_evpn *evp;
 
        *pi = NULL;
@@ -1966,9 +1972,7 @@ static int update_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
                local_attr = *attr;
 
                /* Extract MAC mobility sequence number, if any. */
-               local_attr.mm_seqnum =
-                       bgp_attr_mac_mobility_seqnum(&local_attr, &sticky);
-               local_attr.sticky = sticky;
+               local_attr.mm_seqnum = bgp_attr_mac_mobility_seqnum(&local_attr);
 
                /* Add (or update) attribute to hash. */
                attr_new = bgp_attr_intern(&local_attr);
@@ -2063,9 +2067,8 @@ static int update_evpn_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
                                               BGP_PATH_ATTR_CHANGED);
 
                        /* Extract MAC mobility sequence number, if any. */
-                       local_attr.mm_seqnum = bgp_attr_mac_mobility_seqnum(
-                               &local_attr, &sticky);
-                       local_attr.sticky = sticky;
+                       local_attr.mm_seqnum =
+                               bgp_attr_mac_mobility_seqnum(&local_attr);
 
                        attr_new = bgp_attr_intern(&local_attr);
 
@@ -2198,10 +2201,12 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
        attr.nexthop = vpn->originator_ip;
        attr.mp_nexthop_global_in = vpn->originator_ip;
        attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
-       attr.sticky = CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_STICKY) ? 1 : 0;
-       attr.default_gw = CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_GW) ? 1 : 0;
-       attr.router_flag = CHECK_FLAG(flags,
-                                     ZEBRA_MACIP_TYPE_ROUTER_FLAG) ? 1 : 0;
+       if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_STICKY))
+               SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_STICKY);
+       if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_GW))
+               SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
+       if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_ROUTER_FLAG))
+               SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_ROUTER);
        if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_PROXY_ADVERT))
                attr.es_flags |= ATTR_ES_PROXY_ADVERT;
 
@@ -2503,13 +2508,12 @@ void bgp_evpn_update_type2_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
        attr.nexthop = vpn->originator_ip;
        attr.mp_nexthop_global_in = vpn->originator_ip;
        attr.mp_nexthop_len = BGP_ATTR_NHLEN_IPV4;
-       attr.sticky = (local_pi->attr->sticky) ? 1 : 0;
-       attr.router_flag = (local_pi->attr->router_flag) ? 1 : 0;
+       attr.evpn_flags = local_pi->attr->evpn_flags;
        attr.es_flags = local_pi->attr->es_flags;
-       if (local_pi->attr->default_gw) {
-               attr.default_gw = 1;
+       if (CHECK_FLAG(local_pi->attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
+               SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
                if (is_evpn_prefix_ipaddr_v6(&evp))
-                       attr.router_flag = 1;
+                       SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_ROUTER);
        }
        memcpy(&attr.esi, &local_pi->attr->esi, sizeof(esi_t));
        bgp_evpn_get_rmac_nexthop(vpn, &evp, &attr,

diff --git a/bgpd/bgp_evpn_private.h b/bgpd/bgp_evpn_private.h
index 07bba9b42684bc4ddd5bdf21616dbdaab1876ddc..b05df3d82ae7552c5a82f280fcb2c903444105d5 100644 (file)
--- a/bgpd/bgp_evpn_private.h
+++ b/bgpd/bgp_evpn_private.h
@@ -382,7 +382,7 @@ static inline void encode_mac_mobility_extcomm(int static_mac, uint32_t seq,
 }
 
 static inline void encode_na_flag_extcomm(struct ecommunity_val *eval,
-                                         uint8_t na_flag, bool proxy)
+                                         bool na_flag, bool proxy)
 {
        memset(eval, 0, sizeof(*eval));
        eval->val[0] = ECOMMUNITY_ENCODE_EVPN;

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 6a35935c7e264c46f055b3d453ad3a6113e41536..2a9fc6ce0da29210f0ac1e4094881cfb8750cc20 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -851,8 +851,13 @@ int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
                 * with the
                 * sticky flag.
                 */
-               if (newattr->sticky != existattr->sticky) {
-                       if (newattr->sticky && !existattr->sticky) {
+               bool new_sticky = CHECK_FLAG(newattr->evpn_flags,
+                                            ATTR_EVPN_FLAG_STICKY);
+               bool exist_sticky = CHECK_FLAG(existattr->evpn_flags,
+                                              ATTR_EVPN_FLAG_STICKY);
+
+               if (new_sticky != exist_sticky) {
+                       if (new_sticky && !exist_sticky) {
                                *reason = bgp_path_selection_evpn_sticky_mac;
                                if (debug)
                                        zlog_debug(
@@ -861,7 +866,7 @@ int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
                                return 1;
                        }
 
-                       if (!newattr->sticky && existattr->sticky) {
+                       if (!new_sticky && exist_sticky) {
                                *reason = bgp_path_selection_evpn_sticky_mac;
                                if (debug)
                                        zlog_debug(