pimd: compute inherited_olist before checking for (S,G,rpt) prune dec…#20521
Merged
Jafaral merged 1 commit intoFRRouting:masterfrom Jan 21, 2026
Merged
pimd: compute inherited_olist before checking for (S,G,rpt) prune dec…#20521Jafaral merged 1 commit intoFRRouting:masterfrom
Jafaral merged 1 commit intoFRRouting:masterfrom
Conversation
donaldsharp
reviewed
Jan 20, 2026
pimd/pim_join.c
Outdated
| __func__, &group->group, &rpf->rpf_addr, | ||
| rpf->source_nexthop.interface->name); | ||
|
|
||
| struct pim_jp_sources *first_src = listgetdata(listhead(group->sources)); |
Member
There was a problem hiding this comment.
From my perspective, doesn't this fix belong in pim_ifchannel_prune? The decision is that we should check the inherited_olist upon reception of a prune and when we move from state to state. This is a forwarding (upstream) decision based upon the reception of the S,G rpt prune, such that we can determine whether or not the inherited_olist has anything in it all based upon the (*
,G), (S,G) and (S,G, rpt) state on the particular interface. In other words why do you think this is a send time decision for the upstream? Instead of a reception time for the S,G rpt prune?
hnattamaisub
force-pushed
the
pim
branch
3 times, most recently
from
9830ce9 to
6ad1bdc
Compare
Contributor
Author
|
ci:rerun |
donaldsharp
approved these changes
Jan 21, 2026
nabahr
requested changes
Jan 21, 2026
Contributor
nabahr
left a comment
nabahr
left a comment
There was a problem hiding this comment.
Looks good besides a couple small things.
…ision Problem description: 1) In some corner cases in PIM, incorrect (S,G,rpt) prunes were sent causing traffic blackholing to downstream receivers. 2) The inherited_olist emptiness check was performed before the list was computed due to lazy population of channel_oil, causing it to incorrectly appear empty and prune is incorrectly propogated. Fix: Ensure inherited_olist is computed before checking for emptiness during (S,G,rpt) prune decision. Signed-off-by: harini <hnattamaisub@nvidia.com>
nabahr
approved these changes
Jan 21, 2026
Jafaral
approved these changes
Jan 21, 2026
Member
|
@Mergifyio backport stable/10.5 stable/10.4 |
✅ Backports have been createdDetails
|
This was referenced Jan 21, 2026
Merged
Jafaral
added a commit
that referenced
this pull request
Jan 21, 2026
pimd: compute inherited_olist before checking for (S,G,rpt) prune dec… (backport #20521)
donaldsharp
added a commit
that referenced
this pull request
Jan 22, 2026
pimd: compute inherited_olist before checking for (S,G,rpt) prune dec… (backport #20521)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
…ision
Problem description:
traffic blackholing to downstream receivers.
computed due to lazy population of channel_oil, causing it to incorrectly
appear empty and prune is incorrectly propogated.
Fix:
Ensure inherited_olist is computed before checking for emptiness during (S,G,rpt) prune decision.