Add support for Inband VLan

orchagent/intfsorch.cpp

@@ -17,6 +17,7 @@
 #include "directory.h"
 #include "vnetorch.h"
 #include "subscriberstatetable.h"
+#include "exec.h"
 
 extern sai_object_id_t gVirtualRouterId;
 extern Directory<Orch*> gDirectory;
@@ -41,6 +42,8 @@ const int intfsorch_pri = 35;
 #define RIF_FLEX_STAT_COUNTER_POLL_MSECS "1000"
 #define UPDATE_MAPS_SEC 1
 
+#define INBAND_INTF_TIMER_SEC 1
+
 
 static const vector<sai_router_interface_stat_t> rifStatIds =
 {
@@ -99,8 +102,20 @@ IntfsOrch::IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch, DBCon
         SWSS_LOG_WARN("RIF flex counter group plugins was not set successfully: %s", e.what());
     }
 
-    if(gMySwitchType == "voq")
+    if (gMySwitchType == "voq")
     {
+        //STATE DB connection for setting state of the VoQ inband VLAN interface
+        unique_ptr<DBConnector> stateDb;
+        stateDb = make_unique<DBConnector>("STATE_DB", 0);
+        m_stateVlanTable = unique_ptr<Table>(new Table(stateDb.get(), STATE_VLAN_TABLE_NAME));
+
+        //Timer to bring up inband Vlan netdev
+        auto intervT = timespec { .tv_sec = INBAND_INTF_TIMER_SEC , .tv_nsec = 0 };
+        m_inbandVlanTimer = new SelectableTimer(intervT);
+        auto executorInbandVlan = new ExecutableTimer(m_inbandVlanTimer, this,
+                                                      "INBAND_VLAN_TIMER");
+        Orch::addExecutor(executorInbandVlan);
+
         //Add subscriber to process VOQ system interface
         tableName = CHASSIS_APP_SYSTEM_INTERFACE_TABLE_NAME;
         Orch::addExecutor(new Consumer(new SubscriberStateTable(chassisAppDb, tableName, TableConsumable::DEFAULT_POP_BATCH_SIZE, 0), this, tableName));
@@ -737,6 +752,10 @@ void IntfsOrch::doTask(Consumer &consumer)
                     it++;
                     continue;
                 }
+                if (inband_type == "vlan")
+                {
+                    m_inbandVlanTimer->start();
+                }
             }
 
             Port port;
@@ -1319,6 +1338,11 @@ void IntfsOrch::doTask(SelectableTimer &timer)
 {
     SWSS_LOG_ENTER();
 
+    if (m_inbandVlanTimer == &timer)
+    {
+        return processInbandVlanReady();
+    }
+
     SWSS_LOG_DEBUG("Registering %" PRId64 " new intfs", m_rifsToAdd.size());
     string value;
     for (auto it = m_rifsToAdd.begin(); it != m_rifsToAdd.end(); )
@@ -1357,6 +1381,39 @@ void IntfsOrch::doTask(SelectableTimer &timer)
     }
 }
 
+void IntfsOrch::processInbandVlanReady()
+{
+     SWSS_LOG_ENTER();
+
+     Port inbandVlan;
+     if (!gPortsOrch->getInbandPort(inbandVlan))
+     {
+         return;
+     }
+
+     string value;
+     const auto id = sai_serialize_object_id(inbandVlan.m_rif_id);
+     if (m_vidToRidTable->hget("", id, value))
+     {
+         stringstream cmd;
+         cmd << "ip link set " << inbandVlan.m_alias << " up";
+
+         std::string res;
+         int ret = swss::exec(cmd.str(), res);
+         if (ret)
+         {
+             SWSS_LOG_ERROR("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
+         }
+         else
+         {
+             m_stateVlanTable->hset(inbandVlan.m_alias, "state", "ok");
+             SWSS_LOG_INFO("Added inband VLAN %s to STATE_VLAN_TABLE", inbandVlan.m_alias.c_str());
+
+             m_inbandVlanTimer->stop();
+         }
+     }
+}
+
 bool IntfsOrch::isRemoteSystemPortIntf(string alias)
 {
     Port port;
@@ -1415,4 +1472,3 @@ void IntfsOrch::voqSyncDelIntf(string &alias)
 
     m_tableVoqSystemInterfaceTable->del(alias);
 }
-

orchagent/intfsorch.h

@@ -84,6 +84,7 @@ class IntfsOrch : public Orch
     unique_ptr<Table> m_rifNameTable;
     unique_ptr<Table> m_rifTypeTable;
     unique_ptr<Table> m_vidToRidTable;
+    unique_ptr<Table> m_stateVlanTable;
     unique_ptr<ProducerTable> m_flexCounterTable;
     unique_ptr<ProducerTable> m_flexCounterGroupTable;
 
@@ -98,6 +99,9 @@ class IntfsOrch : public Orch
     bool setIntfVlanFloodType(const Port &port, sai_vlan_flood_control_type_t vlan_flood_type);
     bool setIntfProxyArp(const string &alias, const string &proxy_arp);
 
+    SelectableTimer* m_inbandVlanTimer = nullptr;
+    void processInbandVlanReady();
+
     unique_ptr<Table> m_tableVoqSystemInterfaceTable;
     void voqSyncAddIntf(string &alias);
     void voqSyncDelIntf(string &alias);

orchagent/neighorch.cpp

@@ -454,7 +454,21 @@ void NeighOrch::decreaseNextHopRefCount(const NextHopKey &nexthop, uint32_t coun
 
 bool NeighOrch::getNeighborEntry(const NextHopKey &nexthop, NeighborEntry &neighborEntry, MacAddress &macAddress)
 {
-    if (!hasNextHop(nexthop))
+    string alias = nexthop.alias;
+    if(m_intfsOrch->isRemoteSystemPortIntf(alias))
+    {
+        Port inbp;
+        if (!gPortsOrch->getInbandPort(inbp))
+        {
+            SWSS_LOG_ERROR("Failed to find inband port");
+            return false;
+        }
+        alias = inbp.m_alias;
+    }
+
+    NextHopKey updatedNexthop(nexthop.ip_address, alias);
+
+    if (!hasNextHop(updatedNexthop))
     {
         return false;
     }
@@ -474,12 +488,20 @@ bool NeighOrch::getNeighborEntry(const NextHopKey &nexthop, NeighborEntry &neigh
 
 bool NeighOrch::getNeighborEntry(const IpAddress &ipAddress, NeighborEntry &neighborEntry, MacAddress &macAddress)
 {
-    string alias = m_intfsOrch->getRouterIntfsAlias(ipAddress);
-    if (alias.empty())
+    string alias;
+    if (m_remoteNeigh.find(ipAddress) != m_remoteNeigh.end())
     {
-        return false;
+        alias = m_remoteNeigh[ipAddress];
     }
-
+    else
+    {
+        alias = m_intfsOrch->getRouterIntfsAlias(ipAddress);
+        if (alias.empty())
+        {
+            return false;
+        }
+    }
+
     NextHopKey nexthop(ipAddress, alias);
     return getNeighborEntry(nexthop, neighborEntry, macAddress);
 }
@@ -524,23 +546,36 @@ void NeighOrch::doTask(Consumer &consumer)
             continue;
         }
 
-        if(gPortsOrch->isInbandPort(alias))
+        IpAddress ip_address(key.substr(found+1));
+
+        if (gPortsOrch->isInbandPort(alias))
         {
             Port ibport;
             gPortsOrch->getInbandPort(ibport);
-            if(ibport.m_type != Port::VLAN)
+            if (ibport.m_type != Port::VLAN)
             {
                 //For "port" type Inband, the neighbors are only remote neighbors.
                 //Hence, this is the neigh learned due to the kernel entry added on
                 //Inband interface for the remote system port neighbors. Skip
                 it = consumer.m_toSync.erase(it);
                 continue;
             }
-            //For "vlan" type inband, may identify the remote neighbors and skip
+            else
+            {
+                /* For inband Vlan, a kernel neigh is added for every remote neighbor
+                 * and the interface that the neigh is attached is inband Vlan.
+                 * neighsyncd adds the kernel neigh to neigh table in APPL_DB again.
+                 * The following change is to skip adding these remote neighbor attached
+                 * to inband Vlan.
+                 */
+                if (m_remoteNeigh.find(ip_address) != m_remoteNeigh.end())
+                {
+                    it = consumer.m_toSync.erase(it);
+                    continue;
+                }
+            }
         }
-
-        IpAddress ip_address(key.substr(found+1));
-
+
         NeighborEntry neighbor_entry = { ip_address, alias };
 
         if (op == SET_COMMAND)
@@ -1088,6 +1123,8 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
                     fvVector.push_back(mac);
                     m_stateSystemNeighTable->set(state_key, fvVector);
 
+                    m_remoteNeigh[ip_address] = alias;
+
                     it = consumer.m_toSync.erase(it);
                 }
                 else
@@ -1113,6 +1150,8 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
                     //neigh successfully deleted from SAI. Set STATE DB to signal to remove entries from kernel
                     m_stateSystemNeighTable->del(state_key);
 
+                    m_remoteNeigh.erase(ip_address);
+
                     it = consumer.m_toSync.erase(it);
                 }
                 else
@@ -1203,6 +1242,21 @@ void NeighOrch::voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacA
     sai_attribute_t attr;
     sai_status_t status;
 
+    Port inbandPort;
+    if (!gPortsOrch->getInbandPort(inbandPort))
+    {
+        SWSS_LOG_ERROR("Failed to get inband port/VLAN");
+        return;
+    }
+
+    // Inband neighbors are not synced to CHASSIS_APP_DB for VLAN type inband interface
+    // since these neigibors are learned within inband VLAN.
+    if (inbandPort.m_type == Port::VLAN && inbandPort.m_alias == alias)
+    {
+        SWSS_LOG_NOTICE("Skip inband VLAN neigh: %s", ip_address.to_string().c_str());
+        return;
+    }
+
     //Sync only local neigh. Confirm for the local neigh and
     //get the system port alias for key for syncing to CHASSIS_APP_DB
     Port port;
@@ -1240,7 +1294,15 @@ void NeighOrch::voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacA
     FieldValueTuple eiFv ("encap_index", to_string(attr.value.u32));
     attrs.push_back(eiFv);
 
-    FieldValueTuple macFv ("neigh", mac.to_string());
+    FieldValueTuple macFv;
+    if (inbandPort.m_type == Port::VLAN)
+    {
+        macFv = FieldValueTuple("neigh", gMacAddress.to_string());
+    }
+    else
+    {
+        macFv = FieldValueTuple("neigh", mac.to_string());
+    }
     attrs.push_back(macFv);
 
     string key = alias + m_tableVoqSystemNeighTable->getTableNameSeparator().c_str() + ip_address.to_string();

orchagent/neighorch.h

@@ -96,6 +96,7 @@ class NeighOrch : public Orch, public Subject, public Observer
     bool resolveNeighborEntry(const NeighborEntry &, const MacAddress &);
 
     void doTask(Consumer &consumer);
+
     void doVoqSystemNeighTask(Consumer &consumer);
 
     unique_ptr<Table> m_tableVoqSystemNeighTable;
@@ -104,6 +105,8 @@ class NeighOrch : public Orch, public Subject, public Observer
     bool addVoqEncapIndex(string &alias, IpAddress &ip, vector<sai_attribute_t> &neighbor_attrs);
     void voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacAddress &mac, sai_neighbor_entry_t &neighbor_entry);
     void voqSyncDelNeigh(string &alias, IpAddress &ip_address);
+
+    std::map<IpAddress, string> m_remoteNeigh;     
 };
 
 #endif /* SWSS_NEIGHORCH_H */