Skip to content

vpp: manual merge PRs from master to 202511#1786

Merged
vmittal-msft merged 7 commits intosonic-net:202511from
yue-fred-gao:vpp_2511_dc
Mar 9, 2026
Merged

vpp: manual merge PRs from master to 202511#1786
vmittal-msft merged 7 commits intosonic-net:202511from
yue-fred-gao:vpp_2511_dc

Conversation

@yue-fred-gao
Copy link
Contributor

@yue-fred-gao yue-fred-gao commented Mar 3, 2026

what I did

Cherry-pick:

3e5c58df vpp: support binding multiple ACL tables by priority (#1732)
05f87e69 vpp: support ACL attached to LAG and UDP in ACE (#1718)
78ba5f09 Graceful shutdown vpp to avoid core dump (#1714)
69eab2a6 Support for sonic-mgmt ACL testing on VPP (#1599)
1bf99980 changes for vpp release 202510 (#1695)

why I did it

vpp in 202511 branch doesn't support ACL without above PRs

AkeelAli and others added 4 commits March 3, 2026 06:39
* Enabling sonic-mgmt ACL testing for Sonic-VPP

* Use retval in debugs
Signed-off-by: Yue Gao <yuega2@cisco.com>
* Handle acl attachment through LAG update
* Add default permit-all rules
* Support ACL with UDP protocol
* if protocol is not specified but port or port-range is
   create 2 rules with proto UDP and TCP. vpp requires proto
   to be set if port or port-range is used
* realign ace stats index because each ace can map to multiple acl rules

Signed-off-by: Yue Gao <yuega2@cisco.com>
why
currently vpp doesn't support binding multiple ACL tables. Each table is appended with default permit-all rules. With multiple tables, this may cause acl matched by such rules and skip the actual rule to make in the tables after this one.

what this PR does
remove the default permit-all rules for each table
If a table is empty, create a dummy rule that won't match any traffic because vpp doesn't allow empty table. The dummy rule matches dest-ip to 0.0.0.0/32
sort all the tables by priority in the table group. vpp doesn't support parallel matching
added catch-all acl group to the end. vpp default behavior of no match is drop but sonic is accept.
Fix sonic-vpp crashing due to race condition during stats pull. If the interface to get stats has been removed, stat_segment_ls_r returns null.

Signed-off-by: Yue Gao <yuega2@cisco.com>
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@zjswhhh
Copy link
Contributor

zjswhhh commented Mar 3, 2026

Hi @vmittal-msft - please help merge. These commits have merge conflicts to 202511 hence the manual PR. Thanks a lot!

@yue-fred-gao
Copy link
Contributor Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vmittal-msft vmittal-msft merged commit ea00e3c into sonic-net:202511 Mar 9, 2026
16 checks passed
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.

7 participants