Merge pull request #92 from pythonbpf/fix/ringbuf-map-type

Fix auto testing by adding the verifier testing mode as well, suppress deperacation warnings

Author: r41k0u

pythonbpf/maps/maps_pass.py

@@ -175,10 +175,15 @@ def process_bpf_map(func_node, compilation_context):
 
     if isinstance(rval, ast.Call) and isinstance(rval.func, ast.Name):
         handler = MapProcessorRegistry.get_processor(rval.func.id)
-        if handler:
-            return handler(map_name, rval, compilation_context)
-        else:
-            logger.warning(f"Unknown map type {rval.func.id}, defaulting to HashMap")
-            return process_hash_map(map_name, rval, compilation_context)
+        if handler is None:
+            # Raise an exception and fail the build because the
+            # map carried the wrong type. A misspelled map type
+            # is a program error.
+            known = ", ".join(sorted(MapProcessorRegistry.known_types()))
+            raise ValueError(
+                f"Unknown map type '{rval.func.id}' returned by '{map_name}'. "
+                f"Known map types: {known}"
+            )
+        return handler(map_name, rval, compilation_context)
     else:
         raise ValueError("Function under @map must return a map")

pythonbpf/maps/maps_utils.py

@@ -33,3 +33,8 @@ def decorator(func):
     def get_processor(cls, map_type_name):
         """Get the processor function for a map type"""
         return cls._processors.get(map_type_name)
+
+    @classmethod
+    def known_types(cls):
+        """Names of every registered map type, for error messages"""
+        return list(cls._processors.keys())

tests/failing_tests/if.py tests/passing_tests/if.pytests/failing_tests/if.py renamed to tests/passing_tests/if.py

@@ -1,13 +1,13 @@
 from pythonbpf import bpf, BPF, map, bpfglobal, section, compile, compile_to_ir
-from pythonbpf.maps import RingBuf, HashMap
+from pythonbpf.maps import RingBuffer, HashMap
 from ctypes import c_int32, c_void_p
 
 
 # Define a map
 @bpf
 @map
-def mymap() -> RingBuf:
-    return RingBuf(max_entries=(1024))
+def mymap() -> RingBuffer:
+    return RingBuffer(max_entries=4096)
 
 
 @bpf

tests/passing_tests/ringbuf.py

@@ -2,15 +2,27 @@
 #
 # [xfail]  — tests expected to fail.
 #   key   = path relative to tests/
-#   value = {reason = "...", level = "ir" | "llc"}
-#     level "ir"  = fails during pythonbpf IR generation (exception or ERROR log)
-#     level "llc" = IR generates but llc rejects it
+#   value = {reason = "...", level = "ir" | "llc" | "verifier"}
+#     level "ir"       = fails during pythonbpf IR generation (exception or ERROR log)
+#     level "llc"      = IR generates but llc rejects it
+#     level "verifier" = IR and llc both succeed, but the kernel verifier rejects it
+#
+# A failure at one level implies failure at every later one, so the declared
+# level marks that level and all later ones xfail.
 #
 
 [xfail]
 
 "failing_tests/conditionals/struct_ptr.py" = {reason = "Struct pointer used directly as boolean condition not supported", level = "ir"}
 
+# Compiles cleanly; rejected by the kernel. The `data + 34 < data_end` guard is
+# emitted as a signed compare over values round-tripped through the stack, so the
+# verifier never narrows the packet range (it stays r=0) and the later
+# `iph.saddr` read fails with "invalid access to packet, off=26 size=4" /
+# "R1 offset is outside of the packet". Direct packet access needs bounds checks
+# in a form the verifier can follow.
+"failing_tests/xdp/xdp_test_1.py" = {reason = "XDP direct packet access: the data/data_end guard does not establish a packet range the verifier can use", level = "verifier"}
+
 "failing_tests/license.py" = {reason = "Missing LICENSE global produces IR that llc rejects — should be caught earlier with a clear error message", level = "llc"}
 
 "failing_tests/undeclared_values.py" = {reason = "Undeclared variable used in f-string — should raise SyntaxError (correct behaviour, test documents it)", level = "ir"}