bgpd: fix prefix same as nexthop in label per nexthop #16990
+300
−32
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
October 3, 2024 10:46
When a prefix is imported using the "network" command under a vrf, which is a connected prefix, and in the context of label allocation per nexthop: .. >router bgp 1 vrf vrf1 > address-family ipv4 unicast > redistribute static > network 172.16.0.1/32 <--- connected network > network 192.168.106.0/29 > label vpn export auto > label vpn export allocation-mode per-nexthop .. We encounter an MPLS entry where the nexthop is the prefix itself: > 18 BGP 172.16.0.1 - Actually, when using the "network" command, a bnc context is used, but it is filled by using the prefix itself instead of the nexthop for other BGP updates. Consequently, when picking up the original nexthop for label allocation, the function behaves incorrectly. Instead ensure that the nexthop type of bnc->nexthop is not a nexthop_ifindex; otherwise fallback to the per vrf label. Update topotests. PR: 91877 Signed-off-by: Loïc Sang <loic.sang@6wind.com>
WARNING: topo: Waiting time is too small (count=10, wait=0.5), using default values (count=20, wait=3) supress warning by inscreasing wait time. Signed-off-by: Loïc Sang <loic.sang@6wind.com>
ton31337
reviewed
Oct 3, 2024
| @@ -1598,6 +1598,16 @@ vpn_leak_from_vrf_get_per_nexthop_label(afi_t afi, struct bgp_path_info *pi, | |||
| return bgp_mplsvpn_get_vpn_label(&from_bgp->vpn_policy[afi]); | |||
| } | |||
|
|
|||
| if (is_bgp_static_route && | |||
| pi->nexthop->nexthop->type == NEXTHOP_TYPE_IFINDEX) { | |||
There was a problem hiding this comment.
why not check against pi->sub_type being BGP_TYPE_REDISTRIBUTED? Also, aggregated routes should be taken into account?
There was a problem hiding this comment.
I want to target only the manually added prefixes using the "network" command in BGP (bgp_static_set). I am not considering routes that were redistributed from other protocols or created through aggregation.
There was a problem hiding this comment.
I meant BGP_TYPE_STATIC, not redistributed :)
There was a problem hiding this comment.
is_bgp_static_route = bpi_ultimate->sub_type == BGP_ROUTE_STATIC &&
› › bpi_ultimate->type == ZEBRA_ROUTE_BGP;
The check is made in is_bgp_static_route
There was a problem hiding this comment.
Then what is the reason of this check pi->nexthop->nexthop->type == NEXTHOP_TYPE_IFINDEX?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a prefix is imported using the "network" command under a vrf, which
is a connected prefix, and in the context of label allocation per
nexthop:
..
We encounter an MPLS entry where the nexthop is the prefix itself:
Actually, when using the "network" command, a bnc context is used, but
it is filled by using the prefix itself instead of the nexthop for other
BGP updates. Consequently, when picking up the original nexthop for
label allocation, the function behaves incorrectly. Instead ensure that
the nexthop type of bnc->nexthop is not a nexthop_ifindex; otherwise
fallback to the per vrf label.
Update topotests.