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

[portsorch]: add support to set mac-address learning attribute on bridge-port #809

Merged
merged 11 commits into from
Nov 12, 2019
Merged

[portsorch]: add support to set mac-address learning attribute on bridge-port #809

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9326978
Merge pull request #1 from Azure/master
shine4chen Feb 13, 2019
e4c92f3
add support to set mac-address learning attribute on bridge-port
Mar 8, 2019
8bf1905
add the corresponding vs-test
leoli-nps Jun 12, 2019
15d7451
refine code according to community review
Jun 17, 2019
85681c8
Merge branch 'bridge-port-mac-learn' of https://github.com/shine4chen…
Jun 17, 2019
2f9c789
[vstest] update the corresponding vstest for pr#809
leoli-nps Jun 21, 2019
4913d31
Merge branch 'master' into bridge-port-mac-learn
shine4chen Jul 10, 2019
2deeaf1
optimize the process of fetching learn mode attribute
Aug 30, 2019
a2901ad
Merge branch 'master' into bridge-port-mac-learn
shine4chen Oct 2, 2019
c757ece
fix compiler error
shine4chen Oct 2, 2019
92100be
Merge branch 'master' into bridge-port-mac-learn
shine4chen Oct 4, 2019
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
158 changes: 157 additions & 1 deletion orchagent/portsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,6 +1482,7 @@ void PortsOrch::doPortTask(Consumer &consumer)
string pfc_asym;
uint32_t mtu = 0;
uint32_t speed = 0;
string learn_mode;
int an = -1;

for (auto i : kfvFieldsValues(t))
Expand Down Expand Up @@ -1524,6 +1525,12 @@ void PortsOrch::doPortTask(Consumer &consumer)
fec_mode = fvValue(i);
}

/* Get port fdb learn mode*/
if (fvField(i) == "learn_mode")
{
learn_mode = fvValue(i);
}

/* Set port asymmetric PFC */
if (fvField(i) == "pfc_asym")
pfc_asym = fvValue(i);
Expand Down Expand Up @@ -1813,7 +1820,48 @@ void PortsOrch::doPortTask(Consumer &consumer)
SWSS_LOG_ERROR("Unknown fec mode %s", fec_mode.c_str());
}
}

if (learn_mode != "")
{
if (learn_mode == "enabled" || learn_mode == "disabled")
{
int32_t mode;

if (learn_mode == "enabled")
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_HW;
}
else
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE;
}

if (p.m_bridge_port_id != SAI_NULL_OBJECT_ID)
{
if(setBridgePortLearnMode(p, mode))
{
SWSS_LOG_NOTICE("Set port %s learn mode to %s", alias.c_str(), learn_mode.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set port %s learn mode to %s", alias.c_str(), learn_mode.c_str());
it++;
continue;
}
}
else
{
m_portSetLearnModeList[alias] = learn_mode;
shine4chen marked this conversation as resolved.
Show resolved Hide resolved

SWSS_LOG_NOTICE("Saved to set port %s learn mode %s", alias.c_str(), learn_mode.c_str());
}
}
else
{
SWSS_LOG_ERROR("Unknown learn mode %s", learn_mode.c_str());
}
}

if (pfc_asym != "")
{
if (setPortPfcAsym(p, pfc_asym))
Expand Down Expand Up @@ -2013,7 +2061,38 @@ void PortsOrch::doVlanMemberTask(Consumer &consumer)
}

if (addBridgePort(port) && addVlanMember(vlan, port, tagging_mode))
shine4chen marked this conversation as resolved.
Show resolved Hide resolved
{
int32_t mode;
string learning_mode;

if(m_portSetLearnModeList.find(port_alias) != m_portSetLearnModeList.end())
{
learning_mode = m_portSetLearnModeList[port_alias];

SWSS_LOG_NOTICE("Set port %s learn mode %s when add port to vlan %s", port_alias.c_str(), learning_mode.c_str(), vlan_alias.c_str());

if (learning_mode == "enabled")
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_HW;
}
else if (learning_mode == "disabled")
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE;
}
else
{
SWSS_LOG_ERROR("Wrong learning_mode '%s' ", learning_mode.c_str());
it = consumer.m_toSync.erase(it);
continue;
}

