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

staticd: fix nexthop tracking memory leak and add a topotest for VRFs #15285

Merged
merged 5 commits into from
Feb 8, 2024

Conversation

idryzhov
Copy link
Contributor

@idryzhov idryzhov commented Feb 2, 2024

No description provided.

@frrbot frrbot bot added bugfix staticd tests Topotests, make check, etc labels Feb 2, 2024
@ton31337 ton31337 added this to the 10.0 milestone Feb 3, 2024
@idryzhov idryzhov force-pushed the staticd-nexthop-refcounter branch 2 times, most recently from 26c7f12 to 3a5cc0a Compare February 3, 2024 19:43
When processing an NHT update, we should go though all `static_vrf`
structures instead of regualar `vrf`, because some of `static_vrf` may
not have corresponding `vrf` and will miss the update.

Signed-off-by: Igor Ryzhov <[email protected]>
Will be used in the following commit.

Signed-off-by: Igor Ryzhov <[email protected]>
When a static route with a gateway nexthop is created, the nexthop is
sent to zebra for NHT, and added to a local hash. When the nexthop's VRF
is deleted from kernel, nexthop still stays in the hash. This is a
memory leak, because it is never deleted from there. Even if the VRF is
recreated in kernel, it is assigned with a new `vrf_id` so the old hash
entry is not reused, and a new one is created. To fix the issue, remove
all nexthops from the hash when the corresponding VRF is deleted, do not
add nexthops to the hash if their corresponding VRF doesn't exist in
kernel and don't add the same nexthop to the hash multiple times.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov idryzhov force-pushed the staticd-nexthop-refcounter branch from 3a5cc0a to ffbf4e0 Compare February 4, 2024 20:28
tests/topotests/static_vrf/r1/frr.conf Outdated Show resolved Hide resolved
tests/topotests/static_vrf/r1/frr.conf Outdated Show resolved Hide resolved
tests/topotests/static_vrf/r1/frr.conf Outdated Show resolved Hide resolved
Test how staticd handles VRF creation/deletion.

Signed-off-by: Igor Ryzhov <[email protected]>
@idryzhov idryzhov force-pushed the staticd-nexthop-refcounter branch from ffbf4e0 to 763ce7b Compare February 6, 2024 12:15
Copy link
Member

@ton31337 ton31337 left a comment

Choose a reason for hiding this comment

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

LGTM

@donaldsharp donaldsharp merged commit c70af15 into FRRouting:master Feb 8, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants