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.

Sign up for GitHub

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

Capability query for MACSEC ACL attribute #3135

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Capability query for MACSEC ACL attribute #3135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 29 additions & 9 deletions orchagent/macsecorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ extern sai_switch_api_t *sai_switch_api;
constexpr bool DEFAULT_ENABLE_ENCRYPT = true;
constexpr bool DEFAULT_SCI_IN_SECTAG = false;
constexpr sai_macsec_cipher_suite_t DEFAULT_CIPHER_SUITE = SAI_MACSEC_CIPHER_SUITE_GCM_AES_128;
bool saiAclFieldSciMatchSupported = true;

static const std::vector<std::string> macsec_sa_attrs =
{
Expand Down Expand Up @@ -636,7 +637,19 @@ MACsecOrch::MACsecOrch(
StatsMode::READ,
MACSEC_STAT_POLLING_INTERVAL_MS, true)
{

SWSS_LOG_ENTER();
sai_attr_capability_t capability;
if (sai_query_attribute_capability(gSwitchId, SAI_OBJECT_TYPE_ACL_TABLE,
SAI_ACL_TABLE_ATTR_FIELD_MACSEC_SCI,
&capability) == SAI_STATUS_SUCCESS)
{
if (capability.create_implemented == false)
{
SWSS_LOG_DEBUG("SAI_ACL_TABLE_ATTR_FIELD_MACSEC_SCI is not supported");
saiAclFieldSciMatchSupported = false;
}
}
}

MACsecOrch::~MACsecOrch()
Expand Down Expand Up @@ -2570,9 +2583,12 @@ bool MACsecOrch::createMACsecACLTable(
attr.value.booldata = true;
attrs.push_back(attr);

attr.id = SAI_ACL_TABLE_ATTR_FIELD_MACSEC_SCI;
attr.value.booldata = sci_in_sectag;
attrs.push_back(attr);
if (saiAclFieldSciMatchSupported == true)
{
attr.id = SAI_ACL_TABLE_ATTR_FIELD_MACSEC_SCI;
attr.value.booldata = sci_in_sectag;
attrs.push_back(attr);
}

sai_status_t status = sai_acl_api->create_acl_table(
&table_id,
Expand Down Expand Up @@ -2738,13 +2754,17 @@ bool MACsecOrch::createMACsecACLDataEntry(
attr.value.aclaction.parameter.s32 = SAI_PACKET_ACTION_DROP;
attr.value.aclaction.enable = true;
attrs.push_back(attr);
if (sci_in_sectag)

if (saiAclFieldSciMatchSupported == true)
{
attr.id = SAI_ACL_ENTRY_ATTR_FIELD_MACSEC_SCI;
attr.value.aclfield.enable = true;
attr.value.aclfield.mask.u64 = 0xFFFFFFFFFFFFFFFF;
attr.value.aclfield.data.u64 = sci;
attrs.push_back(attr);
if (sci_in_sectag)
{
attr.id = SAI_ACL_ENTRY_ATTR_FIELD_MACSEC_SCI;
attr.value.aclfield.enable = true;
attr.value.aclfield.mask.u64 = 0xFFFFFFFFFFFFFFFF;
attr.value.aclfield.data.u64 = sci;
attrs.push_back(attr);
}
}

sai_status_t status = sai_acl_api->create_acl_entry(
Expand Down
Loading