Commit 580d270c40 for frr
commit 580d270c405cfab19f666eeaa6c32a47ef5fae7b
Author: Donald Sharp <sharpd@nvidia.com>
Date: Thu Nov 12 10:44:58 2026 -0500
bgpd: add accessors for EVPN route flags
Add bgp_attr_get_evpn_flags() and bgp_attr_set_evpn_flags() and use
them for every read and write of the sticky, default-gateway, and
router flags stored on a route attribute.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 3df145f11d..4d12f28375 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -3503,6 +3503,7 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
struct ecommunity *ecomm;
bgp_encap_types tun_type = BGP_ENCAP_TYPE_VXLAN;/*Default tunnel type*/
uint8_t df_alg;
+ uint8_t evpn_flags;
if (length == 0) {
bgp_attr_set_ecommunity(attr, NULL);
@@ -3538,8 +3539,11 @@ bgp_attr_ext_communities(struct bgp_attr_parser_args *args)
* set but default gw ext community is present.
* Use default gateway, set and propagate R-bit.
*/
- if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW))
- SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER);
+ evpn_flags = bgp_attr_get_evpn_flags(attr);
+ if (CHECK_FLAG(evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_ROUTER);
+ bgp_attr_set_evpn_flags(attr, evpn_flags);
+ }
/* Check EVPN Neighbor advertisement flags, R-bit */
bgp_attr_evpn_na_flag(attr, &proxy);
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index 6bad894f75..0db0917c6a 100644
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -860,6 +860,16 @@ static inline void bgp_attr_set_df_alg(struct attr *attr, uint8_t df_alg)
attr->df_alg = df_alg;
}
+static inline uint8_t bgp_attr_get_evpn_flags(const struct attr *attr)
+{
+ return attr->evpn_flags;
+}
+
+static inline void bgp_attr_set_evpn_flags(struct attr *attr, uint8_t evpn_flags)
+{
+ attr->evpn_flags = evpn_flags;
+}
+
static inline struct bgp_route_evpn *
bgp_attr_get_evpn_overlay(const struct attr *attr)
{
diff --git a/bgpd/bgp_attr_evpn.c b/bgpd/bgp_attr_evpn.c
index b997d4105b..5279e48a1a 100644
--- a/bgpd/bgp_attr_evpn.c
+++ b/bgpd/bgp_attr_evpn.c
@@ -159,13 +159,16 @@ void bgp_attr_default_gw(struct attr *attr)
{
struct ecommunity *ecom;
uint32_t i;
+ uint8_t evpn_flags = bgp_attr_get_evpn_flags(attr);
/* Reset default-gw flag */
- UNSET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
+ UNSET_FLAG(evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
ecom = bgp_attr_get_ecommunity(attr);
- if (!ecom || !ecom->size)
+ if (!ecom || !ecom->size) {
+ bgp_attr_set_evpn_flags(attr, evpn_flags);
return;
+ }
/* Look for a default gw extended community */
for (i = 0; i < ecom->size; i++) {
@@ -178,10 +181,12 @@ void bgp_attr_default_gw(struct attr *attr)
if ((type == ECOMMUNITY_ENCODE_OPAQUE
&& sub_type == ECOMMUNITY_EVPN_SUBTYPE_DEF_GW)) {
- SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
break;
}
}
+
+ bgp_attr_set_evpn_flags(attr, evpn_flags);
}
/*
@@ -229,6 +234,7 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr)
struct ecommunity *ecom;
uint32_t i;
uint8_t flags = 0;
+ uint8_t evpn_flags;
ecom = bgp_attr_get_ecommunity(attr);
if (!ecom || !ecom->size)
@@ -253,11 +259,13 @@ uint32_t bgp_attr_mac_mobility_seqnum(struct attr *attr)
continue;
flags = *pnt++;
- if (CHECK_FLAG(flags,
- ECOMMUNITY_EVPN_SUBTYPE_MACMOBILITY_FLAG_STICKY))
- SET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY);
+ evpn_flags = bgp_attr_get_evpn_flags(attr);
+
+ if (CHECK_FLAG(flags, ECOMMUNITY_EVPN_SUBTYPE_MACMOBILITY_FLAG_STICKY))
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_STICKY);
else
- UNSET_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY);
+ UNSET_FLAG(evpn_flags, ATTR_EVPN_FLAG_STICKY);
+ bgp_attr_set_evpn_flags(attr, evpn_flags);
pnt++;
pnt = ptr_get_be32(pnt, &seq_num);
@@ -276,6 +284,7 @@ void bgp_attr_evpn_na_flag(struct attr *attr, bool *proxy)
struct ecommunity *ecom;
uint32_t i;
uint8_t val;
+ uint8_t evpn_flags;
ecom = bgp_attr_get_ecommunity(attr);
if (!ecom || !ecom->size)
@@ -294,10 +303,11 @@ void bgp_attr_evpn_na_flag(struct attr *attr, bool *proxy)
sub_type == ECOMMUNITY_EVPN_SUBTYPE_ND) {
val = *pnt++;
- if (CHECK_FLAG(val,
- ECOMMUNITY_EVPN_SUBTYPE_ND_ROUTER_FLAG))
- SET_FLAG(attr->evpn_flags,
- ATTR_EVPN_FLAG_ROUTER);
+ if (CHECK_FLAG(val, ECOMMUNITY_EVPN_SUBTYPE_ND_ROUTER_FLAG)) {
+ evpn_flags = bgp_attr_get_evpn_flags(attr);
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_ROUTER);
+ bgp_attr_set_evpn_flags(attr, evpn_flags);
+ }
if (CHECK_FLAG(val, ECOMMUNITY_EVPN_SUBTYPE_PROXY_FLAG))
*proxy = true;
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index 72f0e43476..4f3bc8a67e 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1441,7 +1441,7 @@ static void build_evpn_route_extcomm(struct bgpevpn *vpn, struct attr *attr, int
}
/* Add MAC mobility (sticky) if needed. */
- if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY)) {
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(attr), ATTR_EVPN_FLAG_STICKY)) {
seqnum = 0;
encode_mac_mobility_extcomm(1, seqnum, &eval_tmp);
ecommunity_append_val_unchecked(ecom, &eval_tmp);
@@ -1454,15 +1454,17 @@ static void build_evpn_route_extcomm(struct bgpevpn *vpn, struct attr *attr, int
}
/* Add default gateway, if needed. */
- if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(attr), ATTR_EVPN_FLAG_DEFAULT_GW)) {
encode_default_gw_extcomm(&eval_tmp);
ecommunity_append_val_unchecked(ecom, &eval_tmp);
}
proxy = !!(bgp_attr_get_es_flags(attr) & ATTR_ES_PROXY_ADVERT);
- if (CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER) || proxy) {
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(attr), ATTR_EVPN_FLAG_ROUTER) || proxy) {
encode_na_flag_extcomm(&eval_tmp,
- CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_ROUTER), proxy);
+ CHECK_FLAG(bgp_attr_get_evpn_flags(attr),
+ ATTR_EVPN_FLAG_ROUTER),
+ proxy);
ecommunity_append_val_unchecked(ecom, &eval_tmp);
}
@@ -1492,8 +1494,9 @@ static void add_mac_mobility_to_attr(uint32_t seq_num, struct attr *attr)
struct ecommunity *ecomm = bgp_attr_get_ecommunity(attr);
/* MM carries the sticky flag and the seq in one community (RFC 7432 7.7) */
- encode_mac_mobility_extcomm(!!CHECK_FLAG(attr->evpn_flags, ATTR_EVPN_FLAG_STICKY), seq_num,
- &eval);
+ encode_mac_mobility_extcomm(!!CHECK_FLAG(bgp_attr_get_evpn_flags(attr),
+ ATTR_EVPN_FLAG_STICKY),
+ seq_num, &eval);
/* Find current MM ecommunity */
ecom_val_ptr = NULL;
@@ -1549,15 +1552,13 @@ enum zclient_send_status evpn_zebra_install(struct bgp *bgp, struct bgpevpn *vpn
flags = 0;
if (pi->sub_type == BGP_ROUTE_IMPORTED) {
- if (CHECK_FLAG(pi->attr->evpn_flags,
- ATTR_EVPN_FLAG_STICKY))
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(pi->attr), ATTR_EVPN_FLAG_STICKY))
SET_FLAG(flags, ZEBRA_MACIP_TYPE_STICKY);
- if (CHECK_FLAG(pi->attr->evpn_flags,
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(pi->attr),
ATTR_EVPN_FLAG_DEFAULT_GW))
SET_FLAG(flags, ZEBRA_MACIP_TYPE_GW);
if (is_evpn_prefix_ipaddr_v6(p) &&
- CHECK_FLAG(pi->attr->evpn_flags,
- ATTR_EVPN_FLAG_ROUTER))
+ CHECK_FLAG(bgp_attr_get_evpn_flags(pi->attr), ATTR_EVPN_FLAG_ROUTER))
SET_FLAG(flags, ZEBRA_MACIP_TYPE_ROUTER_FLAG);
seq = mac_mobility_seqnum(pi->attr);
@@ -2203,7 +2204,7 @@ static void bgp_evpn_get_sync_info(struct bgp *bgp, esi_t *esi,
else
*active_on_peer = true;
- if (CHECK_FLAG(second_best_path->attr->evpn_flags,
+ if (CHECK_FLAG(bgp_attr_get_evpn_flags(second_best_path->attr),
ATTR_EVPN_FLAG_ROUTER))
*peer_router = true;
@@ -2566,6 +2567,7 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
bool old_is_sync = false;
bool mac_only = false;
struct ecommunity *macvrf_soo = NULL;
+ uint8_t evpn_flags;
uint8_t es_flags;
memset(&attr, 0, sizeof(attr));
@@ -2573,14 +2575,16 @@ static int update_evpn_route(struct bgp *bgp, struct bgpevpn *vpn,
/* Build path-attribute for this route. */
bgp_attr_default_set(&attr, bgp, BGP_ORIGIN_IGP);
bgp_evpn_vtep_ip_to_attr_nh(&vpn->originator_ip, &attr);
+
+ evpn_flags = bgp_attr_get_evpn_flags(&attr);
+ es_flags = bgp_attr_get_es_flags(&attr);
if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_STICKY))
- SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_STICKY);
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_STICKY);
if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_GW))
- SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
- es_flags = bgp_attr_get_es_flags(&attr);
-
+ SET_FLAG(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);
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_ROUTER);
+ bgp_attr_set_evpn_flags(&attr, evpn_flags);
if (CHECK_FLAG(flags, ZEBRA_MACIP_TYPE_PROXY_ADVERT))
SET_FLAG(es_flags, ATTR_ES_PROXY_ADVERT);
@@ -2888,6 +2892,7 @@ void bgp_evpn_update_type2_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
bool old_is_sync = false;
struct ecommunity *macvrf_soo = NULL;
uint8_t es_flags;
+ uint8_t evpn_flags;
if (CHECK_FLAG(local_pi->flags, BGP_PATH_REMOVED))
return;
@@ -2916,13 +2921,14 @@ void bgp_evpn_update_type2_route_entry(struct bgp *bgp, struct bgpevpn *vpn,
bgp_attr_default_set(&attr, bgp, BGP_ORIGIN_IGP);
bgp_evpn_vtep_ip_to_attr_nh(&vpn->originator_ip, &attr);
es_flags = bgp_attr_get_es_flags(local_pi->attr);
+ evpn_flags = bgp_attr_get_evpn_flags(local_pi->attr);
- attr.evpn_flags = local_pi->attr->evpn_flags;
- if (CHECK_FLAG(local_pi->attr->evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
- SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
+ if (CHECK_FLAG(evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW)) {
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_DEFAULT_GW);
if (is_evpn_prefix_ipaddr_v6(&evp))
- SET_FLAG(attr.evpn_flags, ATTR_EVPN_FLAG_ROUTER);
+ SET_FLAG(evpn_flags, ATTR_EVPN_FLAG_ROUTER);
}
+ bgp_attr_set_evpn_flags(&attr, evpn_flags);
memcpy(&attr.esi, &local_pi->attr->esi, sizeof(esi_t));
/*
* We are evaluating a change in local/non-local status.
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a18a540786..2aa3040cc2 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1143,9 +1143,9 @@ int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
* with the
* sticky flag.
*/
- bool new_sticky = CHECK_FLAG(newattr->evpn_flags,
+ bool new_sticky = CHECK_FLAG(bgp_attr_get_evpn_flags(newattr),
ATTR_EVPN_FLAG_STICKY);
- bool exist_sticky = CHECK_FLAG(existattr->evpn_flags,
+ bool exist_sticky = CHECK_FLAG(bgp_attr_get_evpn_flags(existattr),
ATTR_EVPN_FLAG_STICKY);
if (new_sticky != exist_sticky) {