Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zebra: Add encap type when building packet for FPM #14675

Merged
merged 1 commit into from
Oct 31, 2023

Conversation

donaldsharp
Copy link
Member

Currently in the single nexthop case w/ evpn sending down via the FPM the encap type is not being set
for the nexthop.

This looks like the result of some code reorg for the nexthop happened but the fpm failed to be accounted for. Let's just move the encap type encoding to where it will happen.

Currently in the single nexthop case w/ evpn sending
down via the FPM the encap type is not being set
for the nexthop.

This looks like the result of some code reorg for the
nexthop happened but the fpm failed to be accounted for.
Let's just move the encap type encoding to where it
will happen.

Signed-off-by: Donald Sharp <[email protected]>
@donaldsharp
Copy link
Member Author

Placing a Do Not Merge as that I don't have easy ability to test this. Going to ask the person who indicated this to me to test it and once they say it's ready I'll remove the label

@stepanblyschak
Copy link

@donaldsharp Tested this patch in SONiC and confirmed the issue is solved. Thanks

@donaldsharp
Copy link
Member Author

ci:rerun

@ton31337
Copy link
Member

@Mergifyio backport dev/9.1

@mergify
Copy link

mergify bot commented Oct 31, 2023

backport dev/9.1

✅ Backports have been created

@mjstapp
Copy link
Contributor

mjstapp commented Oct 31, 2023

CI:rerun

Copy link
Member

@riw777 riw777 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code looks good, waiting on ci

@riw777 riw777 merged commit a401dce into FRRouting:master Oct 31, 2023
82 checks passed
donaldsharp added a commit that referenced this pull request Oct 31, 2023
zebra: Add encap type when building packet for FPM (backport #14675)
@donaldsharp
Copy link
Member Author

@Mergifyio backport stable/8.5 stable/9.0

Copy link

mergify bot commented Nov 8, 2023

backport stable/8.5 stable/9.0

✅ Backports have been created

donaldsharp added a commit that referenced this pull request Nov 8, 2023
zebra: Add encap type when building packet for FPM (backport #14675)
donaldsharp added a commit that referenced this pull request Nov 8, 2023
zebra: Add encap type when building packet for FPM (backport #14675)
StormLiangMS pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Nov 11, 2023
Back port a patch from upstream FRR - FRRouting/frr#14675

Why I did it
The EVPN route is not treated correctly and thus leading to messages:

Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop 30.0.0.2@Vlan200 for 20.0.0.2/32, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop 30.0.0.2@Vlan200 for 200.0.0.0/24, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 200::/64, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 20::/64, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 20::2/128, resolving neighbor
This happens because fpmsyncd does not get encap type field in FPM message.

Work item tracking
Microsoft ADO (number only):
How I did it
Backport fix from FRR.

How to verify it
EVPN scenario.
mssonicbld pushed a commit to mssonicbld/sonic-buildimage that referenced this pull request Nov 11, 2023
…7052)

Back port a patch from upstream FRR - FRRouting/frr#14675

Why I did it
The EVPN route is not treated correctly and thus leading to messages:

Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop 30.0.0.2@Vlan200 for 20.0.0.2/32, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop 30.0.0.2@Vlan200 for 200.0.0.0/24, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 200::/64, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 20::/64, resolving neighbor
Oct 30 11:40:00.494083 r-tigris-22 INFO swss#orchagent: :- addRoute: Failed to get next hop ::ffff:30.0.0.2@Vlan200 for 20::2/128, resolving neighbor
This happens because fpmsyncd does not get encap type field in FPM message.

Work item tracking
Microsoft ADO (number only):
How I did it
Backport fix from FRR.

How to verify it
EVPN scenario.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants