Add BCM multi-instance support in saibcm-modules for XGS and DNX platforms. (sonic-net#8002)

judyjoseph · web-flow · commit 724d19385ceb · 2021-06-29T20:12:18.000-07:00
Why I did it

We hit an issue recently in the chassis bringup where the linux bde attach failed with the following ioctl error.
[ 9058.585960] linux-user-bde (897363): Error: Invalid ioctl (00004c1d)
[ 9105.668237] linux-user-bde (901002): Error: Invalid ioctl (00004c1d)

Debugged with Broadcom team, who suggested to use this flag BCM_INSTANCE_SUPPORT to support multi-instance scenarios ( platforms with more than one asic where there are separate sai/syncd docker instances running controller each asic instance).

This flag was introduced since SDK-6.5.21 and need to be present in SAI and SAI GPL kernel module makefile.

How I did it

Add the flag in this flag BCM_INSTANCE_SUPPORT in gpl modules
diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx
@@ -1 +1 @@
-Subproject commit 569123865209da9d12ef8f2828a3118b00dc5e88
+Subproject commit c2359f831c285aa2dca221bf271b9c93607651da
diff --git a/platform/broadcom/saibcm-modules/make/Make.config b/platform/broadcom/saibcm-modules/make/Make.config
@@ -174,6 +174,9 @@ CPPFLAGS += ${INCFLAGS}
 
 CFLAGS += -DSAI_FIXUP -UKCOM_FILTER_MAX -DKCOM_FILTER_MAX=1024
 
+# Flag to enable multi instance support
+CFLAGS += -DBCM_INSTANCE_SUPPORT
+
 #
 # Debug #ifdef control
 #

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,9 @@ CPPFLAGS += ${INCFLAGS}`
`174`	`174`
`175`	`175`	`CFLAGS += -DSAI_FIXUP -UKCOM_FILTER_MAX -DKCOM_FILTER_MAX=1024`
`176`	`176`
	`177`	`+# Flag to enable multi instance support`
	`178`	`+CFLAGS += -DBCM_INSTANCE_SUPPORT`
	`179`	`+`
`177`	`180`	`#`
`178`	`181`	`# Debug #ifdef control`
`179`	`182`	`#`