[proxy_arp] Implement proxy ARP feature

cfgmgr/intfmgr.cpp

@@ -272,6 +272,33 @@ void IntfMgr::removeSubIntfState(const string &alias)
     }
 }
 
+bool IntfMgr::setIntfProxyArp(const string &alias, const string &proxy_arp)
+{
+    stringstream cmd;
+    string res;
+    string proxy_arp_pvlan;
+
+    if (proxy_arp == "enabled")
+    {
+        proxy_arp_pvlan = "1";
+    }
+    else if (proxy_arp == "disabled")
+    {
+        proxy_arp_pvlan = "0";
+    }
+    else
+    {
+        SWSS_LOG_ERROR("Proxy ARP state is invalid: \"%s\"", proxy_arp.c_str());
+        return false;
+    }
+
+    cmd << ECHO_CMD << " " << proxy_arp_pvlan << " > /proc/sys/net/ipv4/conf/" << alias << "/proxy_arp_pvlan";
+    EXEC_WITH_ERROR_THROW(cmd.str(), res);
+
+    SWSS_LOG_INFO("Proxy ARP set to \"%s\" on interface \"%s\"", proxy_arp.c_str(), alias.c_str());
+    return true;
+}
+
 bool IntfMgr::isIntfStateOk(const string &alias)
 {
     vector<FieldValueTuple> temp;
@@ -346,6 +373,8 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
     string mtu = "";
     string adminStatus = "";
     string nat_zone = "";
+    string proxy_arp = "";
+
     for (auto idx : data)
     {
         const auto &field = fvField(idx);
@@ -363,6 +392,10 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         {
             adminStatus = value;
         }
+        else if (field == "proxy_arp")
+        {
+            proxy_arp = value;
+        }
 
         if (field == "nat_zone")
         {
@@ -420,7 +453,22 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
             FieldValueTuple fvTuple("mac_addr", MacAddress().to_string());
             data.push_back(fvTuple);
         }
-
+
+        if (!proxy_arp.empty())
+        {
+            if (!setIntfProxyArp(alias, proxy_arp))
+            {
+                SWSS_LOG_ERROR("Failed to set proxy ARP to \"%s\" state for the \"%s\" interface", proxy_arp.c_str(), alias.c_str());
+                return false;
+            }
+
+            if (!alias.compare(0, strlen(VLAN_PREFIX), VLAN_PREFIX))
+            {
+                FieldValueTuple fvTuple("proxy_arp", proxy_arp);
+                data.push_back(fvTuple);
+            }
+        }
+
         if (!subIntfAlias.empty())
         {
             if (m_subIntfList.find(subIntfAlias) == m_subIntfList.end())

cfgmgr/intfmgr.h

@@ -46,6 +46,8 @@ class IntfMgr : public Orch
     void removeHostSubIntf(const std::string &subIntf);
     void setSubIntfStateOk(const std::string &alias);
     void removeSubIntfState(const std::string &alias);
+
+    bool setIntfProxyArp(const std::string &alias, const std::string &proxy_arp);
 };
 
 }

orchagent/intfsorch.cpp

@@ -24,6 +24,7 @@ extern sai_router_interface_api_t*  sai_router_intfs_api;
 extern sai_route_api_t*             sai_route_api;
 extern sai_neighbor_api_t*          sai_neighbor_api;
 extern sai_switch_api_t*            sai_switch_api;
+extern sai_vlan_api_t*              sai_vlan_api;
 
 extern sai_object_id_t gSwitchId;
 extern PortsOrch *gPortsOrch;
@@ -226,6 +227,75 @@ bool IntfsOrch::setRouterIntfsAdminStatus(const Port &port)
     return true;
 }
 
+bool IntfsOrch::setIntfVlanFloodType(const Port &port, sai_vlan_flood_control_type_t vlan_flood_type)
+{
+    SWSS_LOG_ENTER();
+
+    if (port.m_type != Port::VLAN)
+    {
+        SWSS_LOG_ERROR("VLAN flood type cannot be set for non VLAN interface \"%s\"", port.m_alias.c_str());
+        return false;
+    }
+
+    sai_attribute_t attr;
+    attr.id = SAI_VLAN_ATTR_BROADCAST_FLOOD_CONTROL_TYPE;
+    attr.value.s32 = vlan_flood_type;
+
+    sai_status_t status = sai_vlan_api->set_vlan_attribute(port.m_vlan_info.vlan_oid, &attr);
+    if (status != SAI_STATUS_SUCCESS)
+    {
+        SWSS_LOG_ERROR("Failed to set flood type for VLAN %u, rv:%d", port.m_vlan_info.vlan_id, status);
+        return false;
+    }
+
+    return true;
+}
+
+bool IntfsOrch::setIntfProxyArp(const string &alias, const string &proxy_arp)
+{
+    SWSS_LOG_ENTER();
+
+    if (m_syncdIntfses.find(alias) == m_syncdIntfses.end())
+    {
+        SWSS_LOG_ERROR("Interface \"%s\" doesn't exist", alias.c_str());
+        return false;
+    }
+
+    if (m_syncdIntfses[alias].proxy_arp == (proxy_arp == "enabled" ? true : false))
+    {
+        SWSS_LOG_INFO("Proxy ARP is already set to \"%s\" on interface \"%s\"", proxy_arp.c_str(), alias.c_str());
+        return true;
+    }
+
+    Port port;
+    if (!gPortsOrch->getPort(alias, port))
+    {
+        SWSS_LOG_ERROR("Failed to get port info for the interface \"%s\"", alias.c_str());
+        return false;
+    }
+
+    if (port.m_type == Port::VLAN)
+    {
+        sai_vlan_flood_control_type_t vlan_flood_type;
+        if (proxy_arp == "enabled")
+        {
+            vlan_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_NONE;
+        }
+        else
+        {
+            vlan_flood_type = SAI_VLAN_FLOOD_CONTROL_TYPE_ALL;
+        }
+
+        if (!setIntfVlanFloodType(port, vlan_flood_type))
+        {
+            return false;
+        }
+    }
+
+    m_syncdIntfses[alias].proxy_arp = (proxy_arp == "enabled") ? true : false;
+    return true;
+}
+
 set<IpPrefix> IntfsOrch:: getSubnetRoutes()
 {
     SWSS_LOG_ENTER();
@@ -440,6 +510,7 @@ void IntfsOrch::doTask(Consumer &consumer)
         uint32_t mtu;
         bool adminUp;
         uint32_t nat_zone_id = 0;
+        string proxy_arp = "";
 
         for (auto idx : data)
         {
@@ -515,6 +586,10 @@ void IntfsOrch::doTask(Consumer &consumer)
             {
                 nat_zone = value;
             }
+            else if (field == "proxy_arp")
+            {
+                proxy_arp = value;
+            }
         }
 
         if (alias == "eth0" || alias == "docker0")
@@ -666,6 +741,11 @@ void IntfsOrch::doTask(Consumer &consumer)
                 }
             }
 
+            if (!proxy_arp.empty())
+            {
+                setIntfProxyArp(alias, proxy_arp);
+            }
+
             it = consumer.m_toSync.erase(it);
         }
         else if (op == DEL_COMMAND)
@@ -724,6 +804,11 @@ void IntfsOrch::doTask(Consumer &consumer)
                 vnet_name = m_vnetInfses.at(alias);
             }
 
+            if (m_syncdIntfses[alias].proxy_arp)
+            {
+                setIntfProxyArp(alias, "disabled");
+            }
+
             if (!vnet_name.empty())
             {
                 VNetOrch* vnet_orch = gDirectory.get<VNetOrch*>();

orchagent/intfsorch.h

@@ -23,6 +23,7 @@ struct IntfsEntry
     std::set<IpPrefix>  ip_addresses;
     int                 ref_count;
     sai_object_id_t     vrf_id;
+    bool                proxy_arp;
 };
 
 typedef map<string, IntfsEntry> IntfsTable;
@@ -87,6 +88,9 @@ class IntfsOrch : public Orch
 
     void addDirectedBroadcast(const Port &port, const IpPrefix &ip_prefix);
     void removeDirectedBroadcast(const Port &port, const IpPrefix &ip_prefix);
+
+    bool setIntfVlanFloodType(const Port &port, sai_vlan_flood_control_type_t vlan_flood_type);
+    bool setIntfProxyArp(const string &alias, const string &proxy_arp);
 };
 
 #endif /* SWSS_INTFSORCH_H */