setBridgePortLearnMode(port, mode);

m_portSetLearnModeList.erase(port_alias);
}

it = consumer.m_toSync.erase(it);
}
else
it++;
}
Expand Down Expand Up @@ -2097,6 +2176,57 @@ void PortsOrch::doLagTask(Consumer &consumer)
gIntfsOrch->setRouterIntfsMtu(l);
}
}

string learn_mode;
for (auto i : kfvFieldsValues(t))
{
/* Get port fdb learn mode*/
if (fvField(i) == "learn_mode")
shine4chen marked this conversation as resolved.
Show resolved Hide resolved
{
learn_mode = fvValue(i);
}
}

if (learn_mode != "")
{
if (learn_mode == "enabled" || learn_mode == "disabled")
{
int32_t mode;

if (learn_mode == "enabled")
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_HW;
}
else
{
mode = SAI_BRIDGE_PORT_FDB_LEARNING_MODE_DISABLE;
}

if (l.m_bridge_port_id != SAI_NULL_OBJECT_ID)
{
if(setBridgePortLearnMode(l, mode))
{
SWSS_LOG_NOTICE("Set port %s learn mode to %s", alias.c_str(), learn_mode.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set port %s learn mode to %s", alias.c_str(), learn_mode.c_str());
it++;
continue;
}
}
else
{
m_portSetLearnModeList[alias] = learn_mode;

SWSS_LOG_NOTICE("Saved to set port %s learn mode %s", alias.c_str(), learn_mode.c_str());
}
}
else
{
SWSS_LOG_ERROR("Unknown learn mode %s", learn_mode.c_str());
}
}
}

it = consumer.m_toSync.erase(it);
Expand Down Expand Up @@ -2568,6 +2698,32 @@ bool PortsOrch::removeBridgePort(Port &port)
return true;
}

bool PortsOrch::setBridgePortLearnMode(Port &port, int32_t mode)
{
SWSS_LOG_ENTER();

if (port.m_bridge_port_id == SAI_NULL_OBJECT_ID)
{
return true;
}
/* Set bridge port learning mode */
sai_attribute_t attr;
attr.id = SAI_BRIDGE_PORT_ATTR_FDB_LEARNING_MODE;
attr.value.s32 = mode;

sai_status_t status = sai_bridge_api->set_bridge_port_attribute(port.m_bridge_port_id, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to set bridge port %s learning mode, rv:%d",
port.m_alias.c_str(), status);
return false;
}

SWSS_LOG_NOTICE("Set bridge port %s learning mode", port.m_alias.c_str());

return true;
}

bool PortsOrch::addVlan(string vlan_alias)
{
SWSS_LOG_ENTER();
Expand Down Expand Up @@ -2767,7 +2923,7 @@ bool PortsOrch::addLag(string lag_alias)

PortUpdate update = { lag, true };
notify(SUBJECT_TYPE_PORT_CHANGE, static_cast<void *>(&update));

shine4chen marked this conversation as resolved.
Show resolved Hide resolved
return true;
}

Expand Down
5 changes: 3 additions & 2 deletions orchagent/portsorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ class PortsOrch : public Orch, public Subject
map<set<int>, sai_object_id_t> m_portListLaneMap;
map<set<int>, tuple<string, uint32_t, int, string>> m_lanesAliasSpeedMap;
map<string, Port> m_portList;

unordered_set<string> m_pendingPortSet;

map<string, string> m_portSetLearnModeList;

NotificationConsumer* m_portStatusNotificationConsumer;

void doTask(Consumer &consumer);
Expand All @@ -143,6 +143,7 @@ class PortsOrch : public Orch, public Subject

bool addBridgePort(Port &port);
bool removeBridgePort(Port &port);
bool setBridgePortLearnMode(Port &port, int32_t mode);

bool addVlan(string vlan);
bool removeVlan(Port vlan);
Expand Down