portorch update commit for lag

patches/sonic-swss/port_orch_lag.patch

@@ -0,0 +1,153 @@
+Index: usonic/sm/sonic-swss/orchagent/portsorch.cpp
+
+--- usonic.orig/sm/sonic-swss/orchagent/portsorch.cpp
++++ usonic/sm/sonic-swss/orchagent/portsorch.cpp
+@@ -2472,39 +2472,51 @@ void PortsOrch::doLagMemberTask(Consumer &consumer)
+                     status = fvValue(i);
+             }
+
+-            /* Sync an enabled member */
+-            if (status == "enabled")
++            if (lag.m_members.find(port_alias) == lag.m_members.end())
+             {
+-                /* Duplicate entry */
+-                if (lag.m_members.find(port_alias) != lag.m_members.end())
++                /* Assert the port doesn't belong to any LAG already */
++                assert(!port.m_lag_id && !port.m_lag_member_id);
++
++                if (!addLagMember(lag, port))
+                 {
+-                    it = consumer.m_toSync.erase(it);
++                    it++;
+                     continue;
+                 }
++            }
+
+-                /* Assert the port doesn't belong to any LAG */
+-                assert(!port.m_lag_id && !port.m_lag_member_id);
+-
+-                if (addLagMember(lag, port))
++            /* Sync an enabled member */
++            if (status == "enabled")
++            {
++                /* enable collection first, distribution-only mode
++                 * is not supported on Mellanox platform
++                 */
++                if (setCollectionOnLagMember(port, true) &&
++                    setDistributionOnLagMember(port, true))
++                {
+                     it = consumer.m_toSync.erase(it);
++                }
+                 else
++                {
+                     it++;
++                    continue;
++                }
+             }
+             /* Sync an disabled member */
+             else /* status == "disabled" */
+             {
+-                /* "status" is "disabled" at start when m_lag_id and
+-                 * m_lag_member_id are absent */
+-                if (!port.m_lag_id || !port.m_lag_member_id)
++                /* disable distribution first, distribution-only mode
++                 * is not supported on Mellanox platform
++                 */
++                if (setDistributionOnLagMember(port, false) &&
++                    setCollectionOnLagMember(port, false))
+                 {
+                     it = consumer.m_toSync.erase(it);
+-                    continue;
+                 }
+-
+-                if (removeLagMember(lag, port))
+-                    it = consumer.m_toSync.erase(it);
+                 else
++                {
+                     it++;
++                    continue;
++                }
+             }
+         }
+         /* Remove a LAG member */
+@@ -2522,9 +2534,13 @@ void PortsOrch::doLagMemberTask(Consumer &consumer)
+             }
+
+             if (removeLagMember(lag, port))
++            {
+                 it = consumer.m_toSync.erase(it);
++            }
+             else
++            {
+                 it++;
++            }
+         }
+         else
+         {
+@@ -3318,6 +3334,52 @@ bool PortsOrch::removeLagMember(Port &lag, Port &port)
+     return true;
+ }
+
++bool PortsOrch::setCollectionOnLagMember(Port &lagMember, bool enableCollection)
++{
++    /* Port must be LAG member */
++    assert(port.m_lag_member_id);
++
++    sai_status_t status = SAI_STATUS_FAILURE;
++    sai_attribute_t attr {};
++
++    attr.id = SAI_LAG_MEMBER_ATTR_INGRESS_DISABLE;
++    attr.value.booldata = !enableCollection;
++
++    status = sai_lag_api->set_lag_member_attribute(lagMember.m_lag_member_id, &attr);
++    if (status != SAI_STATUS_SUCCESS)
++    {
++        SWSS_LOG_ERROR("Failed to %s collection on LAG member %s",
++            enableCollection ? "enable" : "disable",
++            lagMember.m_alias.c_str());
++        return false;
++    }
++
++    return true;
++}
++
++bool PortsOrch::setDistributionOnLagMember(Port &lagMember, bool enableDistribution)
++{
++    /* Port must be LAG member */
++    assert(port.m_lag_member_id);
++
++    sai_status_t status = SAI_STATUS_FAILURE;
++    sai_attribute_t attr {};
++
++    attr.id = SAI_LAG_MEMBER_ATTR_EGRESS_DISABLE;
++    attr.value.booldata = !enableDistribution;
++
++    status = sai_lag_api->set_lag_member_attribute(lagMember.m_lag_member_id, &attr);
++    if (status != SAI_STATUS_SUCCESS)
++    {
++        SWSS_LOG_ERROR("Failed to %s distribution on LAG member %s",
++            enableDistribution ? "enable" : "disable",
++            lagMember.m_alias.c_str());
++        return false;
++    }
++
++    return true;
++}
++
+ void PortsOrch::generateQueueMap()
+ {
+     if (m_isQueueMapGenerated)
+
+Index: usonic/sm/sonic-swss/orchagent/portsorch.h
+
+--- usonic.orig/sm/sonic-swss/orchagent/portsorch.h
++++ usonic/sm/sonic-swss/orchagent/portsorch.h
+@@ -172,6 +172,8 @@ class PortsOrch : public Orch, public Subject
+     bool removeLag(Port lag);
+     bool addLagMember(Port &lag, Port &port);
+     bool removeLagMember(Port &lag, Port &port);
++    bool setCollectionOnLagMember(Port &lagMember, bool enableCollection);
++    bool setDistributionOnLagMember(Port &lagMember, bool enableDistribution);
+     void getLagMember(Port &lag, vector<Port> &portv);
+
+     bool addPort(const set<int> &lane_set, uint32_t speed, int an=0, string fec="");

patches/sonic-swss/series

@@ -1,2 +1,3 @@
 copporch_bug_fix.patch
 [portsyncd]:_fix_portsyncd_restart_case_(#1019).patch
+port_orch_lag.patch