Skip to content

Commit

Permalink
[portsorch] Change speed set flow (sonic-net#764)
Browse files Browse the repository at this point in the history 
- Cache port admin status and speed in port structure in
   initializePort();
 - Don't flap port if port is already down during speed set;
 - Don't set admin status if desired status is already set;
 - Set admin status as last step in doPortTask()

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
  • Loading branch information
@stepanblyschak @yxieca
stepanblyschak authored and yxieca committed Feb 20, 2019
1 parent a6d60f2 commit 7cf55ff
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 41 deletions.
3 changes: 2 additions & 1 deletion orchagent/port.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ class Port
int m_index = 0; // PHY_PORT: index
uint32_t m_mtu = DEFAULT_MTU;
uint32_t m_speed = 0; // Mbps
bool m_autoneg = 0;
bool m_autoneg = false;
bool m_admin_state_up = false;
sai_object_id_t m_port_id = 0;
sai_port_fec_mode_t m_fec_mode = SAI_PORT_FEC_MODE_NONE;
VlanInfo m_vlan_info;
Expand Down
114 changes: 74 additions & 40 deletions orchagent/portsorch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,25 @@ bool PortsOrch::setPortAdminStatus(sai_object_id_t id, bool up)
return true;
}

bool PortsOrch::getPortAdminStatus(sai_object_id_t id, bool &up)
{
SWSS_LOG_ENTER();

sai_attribute_t attr;
attr.id = SAI_PORT_ATTR_ADMIN_STATE;

sai_status_t status = sai_port_api->get_port_attribute(id, 1, &attr);
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Failed to get admin status for port pid:%lx", id);
return false;
}

up = attr.value.booldata;

return true;
}

bool PortsOrch::setPortMtu(sai_object_id_t id, sai_uint32_t mtu)
{
SWSS_LOG_ENTER();
Expand Down Expand Up @@ -1731,45 +1750,43 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
else
{
sai_uint32_t current_speed;

if (!isSpeedSupported(alias, p.m_port_id, speed))
{
it++;
continue;
}

if (getPortSpeed(p.m_port_id, current_speed))
if (p.m_admin_state_up)
{
if (speed != current_speed)
/* Bring port down before applying speed */
if (!setPortAdminStatus(p.m_port_id, false))
{
if (setPortAdminStatus(p.m_port_id, false))
{
if (setPortSpeed(p.m_port_id, speed))
{
SWSS_LOG_NOTICE("Set port %s speed to %u", alias.c_str(), speed);
}
else
{
SWSS_LOG_ERROR("Failed to set port %s speed to %u", alias.c_str(), speed);
it++;
continue;
}
}
else
{
SWSS_LOG_ERROR("Failed to set port admin status DOWN to set speed");
it++;
continue;
}
SWSS_LOG_ERROR("Failed to set port %s admin status DOWN to set speed", alias.c_str());
it++;
continue;
}

p.m_admin_state_up = false;
m_portList[alias] = p;

if (!setPortSpeed(p.m_port_id, speed))
{
SWSS_LOG_ERROR("Failed to set port %s speed to %u", alias.c_str(), speed);
it++;
continue;
}
}
else
{
SWSS_LOG_ERROR("Failed to get current speed for port %s", alias.c_str());
it++;
continue;
/* Port is already down, setting speed */
if (!setPortSpeed(p.m_port_id, speed))
{
SWSS_LOG_ERROR("Failed to set port %s speed to %u", alias.c_str(), speed);
it++;
continue;
}
}
SWSS_LOG_NOTICE("Set port %s speed to %u", alias.c_str(), speed);
}
m_portList[alias].m_speed = speed;
}
Expand All @@ -1794,20 +1811,6 @@ void PortsOrch::doPortTask(Consumer &consumer)
}
}

if (!admin_status.empty())
{
if (setPortAdminStatus(p.m_port_id, admin_status == "up"))
{
SWSS_LOG_NOTICE("Set port %s admin status to %s", alias.c_str(), admin_status.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set port %s admin status to %s", alias.c_str(), admin_status.c_str());
it++;
continue;
}
}

if (!fec_mode.empty())
{
if (fec_mode_map.find(fec_mode) != fec_mode_map.end())
Expand Down Expand Up @@ -1848,6 +1851,23 @@ void PortsOrch::doPortTask(Consumer &consumer)
continue;
}
}

/* Last step set port admin status */
if (!admin_status.empty() && (p.m_admin_state_up != (admin_status == "up")))
{
if (setPortAdminStatus(p.m_port_id, admin_status == "up"))
{
p.m_admin_state_up = (admin_status == "up");
m_portList[alias] = p;
SWSS_LOG_NOTICE("Set port %s admin status to %s", alias.c_str(), admin_status.c_str());
}
else
{
SWSS_LOG_ERROR("Failed to set port %s admin status to %s", alias.c_str(), admin_status.c_str());
it++;
continue;
}
}
}
}
else
Expand Down Expand Up @@ -2412,6 +2432,20 @@ bool PortsOrch::initializePort(Port &port)
port.m_oper_status = SAI_PORT_OPER_STATUS_DOWN;
}

/* initialize port admin status */
if (!getPortAdminStatus(port.m_port_id, port.m_admin_state_up))
{
SWSS_LOG_ERROR("Failed to get initial port admin status %s", port.m_alias.c_str());
return false;
}

/* initialize port admin speed */
if (!getPortSpeed(port.m_port_id, port.m_speed))
{
SWSS_LOG_ERROR("Failed to get initial port admin speed %d", port.m_speed);
return false;
}

/*
* always initialize Port SAI_HOSTIF_ATTR_OPER_STATUS based on oper_status value in appDB.
*/
Expand Down
1 change: 1 addition & 0 deletions orchagent/portsorch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ class PortsOrch : public Orch, public Subject
bool initPort(const string &alias, const set<int> &lane_set);

bool setPortAdminStatus(sai_object_id_t id, bool up);
bool getPortAdminStatus(sai_object_id_t id, bool& up);
bool setPortMtu(sai_object_id_t id, sai_uint32_t mtu);
bool setPortPvid (Port &port, sai_uint32_t pvid);
bool getPortPvid(Port &port, sai_uint32_t &pvid);
Expand Down

0 comments on commit 7cf55ff

Please sign in to comment.