Dataplane telemetry support in SONiC (sonic-net#328)

* initial barefoot checkin october 2017 * Revert "Merge branch 'master' of https://github.com/Azure/sonic-sairedis into rel_6_0" This reverts commit c48a7a20de2fb9e615535481f8727029440413bc, reversing changes made to aa5bf640db7b7fca245c1669eeb02198a50cb5c1. * missed integration diffs * Added new attr type support to sairedis. Also, some fixes for compilation issues * Changes to add new DTel api support in sairedis * Add new file to generate Dtel specific SAI stub API * Missed adding a file in the last commit * Fix ref point for SAI * Updated SAI repo to point to dtel_exp * Changes to handle new additions to DTel experimental SAI. Not compiled yet * handle platform specific lins in different directory (@runtime) * force order of library path to look for platform dir before lib dir * Change SAI branch refpoint * Update SAI submodule refpoint * enable fast-boot for barefoot platforms * Update ref point for SAI * SONiC changes due to DTel experimental SAI changes * allow Makefile to build for other platforms - restore it original for non-bfn platforms * allow clean build * Revert "allow clean build" This reverts commit adfdb8642fe0b5dbb4e19d13871172a03a8c883b. * Revert "allow Makefile to build for other platforms - restore it original for non-bfn platforms" This reverts commit d6b0ca34fcf63d0b79c801cd95d7ee2fe58d21ac. * makefile cleanup towards upstream * Support for platforms based on Barefoot Networks' device (sonic-net#304) * search for exact string - newer onie versions match multiple lines * Will need to revert this Should work without this change. Untested for now * SONiC sairedis changes needed to work with SAIv1.3 * Fix SAI path in gitmodules and add a comment * Remove sai thrift build hack * enable fast-boot for barefoot platforms * enable fast-boot for barefoot platforms * Add missing sai rpc hdr file path for bfn * Update SAI ref points * Multi p4 profile support for bfn sde (#5) * Remove code duplicated in merge * Keep fn in same order as azure master (#8) * Address review comment * Link just bfn sai lib and shorten linking command by removing other libraries linked at compile time (#6) * Link only bfn sai lib * all unresolved symbols resolved at runtime * Preload some bfn libraries on syncd startup * Build fix * also remove commented code * Convert tabs to spaces * Fix alignment * Address upstream comment * BFN: link with just sai library for saisdkdump * Address review comments
dmytroxshevchuk · Jul 12, 2018 · c2c5e7c · c2c5e7c
1 parent c808a0f
commit c2c5e7c
Show file tree

Hide file tree

Showing 19 changed files with 157 additions and 10 deletions.
diff --git a/configure.ac b/configure.ac
@@ -11,6 +11,8 @@ AC_PROG_CXX
 AC_PROG_LIBTOOL
 AC_HEADER_STDC
 
+AM_CONDITIONAL(sonic_asic_platform_barefoot, test x$CONFIGURED_PLATFORM = xbarefoot)
+
 AC_ARG_ENABLE(debug,
 [ --enable-debug turn on debugging],
 [case "${enableval}" in

diff --git a/lib/inc/sai_redis.h b/lib/inc/sai_redis.h
@@ -96,6 +96,7 @@ extern const sai_udf_api_t redis_udf_api;
 extern const sai_virtual_router_api_t redis_virtual_router_api;
 extern const sai_vlan_api_t redis_vlan_api;
 extern const sai_wred_api_t redis_wred_api;
+extern const sai_dtel_api_t redis_dtel_api;
 
 #define UNREFERENCED_PARAMETER(X)
 

diff --git a/lib/src/Makefile.am b/lib/src/Makefile.am
@@ -15,6 +15,7 @@ libsairedis_la_SOURCES = \
  sai_redis_fdb.cpp \
  sai_redis_hash.cpp \
  sai_redis_hostintf.cpp \
+ sai_redis_dtel.cpp \
  sai_redis_interfacequery.cpp \
  sai_redis_lag.cpp \
  sai_redis_mirror.cpp \

diff --git a/lib/src/sai_redis_dtel.cpp b/lib/src/sai_redis_dtel.cpp
@@ -0,0 +1,16 @@
+#include "sai_redis.h"
+
+REDIS_GENERIC_QUAD(DTEL,dtel);
+REDIS_GENERIC_QUAD(DTEL_QUEUE_REPORT,dtel_queue_report);
+REDIS_GENERIC_QUAD(DTEL_INT_SESSION,dtel_int_session);
+REDIS_GENERIC_QUAD(DTEL_REPORT_SESSION,dtel_report_session);
+REDIS_GENERIC_QUAD(DTEL_EVENT,dtel_event);
+
+const sai_dtel_api_t redis_dtel_api = {
+
+ REDIS_GENERIC_QUAD_API(dtel)
+ REDIS_GENERIC_QUAD_API(dtel_queue_report)
+ REDIS_GENERIC_QUAD_API(dtel_int_session)
+ REDIS_GENERIC_QUAD_API(dtel_report_session)
+ REDIS_GENERIC_QUAD_API(dtel_event)
+};
diff --git a/lib/src/sai_redis_interfacequery.cpp b/lib/src/sai_redis_interfacequery.cpp
@@ -242,6 +242,7 @@ sai_status_t sai_api_query(
  API_CASE(VIRTUAL_ROUTER,virtual_router);
  API_CASE(VLAN,vlan);
  API_CASE(WRED,wred);
+ API_CASE(DTEL,dtel);
 
  default:
  SWSS_LOG_ERROR("Invalid API type %d", sai_api_id);

diff --git a/lib/src/sai_redis_port.cpp b/lib/src/sai_redis_port.cpp
@@ -62,7 +62,6 @@ sai_status_t redis_clear_port_pool_stats(
  return SAI_STATUS_NOT_IMPLEMENTED;
 }
 
-
 REDIS_GENERIC_QUAD(PORT,port);
 REDIS_GENERIC_QUAD(PORT_POOL,port_pool);
 

diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp
@@ -1231,6 +1231,7 @@ sai_status_t meta_generic_validation_create(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -1305,6 +1306,9 @@ sai_status_t meta_generic_validation_create(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  VALIDATION_LIST(md, value.aclresource);
  break;
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ VALIDATION_LIST(md, value.ipaddrlist);
+ break;
 
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
 
@@ -1910,6 +1914,7 @@ sai_status_t meta_generic_validation_set(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -1983,6 +1988,9 @@ sai_status_t meta_generic_validation_set(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  VALIDATION_LIST(md, value.aclresource);
  break;
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ VALIDATION_LIST(md, value.ipaddrlist);
+ break;
 
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
 
@@ -2308,6 +2316,7 @@ sai_status_t meta_generic_validation_get(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -2353,6 +2362,9 @@ sai_status_t meta_generic_validation_get(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  VALIDATION_LIST(md, value.aclresource);
  break;
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ VALIDATION_LIST(md, value.ipaddrlist);
+ break;
 
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
@@ -2647,6 +2659,7 @@ void meta_generic_validation_post_create(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -2682,6 +2695,7 @@ void meta_generic_validation_post_create(
  case SAI_ATTR_VALUE_TYPE_UINT32_LIST:
  case SAI_ATTR_VALUE_TYPE_INT32_LIST:
  case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST:
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
@@ -2783,6 +2797,7 @@ void meta_generic_validation_post_remove(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -2817,6 +2832,7 @@ void meta_generic_validation_post_remove(
  case SAI_ATTR_VALUE_TYPE_UINT32_LIST:
  case SAI_ATTR_VALUE_TYPE_INT32_LIST:
  case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST:
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
@@ -3012,6 +3028,7 @@ void meta_generic_validation_post_set(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -3068,6 +3085,7 @@ void meta_generic_validation_post_set(
  case SAI_ATTR_VALUE_TYPE_UINT32_LIST:
  case SAI_ATTR_VALUE_TYPE_INT32_LIST:
  case SAI_ATTR_VALUE_TYPE_QOS_MAP_LIST:
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_INT32_RANGE:
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
@@ -3319,6 +3337,7 @@ void meta_generic_validation_post_get(
 
  // ACL ACTION
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -3367,6 +3386,9 @@ void meta_generic_validation_post_get(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  VALIDATION_LIST_GET(md, value.aclresource);
  break;
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ VALIDATION_LIST_GET(md, value.ipaddrlist);
+ break;
 
  case SAI_ATTR_VALUE_TYPE_UINT32_RANGE:
 

diff --git a/meta/saiserialize.cpp b/meta/saiserialize.cpp
@@ -243,6 +243,9 @@ sai_status_t transfer_attribute(
  RETURN_ON_ERROR(transfer_list(src_attr.value.aclresource, dst_attr.value.aclresource, countOnly));
  break;
 
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ RETURN_ON_ERROR(transfer_list(src_attr.value.ipaddrlist, dst_attr.value.ipaddrlist, countOnly));
+ break;
 
  /* ACL FIELD DATA */
 
@@ -323,6 +326,11 @@ sai_status_t transfer_attribute(
 
  /* ACL ACTION DATA */
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
+ transfer_primitive(src_attr.value.aclaction.enable, dst_attr.value.aclaction.enable);
+ transfer_primitive(src_attr.value.aclaction.parameter.booldata, dst_attr.value.aclaction.parameter.booldata);
+ break;
+
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  transfer_primitive(src_attr.value.aclaction.enable, dst_attr.value.aclaction.enable);
  transfer_primitive(src_attr.value.aclaction.parameter.u8, dst_attr.value.aclaction.parameter.u8);
@@ -904,6 +912,15 @@ std::string sai_serialize_list(
 
 }
 
+std::string sai_serialize_ip_address_list(
+ _In_ const sai_ip_address_list_t& list,
+ _In_ bool countOnly)
+{
+ SWSS_LOG_ENTER();
+
+ return sai_serialize_list(list, countOnly, [&](sai_ip_address_t item) { return sai_serialize_ip_address(item);} );
+}
+
 std::string sai_serialize_enum_list(
  _In_ const sai_s32_list_t& list,
  _In_ const sai_enum_metadata_t* meta,
@@ -1065,6 +1082,9 @@ std::string sai_serialize_acl_action(
 
  switch (meta.attrvaluetype)
  {
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
+ return sai_serialize_bool(action.parameter.booldata);
+
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  return sai_serialize_number(action.parameter.u8);
 
@@ -1269,6 +1289,9 @@ std::string sai_serialize_attr_value(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  return sai_serialize_acl_resource_list(attr.value.aclresource, countOnly);
 
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ return sai_serialize_ip_address_list(attr.value.ipaddrlist, countOnly);
+
  // ACL FIELD DATA
 
  case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL:
@@ -1288,6 +1311,7 @@ std::string sai_serialize_attr_value(
 
  // ACL ACTION DATA
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -1982,6 +2006,16 @@ void sai_deserialize_ip_address(
  SWSS_LOG_THROW("invalid ip address %s", s.c_str());
 }
 
+void sai_deserialize_ip_address_list(
+ _In_ const std::string& s,
+ _Out_ sai_ip_address_list_t& list,
+ _In_ bool countOnly)
+{
+ SWSS_LOG_ENTER();
+
+ sai_deserialize_list(s, list, countOnly, [&](const std::string sitem, sai_ip_address_t& item) { sai_deserialize_ip_address(sitem, item);} );
+}
+
 template <typename T>
 void sai_deserialize_range(
  _In_ const std::string& s,
@@ -2113,6 +2147,9 @@ void sai_deserialize_acl_action(
 
  switch (meta.attrvaluetype)
  {
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
+ return sai_deserialize_bool(s, action.parameter.booldata);
+
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  return sai_deserialize_number(s, action.parameter.u8);
 
@@ -2247,6 +2284,9 @@ void sai_deserialize_attr_value(
  case SAI_ATTR_VALUE_TYPE_ACL_RESOURCE_LIST:
  return sai_deserialize_acl_resource_list(s, attr.value.aclresource, countOnly);
 
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ return sai_deserialize_ip_address_list(s, attr.value.ipaddrlist, countOnly);
+
  // ACL FIELD DATA
 
  case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL:
@@ -2266,6 +2306,7 @@ void sai_deserialize_attr_value(
 
  // ACL ACTION DATA
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:
@@ -2688,6 +2729,10 @@ void sai_deserialize_free_attribute_value(
  sai_free_list(attr.value.aclresource);
  break;
 
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ sai_free_list(attr.value.ipaddrlist);
+ break;
+
  /* ACL FIELD DATA */
 
  case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_BOOL:
@@ -2713,6 +2758,7 @@ void sai_deserialize_free_attribute_value(
 
  /* ACL ACTION DATA */
 
+ case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_BOOL:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_INT8:
  case SAI_ATTR_VALUE_TYPE_ACL_ACTION_DATA_UINT16:

diff --git a/saidiscovery/Makefile.am b/saidiscovery/Makefile.am
@@ -11,8 +11,12 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if sonic_asic_platform_barefoot
+SAILIB=-L/opt/bfn/install/lib -lswitchsai -lswitchapi -lbf_switchd_lib -ltofinopdfixed_thrift -ldriver -lbfutils -lbfsys -lbfutils -L/opt/bfn/install/lib/tofinopd/switch -lpd -lpdcli -lpdthrift
+else
 SAILIB=-lsai
 endif
+endif
 
 saidiscovery_SOURCES = saidiscovery.cpp
 

diff --git a/saiplayer/saiplayer.cpp b/saiplayer/saiplayer.cpp
@@ -315,6 +315,10 @@ void match_list_lengths(
  CHECK_LIST(value.qosmap);
  break;
 
+ case SAI_ATTR_VALUE_TYPE_IP_ADDRESS_LIST:
+ CHECK_LIST(value.ipaddrlist);
+ break;
+
  case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_OBJECT_LIST:
  CHECK_LIST(value.aclfield.data.objlist);
  break;

diff --git a/saisdkdump/Makefile.am b/saisdkdump/Makefile.am
@@ -8,11 +8,17 @@ else
 DBGFLAGS = -g
 endif
 
+
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if sonic_asic_platform_barefoot
+AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
+SAILIB=-L/opt/bfn/install/lib -lswitchsai
+else
 SAILIB=-lsai
 endif
+endif
 
 saisdkdump_SOURCES = saisdkdump.cpp
 saisdkdump_CPPFLAGS = $(DBGFLAGS) $(AM_CPPFLAGS) $(CFLAGS_COMMON) $(SAIFLAGS)

diff --git a/syncd/Makefile.am b/syncd/Makefile.am
@@ -11,8 +11,14 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if sonic_asic_platform_barefoot
+AM_CPPFLAGS += -I/opt/bfn/install/include
+AM_LDFLAGS = -Wl,-unresolved-symbols=ignore-in-shared-libs
+SAILIB=-L/opt/bfn/install/lib -lswitchsai
+else
 SAILIB=-lsai
 endif
+endif
 
 syncd_SOURCES = \
  main.cpp \