Skip to content

[swss] Support FIPS MACSec POST#3836

Merged
prsunny merged 34 commits intosonic-net:masterfrom
ysmanman:macsec-post
Nov 11, 2025
Merged

[swss] Support FIPS MACSec POST#3836
prsunny merged 34 commits intosonic-net:masterfrom
ysmanman:macsec-post

Conversation

@ysmanman
Copy link
Copy Markdown
Contributor

@ysmanman ysmanman commented Aug 18, 2025

Add SAI MACSec POST support in SWSS

  • When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
  • If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
  • Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
  • MACSecMgr does not process any MACSec configuration if SAI POST fails.

With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

  • FIPS is enabled in SONiC; AND
  • SAI supports MACSec POST; AND
  • SAI returns failure on MACSec POST.

We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

  • MACSec ports came up fine when FIPS is not enabled in SONiC;
  • MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.

@ysmanman ysmanman requested a review from prsunny as a code owner August 18, 2025 20:47
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@ysmanman ysmanman changed the title Initial change to support FIPS MACSec POST Support FIPS MACSec POST Aug 25, 2025
@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@ysmanman
Copy link
Copy Markdown
Contributor Author

@rlhui
Copy link
Copy Markdown
Contributor

rlhui commented Aug 27, 2025

@senthil-nexthop

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph
Copy link
Copy Markdown
Contributor

/AzurePipelines run Azure.sonic-swss

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Copy Markdown
Contributor

@judyjoseph judyjoseph left a comment

Choose a reason for hiding this comment

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

LGTM - thanks @ysmanman

@mssonicbld
Copy link
Copy Markdown
Collaborator

/azp run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@judyjoseph judyjoseph requested a review from prsunny November 9, 2025 22:58
@judyjoseph
Copy link
Copy Markdown
Contributor

judyjoseph commented Nov 10, 2025

@prsunny can you review again and merge if ok

Copy link
Copy Markdown
Collaborator

@prsunny prsunny left a comment

Choose a reason for hiding this comment

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

lgtm, @judyjoseph please signoff

@prsunny
Copy link
Copy Markdown
Collaborator

prsunny commented Nov 11, 2025

@ysmanman , thanks for addressing the comments

@prsunny prsunny merged commit 6b976e9 into sonic-net:master Nov 11, 2025
15 checks passed
balanokia pushed a commit to balanokia/sonic-swss that referenced this pull request Nov 17, 2025
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.
YairRaviv pushed a commit to YairRaviv/sonic-swss that referenced this pull request Nov 22, 2025
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.
mssonicbld added a commit to mssonicbld/sonic-buildimage that referenced this pull request Dec 3, 2025
Passing -M option to orchange to enable SAI MACSec POST when:
- FIPS is enabled in SONiC; AND
- MACSec is enabled on platform.

<!--
     Please make sure you've read and understood our contributing guidelines:
     https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

     ** Make sure all your commits include a signature generated with `git commit -s` **

     If this is a bug fix, make sure your description includes "fixes #xxxx", or
     "closes #xxxx" or "resolves #xxxx"

     Please provide the following information:
-->

#### Why I did it
 sonic-net/sonic-swss#3836 adds `-M` option to orchagent to enable SAI MACSec POST. This PR passes the option to orchagent when:
- FIPS is enabled in SONiC; AND
- MACSec is enabled on platform.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
mssonicbld added a commit to sonic-net/sonic-buildimage that referenced this pull request Dec 10, 2025
Passing -M option to orchange to enable SAI MACSec POST when:
- FIPS is enabled in SONiC; AND
- MACSec is enabled on platform.

<!--
 Please make sure you've read and understood our contributing guidelines:
 https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md

 failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **

 If this is a bug fix, make sure your description includes "fixes #xxxx", or
 "closes #xxxx" or "resolves #xxxx"

 Please provide the following information:
-->

#### Why I did it
 sonic-net/sonic-swss#3836 adds `-M` option to orchagent to enable SAI MACSec POST. This PR passes the option to orchagent when:
- FIPS is enabled in SONiC; AND
- MACSec is enabled on platform.

##### Work item tracking
- Microsoft ADO **(number only)**:

#### How I did it

#### How to verify it

<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->

#### Which release branch to backport (provide reason below if selected)

<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->

- [ ] 202205
- [ ] 202211
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505

#### Tested branch (Please provide the tested image version)

<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->

- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->

#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->

<!--
 Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->

#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->

#### A picture of a cute animal (not mandatory but encouraged)
Pterosaur pushed a commit to Janetxxx/sonic-swss that referenced this pull request Jan 6, 2026
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.
yehjunying pushed a commit to yehjunying/sonic-swss that referenced this pull request Jan 16, 2026
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.
theasianpianist pushed a commit to theasianpianist/sonic-swss that referenced this pull request Feb 4, 2026
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
baorliu pushed a commit to baorliu/sonic-swss that referenced this pull request Feb 23, 2026
Add SAI MACSec POST support in SWSS

When FIPS is enabled in SONiC, enable MACSecPOST in switch creation.
If MACSec POST is only supported in MACSec init, create MACSec objects and enable POST when initializing MACSecOrch.
Set SAI POST status in StateDB accordingly based on SAI POST status notificaiton.
MACSecMgr does not process any MACSec configuration if SAI POST fails.
With the PR, the only case that Orchagent declares SAI MACSec POST to fail is:

FIPS is enabled in SONiC; AND
SAI supports MACSec POST; AND
SAI returns failure on MACSec POST.
We particularly verified the following on switch with current BRCM SAI (13.2.1.0) that does not support MACSec POST yet:

MACSec ports came up fine when FIPS is not enabled in SONiC;
MACSec ports came up fine when FIPS is enabled in SONiC and SAI does not support MACSec POST.

Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

10 participants