Skip to content

pimd: prefer kernel ingress on WRONGVIF when MFC iif is stale (backport #22607)#22624

Merged
Jafaral merged 2 commits into
stable/10.7from
mergify/bp/stable/10.7/pr-22607
Jul 10, 2026
Merged

pimd: prefer kernel ingress on WRONGVIF when MFC iif is stale (backport #22607)#22624
Jafaral merged 2 commits into
stable/10.7from
mergify/bp/stable/10.7/pr-22607

Conversation

@mergify

@mergify mergify Bot commented Jul 9, 2026

Copy link
Copy Markdown

When interfaces with duplicate addresses cause join-time RPF to pick the wrong interface, the kernel keeps delivering WRONGVIF after the MFC is installed. Extend the existing NOCACHE ingress-prefer logic to the WRONGVIF handler so upstream RPF and MFC iif realign with the interface the packet actually arrived on.


This is an automatic backport of pull request #22607 done by Mergify.

Jafaral added 2 commits July 9, 2026 20:42
When interfaces with duplicate or overlapping connected addresses cause
join-time RPF to pick the wrong interface, the kernel keeps delivering
WRONGVIF after the MFC is installed. Extend the existing NOCACHE
ingress-prefer logic to the WRONGVIF handler so upstream RPF and MFC iif
realign with the interface the packet actually arrived on.

If zebra still selects a different RPF interface but the kernel ingress
is connected to the source, force RPF and MFC iif onto that ingress so
overlapping connected prefixes (e.g. parent secondary vs PIM-passive
tunnel) can recover.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 45affe6)
Add a topotest that installs FHR state on a parent interface with an
overlapping secondary, then moves traffic onto a PIM-passive tunnel
stand-in so MFC iif is stale and WRONGVIF must realign to kernel ingress.

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
(cherry picked from commit 92b4de8)
@greptile-apps

greptile-apps Bot commented Jul 9, 2026

Copy link
Copy Markdown

Target branch is not in the allowed branches list.

@frrbot frrbot Bot added pim tests Topotests, make check, etc labels Jul 9, 2026
@Jafaral Jafaral merged commit b3fc144 into stable/10.7 Jul 10, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pim size/L stable/10.7 tests Topotests, make check, etc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant