varun-r-mallya/python-bpf
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/Python-BPF.git synced 2025-12-31 21:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

change to 64 bit pointers. May be an issue. revert this commit if issues arise

Browse Source
This commit is contained in:
varun-r-mallya
2025-10-26 15:00:53 +05:30
parent 93285dbdd8
commit a1fe2ed4bc
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pythonbpf/codegen.py
View File

@ -39,7 +39,7 @@ def finalize_module(original_str):
def bpf_passthrough_gen(module): def bpf_passthrough_gen(module):
i32_ty = ir.IntType(32) i32_ty = ir.IntType(32)
ptr_ty = ir.PointerType(ir.IntType(8)) ptr_ty = ir.PointerType(ir.IntType(64))
fnty = ir.FunctionType(ptr_ty, [i32_ty, ptr_ty]) fnty = ir.FunctionType(ptr_ty, [i32_ty, ptr_ty])
# Declare the intrinsic # Declare the intrinsic
@ -158,7 +158,6 @@ def compile_to_ir(filename: str, output: str, loglevel=logging.INFO):
module.add_named_metadata("llvm.ident", [f"PythonBPF {VERSION}"]) module.add_named_metadata("llvm.ident", [f"PythonBPF {VERSION}"])
module_string: str = finalize_module(str(module)) module_string: str = finalize_module(str(module))
module_string += '\ndeclare ptr @llvm.preserve.struct.access.index.p0.p0(ptr, i32 immarg, i32 immarg) "nocallback" "nofree" "nosync" "nounwind" "willreturn" "memory(none)"'
logger.info(f"IR written to {output}") logger.info(f"IR written to {output}")
with open(output, "w") as f: with open(output, "w") as f:

2
pythonbpf/functions/functions_pass.py
View File

@ -402,7 +402,7 @@ def process_bpf_chunk(func_node, module, return_type, map_sym_tab, structs_sym_t
func.linkage = "dso_local" func.linkage = "dso_local"
func.attributes.add("nounwind") func.attributes.add("nounwind")
func.attributes.add("noinline") func.attributes.add("noinline")
func.attributes.add("optnone") # func.attributes.add("optnone")
if func_node.args.args: if func_node.args.args:
# Only look at the first argument for now # Only look at the first argument for now

23
pythonbpf/vmlinux_parser/vmlinux_exports_handler.py
View File

@ -86,7 +86,7 @@ class VmlinuxHandler:
globvar_ir, field_data = self.get_field_type( globvar_ir, field_data = self.get_field_type(
python_type.__name__, field_name python_type.__name__, field_name
) )
builder.function.args[0].type = ir.PointerType(ir.IntType(8)) builder.function.args[0].type = ir.PointerType(ir.IntType(64))
print(builder.function.args[0]) print(builder.function.args[0])
field_ptr = self.load_ctx_field(builder, builder.function.args[0], globvar_ir) field_ptr = self.load_ctx_field(builder, builder.function.args[0], globvar_ir)
print(field_ptr) print(field_ptr)
@ -113,18 +113,18 @@ class VmlinuxHandler:
offset = builder.load(offset_global) offset = builder.load(offset_global)
# Ensure ctx_arg is treated as i8* (byte pointer) # Ensure ctx_arg is treated as i8* (byte pointer)
i8_type = ir.IntType(8) # i8_type = ir.IntType(8)
i8_ptr_type = ir.PointerType(i8_type) i8_ptr_type = ir.PointerType()
# Cast ctx_arg to i8* if it isn't already # Cast ctx_arg to i8* if it isn't already
if str(ctx_arg.type) != str(i8_ptr_type): # if str(ctx_arg.type) != str(i8_ptr_type):
ctx_i8_ptr = builder.bitcast(ctx_arg, i8_ptr_type) # ctx_i8_ptr = builder.bitcast(ctx_arg, i8_ptr_type)
else: # else:
ctx_i8_ptr = ctx_arg # ctx_i8_ptr = ctx_arg
# GEP with explicit type - this is the key fix # GEP with explicit type - this is the key fix
field_ptr = builder.gep( field_ptr = builder.gep(
ctx_i8_ptr, ctx_arg,
[offset], [offset],
inbounds=False, inbounds=False,
) )
@ -138,19 +138,20 @@ class VmlinuxHandler:
raise KeyError raise KeyError
except (KeyError, AttributeError): except (KeyError, AttributeError):
passthrough_type = ir.FunctionType( passthrough_type = ir.FunctionType(
i8_ptr_type, ir.PointerType(),
[ir.IntType(32), i8_ptr_type] [ir.IntType(32), ir.PointerType()],
) )
passthrough_fn = ir.Function( passthrough_fn = ir.Function(
module, module,
passthrough_type, passthrough_type,
name='llvm.bpf.passthrough.p0.p0' name='llvm.bpf.passthrough.p0.p0',
) )
# Call passthrough to satisfy BPF verifier # Call passthrough to satisfy BPF verifier
verified_ptr = builder.call( verified_ptr = builder.call(
passthrough_fn, passthrough_fn,
[ir.Constant(ir.IntType(32), 0), field_ptr], [ir.Constant(ir.IntType(32), 0), field_ptr],
tail=True
) )
# Bitcast to i64* (assuming field is 64-bit, adjust if needed) # Bitcast to i64* (assuming field is 64-bit, adjust if needed)