varun-r-mallya/python-bpf
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/Python-BPF.git synced 2026-03-29 16:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Core: Fix unnecessary args and changes in maps pass

Browse Source
This commit is contained in:
Pragyansh Chaturvedi
2026-03-29 01:36:46 +05:30
parent bdcfe47601
commit 305a8ba9e3
2 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pythonbpf/maps/map_debug_info.py
View File

@ -6,9 +6,10 @@ from .map_types import BPFMapType
logger: logging.Logger = logging.getLogger(__name__) logger: logging.Logger = logging.getLogger(__name__)
def create_map_debug_info(module, map_global, map_name, map_params, structs_sym_tab): def create_map_debug_info(compilation_context, map_global, map_name, map_params):
"""Generate debug info metadata for BPF maps HASH and PERF_EVENT_ARRAY""" """Generate debug info metadata for BPF maps HASH and PERF_EVENT_ARRAY"""
generator = DebugInfoGenerator(module) generator = DebugInfoGenerator(compilation_context.module)
structs_sym_tab = compilation_context.structs_sym_tab
logger.info(f"Creating debug info for map {map_name} with params {map_params}") logger.info(f"Creating debug info for map {map_name} with params {map_params}")
uint_type = generator.get_uint32_type() uint_type = generator.get_uint32_type()
array_type = generator.create_array_type( array_type = generator.create_array_type(
@ -77,11 +78,9 @@ def create_map_debug_info(module, map_global, map_name, map_params, structs_sym_
# Ideally we should expose a single create_map_debug_info function that handles all map types. # Ideally we should expose a single create_map_debug_info function that handles all map types.
# We can probably use a registry pattern to register different map types and their debug info generators. # We can probably use a registry pattern to register different map types and their debug info generators.
# map_params["type"] will be used to determine which generator to use. # map_params["type"] will be used to determine which generator to use.
def create_ringbuf_debug_info( def create_ringbuf_debug_info(compilation_context, map_global, map_name, map_params):
module, map_global, map_name, map_params, structs_sym_tab
):
"""Generate debug information metadata for BPF RINGBUF map""" """Generate debug information metadata for BPF RINGBUF map"""
generator = DebugInfoGenerator(module) generator = DebugInfoGenerator(compilation_context.module)
int_type = generator.get_int32_type() int_type = generator.get_int32_type()

47
pythonbpf/maps/maps_pass.py
View File

@ -31,7 +31,7 @@ def is_map(func_node):
) )
def create_bpf_map(module, map_name, map_params): def create_bpf_map(compilation_context, map_name, map_params):
"""Create a BPF map in the module with given parameters and debug info""" """Create a BPF map in the module with given parameters and debug info"""
# Create the anonymous struct type for BPF map # Create the anonymous struct type for BPF map
@ -40,7 +40,9 @@ def create_bpf_map(module, map_name, map_params):
) )
# Create the global variable # Create the global variable
map_global = ir.GlobalVariable(module, map_struct_type, name=map_name) map_global = ir.GlobalVariable(
compilation_context.module, map_struct_type, name=map_name
)
map_global.linkage = "dso_local" map_global.linkage = "dso_local"
map_global.global_constant = False map_global.global_constant = False
map_global.initializer = ir.Constant(map_struct_type, None) map_global.initializer = ir.Constant(map_struct_type, None)
@ -51,11 +53,13 @@ def create_bpf_map(module, map_name, map_params):
return MapSymbol(type=map_params["type"], sym=map_global, params=map_params) return MapSymbol(type=map_params["type"], sym=map_global, params=map_params)
def _parse_map_params(rval, compilation_context, expected_args=None): def _parse_map_params(rval, expected_args=None):
"""Parse map parameters from call arguments and keywords.""" """Parse map parameters from call arguments and keywords."""
params = {} params = {}
handler = compilation_context.vmlinux_handler
# TODO: Replace it with compilation_context.vmlinux_handler someday?
handler = VmlinuxHandlerRegistry.get_handler()
# Parse positional arguments # Parse positional arguments
if expected_args: if expected_args:
for i, arg_name in enumerate(expected_args): for i, arg_name in enumerate(expected_args):
@ -82,14 +86,6 @@ def _parse_map_params(rval, compilation_context, expected_args=None):
def _get_vmlinux_enum(handler, name): def _get_vmlinux_enum(handler, name):
if handler and handler.is_vmlinux_enum(name): if handler and handler.is_vmlinux_enum(name):
return handler.get_vmlinux_enum_value(name) return handler.get_vmlinux_enum_value(name)
# Fallback to VmlinuxHandlerRegistry if handler invalid
# This is for backward compatibility or if refactoring isn't complete
if (
VmlinuxHandlerRegistry.get_handler()
and VmlinuxHandlerRegistry.get_handler().is_vmlinux_enum(name)
):
return VmlinuxHandlerRegistry.get_handler().get_vmlinux_enum_value(name)
return None return None
@ -97,9 +93,7 @@ def _get_vmlinux_enum(handler, name):
def process_ringbuf_map(map_name, rval, compilation_context): def process_ringbuf_map(map_name, rval, compilation_context):
"""Process a BPF_RINGBUF map declaration""" """Process a BPF_RINGBUF map declaration"""
logger.info(f"Processing Ringbuf: {map_name}") logger.info(f"Processing Ringbuf: {map_name}")
map_params = _parse_map_params( map_params = _parse_map_params(rval, expected_args=["max_entries"])
rval, compilation_context, expected_args=["max_entries"]
)
map_params["type"] = BPFMapType.RINGBUF map_params["type"] = BPFMapType.RINGBUF
# NOTE: constraints borrowed from https://docs.ebpf.io/linux/map-type/BPF_MAP_TYPE_RINGBUF/ # NOTE: constraints borrowed from https://docs.ebpf.io/linux/map-type/BPF_MAP_TYPE_RINGBUF/
@ -115,13 +109,12 @@ def process_ringbuf_map(map_name, rval, compilation_context):
logger.info(f"Ringbuf map parameters: {map_params}") logger.info(f"Ringbuf map parameters: {map_params}")
map_global = create_bpf_map(compilation_context.module, map_name, map_params) map_global = create_bpf_map(compilation_context, map_name, map_params)
create_ringbuf_debug_info( create_ringbuf_debug_info(
compilation_context.module, compilation_context,
map_global.sym, map_global.sym,
map_name, map_name,
map_params, map_params,
compilation_context.structs_sym_tab,
) )
return map_global return map_global
@ -130,20 +123,17 @@ def process_ringbuf_map(map_name, rval, compilation_context):
def process_hash_map(map_name, rval, compilation_context): def process_hash_map(map_name, rval, compilation_context):
"""Process a BPF_HASH map declaration""" """Process a BPF_HASH map declaration"""
logger.info(f"Processing HashMap: {map_name}") logger.info(f"Processing HashMap: {map_name}")
map_params = _parse_map_params( map_params = _parse_map_params(rval, expected_args=["key", "value", "max_entries"])
rval, compilation_context, expected_args=["key", "value", "max_entries"]
)
map_params["type"] = BPFMapType.HASH map_params["type"] = BPFMapType.HASH
logger.info(f"Map parameters: {map_params}") logger.info(f"Map parameters: {map_params}")
map_global = create_bpf_map(compilation_context.module, map_name, map_params) map_global = create_bpf_map(compilation_context, map_name, map_params)
# Generate debug info for BTF # Generate debug info for BTF
create_map_debug_info( create_map_debug_info(
compilation_context.module, compilation_context,
map_global.sym, map_global.sym,
map_name, map_name,
map_params, map_params,
compilation_context.structs_sym_tab,
) )
return map_global return map_global
@ -152,20 +142,17 @@ def process_hash_map(map_name, rval, compilation_context):
def process_perf_event_map(map_name, rval, compilation_context): def process_perf_event_map(map_name, rval, compilation_context):
"""Process a BPF_PERF_EVENT_ARRAY map declaration""" """Process a BPF_PERF_EVENT_ARRAY map declaration"""
logger.info(f"Processing PerfEventArray: {map_name}") logger.info(f"Processing PerfEventArray: {map_name}")
map_params = _parse_map_params( map_params = _parse_map_params(rval, expected_args=["key_size", "value_size"])
rval, compilation_context, expected_args=["key_size", "value_size"]
)
map_params["type"] = BPFMapType.PERF_EVENT_ARRAY map_params["type"] = BPFMapType.PERF_EVENT_ARRAY
logger.info(f"Map parameters: {map_params}") logger.info(f"Map parameters: {map_params}")
map_global = create_bpf_map(compilation_context.module, map_name, map_params) map_global = create_bpf_map(compilation_context, map_name, map_params)
# Generate debug info for BTF # Generate debug info for BTF
create_map_debug_info( create_map_debug_info(
compilation_context.module, compilation_context,
map_global.sym, map_global.sym,
map_name, map_name,
map_params, map_params,
compilation_context.structs_sym_tab,
) )
return map_global return map_global