Prevent Profile Creation for Invalid Cable Length

.azure-pipelines/docker-sonic-vs/start.sh

@@ -75,6 +75,14 @@ elif [ "$HWSKU" == "DPU-2P" ]; then
     cp /usr/share/sonic/hwsku/sai_dpu_2p.profile /usr/share/sonic/hwsku/sai.profile
 fi
 
+if [ "$BFDOFFLOAD" == "false" ]; then
+    if ! grep -q "SAI_VS_BFD_OFFLOAD_SUPPORTED=" /usr/share/sonic/hwsku/sai.profile; then
+        echo 'SAI_VS_BFD_OFFLOAD_SUPPORTED=false' >> /usr/share/sonic/hwsku/sai.profile
+    else
+        sed -i "s/SAI_VS_BFD_OFFLOAD_SUPPORTED.*/SAI_VS_BFD_OFFLOAD_SUPPORTED=false/g" /usr/share/sonic/hwsku/sai.profile
+    fi
+fi
+
 mkdir -p /etc/swss/config.d/
 
 rm -f /var/run/rsyslogd.pid

.gitignore

@@ -59,6 +59,8 @@ cfgmgr/sflowmgrd
 cfgmgr/macsecmgrd
 cfgmgr/coppmgrd
 cfgmgr/tunnelmgrd
+cfgmgr/fabricmgrd
+cfgmgr/stpmgrd
 fpmsyncd/fpmsyncd
 gearsyncd/gearsyncd
 mclagsyncd/mclagsyncd
@@ -94,3 +96,4 @@ tests/tests.log
 tests/tests.trs
 tests/mock_tests/**/*log
 tests/mock_tests/**/*trs
+orchagent/p4orch/tests/p4orch_tests

cfgmgr/buffermgrdyn.cpp

@@ -1462,6 +1462,26 @@ task_process_status BufferMgrDynamic::refreshPgsForPort(const string &port, cons
                 continue;
             }
 
+            // If cable len is 0m, remove lossless PG, keep lossy PG.
+            if (cable_length == "0m" && portPg.lossless)
+            {
+                if (oldProfile.empty())
+                {
+                    SWSS_LOG_INFO("No lossless profile found for port %s when cable length is set to '0m'.", port.c_str());
+                    continue;
+                }
+
+                if (m_bufferProfileLookup.find(oldProfile) != m_bufferProfileLookup.end())
+                {
+                    m_bufferProfileLookup[oldProfile].port_pgs.erase(key);
+                }
+
+                updateBufferObjectToDb(key, oldProfile, false);
+                profilesToBeReleased.insert(oldProfile);
+                portPg.running_profile_name.clear();
+                continue;
+            }
+
             string threshold;
             // Calculate new headroom size
             if (portPg.static_configured)

orchagent/Makefile.am

@@ -107,6 +107,8 @@ orchagent_SOURCES = \
             response_publisher.cpp \
             nvgreorch.cpp \
             zmqorch.cpp \
+            dash/dashenifwdorch.cpp \
+            dash/dashenifwdinfo.cpp \
             dash/dashorch.cpp \
             dash/dashrouteorch.cpp \
             dash/dashvnetorch.cpp \

orchagent/aclorch.cpp

@@ -51,6 +51,8 @@ extern Directory<Orch*> gDirectory;
 
 const int TCP_PROTOCOL_NUM = 6; // TCP protocol number
 
