Dataplane telemetry support in SONiC #328

shruthi9 · 2018-06-08T23:24:21Z

This includes changes to make SONiC work with SAIv 1.3, as DTel API support is only in v 1.3. These changes can be reverted when official SONiC support for v1.3 is added.

Design for the feature is at:
sonic-net/SONiC#182

… rel_6_0

into rel_6_0" This reverts commit c48a7a2, reversing changes made to aa5bf64.

…tion issues

Rel 6 0 telemetry

…d yet

… non-bfn platforms

…-sairedis into bf-master

lguohan · 2018-06-27T23:51:08Z

syncd/Makefile.am

@@ -29,6 +34,7 @@ syncd_LDADD = -lhiredis -lswsscommon $(SAILIB) -lpthread -L$(top_srcdir)/meta/.l
 if SAITHRIFT
 syncd_CPPFLAGS += -DSAITHRIFT=yes
 syncd_LDADD += -lrpcserver -lthrift
+#syncd_LDADD += -lthrift


remove this commented line.

habeebmohammed

Job well done! All the code looks good. Coding style is consistent.

lguohan · 2018-07-03T23:28:32Z

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


remove library other than the sai package.

dproc

The dtel related part looks good to me

lguohan · 2018-07-10T16:45:06Z

Can you resolve the conflict?

Azure merge

lguohan · 2018-07-10T19:15:29Z

lib/src/sai_redis_bridge.cpp

@@ -13,10 +13,12 @@ sai_status_t redis_get_bridge_stats(
    return SAI_STATUS_NOT_IMPLEMENTED;
 }

-sai_status_t redis_clear_bridge_stats(
+sai_status_t redis_get_bridge_stats_ext(


i am not sure this needs to be modified.

lguohan · 2018-07-10T23:00:36Z

vslib/src/sai_vs_dtel.cpp

+
+const sai_dtel_api_t vs_dtel_api = {
+
+	VS_GENERIC_QUAD_API(dtel)


can you convert all tabs to spaces?

lguohan · 2018-07-10T23:01:15Z

syncd/Makefile.am

@@ -11,8 +11,13 @@ endif
 if SAIVS
 SAILIB=-L$(top_srcdir)/vslib/src/.libs -lsaivs
 else
+if sonic_asic_platform_barefoot
+AM_CPPFLAGS += -I/opt/bfn/install/include
+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


only link to libsai

…ibraries 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

lguohan · 2018-07-11T01:41:45Z

lib/src/sai_redis_dtel.cpp

+
+const sai_dtel_api_t redis_dtel_api = {
+
+	REDIS_GENERIC_QUAD_API(dtel)


TAB -> SPACES

lguohan · 2018-07-12T09:00:56Z

saisdkdump/Makefile.am

 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


remove library other than the sai package.

lguohan · 2018-07-12T09:05:28Z

syncd/scripts/syncd_init_common.sh

+    export ONIE_PLATFORM=`grep onie_platform /etc/machine.conf | awk 'BEGIN { FS = "=" } ; { print $2 }'`
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/bfn/install/lib/platform/$ONIE_PLATFORM:/opt/bfn/install/lib:/opt/bfn/install/lib/tofinopd/switch
+     . /opt/bfn/install/bin/dma_setup.sh
+     export LD_PRELOAD=libswitchapi.so:libswitchsai.so:libpd.so:libpdcli.so:libdriver.so:libbfsys.so:libbfutils.so:libbf_switchd_lib.so:libtofinopdfixed_thrift.so:libpdthrift.so


alignment here is not consistent.

lguohan · 2018-07-12T09:07:42Z

vslib/src/sai_vs_policer.cpp

@@ -40,6 +40,20 @@ sai_status_t vs_clear_policer_stats(
    return SAI_STATUS_NOT_IMPLEMENTED;
 }

+sai_status_t vs_get_policer_stats_ext(


this one should replace vs_sai_get_policer_stats_ext

Please remove vs_sai_get_policer_stats_ext above.

…-sairedis into bf-master

* BFN: link with just sai library for saisdkdump

…s into bf-master

@runtime

* initial barefoot checkin october 2017 * Revert "Merge branch 'master' of https://github.com/Azure/sonic-sairedis into rel_6_0" This reverts commit c48a7a2, reversing changes made to aa5bf64. * 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 adfdb86. * Revert "allow Makefile to build for other platforms - restore it original for non-bfn platforms" This reverts commit d6b0ca3. * 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 (sonic-net#5) * Remove code duplicated in merge * Keep fn in same order as azure master (sonic-net#8) * Address review comment * Link just bfn sai lib and shorten linking command by removing other libraries linked at compile time (sonic-net#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

@runtime

* initial barefoot checkin october 2017 * Revert "Merge branch 'master' of https://github.com/Azure/sonic-sairedis into rel_6_0" This reverts commit c48a7a2, reversing changes made to aa5bf64. * 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 adfdb86. * Revert "allow Makefile to build for other platforms - restore it original for non-bfn platforms" This reverts commit d6b0ca3. * 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 (sonic-net#5) * Remove code duplicated in merge * Keep fn in same order as azure master (sonic-net#8) * Address review comment * Link just bfn sai lib and shorten linking command by removing other libraries linked at compile time (sonic-net#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

kram and others added 30 commits November 2, 2017 17:00

initial barefoot checkin october 2017

aa5bf64

Merge branch 'master' of https://github.com/Azure/sonic-sairedis into…

c48a7a2

… rel_6_0

Revert "Merge branch 'master' of https://github.com/Azure/sonic-sairedis

29ab3de

into rel_6_0" This reverts commit c48a7a2, reversing changes made to aa5bf64.

missed integration diffs

e0366e0

Merge remote-tracking branch 'azure/master' into bf-master

30c8f89

Merge remote-tracking branch 'azure/master' into bf-master

67d998b

Merge remote-tracking branch 'azure/master' into bf-master

17ef711

Added new attr type support to sairedis. Also, some fixes for compila…

1b39bc2

…tion issues

Merge branch 'rel_6_0' into rel_6_0_telemetry

0204303

Changes to add new DTel api support in sairedis

23a5d39

Add new file to generate Dtel specific SAI stub API

8138854

Missed adding a file in the last commit

be10c3f

Merge pull request #1 from barefootnetworks/rel_6_0_telemetry

77a33ca

Rel 6 0 telemetry

Merge remote-tracking branch 'azure/master' into bf-master

ce80282

Fix ref point for SAI

b31892b

Updated SAI repo to point to dtel_exp

1c1d862

Changes to handle new additions to DTel experimental SAI. Not compile…

488287d

…d yet

handle platform specific lins in different directory (@runtime)

05048cf

force order of library path to look for platform dir before lib dir

450ed3b

Merge branch 'telemetry_cfgdb' into rel_7_0_telemetry

eb81f24

Merge branch 'telemetry_exp_sai' into rel_7_0_telemetry

5c3c19d

Change SAI branch refpoint

c97ca98

Update SAI submodule refpoint

f32489b

enable fast-boot for barefoot platforms

2da73f8

Update ref point for SAI

2467bc6

Merge branch 'rel_7_0' into rel_7_0_telemetry

679f7ee

SONiC changes due to DTel experimental SAI changes

216f745

allow Makefile to build for other platforms - restore it original for…

d6b0ca3

… non-bfn platforms

Merge branch 'rel_7_0' into rel_7_0_telemetry

909a50e

allow clean build

adfdb86

mkbalani and others added 2 commits June 22, 2018 16:36

Merge branch 'bf-master' of https://github.com/barefootnetworks/sonic…

8f44c34

…-sairedis into bf-master

Update SAI ref points

4b98411

lguohan reviewed Jun 27, 2018

View reviewed changes

habeebmohammed reviewed Jul 2, 2018

View reviewed changes

lguohan reviewed Jul 3, 2018

View reviewed changes

dproc reviewed Jul 4, 2018

View reviewed changes

mkbalani and others added 2 commits July 5, 2018 18:38

Multi p4 profile support for bfn sde (#5)

73c9611

Merge remote-tracking branch 'azure/master' into azure-merge

3623488

mkbalani and others added 2 commits July 10, 2018 11:29

Remove code duplicated in merge

96adf56

Merge pull request #7 from barefootnetworks/azure-merge

5de2c9a

Azure merge

lguohan reviewed Jul 10, 2018

View reviewed changes

Keep fn in same order as azure master (#8)

c19b02a

lguohan reviewed Jul 10, 2018

View reviewed changes

Shruthi Krishnan and others added 2 commits July 10, 2018 17:24

Address review comment

befaed1

Link just bfn sai lib and shorten linking command by removing other l…

82760ff

…ibraries 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

lguohan reviewed Jul 11, 2018

View reviewed changes

lib/src/sai_redis_dtel.cpp Outdated

const sai_dtel_api_t redis_dtel_api = {

REDIS_GENERIC_QUAD_API(dtel)

Copy link

Contributor

lguohan Jul 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TAB -> SPACES

Convert tabs to spaces

14902a5

lguohan reviewed Jul 12, 2018

View reviewed changes

mkbalani and others added 5 commits July 12, 2018 11:53

Fix alignment

5d914e5

Merge branch 'bf-master' of https://github.com/barefootnetworks/sonic…

3c70742

…-sairedis into bf-master

Address upstream comment

fc15c56

* BFN: link with just sai library for saisdkdump

Address review comments

14cbaef

Merge branch 'bf-master' of github.com:barefootnetworks/sonic-sairedi…

7b11204

…s into bf-master

lguohan merged commit c2c5e7c into sonic-net:master Jul 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dataplane telemetry support in SONiC #328

Dataplane telemetry support in SONiC #328

shruthi9 commented Jun 8, 2018 •

edited

Loading

lguohan Jun 27, 2018

habeebmohammed left a comment

lguohan Jul 3, 2018 •

edited

Loading

dproc left a comment

lguohan commented Jul 10, 2018

lguohan Jul 10, 2018

mkbalani Jul 10, 2018

lguohan Jul 10, 2018

shruthi9 Jul 11, 2018

lguohan Jul 10, 2018

mkbalani Jul 12, 2018

lguohan Jul 11, 2018

lguohan Jul 12, 2018

mkbalani Jul 12, 2018

lguohan Jul 12, 2018

mkbalani Jul 12, 2018

lguohan Jul 12, 2018


		const sai_dtel_api_t vs_dtel_api = {

		VS_GENERIC_QUAD_API(dtel)


		const sai_dtel_api_t redis_dtel_api = {

		REDIS_GENERIC_QUAD_API(dtel)

Dataplane telemetry support in SONiC #328

Dataplane telemetry support in SONiC #328

Conversation

shruthi9 commented Jun 8, 2018 • edited Loading

Choose a reason for hiding this comment

habeebmohammed left a comment

Choose a reason for hiding this comment

lguohan Jul 3, 2018 • edited Loading

Choose a reason for hiding this comment

dproc left a comment

Choose a reason for hiding this comment

lguohan commented Jul 10, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shruthi9 commented Jun 8, 2018 •

edited

Loading

lguohan Jul 3, 2018 •

edited

Loading