[vnetorch]: Use metadata matching for tunnel (sonic-net#841)

* [vnetorch]: Use metadata matching for tunnel

Signed-off-by: Marian Pritsak <marianp@mellanox.com>

* Rename to meta tunnel table

Author: marian-pritsak

orchagent/vnetorch.cpp

@@ -262,9 +262,11 @@ VNetVrfObject::~VNetVrfObject()
  */
 std::bitset<VNET_BITMAP_SIZE> VNetBitmapObject::vnetBitmap_;
 std::bitset<VNET_TUNNEL_SIZE> VNetBitmapObject::tunnelOffsets_;
+std::bitset<VNET_TUNNEL_SIZE> VNetBitmapObject::tunnelIdOffsets_;
 map<string, uint32_t> VNetBitmapObject::vnetIds_;
 map<uint32_t, VnetBridgeInfo> VNetBitmapObject::bridgeInfoMap_;
 map<tuple<MacAddress, sai_object_id_t>, VnetNeighInfo> VNetBitmapObject::neighInfoMap_;
+map<tuple<IpAddress, sai_object_id_t>, uint16_t> VNetBitmapObject::endpointMap_;
 
 VNetBitmapObject::VNetBitmapObject(const std::string& vnet, const VNetInfo& vnetInfo,
                              vector<sai_attribute_t>& attrs) : VNetObject(vnetInfo)
@@ -349,6 +351,29 @@ void VNetBitmapObject::recycleTunnelRouteTableOffset(uint32_t offset)
     tunnelOffsets_[offset] = false;
 }
 
