Skip to contentSkip to conversation

selftest/bpf: make bpftool if it is not already built

PATCH In review Balamuruhan S 2 participants 3 messages Aug 14, 2020 – Aug 18, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftest/bpf: make bpftool if it is not already built

test_bpftool error out if bpftool is not available in bpftool dir linux/tools/bpf/bpftool, build and clean it as part of test bootstrap and teardown.

Error log:
---------
test_feature_dev_json (test_bpftool.TestBpftool) ... ERROR test_feature_kernel (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full_vs_not_full (test_bpftool.TestBpftool) ... ERROR test_feature_macros (test_bpftool.TestBpftool) ... ERROR

======================================================================
ERROR: test_feature_dev_json (test_bpftool.TestBpftool)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return f(*args, iface, **kwargs)
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",

    res = bpftool_json(["feature", "probe", "dev", iface])

File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
res = _bpftool(args)
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return subprocess.check_output(_args)
File "/usr/lib/python3.8/subprocess.py", line 411, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
File "/usr/lib/python3.8/subprocess.py", line 489, in run
with Popen(*popenargs, **kwargs) as process:
File "/usr/lib/python3.8/subprocess.py", line 854, in __init__
self._execute_child(args, executable, preexec_fn, close_fds,
File "/usr/lib/python3.8/subprocess.py", line 1702, in _execute_child
raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'bpftool'

---
 tools/testing/selftests/bpf/test_bpftool.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
tools/testing/selftests/bpf/test_bpftool.py +13 -0
index 4fed2dc25c0a..60357c6891a6 100644
@@ -58,12 +58,25 @@ def default_iface(f):
     return wrapper
 
 
+def make_bpftool(clean=False):
+    cmd = "make"
+    if clean:
+        cmd = "make clean"
+    return subprocess.run(cmd, shell=True, cwd=bpftool_dir, check=True,
+                          stdout=subprocess.DEVNULL)
+
 class TestBpftool(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         if os.getuid() != 0:
             raise UnprivilegedUserError(
                 "This test suite needs root privileges")
+        if subprocess.getstatusoutput("bpftool -h")[0]:
+            make_bpftool()
+
+    @classmethod
+    def tearDownClass(cls):
+        make_bpftool(clean=True)
 
     @default_iface
     def test_feature_dev_json(self, iface):

base-commit: 6e868cf355725fbe9fa512d01b09b8ee7f3358f0

Signature · 1 line
2.24.1
#1 lore raw
Quoted 56 lines · Balamuruhan S

test_bpftool error out if bpftool is not available in bpftool dir linux/tools/bpf/bpftool, build and clean it as part of test bootstrap and teardown.

Error log:
---------
test_feature_dev_json (test_bpftool.TestBpftool) ... ERROR test_feature_kernel (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full_vs_not_full (test_bpftool.TestBpftool) ... ERROR test_feature_macros (test_bpftool.TestBpftool) ... ERROR

======================================================================
ERROR: test_feature_dev_json (test_bpftool.TestBpftool)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return f(*args, iface, **kwargs)
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",

     res = bpftool_json(["feature", "probe", "dev", iface])

File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
res = _bpftool(args)
File "/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return subprocess.check_output(_args)
File "/usr/lib/python3.8/subprocess.py", line 411, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
File "/usr/lib/python3.8/subprocess.py", line 489, in run
with Popen(*popenargs, **kwargs) as process:
File "/usr/lib/python3.8/subprocess.py", line 854, in __init__
self._execute_child(args, executable, preexec_fn, close_fds,
File "/usr/lib/python3.8/subprocess.py", line 1702, in _execute_child
raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'bpftool'

---
  tools/testing/selftests/bpf/test_bpftool.py | 13 +++++++++++++
  1 file changed, 13 insertions(+)
tools/testing/selftests/bpf/test_bpftool.py +7 -0
index 4fed2dc25c0a..60357c6891a6 100644
@@ -58,12 +58,25 @@ def default_iface(f):
      return wrapper
 
 
+def make_bpftool(clean=False):
+    cmd = "make"
+    if clean:
+        cmd = "make clean"
+    return subprocess.run(cmd, shell=True, cwd=bpftool_dir, check=True,
+                          stdout=subprocess.DEVNULL)
+
  class TestBpftool(unittest.TestCase):
      @classmethod

tools/testing/selftests/bpf/test_bpftool.py def default_iface(f): · line 79

Quoted 10 lines
tools/testing/selftests/bpf/test_bpftool.py +6 -0
      def setUpClass(cls):
          if os.getuid() != 0:
              raise UnprivilegedUserError(
                  "This test suite needs root privileges")
+        if subprocess.getstatusoutput("bpftool -h")[0]:
+            make_bpftool()
+
+    @classmethod
+    def tearDownClass(cls):
+        make_bpftool(clean=True)

I think make_bpftool clean should only be called if the make actually triggered during setUpClass, right?

Quoted 6 lines
tools/testing/selftests/bpf/test_bpftool.py +0 -0
      @default_iface
      def test_feature_dev_json(self, iface):
 

base-commit: 6e868cf355725fbe9fa512d01b09b8ee7f3358f0

#2 lore raw
Quoted 68 lines · Yonghong Song
Quoted 66 lines · Balamuruhan S

test_bpftool error out if bpftool is not available in bpftool dir linux/tools/bpf/bpftool, build and clean it as part of test bootstrap and teardown.

Error log:
---------
test_feature_dev_json (test_bpftool.TestBpftool) ... ERROR test_feature_kernel (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full (test_bpftool.TestBpftool) ... ERROR test_feature_kernel_full_vs_not_full (test_bpftool.TestBpftool) ... ERROR test_feature_macros (test_bpftool.TestBpftool) ... ERROR

======================================================================
ERROR: test_feature_dev_json (test_bpftool.TestBpftool)
----------------------------------------------------------------------
Traceback (most recent call last):
File
"/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return f(*args, iface, **kwargs)
File
"/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",

     res = bpftool_json(["feature", "probe", "dev", iface])

File
"/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
res = _bpftool(args)
File
"/home/ubuntu/disk/linux/tools/testing/selftests/bpf/test_bpftool.py",
return subprocess.check_output(_args)
File "/usr/lib/python3.8/subprocess.py", line 411, in check_output
return run(*popenargs, stdout=PIPE, timeout=timeout, check=True,
File "/usr/lib/python3.8/subprocess.py", line 489, in run
with Popen(*popenargs, **kwargs) as process:
File "/usr/lib/python3.8/subprocess.py", line 854, in __init__
self._execute_child(args, executable, preexec_fn, close_fds,
File "/usr/lib/python3.8/subprocess.py", line 1702, in _execute_child
raise child_exception_type(errno_num, err_msg, err_filename)
FileNotFoundError: [Errno 2] No such file or directory: 'bpftool'

---
  tools/testing/selftests/bpf/test_bpftool.py | 13 +++++++++++++
  1 file changed, 13 insertions(+)
tools/testing/selftests/bpf/test_bpftool.py +8 -0
index 4fed2dc25c0a..60357c6891a6 100644
@@ -58,12 +58,25 @@ def default_iface(f):
      return wrapper
 
 
+def make_bpftool(clean=False):
+    cmd = "make"
+    if clean:
+        cmd = "make clean"
+    return subprocess.run(cmd, shell=True, cwd=bpftool_dir, check=True,
+                          stdout=subprocess.DEVNULL)
+
  class TestBpftool(unittest.TestCase):
      @classmethod
      def setUpClass(cls):
          if os.getuid() != 0:
              raise UnprivilegedUserError(
                  "This test suite needs root privileges")
+        if subprocess.getstatusoutput("bpftool -h")[0]:
Quoted 8 lines

tools/testing/selftests/bpf/test_bpftool.py def default_iface(f): · line 79

Quoted 5 lines
tools/testing/selftests/bpf/test_bpftool.py +5 -0
+            make_bpftool()
+
+    @classmethod
+    def tearDownClass(cls):
+        make_bpftool(clean=True)

I think make_bpftool clean should only be called if the make actually triggered during setUpClass, right?

yes, I will fix it in the next version.

Quoted 7 lines
Quoted 7 lines
tools/testing/selftests/bpf/test_bpftool.py +0 -0
      @default_iface
      def test_feature_dev_json(self, iface):
 

base-commit: 6e868cf355725fbe9fa512d01b09b8ee7f3358f0