Skip to content

[FRR]: Fix SRv6 static SIDs delete crash#1200

Merged
r12f merged 4 commits intoAzure:202412from
cscarpitta:fix/fix_srv6_static_sids_crash_202412
Jun 12, 2025
Merged

[FRR]: Fix SRv6 static SIDs delete crash#1200
r12f merged 4 commits intoAzure:202412from
cscarpitta:fix/fix_srv6_static_sids_crash_202412

Conversation

@cscarpitta
Copy link

This PR fixes a crash that could occur when a SID is removed after the parent locator has already been removed.

Fixes: sonic-net/sonic-buildimage#22690

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>
@cscarpitta cscarpitta requested a review from lguohan as a code owner June 4, 2025 16:57
@cscarpitta
Copy link
Author

@microsoft-github-policy-service agree company="Cisco"

@ahsalam
Copy link

ahsalam commented Jun 4, 2025

@BYGX-wcr could you review ?

@BYGX-wcr
Copy link

BYGX-wcr commented Jun 4, 2025

There are many places where we are setting and unsetting those FLAGs. Can we have a unified interface for installation/uninstallation and release/occupy so that we only need to do the flag changes in that unified interface?

cscarpitta and others added 2 commits June 5, 2025 05:44
@cscarpitta
Copy link
Author

@BYGX-wcr Done. I did a bit of refactoring.

Now there is only one place where we set/unset each flag.

The STATIC_FLAG_SRV6_SID_SENT_TO_ZEBRA flag is set/unset inside static_zebra_srv6_sid_install/uninstall

The STATIC_FLAG_SRV6_SID_VALID flag is set/unset inside static_zebra_srv6_sid_notify/static_zebra_release_srv6_sid

Copy link

@BYGX-wcr BYGX-wcr left a comment

Choose a reason for hiding this comment

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

LGTM

@BYGX-wcr
Copy link

BYGX-wcr commented Jun 5, 2025

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@r12f r12f enabled auto-merge (squash) June 5, 2025 16:13
@BYGX-wcr
Copy link

BYGX-wcr commented Jun 6, 2025

@cscarpitta, this PR consistently failed at pc/test_lag_member_forwarding.py. Please check the issue.

@ahsalam
Copy link

ahsalam commented Jun 9, 2025

@cscarpitta, this PR consistently failed at pc/test_lag_member_forwarding.py. Please check the issue.

@BYGX-wcr we are looking the issue

@r12f
Copy link

r12f commented Jun 11, 2025

/azp run Azure.sonic-buildimage-msft.PR

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@r12f r12f disabled auto-merge June 12, 2025 17:59
@r12f r12f merged commit 07dbeed into Azure:202412 Jun 12, 2025
9 of 17 checks passed
mssonicbld added a commit that referenced this pull request Jun 13, 2025
…03 (#1235)

```<br>* aa74696 - (HEAD -> 202503) Merge branch '202412' of https://github.com/Azure/sonic-buildimage-msft into 202503 (2025-06-13) [Sonic Automation]
* 9fa6edd - (origin/202412, 202412) [action] [PR:22588] skip frr_bmp container from monit (#1212) (2025-06-12) [mssonicbld]
* 70de857 - [submodule][202412] Update submodule sonic-sairedis to the latest HEAD automatically (#1214) (2025-06-12) [mssonicbld]
* f3d9c03 - [action] [PR:22673] Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (#1224) (2025-06-12) [mssonicbld]
* c20f188 - Add qos values for Arista-7060X6-16PE-384C-O128S2 TH5-512 (#1220) (2025-06-12) [rick-arista]
* 07dbeed - [FRR]: Fix SRv6 static SIDs delete crash (#1200) (2025-06-12) [Riff]
|\ 
| failure_prs.log skip_prs.log 2d5e52b - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-10) [Carmine Scarpitta]
| failure_prs.log skip_prs.log 26e0868 - Merge branch '202412' into fix/fix_srv6_static_sids_crash_202412 (2025-06-05) [Carmine Scarpitta]
| failure_prs.log skip_prs.log 1b90ab9 - Address review comments (2025-06-05) [Carmine Scarpitta]
| failure_prs.log skip_prs.log cb402c7 - [FRR]: Fix SRv6 static SIDs delete crash (2025-06-04) [Carmine Scarpitta]
* 053f8ac - [202412] Code sync sonic-net/sonic-buildimage:202411 => 202412 (#1159) (2025-06-12) [Riff]
|\ 
| failure_prs.log skip_prs.log 8cd8a28 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (2025-06-10) [r12f]
| failure_prs.log skip_prs.log 81dd34b - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22883) (2025-06-08) [mssonicbld]
| failure_prs.log skip_prs.log 66690b6 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22857) (2025-06-06) [mssonicbld]
| failure_prs.log skip_prs.log 221fdba - [submodule] Update submodule sonic-swss-common to the latest HEAD automatically (#22858) (2025-06-06) [mssonicbld]
| failure_prs.log skip_prs.log 928671d - switch to use host syslog to for openbmp logging (#22817) (2025-06-03) [mssonicbld]
| failure_prs.log skip_prs.log f212bcd - Adding default QoS configurations for Arista-7050CX3-32S-C28S4. (#22744) (2025-05-31) [mssonicbld]
| failure_prs.log skip_prs.log e060bb6 - [submodule] Update submodule sonic-gnmi to the latest HEAD automatically (#22740) (2025-05-29) [mssonicbld]
| failure_prs.log skip_prs.log 6cfffb6 - [submodule] Update submodule sonic-linux-kernel to the latest HEAD automatically (#22290) (2025-05-25) [mssonicbld]
| failure_prs.log skip_prs.log c4fef0a - skip frr_bmp container from monit (#22603) (2025-05-25) [mssonicbld]
| failure_prs.log skip_prs.log 3a9d5bc - [build] Upgrade natsort pypi package from 6.2.1 to 8.4.0 (#22609) (2025-05-24) [Liu Shilong]
| failure_prs.log skip_prs.log 683b336 - Bump up /dev/shm size for Broadcom platforms to 512MB by default (#22547) (2025-05-23) [mssonicbld]
| failure_prs.log skip_prs.log fb14505 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (#22636) (2025-05-22) [mssonicbld]
| failure_prs.log skip_prs.log 78d363b - [resolv-config] Improve container resolv.conf update mechanism (#22462) (2025-05-15) [mssonicbld]
| failure_prs.log skip_prs.log e87edda - Override PTF_IMAGE_TAG for release branch [202411] (#22585) (2025-05-13) [Sai Kiran]
* 8081aec - Fix info and order of components for 7060x6_64pe_b (#1231) (2025-06-12) [Ryan Garofano]<br>```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants