Pass down structs_sym_tab to maps_debug_info, allow vmlinux enums to be used in an indexed format for map declaration

pythonbpf/maps/map_debug_info.py

@@ -1,31 +1,22 @@
-import logging
-from llvmlite import ir
 from pythonbpf.debuginfo import DebugInfoGenerator
 from .map_types import BPFMapType
 
-logger: logging.Logger = logging.getLogger(__name__)
-
 
 def create_map_debug_info(module, map_global, map_name, map_params, structs_sym_tab):
     """Generate debug info metadata for BPF maps HASH and PERF_EVENT_ARRAY"""
     generator = DebugInfoGenerator(module)
-    logger.info(f"Creating debug info for map {map_name} with params {map_params}")
+
     uint_type = generator.get_uint32_type()
+    ulong_type = generator.get_uint64_type()
     array_type = generator.create_array_type(
         uint_type, map_params.get("type", BPFMapType.UNSPEC).value
     )
     type_ptr = generator.create_pointer_type(array_type, 64)
     key_ptr = generator.create_pointer_type(
-        array_type
+        array_type if "key_size" in map_params else ulong_type, 64
-        if "key_size" in map_params
-        else _get_key_val_dbg_type(map_params.get("key"), generator, structs_sym_tab),
-        64,
     )
     value_ptr = generator.create_pointer_type(
-        array_type
+        array_type if "value_size" in map_params else ulong_type, 64
-        if "value_size" in map_params
-        else _get_key_val_dbg_type(map_params.get("value"), generator, structs_sym_tab),
-        64,
     )
 
     elements_arr = []
@@ -106,65 +97,3 @@ def create_ringbuf_debug_info(
     )
     map_global.set_metadata("dbg", global_var)
     return global_var
-
-
-def _get_key_val_dbg_type(name, generator, structs_sym_tab):
-    """Get the debug type for key/value based on type object"""
-
-    if not name:
-        logger.warn("No name provided for key/value type, defaulting to uint64")
-        return generator.get_uint64_type()
-
-    type_obj = structs_sym_tab.get(name)
-    if type_obj:
-        return _get_struct_debug_type(type_obj, generator, structs_sym_tab)
-
-    # Fallback to basic types
-    logger.info(f"No struct named {name}, falling back to basic type")
-
-    # NOTE: Only handling int and long for now
-    if name in ["c_int32", "c_uint32"]:
-        return generator.get_uint32_type()
-
-    # Default fallback for now
-    return generator.get_uint64_type()
-
-
-def _get_struct_debug_type(struct_obj, generator, structs_sym_tab):
-    """Recursively create debug type for struct"""
-    elements_arr = []
-    for fld in struct_obj.fields.keys():
-        fld_type = struct_obj.field_type(fld)
-        if isinstance(fld_type, ir.IntType):
-            if fld_type.width == 32:
-                fld_dbg_type = generator.get_uint32_type()
-            else:
-                # NOTE: Assuming 64-bit for all other int types
-                fld_dbg_type = generator.get_uint64_type()
-        elif isinstance(fld_type, ir.ArrayType):
-            # NOTE: Array types have u8 elements only for now
-            # Debug info generation should fail for other types
-            elem_type = fld_type.element
-            if isinstance(elem_type, ir.IntType) and elem_type.width == 8:
-                char_type = generator.get_uint8_type()
-                fld_dbg_type = generator.create_array_type(char_type, fld_type.count)
-            else:
-                logger.warning(
-                    f"Array element type {str(elem_type)} not supported for debug info, skipping"
-                )
-                continue
-        else:
-            # NOTE: Only handling int and char arrays for now
-            logger.warning(
-                f"Field type {str(fld_type)} not supported for debug info, skipping"
-            )
-            continue
-
-        member = generator.create_struct_member(
-            fld, fld_dbg_type, struct_obj.field_size(fld)
-        )
-        elements_arr.append(member)
-    struct_type = generator.create_struct_type(
-        elements_arr, struct_obj.size, is_distinct=True
-    )
-    return struct_type

pythonbpf/maps/maps_pass.py

@@ -105,9 +105,7 @@ def process_ringbuf_map(map_name, rval, module, structs_sym_tab):
     logger.info(f"Ringbuf map parameters: {map_params}")
 
     map_global = create_bpf_map(module, map_name, map_params)
-    create_ringbuf_debug_info(
+    create_ringbuf_debug_info(module, map_global.sym, map_name, map_params)
-        module, map_global.sym, map_name, map_params, structs_sym_tab
-    )
     return map_global
 
 
@@ -121,7 +119,7 @@ def process_hash_map(map_name, rval, module, structs_sym_tab):
     logger.info(f"Map parameters: {map_params}")
     map_global = create_bpf_map(module, map_name, map_params)
     # Generate debug info for BTF
-    create_map_debug_info(module, map_global.sym, map_name, map_params, structs_sym_tab)
+    create_map_debug_info(module, map_global.sym, map_name, map_params)
     return map_global
 
 

tests/passing_tests/hash_map_struct.py

@@ -1,42 +0,0 @@
-from pythonbpf import bpf, section, struct, bpfglobal, compile, map
-from pythonbpf.maps import HashMap
-from pythonbpf.helper import pid
-from ctypes import c_void_p, c_int64
-
-
-@bpf
-@struct
-class val_type:
-    counter: c_int64
-    shizzle: c_int64
-
-
-@bpf
-@map
-def last() -> HashMap:
-    return HashMap(key=val_type, value=c_int64, max_entries=16)
-
-
-@bpf
-@section("tracepoint/syscalls/sys_enter_clone")
-def hello_world(ctx: c_void_p) -> c_int64:
-    obj = val_type()
-    obj.counter, obj.shizzle = 42, 96
-    t = last.lookup(obj)
-    if t:
-        print(f"Found existing entry: counter={obj.counter}, pid={t}")
-        last.delete(obj)
-        return 0  # type: ignore [return-value]
-    val = pid()
-    last.update(obj, val)
-    print(f"Map updated!, {obj.counter}, {obj.shizzle}, {val}")
-    return 0  # type: ignore [return-value]
-
-
-@bpf
-@bpfglobal
-def LICENSE() -> str:
-    return "GPL"
-
-
-compile()