+uint16_t VNetBitmapObject::getFreeTunnelId()
+{
+    SWSS_LOG_ENTER();
+
+    for (uint16_t i = 1; i < tunnelIdOffsets_.size(); i++)
+    {
+        if (tunnelIdOffsets_[i] == false)
+        {
+            tunnelIdOffsets_[i] = true;
+            return i;
+        }
+    }
+
+    return 0;
+}
+
+void VNetBitmapObject::recycleTunnelId(uint16_t offset)
+{
+    SWSS_LOG_ENTER();
+
+    tunnelIdOffsets_[offset] = false;
+}
+
 VnetBridgeInfo VNetBitmapObject::getBridgeInfoByVni(uint32_t vni, string tunnelName)
 {
     SWSS_LOG_ENTER();
@@ -828,6 +853,8 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
     uint32_t peerBitmap = vnet_id_;
     MacAddress mac = endp.mac ? endp.mac : gVxlanMacAddress;
     TunnelRouteInfo tunnelRouteInfo;
+    sai_ip_address_t underlayAddr;
+    copy(underlayAddr, endp.ip);
 
     VNetOrch* vnet_orch = gDirectory.get<VNetOrch*>();
     for (auto peer : peer_list)
@@ -847,8 +874,6 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
 
         /* FDB entry to the tunnel */
         vector<sai_attribute_t> fdb_attrs;
-        sai_ip_address_t underlayAddr;
-        copy(underlayAddr, endp.ip);
         neighInfo.fdb_entry.switch_id = gSwitchId;
         mac.getMac(neighInfo.fdb_entry.mac_address);
         neighInfo.fdb_entry.bv_id = bInfo.bridge_id;
@@ -858,11 +883,11 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
         fdb_attrs.push_back(attr);
 
         attr.id = SAI_FDB_ENTRY_ATTR_BRIDGE_PORT_ID;
-        attr.value.oid = bInfo.bridge_port_tunnel_id;
+        attr.value.oid = bInfo.bridge_port_rif_id;
         fdb_attrs.push_back(attr);
 
-        attr.id = SAI_FDB_ENTRY_ATTR_ENDPOINT_IP;
-        attr.value.ipaddr = underlayAddr;
+        attr.id = SAI_FDB_ENTRY_ATTR_PACKET_ACTION;
+        attr.value.s32 = SAI_PACKET_ACTION_FORWARD;
         fdb_attrs.push_back(attr);
 
         status = sai_fdb_api->create_fdb_entry(
@@ -930,6 +955,52 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
         throw std::runtime_error("VNet route creation failed");
     }
 
+    /* Tunnel endpoint */
+    VxlanTunnelOrch* vxlan_orch = gDirectory.get<VxlanTunnelOrch*>();
+    auto *tunnel = vxlan_orch->getVxlanTunnel(getTunnelName());
+    auto endpoint = make_tuple(endp.ip, tunnel->getTunnelId());
+    uint16_t tunnelIndex = 0;
+    if (endpointMap_.find(endpoint) == endpointMap_.end())
+    {
+        tunnelIndex = getFreeTunnelId();
+        vector<sai_attribute_t> vxlan_attrs;
+
+        sai_object_id_t tunnelL3VxlanEntryId;
+        attr.id = SAI_TABLE_META_TUNNEL_ENTRY_ATTR_ACTION;
+        attr.value.s32 = SAI_TABLE_META_TUNNEL_ENTRY_ACTION_TUNNEL_ENCAP;
+        vxlan_attrs.push_back(attr);
+
+        attr.id = SAI_TABLE_META_TUNNEL_ENTRY_ATTR_METADATA_KEY;
+        attr.value.u16 = tunnelIndex;
+        vxlan_attrs.push_back(attr);
+
+        attr.id = SAI_TABLE_META_TUNNEL_ENTRY_ATTR_UNDERLAY_DIP;
+        attr.value.ipaddr = underlayAddr;
+        vxlan_attrs.push_back(attr);
+
+        attr.id = SAI_TABLE_META_TUNNEL_ENTRY_ATTR_TUNNEL_ID;
+        attr.value.oid = tunnel->getTunnelId();
+        vxlan_attrs.push_back(attr);
+
+        status = sai_bmtor_api->create_table_meta_tunnel_entry(
+                &tunnelL3VxlanEntryId,
+                gSwitchId,
+                (uint32_t)vxlan_attrs.size(),
+                vxlan_attrs.data());
+
+        if (status != SAI_STATUS_SUCCESS)
+        {
+            SWSS_LOG_ERROR("Failed to create L3 VXLAN entry, SAI rc: %d", status);
+            throw std::runtime_error("VNet route creation failed");
+        }
+
+        endpointMap_.emplace(endpoint, tunnelIndex);
+    }
+    else
+    {
+        tunnelIndex = endpointMap_.at(endpoint);
+    }
+
     /* Tunnel route */
     vector<sai_attribute_t> tr_attrs;
     sai_ip_prefix_t pfx;
@@ -960,6 +1031,10 @@ bool VNetBitmapObject::addTunnelRoute(IpPrefix& ipPrefix, tunnelEndpoint& endp)
     attr.value.oid = tunnelRouteInfo.nexthopId;
     tr_attrs.push_back(attr);
 
+    attr.id = SAI_TABLE_BITMAP_ROUTER_ENTRY_ATTR_TUNNEL_INDEX;
+    attr.value.u16 = tunnelIndex;
+    tr_attrs.push_back(attr);
+
     status = sai_bmtor_api->create_table_bitmap_router_entry(
             &tunnelRouteInfo.tunnelRouteTableEntryId,
             gSwitchId,
@@ -1105,6 +1180,11 @@ bool VNetBitmapObject::addRoute(IpPrefix& ipPrefix, nextHop& nh)
         attr.id = SAI_TABLE_BITMAP_ROUTER_ENTRY_ATTR_NEXT_HOP;
         attr.value.oid = nh_id;
         attrs.push_back(attr);
+
+        attr.id = SAI_TABLE_BITMAP_ROUTER_ENTRY_ATTR_TUNNEL_INDEX;
+        attr.value.u16 = 0;
+        attrs.push_back(attr);
+
     }
     else
     {

orchagent/vnetorch.h

@@ -239,6 +239,10 @@ class VNetBitmapObject: public VNetObject
     static uint32_t getFreeTunnelRouteTableOffset();
     static void recycleTunnelRouteTableOffset(uint32_t offset);
 
+    static uint16_t getFreeTunnelId();
+
+    static void recycleTunnelId(uint16_t offset);
+
     static VnetBridgeInfo getBridgeInfoByVni(uint32_t vni, string tunnelName);
     static bool clearBridgeInfoByVni(uint32_t vni, string tunnelName);
 
@@ -249,8 +253,10 @@ class VNetBitmapObject: public VNetObject
     static std::bitset<VNET_BITMAP_SIZE> vnetBitmap_;
     static map<string, uint32_t> vnetIds_;
     static std::bitset<VNET_TUNNEL_SIZE> tunnelOffsets_;
+    static std::bitset<VNET_TUNNEL_SIZE> tunnelIdOffsets_;
     static map<uint32_t, VnetBridgeInfo> bridgeInfoMap_;
     static map<tuple<MacAddress, sai_object_id_t>, VnetNeighInfo> neighInfoMap_;
+    static map<tuple<IpAddress, sai_object_id_t>, uint16_t> endpointMap_;
 
     map<IpPrefix, RouteInfo> routeMap_;
     map<IpPrefix, TunnelRouteInfo> tunnelRouteMap_;