+#define MAC_EXACT_MATCH "ff:ff:ff:ff:ff:ff"
+
 acl_rule_attr_lookup_t aclMatchLookup =
 {
     { MATCH_IN_PORTS,          SAI_ACL_ENTRY_ATTR_FIELD_IN_PORTS },
@@ -79,6 +81,8 @@ acl_rule_attr_lookup_t aclMatchLookup =
     { MATCH_TUNNEL_VNI,        SAI_ACL_ENTRY_ATTR_FIELD_TUNNEL_VNI },
     { MATCH_INNER_ETHER_TYPE,  SAI_ACL_ENTRY_ATTR_FIELD_INNER_ETHER_TYPE },
     { MATCH_INNER_IP_PROTOCOL, SAI_ACL_ENTRY_ATTR_FIELD_INNER_IP_PROTOCOL },
+    { MATCH_INNER_SRC_MAC,     SAI_ACL_ENTRY_ATTR_FIELD_INNER_SRC_MAC },
+    { MATCH_INNER_DST_MAC,     SAI_ACL_ENTRY_ATTR_FIELD_INNER_DST_MAC },
     { MATCH_INNER_L4_SRC_PORT, SAI_ACL_ENTRY_ATTR_FIELD_INNER_L4_SRC_PORT },
     { MATCH_INNER_L4_DST_PORT, SAI_ACL_ENTRY_ATTR_FIELD_INNER_L4_DST_PORT },
     { MATCH_BTH_OPCODE,        SAI_ACL_ENTRY_ATTR_FIELD_BTH_OPCODE},
@@ -648,6 +652,7 @@ void AclRule::TunnelNH::clear()
     vxlan_orch->removeNextHopTunnel(tunnel_name, endpoint_ip, mac, vni);
 }
 
+
 string AclTableType::getName() const
 {
     return m_name;
@@ -908,6 +913,13 @@ bool AclRule::validateAddMatch(string attr_name, string attr_value)
         {
             matchData.data.booldata = (attr_name == "true");
         }
+        else if (attr_name == MATCH_INNER_DST_MAC || attr_name == MATCH_INNER_SRC_MAC)
+        {
+            swss::MacAddress mac(attr_value);
+            swss::MacAddress mask(MAC_EXACT_MATCH);
+            memcpy(matchData.data.mac, mac.getMac(), sizeof(sai_mac_t));
+            memcpy(matchData.mask.mac, mask.getMac(), sizeof(sai_mac_t));
+        }
         else if (attr_name == MATCH_IN_PORTS)
         {
             auto ports = tokenize(attr_value, ',');

orchagent/aclorch.h

@@ -51,6 +51,8 @@
 #define MATCH_INNER_IP_PROTOCOL "INNER_IP_PROTOCOL"
 #define MATCH_INNER_L4_SRC_PORT "INNER_L4_SRC_PORT"
 #define MATCH_INNER_L4_DST_PORT "INNER_L4_DST_PORT"
+#define MATCH_INNER_SRC_MAC     "INNER_SRC_MAC"
+#define MATCH_INNER_DST_MAC     "INNER_DST_MAC"
 #define MATCH_BTH_OPCODE        "BTH_OPCODE"
 #define MATCH_AETH_SYNDROME     "AETH_SYNDROME"
 #define MATCH_TUNNEL_TERM       "TUNNEL_TERM"

orchagent/bfdorch.cpp

@@ -113,9 +113,11 @@ void BfdOrch::doTask(Consumer &consumer)
     SWSS_LOG_ENTER();
     BgpGlobalStateOrch* bgp_global_state_orch = gDirectory.get<BgpGlobalStateOrch*>();
     bool tsa_enabled = false;
+    bool use_software_bfd = true;
     if (bgp_global_state_orch)
     {
         tsa_enabled = bgp_global_state_orch->getTsaState();
+        use_software_bfd = bgp_global_state_orch->getSoftwareBfd();
     }
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
@@ -128,7 +130,8 @@ void BfdOrch::doTask(Consumer &consumer)
 
         if (op == SET_COMMAND)
         {
-            if (gMySwitchType == "dpu") {
+            if (use_software_bfd)
+            {
                 //program entry in software BFD table
                 m_stateSoftBfdSessionTable->set(createStateDBKey(key), data);
                 it = consumer.m_toSync.erase(it);
@@ -176,7 +179,8 @@ void BfdOrch::doTask(Consumer &consumer)
         }
         else if (op == DEL_COMMAND)
         {
-            if (gMySwitchType == "dpu") {
+            if (use_software_bfd)
+            {
                 //delete entry from software BFD table
                 m_stateSoftBfdSessionTable->del(createStateDBKey(key));
                 it = consumer.m_toSync.erase(it);
@@ -704,6 +708,8 @@ BgpGlobalStateOrch::BgpGlobalStateOrch(DBConnector *db, string tableName):
 {
     SWSS_LOG_ENTER();
     tsa_enabled = false;
+    bool ipv6 = true;
+    bfd_offload = (offload_supported(!ipv6) && offload_supported(ipv6));
 }
 
 BgpGlobalStateOrch::~BgpGlobalStateOrch(void)
@@ -716,6 +722,51 @@ bool BgpGlobalStateOrch::getTsaState()
     SWSS_LOG_ENTER();
     return tsa_enabled;
 }
+
+bool BgpGlobalStateOrch::getSoftwareBfd()
+{
+    SWSS_LOG_ENTER();
+    return !bfd_offload;
+}
+
+bool BgpGlobalStateOrch::offload_supported(bool get_ipv6)
+{
+    sai_attribute_t attr;
+    sai_status_t status;
+    sai_attr_capability_t capability;
+
+    attr.id = SAI_SWITCH_ATTR_SUPPORTED_IPV4_BFD_SESSION_OFFLOAD_TYPE;
+    if(get_ipv6)
+    {
+        attr.id = SAI_SWITCH_ATTR_SUPPORTED_IPV6_BFD_SESSION_OFFLOAD_TYPE;
+    }
+
+    status = sai_query_attribute_capability(gSwitchId, SAI_OBJECT_TYPE_SWITCH,
+                                            attr.id, &capability);
+    if (status != SAI_STATUS_SUCCESS)
+    {
+        SWSS_LOG_ERROR("Unable to query BFD offload capability");
+        return false;
+    }
+    if (!capability.set_implemented)
+    {
+        SWSS_LOG_ERROR("BFD offload type not implemented");
+        return false;
+    }
+
+    uint32_t list[1] = { 1 };
+    attr.value.u32list.count = 1;
+    attr.value.u32list.list = list;
+    status = sai_switch_api->get_switch_attribute(gSwitchId, 1, &attr);
+    if(status == SAI_STATUS_SUCCESS && attr.value.u32list.count > 0)
+    {
+        SWSS_LOG_INFO("BFD offload type: %d", attr.value.u32list.list[0]);
+        return (attr.value.u32list.list[0] != SAI_BFD_SESSION_OFFLOAD_TYPE_NONE);
+    }
+    SWSS_LOG_ERROR("Could not get supported BFD offload type, rv: %d", status);
+    return false;
+}
+
 void BgpGlobalStateOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();

orchagent/bfdorch.h

@@ -54,9 +54,12 @@ class BgpGlobalStateOrch : public Orch
     BgpGlobalStateOrch(swss::DBConnector *db, std::string tableName);
     virtual ~BgpGlobalStateOrch(void);
     bool getTsaState();
+    bool getSoftwareBfd();
 
 private:
     bool tsa_enabled;
+    bool bfd_offload;
+    bool offload_supported(bool get_ipv6);
 
 };
 #endif /* SWSS_BFDORCH_H */

orchagent/bufferorch.cpp

@@ -1858,6 +1858,7 @@ void BufferOrch::doTask()
             continue;
         consumer->drain();
     }
+    gPortsOrch->flushCounters();
 }
 
 void BufferOrch::doTask(Consumer &consumer)
@@ -1921,4 +1922,6 @@ void BufferOrch::doTask(Consumer &consumer)
     {
         (this->*(m_bufferFlushHandlerMap[map_type_name]))(consumer);
     }
+
+    gPortsOrch->flushCounters();
 }

orchagent/copporch.cpp

@@ -188,13 +188,17 @@ void CoppOrch::initDefaultTrapIds()
     attr.value.oid = m_trap_group_map[default_trap_group];
     trap_id_attrs.push_back(attr);
 
-    /* Mellanox platform doesn't support trap priority setting */
-    /* Marvell platform doesn't support trap priority. */
+    /*
+     * Use a default trap priority > 0 to avoid undesirable packet trapping
+     * behavior on some platforms that use 0 as default SAI-internal priority.
+     * Note: Mellanox and Marvell platforms don't support trap priority setting.
+     */
+
     char *platform = getenv("platform");
     if (!platform || (!strstr(platform, MLNX_PLATFORM_SUBSTRING) && (!strstr(platform, MRVL_PRST_PLATFORM_SUBSTRING))))
     {
         attr.id = SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY;
-        attr.value.u32 = 0;
+        attr.value.u32 = 1;
         trap_id_attrs.push_back(attr);
     }