[MSTP] Swss Support

cfgmgr/stpmgr.h

@@ -7,6 +7,9 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <bitset>
+#include <vector>
+#include <string>
+#include <unordered_set>
 
 #include "dbconnector.h"
 #include "netmsg.h"
@@ -31,9 +34,9 @@
 #define MAX_VLANS 4096
 
 // Maximum number of instances supported
-#define L2_INSTANCE_MAX            MAX_VLANS
-#define STP_DEFAULT_MAX_INSTANCES  255
-#define INVALID_INSTANCE           -1
+#define L2_INSTANCE_MAX             MAX_VLANS
+#define STP_DEFAULT_MAX_INSTANCES   255
+#define INVALID_INSTANCE            -1
 
 #define GET_FIRST_FREE_INST_ID(_idx) \
     while (_idx < (int)l2InstPool.size() && l2InstPool.test(_idx)) ++_idx; \
@@ -49,7 +52,15 @@
 typedef enum L2_PROTO_MODE {
     L2_NONE,
     L2_PVSTP,
-} L2_PROTO_MODE;
+    L2_MSTP
+}L2_PROTO_MODE;
+
+
+typedef enum LinkType {
+    AUTO =              0,      // Auto
+    POINT_TO_POINT =    1,      // Point-to-point
+    SHARED =            2       // Shared
+} LinkType;
 
 typedef enum STP_MSG_TYPE {
     STP_INVALID_MSG,
@@ -60,6 +71,9 @@ typedef enum STP_MSG_TYPE {
     STP_PORT_CONFIG,
     STP_VLAN_MEM_CONFIG,
     STP_STPCTL_MSG,
+    STP_MST_GLOBAL_CONFIG,
+    STP_MST_INST_CONFIG,
+    STP_MST_INST_PORT_CONFIG,
     STP_MAX_MSG
 } STP_MSG_TYPE;
 
@@ -151,22 +165,26 @@ typedef struct VLAN_ATTR {
     uint8_t padding[3];
 } ALIGNED(4) VLAN_ATTR;
 
+typedef struct VLAN_LIST{
+    uint16_t    vlan_id;
+}VLAN_LIST;
+
 typedef struct STP_PORT_CONFIG_MSG {
-    uint8_t opcode; // enable/disable
-    char    intf_name[IFNAMSIZ];
-    uint8_t enabled;
-    uint8_t root_guard;
-    uint8_t bpdu_guard;
-    uint8_t bpdu_guard_do_disable;
-    uint8_t portfast;
-    uint8_t uplink_fast;
-    // Add 2 bytes padding for alignment
-    uint16_t padding;
-    int      path_cost;
-    int      priority;
-    int      count;
-    VLAN_ATTR vlan_list[0];
-} ALIGNED(4) STP_PORT_CONFIG_MSG;
+    uint8_t     opcode;             // enable/disable
+    char        intf_name[IFNAMSIZ];
+    uint8_t     enabled;
+    uint8_t     root_guard;
+    uint8_t     bpdu_guard;
+    uint8_t     bpdu_guard_do_disable;
+    uint8_t     portfast;           // PVST only
+    uint8_t     uplink_fast;        // PVST only
+    uint8_t     edge_port;          // MSTP only
+    LinkType    link_type;          // MSTP only
+    int         path_cost;
+    int         priority;
+    int         count;
+    VLAN_ATTR   vlan_list[0];
+} STP_PORT_CONFIG_MSG;;
 
 typedef struct STP_VLAN_MEM_CONFIG_MSG {
     uint8_t opcode;   // enable/disable
@@ -181,6 +199,32 @@ typedef struct STP_VLAN_MEM_CONFIG_MSG {
     int     priority;
 } ALIGNED(4) STP_VLAN_MEM_CONFIG_MSG;
 
+typedef struct STP_MST_GLOBAL_CONFIG_MSG {
+    uint8_t     opcode; // enable/disable
+    uint32_t    revision_number;
+    char        name[32];
+    uint8_t     forward_delay;
+    uint8_t     hello_time;
+    uint8_t     max_age;
+    uint8_t     max_hops;
+}__attribute__ ((packed))STP_MST_GLOBAL_CONFIG_MSG;
+
+typedef struct STP_MST_INST_CONFIG_MSG {
+    uint8_t         opcode;     // enable/disable
+    uint16_t        mst_id;     // MST instance ID
+    int             priority;   // Bridge priority
+    uint16_t        vlan_count; // Number of VLANs in this instance
+    VLAN_LIST       vlan_list[0]; // Flexible array for VLAN IDs
+}__attribute__((packed)) STP_MST_INST_CONFIG_MSG;
+
+typedef struct STP_MST_INST_PORT_CONFIG_MSG {
+    uint8_t     opcode;         // enable/disable
+    char        intf_name[IFNAMSIZ];  // Interface name
+    uint16_t    mst_id;         // MST instance ID
+    int         path_cost;      // Path cost
+    int         priority;       // Port priority
+} __attribute__((packed)) STP_MST_INST_PORT_CONFIG_MSG;
+
 namespace swss {
 
 class StpMgr : public Orch
@@ -194,7 +238,7 @@ class StpMgr : public Orch
     int  sendMsgStpd(STP_MSG_TYPE msgType, uint32_t msgLen, void *data);
     MacAddress macAddress;
     bool isPortInitDone(DBConnector *app_db);
-    uint16_t getStpMaxInstances(void);
+    uint16_t getStpMaxInstances(void);    
 
 private:
     Table m_cfgStpGlobalTable;
@@ -207,6 +251,9 @@ class StpMgr : public Orch
     Table m_stateVlanMemberTable;
     Table m_stateLagTable;
     Table m_stateStpTable;
+    Table m_cfgMstGlobalTable;
+    Table m_cfgMstInstTable;
+    Table m_cfgMstInstPortTable;
 
     std::bitset<L2_INSTANCE_MAX> l2InstPool;
     int stpd_fd;
@@ -220,6 +267,7 @@ class StpMgr : public Orch
     bool stpVlanTask;
     bool stpVlanPortTask;
     bool stpPortTask;
+    bool stpMstInstTask;
 
     void doTask(Consumer &consumer);
     void doStpGlobalTask(Consumer &consumer);
@@ -228,6 +276,9 @@ class StpMgr : public Orch
     void doStpPortTask(Consumer &consumer);
     void doVlanMemUpdateTask(Consumer &consumer);
     void doLagMemUpdateTask(Consumer &consumer);
+    void doStpMstGlobalTask(Consumer &consumer);
+    void doStpMstInstTask(Consumer &consumer);
+    void doStpMstInstPortTask(Consumer &consumer);
 
     bool isVlanStateOk(const std::string &alias);
     bool isLagStateOk(const std::string &alias);
@@ -239,17 +290,19 @@ class StpMgr : public Orch
     int allocL2Instance(uint32_t vlan_id);
     void deallocL2Instance(uint32_t vlan_id);
     bool isLagEmpty(const std::string &key);
-
-    // The rest of the methods remain unchanged except we replaced the old approach with alignment-based approach
-    void processStpPortAttr(const std::string op,
-                            std::vector<FieldValueTuple> &tupEntry,
-                            const std::string intfName);
-    void processStpVlanPortAttr(const std::string op,
-                                uint32_t vlan_id,
-                                const std::string intfName,
-                                std::vector<FieldValueTuple> &tupEntry);
+    void processStpPortAttr(const std::string op, std::vector<FieldValueTuple>&tupEntry, const std::string intfName);
+    void processStpVlanPortAttr(const std::string op, uint32_t vlan_id, const std::string intfName,
+                    std::vector<FieldValueTuple>&tupEntry);
+    void processStpMstInstPortAttr(const std::string op, uint16_t mst_id, const std::string intfName,
+                                       std::vector<FieldValueTuple>&tupEntry);
+    std::vector<uint16_t> parseVlanList(const std::string &vlanStr);
+    void updateVlanInstanceMap(int instance, const std::vector<uint16_t>&newVlanList, bool operation);
+    bool isInstanceMapped(uint16_t instance);
+    std::vector<std::string> getVlanAliasesForInstance(uint16_t instance);
+
+
 };
 
-} // namespace swss
-
+}
 #endif
+

cfgmgr/stpmgrd.cpp

@@ -42,20 +42,24 @@ int main(int argc, char **argv)
         TableConnector conf_stp_vlan_table(&conf_db, CFG_STP_VLAN_TABLE_NAME);
         TableConnector conf_stp_vlan_port_table(&conf_db, CFG_STP_VLAN_PORT_TABLE_NAME);
         TableConnector conf_stp_port_table(&conf_db, CFG_STP_PORT_TABLE_NAME);
-
+        TableConnector conf_mst_global_table(&conf_db, "STP_MST");
+        TableConnector conf_mst_inst_table(&conf_db, "STP_MST_INST");
+        TableConnector conf_mst_inst_port_table(&conf_db, "STP_MST_PORT");
         // VLAN DB Tables
         TableConnector state_vlan_member_table(&state_db, STATE_VLAN_MEMBER_TABLE_NAME);
 
         // LAG Tables
         TableConnector conf_lag_member_table(&conf_db, CFG_LAG_MEMBER_TABLE_NAME);
-
         vector<TableConnector> tables = {
             conf_stp_global_table,
             conf_stp_vlan_table,
             conf_stp_vlan_port_table,
             conf_stp_port_table,
             conf_lag_member_table,
-            state_vlan_member_table
+            state_vlan_member_table,
+            conf_mst_global_table,
+            conf_mst_inst_table,
+            conf_mst_inst_port_table
         };
 
 
@@ -64,7 +68,7 @@ int main(int argc, char **argv)
         // Open a Unix Domain Socket with STPd for communication
         stpmgr.ipcInitStpd();
         stpmgr.isPortInitDone(&app_db);
-        
+
         // Get max STP instances from state DB and send to stpd
         STP_INIT_READY_MSG msg;
         memset(&msg, 0, sizeof(STP_INIT_READY_MSG));
@@ -116,4 +120,4 @@ int main(int argc, char **argv)
     }
 
     return -1;
-}
+}

orchagent/orchdaemon.cpp

@@ -231,7 +231,8 @@ bool OrchDaemon::init()
     vector<string> stp_tables = {
         APP_STP_VLAN_INSTANCE_TABLE_NAME,
         APP_STP_PORT_STATE_TABLE_NAME,
-        APP_STP_FASTAGEING_FLUSH_TABLE_NAME
+        APP_STP_FASTAGEING_FLUSH_TABLE_NAME,
+        APP_STP_INST_PORT_FLUSH_TABLE_NAME
     };
     gStpOrch = new StpOrch(m_applDb, m_stateDb, stp_tables);
     gDirectory.set(gStpOrch);
@@ -1316,4 +1317,4 @@ bool DpuOrchDaemon::init()
     addOrchList(dash_port_map_orch);
 
     return true;
-}
+}

orchagent/p4orch/tests/mock_sai_stp.h

@@ -6,36 +6,36 @@ extern "C"
 {
 #include "sai.h"
 }
-    
+
 // Mock class for SAI STP APIs
 class MockSaiStp {
 public:
     // Mock method for creating an STP instance
     MOCK_METHOD4(create_stp,
-                sai_status_t(_Out_ sai_object_id_t *stp_instance_id, 
-                             _In_ sai_object_id_t switch_id, 
-                             _In_ uint32_t attr_count, 
+                sai_status_t(_Out_ sai_object_id_t *stp_instance_id,
+                             _In_ sai_object_id_t switch_id,
+                             _In_ uint32_t attr_count,
                              _In_ const sai_attribute_t *attr_list));
 
     // Mock method for removing an STP instance
     MOCK_METHOD1(remove_stp, sai_status_t(_In_ sai_object_id_t stp_instance_id));
 
     // Mock method for setting STP instance attributes
     MOCK_METHOD2(set_stp_attribute,
-                sai_status_t(_In_ sai_object_id_t stp_instance_id, 
+                sai_status_t(_In_ sai_object_id_t stp_instance_id,
                              _In_ const sai_attribute_t *attr));
 
     // Mock method for getting STP instance attributes
     MOCK_METHOD3(get_stp_attribute,
-                sai_status_t(_Out_ sai_object_id_t stp_instance_id, 
-                             _In_ uint32_t attr_count, 
+                sai_status_t(_Out_ sai_object_id_t stp_instance_id,
+                             _In_ uint32_t attr_count,
                              _In_ sai_attribute_t *attr_list));
 
     // Mock method for creating an STP port
     MOCK_METHOD4(create_stp_port,
-                sai_status_t(_Out_ sai_object_id_t *stp_port_id, 
-                             _In_ sai_object_id_t switch_id, 
-                             _In_ uint32_t attr_count, 
+                sai_status_t(_Out_ sai_object_id_t *stp_port_id,
+                             _In_ sai_object_id_t switch_id,
+                             _In_ uint32_t attr_count,
                              _In_ const sai_attribute_t *attr_list));
 
     // Mock method for removing an STP port
@@ -44,22 +44,28 @@ class MockSaiStp {
 
     // Mock method for setting STP port attributes
     MOCK_METHOD2(set_stp_port_attribute,
-                sai_status_t(_Out_ sai_object_id_t stp_port_id, 
+                sai_status_t(_Out_ sai_object_id_t stp_port_id,
                              _In_ const sai_attribute_t *attr));
 
     // Mock method for getting STP port attributes
     MOCK_METHOD3(get_stp_port_attribute,
-                sai_status_t(_Out_ sai_object_id_t stp_port_id, 
+                sai_status_t(_Out_ sai_object_id_t stp_port_id,
                             _In_ uint32_t attr_count,
                             _In_ sai_attribute_t *attr_list));
+
+    // Mock method for flushing FDB entries
+    MOCK_METHOD3(flush_fdb_entries,
+                sai_status_t(_In_ sai_object_id_t switch_id,
+                 _In_ uint32_t attr_count,
+                 _In_ const sai_attribute_t *attr_list));
 };
 
 // Global mock object for SAI STP APIs
 MockSaiStp *mock_sai_stp;
 
-sai_status_t mock_create_stp(_Out_ sai_object_id_t *stp_instance_id, 
-                        _In_ sai_object_id_t switch_id, 
-                        _In_ uint32_t attr_count, 
+sai_status_t mock_create_stp(_Out_ sai_object_id_t *stp_instance_id,
+                        _In_ sai_object_id_t switch_id,
+                        _In_ uint32_t attr_count,
                         _In_ const sai_attribute_t *attr_list)
 {
     return mock_sai_stp->create_stp(stp_instance_id, switch_id, attr_count, attr_list);
@@ -75,14 +81,14 @@ sai_status_t mock_set_stp_attribute(_In_ sai_object_id_t stp_instance_id, _In_ c
     return mock_sai_stp->set_stp_attribute(stp_instance_id, attr);
 }
 
-sai_status_t mock_get_stp_attribute(_Out_ sai_object_id_t stp_instance_id, 
+sai_status_t mock_get_stp_attribute(_Out_ sai_object_id_t stp_instance_id,
                             _In_ uint32_t attr_count, _Inout_ sai_attribute_t *attr_list)
 {
     return mock_sai_stp->get_stp_attribute(stp_instance_id, attr_count, attr_list);
 }
-sai_status_t mock_create_stp_port(_Out_ sai_object_id_t *stp_port_id, 
-                             _In_ sai_object_id_t switch_id, 
-                             _In_ uint32_t attr_count, 
+sai_status_t mock_create_stp_port(_Out_ sai_object_id_t *stp_port_id,
+                             _In_ sai_object_id_t switch_id,
+                             _In_ uint32_t attr_count,
                              _In_ const sai_attribute_t *attr_list)
 {
     return mock_sai_stp->create_stp_port(stp_port_id, switch_id,attr_count, attr_list);
@@ -93,18 +99,17 @@ sai_status_t mock_remove_stp_port(_In_ sai_object_id_t stp_port_id)
     return mock_sai_stp->remove_stp_port(stp_port_id);
 }
 
-sai_status_t mock_set_stp_port_attribute(_In_ sai_object_id_t stp_port_id, 
+sai_status_t mock_set_stp_port_attribute(_In_ sai_object_id_t stp_port_id,
                              _In_ const sai_attribute_t *attr)
 {
     return mock_sai_stp->set_stp_port_attribute(stp_port_id, attr);
 }
 
-sai_status_t mock_get_stp_port_attribute(_Out_ sai_object_id_t stp_port_id, 
+sai_status_t mock_get_stp_port_attribute(_Out_ sai_object_id_t stp_port_id,
                                     _In_ uint32_t attr_count,
-                                    _Inout_ sai_attribute_t *attr_list)            
+                                    _Inout_ sai_attribute_t *attr_list)
 {
     return mock_sai_stp->get_stp_port_attribute(stp_port_id, attr_count, attr_list);
 }
 
 #endif // MOCK_SAI_STP_H
-