Support tunnel traffic QoS remapping

orchagent/muxorch.cpp

@@ -42,7 +42,6 @@ extern sai_next_hop_api_t* sai_next_hop_api;
 extern sai_router_interface_api_t* sai_router_intfs_api;
 
 /* Constants */
-#define MUX_TUNNEL "MuxTunnel0"
 #define MUX_ACL_TABLE_NAME INGRESS_TABLE_DROP
 #define MUX_ACL_RULE_NAME "mux_acl_rule"
 #define MUX_HW_STATE_UNKNOWN "unknown"
@@ -162,7 +161,11 @@ static sai_status_t remove_route(IpPrefix &pfx)
     return status;
 }
 
-static sai_object_id_t create_tunnel(const IpAddress* p_dst_ip, const IpAddress* p_src_ip)
+static sai_object_id_t create_tunnel(
+    const IpAddress* p_dst_ip,
+    const IpAddress* p_src_ip,
+    sai_object_id_t tc_to_dscp_map_id,
+    sai_object_id_t tc_to_queue_map_id)
 {
     sai_status_t status;
 
@@ -206,6 +209,12 @@ static sai_object_id_t create_tunnel(const IpAddress* p_dst_ip, const IpAddress*
     attr.value.s32 = SAI_TUNNEL_TTL_MODE_PIPE_MODEL;
     tunnel_attrs.push_back(attr);
 
+    // Set DSCP mode to PIPE to ensure that outer DSCP is independent of inner DSCP
+    // and inner DSCP is unchanged at decap  
+    attr.id = SAI_TUNNEL_ATTR_ENCAP_DSCP_MODE;
+    attr.value.s32 = SAI_TUNNEL_DSCP_MODE_PIPE_MODEL;
+    tunnel_attrs.push_back(attr);
+
     attr.id = SAI_TUNNEL_ATTR_LOOPBACK_PACKET_ACTION;
     attr.value.s32 = SAI_PACKET_ACTION_DROP;
     tunnel_attrs.push_back(attr);
@@ -224,6 +233,20 @@ static sai_object_id_t create_tunnel(const IpAddress* p_dst_ip, const IpAddress*
         tunnel_attrs.push_back(attr);
     }
 
+    // DSCP rewriting
+    if (tc_to_dscp_map_id != SAI_NULL_OBJECT_ID)
+    {
+        attr.id = SAI_TUNNEL_ATTR_ENCAP_QOS_TC_AND_COLOR_TO_DSCP_MAP;
+        attr.value.oid = tc_to_dscp_map_id;
+    }
+
+    // TC remapping
+    if (tc_to_queue_map_id != SAI_NULL_OBJECT_ID)
+    {
+        attr.id = SAI_TUNNEL_ATTR_ENCAP_QOS_TC_TO_QUEUE_MAP;
+        attr.value.oid = tc_to_queue_map_id;
+    }
+
     sai_object_id_t tunnel_id;
     status = sai_tunnel_api->create_tunnel(&tunnel_id, gSwitchId, (uint32_t)tunnel_attrs.size(), tunnel_attrs.data());
     if (status != SAI_STATUS_SUCCESS)
@@ -1229,10 +1252,11 @@ bool MuxOrch::handlePeerSwitch(const Request& request)
                            MUX_TUNNEL, peer_ip.to_string().c_str());
             return false;
         }
-
+        sai_object_id_t tc_to_dscp_map_id = decap_orch_->getTCToDSCPMap(MUX_TUNNEL);
+        sai_object_id_t tc_to_queue_map_id = decap_orch_->getTCToQueueMap(MUX_TUNNEL);
         auto it =  dst_ips.getIpAddresses().begin();
         const IpAddress& dst_ip = *it;
-        mux_tunnel_id_ = create_tunnel(&peer_ip, &dst_ip);
+        mux_tunnel_id_ = create_tunnel(&peer_ip, &dst_ip, tc_to_dscp_map_id, tc_to_queue_map_id);
         SWSS_LOG_NOTICE("Mux peer ip '%s' was added, peer name '%s'",
                          peer_ip.to_string().c_str(), peer_name.c_str());
     }

orchagent/qosorch.cpp

@@ -103,6 +103,14 @@ task_process_status QosMapHandler::processWorkItem(Consumer& consumer)
     SWSS_LOG_ENTER();
 
     sai_object_id_t sai_object = SAI_NULL_OBJECT_ID;
+    /*
+     ToDo:
+     As we are going to have more than one QosMap in type DSCP_TO_TC_MAP, TC_TO_PRIORITY_GROUP_MAP and TC_TO_QUEUE_MAP,
+     we need some mechanism to which one is switch level, and which one is for tunnel use only.
+     Two options now:
+     1. Hardcode the switch level map name
+     2. Always use the first map as switch level QoS map
+    */ 
     auto it = consumer.m_toSync.begin();
     KeyOpFieldsValuesTuple tuple = it->second;
     string qos_object_name = kfvKey(tuple);