probes: add tests for ConfigBpf parameter from bpftool -j

Signed-off-by: Deepesh Pathak <deepshpathak@gmail.com>
cilium · Jun 29, 2020 · 48f8e79 · 48f8e79
1 parent c4d38ac
commit 48f8e79
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/pkg/datapath/linux/probes/probes_test.go b/pkg/datapath/linux/probes/probes_test.go
@@ -38,6 +38,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 	}{
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -52,6 +53,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "m",
 				ConfigNetClsBpf:     "m",
@@ -67,6 +69,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		// Disable options which generate errors
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "n",
 				ConfigBpfSyscall:    "n",
 				ConfigNetSchIngress: "n",
 				ConfigNetClsBpf:     "n",
@@ -81,6 +84,22 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "n",
+				ConfigBpfSyscall:    "y",
+				ConfigNetSchIngress: "y",
+				ConfigNetClsBpf:     "y",
+				ConfigNetClsAct:     "y",
+				ConfigBpfJit:        "y",
+				ConfigHaveEbpfJit:   "y",
+				ConfigCgroupBpf:     "y",
+				ConfigLwtunnelBpf:   "y",
+				ConfigBpfEvents:     "y",
+			},
+			expectErr: true,
+		},
+		{
+			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "n",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -95,6 +114,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "n",
 				ConfigNetClsBpf:     "y",
@@ -109,6 +129,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "n",
@@ -123,6 +144,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -137,6 +159,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -151,6 +174,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -166,6 +190,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		// Disable options which generate warnings
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -180,6 +205,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -194,6 +220,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",
@@ -208,6 +235,7 @@ func (s *ProbesTestSuite) TestSystemConfigProbes(c *C) {
 		},
 		{
 			systemConfig: SystemConfig{
+				ConfigBpf:           "y",
 				ConfigBpfSyscall:    "y",
 				ConfigNetSchIngress: "y",
 				ConfigNetClsBpf:     "y",

diff --git a/pkg/datapath/linux/requirements.go b/pkg/datapath/linux/requirements.go
@@ -180,7 +180,7 @@ func CheckMinRequirements() {
 			if _, ok := err.(*probes.ErrKernelConfigNotFound); ok {
 				log.WithError(err).Info(errMsg)
 			} else {
-				log.WithError(err).Fatal(errMsg)
+				log.WithError(err).Warn(errMsg)
 			}
 		}
 		if err := probeManager.CreateHeadersFile(); err != nil {