diff --git a/bpftrace-0.12.1-RHEL-8-fixes.patch b/bpftrace-0.12.1-RHEL-8-fixes.patch deleted file mode 100644 index 270277bab4eb84602e4eee972dd96e6767497794..0000000000000000000000000000000000000000 --- a/bpftrace-0.12.1-RHEL-8-fixes.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 3a7f0bf4f506014644cf935332346e3c227123c9 Mon Sep 17 00:00:00 2001 -From: Jerome Marchand -Date: Tue, 11 Jun 2019 16:41:59 +0200 -Subject: [PATCH] RHEL 8 fixes - -Fixes the following RHEL 8 specific issues: - - library path in gethostlatency and threadsnoop ---- - tools/gethostlatency.bt | 12 ++++++------ - tools/threadsnoop.bt | 2 +- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tools/gethostlatency.bt b/tools/gethostlatency.bt -index 9f4ec31e..dd389c6f 100755 ---- a/tools/gethostlatency.bt -+++ b/tools/gethostlatency.bt -@@ -26,17 +26,17 @@ BEGIN - "HOST"); - } - --uprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo, --uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname, --uprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2 -+uprobe:/lib64/libc.so.6:getaddrinfo, -+uprobe:/lib64/libc.so.6:gethostbyname, -+uprobe:/lib64/libc.so.6:gethostbyname2 - { - @start[tid] = nsecs; - @name[tid] = arg0; - } - --uretprobe:/lib/x86_64-linux-gnu/libc.so.6:getaddrinfo, --uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname, --uretprobe:/lib/x86_64-linux-gnu/libc.so.6:gethostbyname2 -+uretprobe:/lib64/libc.so.6:getaddrinfo, -+uretprobe:/lib64/libc.so.6:gethostbyname, -+uretprobe:/lib64/libc.so.6:gethostbyname2 - /@start[tid]/ - { - $latms = (nsecs - @start[tid]) / 1e6; -diff --git a/tools/threadsnoop.bt b/tools/threadsnoop.bt -index 3824bc6d..bdc6e4df 100755 ---- a/tools/threadsnoop.bt -+++ b/tools/threadsnoop.bt -@@ -18,7 +18,7 @@ BEGIN - printf("%-10s %-6s %-16s %s\n", "TIME(ms)", "PID", "COMM", "FUNC"); - } - --uprobe:/lib/x86_64-linux-gnu/libpthread.so.0:pthread_create -+uprobe:/usr/lib64/libpthread.so.0:pthread_create - { - printf("%-10u %-6d %-16s %s\n", elapsed / 1e6, pid, comm, - usym(arg2)); --- -2.30.2 - diff --git a/bpftrace-0.12.1-orc-Fix-build-with-clang-13.patch b/bpftrace-0.12.1-orc-Fix-build-with-clang-13.patch deleted file mode 100644 index ab1547b094cd4a735985edae9588a4cde9ae07b1..0000000000000000000000000000000000000000 --- a/bpftrace-0.12.1-orc-Fix-build-with-clang-13.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 3bde9d98aa48b9c7eba9fe559dee6c66d8b57634 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 4 Sep 2021 17:28:17 -0700 -Subject: [PATCH] orc: Fix build with clang >= 13 - -Fixes errors like -src/ast/bpforc/bpforcv2.cpp:3:9: error: constructor for 'bpftrace::BpfOrc' must explicitly initialize the member 'ES' which does not have a default constructor -BpfOrc::BpfOrc(TargetMachine *TM, DataLayout DL) - ^ - -Fixes https://github.com/iovisor/bpftrace/issues/1963 - -Signed-off-by: Khem Raj ---- - src/bpforc.h | 23 ++++++++++++++++++++++- - src/bpforcv2.cpp | 23 +++++++++++++++-------- - 2 files changed, 37 insertions(+), 9 deletions(-) - -diff --git a/src/bpforc.h b/src/bpforc.h -index 5634c544..1900e497 100644 ---- a/src/bpforc.h -+++ b/src/bpforc.h -@@ -20,6 +20,9 @@ - #ifdef LLVM_ORC_V2 - #include - #include -+#if LLVM_VERSION_MAJOR >= 13 -+#include -+#endif - #endif - - #include -@@ -66,8 +69,12 @@ class BpfOrc - std::unique_ptr TM; - DataLayout DL; - #if LLVM_VERSION_MAJOR >= 7 -+#ifdef LLVM_ORC_V2 -+ std::unique_ptr ES; -+#else // LLVM_ORC_V1 - ExecutionSession ES; - #endif -+#endif - #if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 12 - std::shared_ptr Resolver; - #endif -@@ -92,7 +99,21 @@ class BpfOrc - #endif - - public: -+#if LLVM_VERSION_MAJOR >= 13 -+ ~BpfOrc() -+ { -+ if (auto Err = ES->endSession()) -+ ES->reportError(std::move(Err)); -+ } -+#endif -+#ifdef LLVM_ORC_V2 -+ BpfOrc(TargetMachine *TM, -+ DataLayout DL, -+ std::unique_ptr ES); -+#else - BpfOrc(TargetMachine *TM, DataLayout DL); -+#endif -+ - void compile(std::unique_ptr M); - - /* Helper for creating a orc object, responsible for creating internal objects -@@ -125,7 +146,7 @@ class BpfOrc - #ifdef LLVM_ORC_V2 - Expected lookup(StringRef Name) - { -- return ES.lookup({ &MainJD }, Mangle(Name.str())); -+ return ES->lookup({ &MainJD }, Mangle(Name.str())); - } - #endif - }; -diff --git a/src/bpforcv2.cpp b/src/bpforcv2.cpp -index 209e08e5..104213b0 100644 ---- a/src/bpforcv2.cpp -+++ b/src/bpforcv2.cpp -@@ -1,24 +1,26 @@ - // Included by bpforc.cpp - --BpfOrc::BpfOrc(TargetMachine *TM, DataLayout DL) -+BpfOrc::BpfOrc(TargetMachine *TM, -+ DataLayout DL, -+ std::unique_ptr ES) - : TM(std::move(TM)), - DL(std::move(DL)), -- ObjectLayer(ES, -+ ES(std::move(ES)), -+ ObjectLayer(*(this->ES), - [this]() { - return std::make_unique(sections_); - }), -- CompileLayer(ES, -+ CompileLayer(*this->ES, - ObjectLayer, - std::make_unique(*this->TM)), -- Mangle(ES, this->DL), -+ Mangle(*this->ES, this->DL), - CTX(std::make_unique()), -- MainJD(cantFail(ES.createJITDylib("
"))) -+ MainJD(cantFail(this->ES->createJITDylib("
"))) - { - MainJD.addGenerator( - cantFail(DynamicLibrarySearchGenerator::GetForCurrentProcess( - DL.getGlobalPrefix()))); - } -- - LLVMContext &BpfOrc::getContext() - { - return *CTX.getContext(); -@@ -37,8 +39,13 @@ std::unique_ptr BpfOrc::Create() - // return unique_ptrs - auto DL = cantFail(JTMB.getDefaultDataLayoutForTarget()); - auto TM = cantFail(JTMB.createTargetMachine()); -- -- return std::make_unique(TM.release(), std::move(DL)); -+#if LLVM_VERSION_MAJOR >= 13 -+ auto EPC = SelfExecutorProcessControl::Create(); -+ auto ES = std::make_unique(std::move(*EPC)); -+#else -+ auto ES = std::make_unique(); -+#endif -+ return std::make_unique(TM.release(), std::move(DL), std::move(ES)); - } - - void BpfOrc::compile(std::unique_ptr M) --- -2.31.1 - diff --git a/bpftrace-0.16.0-IR-builder-get-rid-of-getPointerElementType-calls.patch b/bpftrace-0.16.0-IR-builder-get-rid-of-getPointerElementType-calls.patch new file mode 100644 index 0000000000000000000000000000000000000000..c7d9961d3ecddc197fd1cfe660e52a7ae128731b --- /dev/null +++ b/bpftrace-0.16.0-IR-builder-get-rid-of-getPointerElementType-calls.patch @@ -0,0 +1,457 @@ +From dfc1f92653707c8d11bdb3be98e68f8297b9bc71 Mon Sep 17 00:00:00 2001 +From: Viktor Malik +Date: Mon, 10 Oct 2022 14:26:38 +0200 +Subject: [PATCH] IR builder: get rid of getPointerElementType calls + +Usage of Value::getPointerElementType is deprecated and will be dropped +in LLVM 16 [1]. + +There are several places where we use this method: +- function (value) calls - the called function type is usually + available, so just pass it to createCall, the only exception is + CreateProbeReadStr which must have been refactored +- getting the type of alloca instruction - there is a dedicated + AllocaInst::getAllocatedType method that can be used instead +- strncmp - pass sizes of the strings to CreateStrncmp to be able to get + the correct string type (which is array of uint8) + +[1] https://llvm.org/docs/OpaquePointers.html +--- + src/ast/irbuilderbpf.cpp | 143 ++++++++++++-------------------- + src/ast/irbuilderbpf.h | 23 +++-- + src/ast/passes/codegen_llvm.cpp | 30 +++++-- + 3 files changed, 86 insertions(+), 110 deletions(-) + +diff --git a/src/ast/irbuilderbpf.cpp b/src/ast/irbuilderbpf.cpp +index d49883f7..4036b2df 100644 +--- a/src/ast/irbuilderbpf.cpp ++++ b/src/ast/irbuilderbpf.cpp +@@ -288,17 +288,16 @@ CallInst *IRBuilderBPF::CreateHelperCall(libbpf::bpf_func_id func_id, + Constant *helper_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(func_id), + helper_ptr_type); +- return createCall(helper_func, args, Name); ++ return createCall(helper_type, helper_func, args, Name); + } + +-CallInst *IRBuilderBPF::createCall(Value *callee, ++CallInst *IRBuilderBPF::createCall(FunctionType *callee_type, ++ Value *callee, + ArrayRef args, + const Twine &Name) + { + #if LLVM_VERSION_MAJOR >= 11 +- auto *calleePtrType = cast(callee->getType()); +- auto *calleeType = cast(calleePtrType->getPointerElementType()); +- return CreateCall(calleeType, callee, args, Name); ++ return CreateCall(callee_type, callee, args, Name); + #else + return CreateCall(callee, args, Name); + #endif +@@ -307,7 +306,7 @@ CallInst *IRBuilderBPF::createCall(Value *callee, + CallInst *IRBuilderBPF::CreateBpfPseudoCallId(int mapid) + { + Function *pseudo_func = module_.getFunction("llvm.bpf.pseudo"); +- return createCall(pseudo_func, ++ return CreateCall(pseudo_func, + { getInt64(BPF_PSEUDO_MAP_FD), getInt64(mapid) }, + "pseudo"); + } +@@ -346,7 +345,8 @@ CallInst *IRBuilderBPF::createMapLookup(int mapid, Value *key) + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_lookup_elem), + lookup_func_ptr_type); +- return createCall(lookup_func, { map_ptr, key }, "lookup_elem"); ++ return createCall( ++ lookup_func_type, lookup_func, { map_ptr, key }, "lookup_elem"); + } + + CallInst *IRBuilderBPF::CreateGetJoinMap(Value *ctx, const location &loc) +@@ -397,8 +397,7 @@ Value *IRBuilderBPF::CreateMapLookupElem(Value *ctx, + CREATE_MEMCPY(value, call, type.GetSize(), 1); + else + { +- assert(value->getType()->isPointerTy() && +- (value->getType()->getPointerElementType() == getInt64Ty())); ++ assert(value->getAllocatedType() == getInt64Ty()); + // createMapLookup returns an u8* + auto *cast = CreatePointerCast(call, value->getType(), "cast"); + CreateStore(CreateLoad(getInt64Ty(), cast), value); +@@ -448,7 +447,8 @@ void IRBuilderBPF::CreateMapUpdateElem(Value *ctx, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_update_elem), + update_func_ptr_type); +- CallInst *call = createCall(update_func, ++ CallInst *call = createCall(update_func_type, ++ update_func, + { map_ptr, key, val, flags }, + "update_elem"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_update_elem, loc); +@@ -472,7 +472,8 @@ void IRBuilderBPF::CreateMapDeleteElem(Value *ctx, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_map_delete_elem), + delete_func_ptr_type); +- CallInst *call = createCall(delete_func, { map_ptr, key }, "delete_elem"); ++ CallInst *call = createCall( ++ delete_func_type, delete_func, { map_ptr, key }, "delete_elem"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_map_delete_elem, loc); + } + +@@ -508,72 +509,53 @@ void IRBuilderBPF::CreateProbeRead(Value *ctx, + Constant *proberead_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(read_fn), + proberead_func_ptr_type); +- CallInst *call = createCall(proberead_func, ++ CallInst *call = createCall(proberead_func_type, ++ proberead_func, + { dst, size, src }, + probeReadHelperName(read_fn)); + CreateHelperErrorCond(ctx, call, read_fn, loc); + } + +-Constant *IRBuilderBPF::createProbeReadStrFn(llvm::Type *dst, +- llvm::Type *src, +- AddrSpace as) +-{ +- assert(src && (src->isIntegerTy() || src->isPointerTy())); +- // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr) +- FunctionType *probereadstr_func_type = FunctionType::get( +- getInt64Ty(), { dst, getInt32Ty(), src }, false); +- PointerType *probereadstr_func_ptr_type = PointerType::get( +- probereadstr_func_type, 0); +- return ConstantExpr::getCast(Instruction::IntToPtr, +- getInt64(selectProbeReadHelper(as, true)), +- probereadstr_func_ptr_type); +-} +- + CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, ++ Value *dst, + size_t size, + Value *src, + AddrSpace as, + const location &loc) + { +- assert(ctx && ctx->getType() == getInt8PtrTy()); + return CreateProbeReadStr(ctx, dst, getInt32(size), src, as, loc); + } + + CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, + Value *dst, +- size_t size, +- Value *src, +- AddrSpace as, +- const location &loc) +-{ +- assert(ctx && ctx->getType() == getInt8PtrTy()); +- Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as); +- auto read_fn = selectProbeReadHelper(as, true); +- CallInst *call = createCall(fn, +- { dst, getInt32(size), src }, +- probeReadHelperName(read_fn)); +- CreateHelperErrorCond(ctx, call, read_fn, loc); +- return call; +-} +- +-CallInst *IRBuilderBPF::CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, + llvm::Value *size, + Value *src, + AddrSpace as, + const location &loc) + { + assert(ctx && ctx->getType() == getInt8PtrTy()); +- assert(dst && dst->getAllocatedType()->isArrayTy() && +- dst->getAllocatedType()->getArrayElementType() == getInt8Ty()); + assert(size && size->getType()->isIntegerTy()); ++ if (auto *dst_alloca = dyn_cast(dst)) ++ { ++ assert(dst_alloca->getAllocatedType()->isArrayTy() && ++ dst_alloca->getAllocatedType()->getArrayElementType() == ++ getInt8Ty()); ++ } + +- auto *size_i32 = CreateIntCast(size, getInt32Ty(), false); ++ auto *size_i32 = size; ++ if (size_i32->getType()->getScalarSizeInBits() != 32) ++ size_i32 = CreateIntCast(size_i32, getInt32Ty(), false); + +- Constant *fn = createProbeReadStrFn(dst->getType(), src->getType(), as); + auto read_fn = selectProbeReadHelper(as, true); +- CallInst *call = createCall(fn, ++ // int bpf_probe_read_str(void *dst, int size, const void *unsafe_ptr) ++ FunctionType *probereadstr_func_type = FunctionType::get( ++ getInt64Ty(), { dst->getType(), getInt32Ty(), src->getType() }, false); ++ PointerType *probereadstr_func_ptr_type = PointerType::get( ++ probereadstr_func_type, 0); ++ Constant *probereadstr_callee = ConstantExpr::getCast( ++ Instruction::IntToPtr, getInt64(read_fn), probereadstr_func_ptr_type); ++ CallInst *call = createCall(probereadstr_func_type, ++ probereadstr_callee, + { dst, size_i32, src }, + probeReadHelperName(read_fn)); + CreateHelperErrorCond(ctx, call, read_fn, loc); +@@ -732,8 +714,10 @@ Value *IRBuilderBPF::CreateUSDTReadArgument(Value *ctx, + return result; + } + +-Value *IRBuilderBPF::CreateStrncmp(Value *val1, +- Value *val2, ++Value *IRBuilderBPF::CreateStrncmp(Value *str1, ++ uint64_t str1_size, ++ Value *str2, ++ uint64_t str2_size, + uint64_t n, + bool inverse) + { +@@ -762,40 +746,21 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + // Check if the compared strings are literals. + // If so, we can avoid storing the literal in memory. + std::optional literal1; +- if (auto constString1 = dyn_cast(val1)) ++ if (auto constString1 = dyn_cast(str1)) + literal1 = constString1->getAsString(); +- else if (isa(val1)) ++ else if (isa(str1)) + literal1 = ""; + else + literal1 = std::nullopt; + + std::optional literal2; +- if (auto constString2 = dyn_cast(val2)) ++ if (auto constString2 = dyn_cast(str2)) + literal2 = constString2->getAsString(); +- else if (isa(val2)) ++ else if (isa(str2)) + literal2 = ""; + else + literal2 = std::nullopt; + +- auto *val1p = dyn_cast(val1->getType()); +- auto *val2p = dyn_cast(val2->getType()); +-#ifndef NDEBUG +- if (!literal1) +- { +- assert(val1p); +- assert(val1p->getPointerElementType()->isArrayTy() && +- val1p->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); +- } +- if (!literal2) +- { +- assert(val2p); +- assert(val2p->getPointerElementType()->isArrayTy() && +- val2p->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); +- } +-#endif +- + Function *parent = GetInsertBlock()->getParent(); + AllocaInst *store = CreateAllocaBPF(getInt1Ty(), "strcmp.result"); + BasicBlock *str_ne = BasicBlock::Create(module_.getContext(), +@@ -822,8 +787,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + l = getInt8(literal1->c_str()[i]); + else + { +- auto *ptr_l = CreateGEP(val1p->getPointerElementType(), +- val1, ++ auto *ptr_l = CreateGEP(ArrayType::get(getInt8Ty(), str1_size), ++ str1, + { getInt32(0), getInt32(i) }); + l = CreateLoad(getInt8Ty(), ptr_l); + } +@@ -833,8 +798,8 @@ Value *IRBuilderBPF::CreateStrncmp(Value *val1, + r = getInt8(literal2->c_str()[i]); + else + { +- auto *ptr_r = CreateGEP(val2p->getPointerElementType(), +- val2, ++ auto *ptr_r = CreateGEP(ArrayType::get(getInt8Ty(), str2_size), ++ str2, + { getInt32(0), getInt32(i) }); + r = CreateLoad(getInt8Ty(), ptr_r); + } +@@ -994,11 +959,9 @@ void IRBuilderBPF::CreateGetCurrentComm(Value *ctx, + size_t size, + const location &loc) + { +- assert(buf->getType()->getPointerElementType()->isArrayTy() && +- buf->getType()->getPointerElementType()->getArrayNumElements() >= +- size && +- buf->getType()->getPointerElementType()->getArrayElementType() == +- getInt8Ty()); ++ assert(buf->getAllocatedType()->isArrayTy() && ++ buf->getAllocatedType()->getArrayNumElements() >= size && ++ buf->getAllocatedType()->getArrayElementType() == getInt8Ty()); + + // long bpf_get_current_comm(char *buf, int size_of_buf) + // Return: 0 on success or negative error +@@ -1077,7 +1040,7 @@ void IRBuilderBPF::CreateSignal(Value *ctx, Value *sig, const location &loc) + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_send_signal), + signal_func_ptr_type); +- CallInst *call = createCall(signal_func, { sig }, "signal"); ++ CallInst *call = createCall(signal_func_type, signal_func, { sig }, "signal"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_send_signal, loc); + } + +@@ -1091,7 +1054,7 @@ void IRBuilderBPF::CreateOverrideReturn(Value *ctx, Value *rc) + Constant *override_func = ConstantExpr::getCast(Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_override_return), + override_func_ptr_type); +- createCall(override_func, { ctx, rc }, "override"); ++ createCall(override_func_type, override_func, { ctx, rc }, "override"); + } + + CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb, +@@ -1126,7 +1089,8 @@ CallInst *IRBuilderBPF::CreateSkbOutput(Value *skb, + Instruction::IntToPtr, + getInt64(libbpf::BPF_FUNC_skb_output), + skb_output_func_ptr_type); +- CallInst *call = createCall(skb_output_func, ++ CallInst *call = createCall(skb_output_func_type, ++ skb_output_func, + { skb, map_ptr, flags, data, size_val }, + "skb_output"); + return call; +@@ -1320,7 +1284,8 @@ void IRBuilderBPF::CreateSeqPrintf(Value *ctx, + CreateGEP(getInt64Ty(), meta, getInt64(0)), + "seq"); + +- CallInst *call = createCall(seq_printf_func, ++ CallInst *call = createCall(seq_printf_func_type, ++ seq_printf_func, + { seq, fmt, fmt_size, data, data_len }, + "seq_printf"); + CreateHelperErrorCond(ctx, call, libbpf::BPF_FUNC_seq_printf, loc); +diff --git a/src/ast/irbuilderbpf.h b/src/ast/irbuilderbpf.h +index e124911b..c9ffb545 100644 +--- a/src/ast/irbuilderbpf.h ++++ b/src/ast/irbuilderbpf.h +@@ -90,17 +90,11 @@ public: + AddrSpace as, + const location &loc); + CallInst *CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, ++ Value *dst, + llvm::Value *size, + Value *src, + AddrSpace as, + const location &loc); +- CallInst *CreateProbeReadStr(Value *ctx, +- AllocaInst *dst, +- size_t size, +- Value *src, +- AddrSpace as, +- const location &loc); + CallInst *CreateProbeReadStr(Value *ctx, + Value *dst, + size_t size, +@@ -115,7 +109,12 @@ public: + pid_t pid, + AddrSpace as, + const location &loc); +- Value *CreateStrncmp(Value *val1, Value *val2, uint64_t n, bool inverse); ++ Value *CreateStrncmp(Value *str1, ++ uint64_t str1_size, ++ Value *str2, ++ uint64_t str2_size, ++ uint64_t n, ++ bool inverse); + CallInst *CreateGetNs(bool boot_time, const location &loc); + CallInst *CreateGetPidTgid(const location &loc); + CallInst *CreateGetCurrentCgroupId(const location &loc); +@@ -131,7 +130,10 @@ public: + ArrayRef args, + const Twine &Name, + const location *loc = nullptr); +- CallInst *createCall(Value *callee, ArrayRef args, const Twine &Name); ++ CallInst *createCall(FunctionType *callee_type, ++ Value *callee, ++ ArrayRef args, ++ const Twine &Name); + void CreateGetCurrentComm(Value *ctx, AllocaInst *buf, size_t size, const location& loc); + void CreatePerfEventOutput(Value *ctx, + Value *data, +@@ -185,9 +187,6 @@ private: + AddrSpace as, + const location &loc); + CallInst *createMapLookup(int mapid, Value *key); +- Constant *createProbeReadStrFn(llvm::Type *dst, +- llvm::Type *src, +- AddrSpace as); + libbpf::bpf_func_id selectProbeReadHelper(AddrSpace as, bool str); + + std::map structs_; +diff --git a/src/ast/passes/codegen_llvm.cpp b/src/ast/passes/codegen_llvm.cpp +index a818ca0b..2b888087 100644 +--- a/src/ast/passes/codegen_llvm.cpp ++++ b/src/ast/passes/codegen_llvm.cpp +@@ -1133,8 +1133,12 @@ void CodegenLLVM::visit(Call &call) + auto left_string = getString(left_arg); + auto right_string = getString(right_arg); + +- expr_ = b_.CreateStrncmp( +- left_string.first, right_string.first, size, false); ++ expr_ = b_.CreateStrncmp(left_string.first, ++ left_string.second, ++ right_string.first, ++ right_string.second, ++ size, ++ false); + } + else if (call.func == "override") + { +@@ -1269,8 +1273,7 @@ void CodegenLLVM::visit(Variable &var) + else + { + auto *var_alloca = variables_[var.ident]; +- expr_ = b_.CreateLoad(var_alloca->getType()->getPointerElementType(), +- var_alloca); ++ expr_ = b_.CreateLoad(var_alloca->getAllocatedType(), var_alloca); + } + } + +@@ -1310,7 +1313,12 @@ void CodegenLLVM::binop_string(Binop &binop) + auto right_string = getString(binop.right); + + size_t len = std::min(left_string.second, right_string.second); +- expr_ = b_.CreateStrncmp(left_string.first, right_string.first, len, inverse); ++ expr_ = b_.CreateStrncmp(left_string.first, ++ left_string.second, ++ right_string.first, ++ right_string.second, ++ len, ++ inverse); + } + + void CodegenLLVM::binop_buf(Binop &binop) +@@ -1334,7 +1342,12 @@ void CodegenLLVM::binop_buf(Binop &binop) + + size_t len = std::min(binop.left->type.GetSize(), + binop.right->type.GetSize()); +- expr_ = b_.CreateStrncmp(left_string, right_string, len, inverse); ++ expr_ = b_.CreateStrncmp(left_string, ++ binop.left->type.GetSize(), ++ right_string, ++ binop.right->type.GetSize(), ++ len, ++ inverse); + } + + void CodegenLLVM::binop_int(Binop &binop) +@@ -3528,9 +3541,8 @@ void CodegenLLVM::createIncDec(Unop &unop) + else if (unop.expr->is_variable) + { + Variable &var = static_cast(*unop.expr); +- Value *oldval = b_.CreateLoad( +- variables_[var.ident]->getType()->getPointerElementType(), +- variables_[var.ident]); ++ Value *oldval = b_.CreateLoad(variables_[var.ident]->getAllocatedType(), ++ variables_[var.ident]); + Value *newval; + if (is_increment) + newval = b_.CreateAdd(oldval, b_.GetIntSameSize(step, oldval)); +-- +2.38.1 + diff --git a/bpftrace-0.12.1-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch b/bpftrace-0.16.0-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch similarity index 92% rename from bpftrace-0.12.1-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch rename to bpftrace-0.16.0-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch index 54ed64a63f3cedd34a85c1d044dbc57adcf9b477..aa746b50952e5bbc70023539e237f4d8150dc189 100644 --- a/bpftrace-0.12.1-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch +++ b/bpftrace-0.16.0-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch @@ -1,7 +1,7 @@ -From 69f6d7ff04f43451eea2fb028a84a76331bbf6ea Mon Sep 17 00:00:00 2001 +From 7598b2b918835ab71e48bd7617812bde3a2537a7 Mon Sep 17 00:00:00 2001 From: Jerome Marchand Date: Thu, 11 Jun 2020 14:56:36 +0200 -Subject: [PATCH] RHEL-8: aarch64: fixes statsnoop and opensnoop +Subject: [PATCH 4/6] RHEL-8: aarch64: fixes statsnoop and opensnoop On aarch64 the open syscall has been dropped. Only openat remains, wich is called by libc open() function. @@ -60,5 +60,5 @@ index b2d529e2..f612ea94 100755 { $ret = args->ret; -- -2.30.2 +2.35.3 diff --git a/bpftrace-0.16.0-RHEL8-remove-not-existing-attachpoints-from-tools.patch b/bpftrace-0.16.0-RHEL8-remove-not-existing-attachpoints-from-tools.patch new file mode 100644 index 0000000000000000000000000000000000000000..cd54ed4259e663bed184df0119697d776d9fb2bb --- /dev/null +++ b/bpftrace-0.16.0-RHEL8-remove-not-existing-attachpoints-from-tools.patch @@ -0,0 +1,82 @@ +From 7e813d0e3048f52781199384a120f5e5cbad22ae Mon Sep 17 00:00:00 2001 +From: Viktor Malik +Date: Mon, 5 Dec 2022 13:31:25 +0100 +Subject: [PATCH] RHEL8: remove not existing attachpoints from tools + +tools/bio* attempt to attach each probe to multiple kprobes to cover all +possible systems. Remove probes which do not exist in RHEL8 to remove +unnecessary warnings. +--- + tools/biolatency.bt | 6 ++---- + tools/biostacks.bt | 4 +--- + tools/old/biosnoop.bt | 6 ++---- + 3 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/tools/biolatency.bt b/tools/biolatency.bt +index d5af1f29..4ea910b4 100755 +--- a/tools/biolatency.bt ++++ b/tools/biolatency.bt +@@ -16,14 +16,12 @@ BEGIN + printf("Tracing block device I/O... Hit Ctrl-C to end.\n"); + } + +-kprobe:blk_account_io_start, +-kprobe:__blk_account_io_start ++kprobe:blk_account_io_start + { + @start[arg0] = nsecs; + } + +-kprobe:blk_account_io_done, +-kprobe:__blk_account_io_done ++kprobe:blk_account_io_done + /@start[arg0]/ + { + @usecs = hist((nsecs - @start[arg0]) / 1000); +diff --git a/tools/biostacks.bt b/tools/biostacks.bt +index 1bc9f819..80d8cb9e 100755 +--- a/tools/biostacks.bt ++++ b/tools/biostacks.bt +@@ -18,14 +18,12 @@ BEGIN + printf("Tracing block I/O with init stacks. Hit Ctrl-C to end.\n"); + } + +-kprobe:blk_account_io_start, +-kprobe:__blk_account_io_start ++kprobe:blk_account_io_start + { + @reqstack[arg0] = kstack; + @reqts[arg0] = nsecs; + } + +-kprobe:blk_start_request, + kprobe:blk_mq_start_request + /@reqts[arg0]/ + { +diff --git a/tools/old/biosnoop.bt b/tools/old/biosnoop.bt +index 1a99643a..327251e3 100755 +--- a/tools/old/biosnoop.bt ++++ b/tools/old/biosnoop.bt +@@ -22,8 +22,7 @@ BEGIN + printf("%-12s %-7s %-16s %-6s %7s\n", "TIME(ms)", "DISK", "COMM", "PID", "LAT(ms)"); + } + +-kprobe:blk_account_io_start, +-kprobe:__blk_account_io_start ++kprobe:blk_account_io_start + { + @start[arg0] = nsecs; + @iopid[arg0] = pid; +@@ -31,8 +30,7 @@ kprobe:__blk_account_io_start + @disk[arg0] = ((struct request *)arg0)->rq_disk->disk_name; + } + +-kprobe:blk_account_io_done, +-kprobe:__blk_account_io_done ++kprobe:blk_account_io_done + /@start[arg0] != 0 && @iopid[arg0] != 0 && @iocomm[arg0] != ""/ + + { +-- +2.38.1 + diff --git a/bpftrace-0.16.0-tcpdrop-Fix-ERROR-Error-attaching-probe-kprobe-tcp_d.patch b/bpftrace-0.16.0-tcpdrop-Fix-ERROR-Error-attaching-probe-kprobe-tcp_d.patch new file mode 100644 index 0000000000000000000000000000000000000000..4430f11e211a2eaafabeebc014e162f341dd8500 --- /dev/null +++ b/bpftrace-0.16.0-tcpdrop-Fix-ERROR-Error-attaching-probe-kprobe-tcp_d.patch @@ -0,0 +1,173 @@ +From e661f2a043f8b6548e0bb3e0cc5992d7c0ff3b0f Mon Sep 17 00:00:00 2001 +From: Rong Tao +Date: Sat, 1 Oct 2022 16:15:27 +0800 +Subject: [PATCH] tcpdrop: Fix: ERROR: Error attaching probe: 'kprobe:tcp_drop' + +kernel commit 8fbf195798b5('tcp_drop() is no longer needed.') remove +the kprobe:tcp_drop, bcc commit 16eab39171eb('Add +tracepoint:skb:kfree_skb if no tcp_drop() kprobe.') already fix this +problem. + +CI old kernel is too old and not support the 'reason' field, move the +old tools/tcpdrop.bt into tools/old/tcpdrop.bt and set the CI to use +it. + +Since 5.17 support trace_kfree_skb(skb, ..., reason) 'reason' field. +Since 5.19 remove tcp_drop() function. + +ERROR log: + + $ sudo ./tcpdrop.bt + ./tcpdrop.bt:49-51: WARNING: tcp_drop is not traceable (either non-existing, inlined, or marked as "notrace"); attaching to it will likely fail + Attaching 3 probes... + cannot attach kprobe, probe entry may not exist + ERROR: Error attaching probe: 'kprobe:tcp_drop' + +Link: https://github.com/iovisor/bpftrace/pull/2379 +Signed-off-by: Rong Tao +--- + tools/old/tcpdrop.bt | 85 ++++++++++++++++++++++++++++++++++++++++++++ + tools/tcpdrop.bt | 22 ++++++------ + 2 files changed, 97 insertions(+), 10 deletions(-) + create mode 100755 tools/old/tcpdrop.bt + +diff --git a/tools/old/tcpdrop.bt b/tools/old/tcpdrop.bt +new file mode 100755 +index 00000000..685a5f6a +--- /dev/null ++++ b/tools/old/tcpdrop.bt +@@ -0,0 +1,85 @@ ++#!/usr/bin/env bpftrace ++/* ++ * tcpdrop.bt Trace TCP kernel-dropped packets/segments. ++ * For Linux, uses bpftrace and eBPF. ++ * ++ * USAGE: tcpdrop.bt ++ * ++ * This is a bpftrace version of the bcc tool of the same name. ++ * It is limited to ipv4 addresses, and cannot show tcp flags. ++ * ++ * This provides information such as packet details, socket state, and kernel ++ * stack trace for packets/segments that were dropped via tcp_drop(). ++ ++ * WARNING: this script attaches to the tcp_drop kprobe which is likely inlined ++ * on newer kernels and not replaced by anything else, therefore ++ * the script will stop working ++ * ++ * For Linux <= 5.18. ++ * ++ * Copyright (c) 2018 Dale Hamel. ++ * Licensed under the Apache License, Version 2.0 (the "License") ++ * ++ * 23-Nov-2018 Dale Hamel created this. ++ */ ++ ++#ifndef BPFTRACE_HAVE_BTF ++#include ++#include ++#else ++#include ++#endif ++ ++BEGIN ++{ ++ printf("Tracing tcp drops. Hit Ctrl-C to end.\n"); ++ printf("%-8s %-8s %-16s %-21s %-21s %-8s\n", "TIME", "PID", "COMM", "SADDR:SPORT", "DADDR:DPORT", "STATE"); ++ ++ // See https://github.com/torvalds/linux/blob/master/include/net/tcp_states.h ++ @tcp_states[1] = "ESTABLISHED"; ++ @tcp_states[2] = "SYN_SENT"; ++ @tcp_states[3] = "SYN_RECV"; ++ @tcp_states[4] = "FIN_WAIT1"; ++ @tcp_states[5] = "FIN_WAIT2"; ++ @tcp_states[6] = "TIME_WAIT"; ++ @tcp_states[7] = "CLOSE"; ++ @tcp_states[8] = "CLOSE_WAIT"; ++ @tcp_states[9] = "LAST_ACK"; ++ @tcp_states[10] = "LISTEN"; ++ @tcp_states[11] = "CLOSING"; ++ @tcp_states[12] = "NEW_SYN_RECV"; ++} ++ ++kprobe:tcp_drop ++{ ++ $sk = ((struct sock *) arg0); ++ $inet_family = $sk->__sk_common.skc_family; ++ ++ if ($inet_family == AF_INET || $inet_family == AF_INET6) { ++ if ($inet_family == AF_INET) { ++ $daddr = ntop($sk->__sk_common.skc_daddr); ++ $saddr = ntop($sk->__sk_common.skc_rcv_saddr); ++ } else { ++ $daddr = ntop($sk->__sk_common.skc_v6_daddr.in6_u.u6_addr8); ++ $saddr = ntop($sk->__sk_common.skc_v6_rcv_saddr.in6_u.u6_addr8); ++ } ++ $lport = $sk->__sk_common.skc_num; ++ $dport = $sk->__sk_common.skc_dport; ++ ++ // Destination port is big endian, it must be flipped ++ $dport = bswap($dport); ++ ++ $state = $sk->__sk_common.skc_state; ++ $statestr = @tcp_states[$state]; ++ ++ time("%H:%M:%S "); ++ printf("%-8d %-16s ", pid, comm); ++ printf("%39s:%-6d %39s:%-6d %-10s\n", $saddr, $lport, $daddr, $dport, $statestr); ++ printf("%s\n", kstack); ++ } ++} ++ ++END ++{ ++ clear(@tcp_states); ++} +diff --git a/tools/tcpdrop.bt b/tools/tcpdrop.bt +index 3450a533..bb31107f 100755 +--- a/tools/tcpdrop.bt ++++ b/tools/tcpdrop.bt +@@ -9,16 +9,15 @@ + * It is limited to ipv4 addresses, and cannot show tcp flags. + * + * This provides information such as packet details, socket state, and kernel +- * stack trace for packets/segments that were dropped via tcp_drop(). +- +- * WARNING: this script attaches to the tcp_drop kprobe which is likely inlined +- * on newer kernels and not replaced by anything else, therefore +- * the script will stop working +- ++ * stack trace for packets/segments that were dropped via kfree_skb. ++ * ++ * For Linux 5.17+ (see tools/old for script for lower versions). ++ * + * Copyright (c) 2018 Dale Hamel. + * Licensed under the Apache License, Version 2.0 (the "License") +- ++ * + * 23-Nov-2018 Dale Hamel created this. ++ * 01-Oct-2022 Rong Tao use tracepoint:skb:kfree_skb + */ + + #ifndef BPFTRACE_HAVE_BTF +@@ -48,12 +47,15 @@ BEGIN + @tcp_states[12] = "NEW_SYN_RECV"; + } + +-kprobe:tcp_drop ++tracepoint:skb:kfree_skb + { +- $sk = ((struct sock *) arg0); ++ $reason = args->reason; ++ $skb = (struct sk_buff *)args->skbaddr; ++ $sk = ((struct sock *) $skb->sk); + $inet_family = $sk->__sk_common.skc_family; + +- if ($inet_family == AF_INET || $inet_family == AF_INET6) { ++ if ($reason > SKB_DROP_REASON_NOT_SPECIFIED && ++ ($inet_family == AF_INET || $inet_family == AF_INET6)) { + if ($inet_family == AF_INET) { + $daddr = ntop($sk->__sk_common.skc_daddr); + $saddr = ntop($sk->__sk_common.skc_rcv_saddr); +-- +2.38.1 + diff --git a/bpftrace-0.16.0-tools-old-mdflush.bt-fix-BPFTRACE_HAVE_BTF-macro.patch b/bpftrace-0.16.0-tools-old-mdflush.bt-fix-BPFTRACE_HAVE_BTF-macro.patch new file mode 100644 index 0000000000000000000000000000000000000000..6607d0f1fd0bd10895448f41072f6b9c49ce8b2c --- /dev/null +++ b/bpftrace-0.16.0-tools-old-mdflush.bt-fix-BPFTRACE_HAVE_BTF-macro.patch @@ -0,0 +1,27 @@ +From 31a42a47b90f97a2a8c2446101c0007cf09288bc Mon Sep 17 00:00:00 2001 +From: Viktor Malik +Date: Mon, 5 Dec 2022 11:57:24 +0100 +Subject: [PATCH] tools/old/mdflush.bt: fix BPFTRACE_HAVE_BTF macro + +The correct macro to use is called BPFTRACE_HAVE_BTF, not +__BPFTRACE_HAVE_BTF. +--- + tools/old/mdflush.bt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/old/mdflush.bt b/tools/old/mdflush.bt +index 921c8f1b..23c7dd51 100755 +--- a/tools/old/mdflush.bt ++++ b/tools/old/mdflush.bt +@@ -15,7 +15,7 @@ + * 08-Sep-2018 Brendan Gregg Created this. + */ + +-#ifndef __BPFTRACE_HAVE_BTF ++#ifndef BPFTRACE_HAVE_BTF + #include + #include + #endif +-- +2.38.1 + diff --git a/bpftrace.spec b/bpftrace.spec index 4efdcc1a8b223d5da4971c5b7132c941b5abcece..23e4d6600c697208d575b942a4dea643b6225267 100644 --- a/bpftrace.spec +++ b/bpftrace.spec @@ -1,17 +1,24 @@ -%define anolis_release .0.1 %bcond_without llvm_static Name: bpftrace -Version: 0.12.1 -Release: 4%{anolis_release}%{?dist} +Version: 0.16.0 +Release: 1%{?dist} Summary: High-level tracing language for Linux eBPF License: ASL 2.0 +%define cereal_version 1.3.2 + URL: https://github.com/iovisor/bpftrace Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-%{version}-RHEL-8-fixes.patch -Patch1: %{name}-%{version}-orc-Fix-build-with-clang-13.patch - +# Cereal is a header-only serialization library which is not packaged into +# RHEL8, so we download it manually. This is ok to do as it is only necessary +# for build. +Source1: https://github.com/USCiLab/cereal/archive/v%{cereal_version}/cereal-%{cereal_version}.tar.gz + +Patch0: %{name}-%{version}-IR-builder-get-rid-of-getPointerElementType-calls.patch +Patch1: %{name}-%{version}-tools-old-mdflush.bt-fix-BPFTRACE_HAVE_BTF-macro.patch +Patch2: %{name}-%{version}-tcpdrop-Fix-ERROR-Error-attaching-probe-kprobe-tcp_d.patch +Patch3: %{name}-%{version}-RHEL8-remove-not-existing-attachpoints-from-tools.patch Patch10: %{name}-%{version}-RHEL-8-aarch64-fixes-statsnoop-and-opensnoop.patch # Arches will be included as upstream support is added and dependencies are @@ -49,7 +56,7 @@ and predecessor tracers such as DTrace and SystemTap %prep -%autosetup -N +%autosetup -N -a 1 %autopatch -p1 -M 9 %ifarch aarch64 @@ -57,6 +64,9 @@ and predecessor tracers such as DTrace and SystemTap %endif %build +# Set CPATH so that CMake finds the cereal headers +CPATH=$PWD/cereal-%{cereal_version}/include:$CPATH +export CPATH %cmake . \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_TESTING:BOOL=OFF \ @@ -77,6 +87,11 @@ and predecessor tracers such as DTrace and SystemTap find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ sed -i -e '1s=^#!/usr/bin/env %{name}\([0-9.]\+\)\?$=#!%{_bindir}/%{name}=' {} \; +# Some tools require old versions for RHEL8 +cp %{buildroot}/%{_datadir}/%{name}/tools/old/biosnoop.bt %{buildroot}/%{_datadir}/%{name}/tools +cp %{buildroot}/%{_datadir}/%{name}/tools/old/mdflush.bt %{buildroot}/%{_datadir}/%{name}/tools + + %files %doc README.md CONTRIBUTING-TOOLS.md %doc docs/reference_guide.md docs/tutorial_one_liners.md @@ -84,20 +99,25 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/tools %dir %{_datadir}/%{name}/tools/doc +%dir %{_datadir}/%{name}/tools/old %{_bindir}/%{name} +%{_bindir}/%{name}-aotrt %{_mandir}/man8/* %attr(0755,-,-) %{_datadir}/%{name}/tools/*.bt %{_datadir}/%{name}/tools/doc/*.txt -# tcp_drop() is inlined on ppc64 -%ifarch %{power64} -%exclude %{_datadir}/%{name}/tools/tcpdrop.bt -%exclude %{_datadir}/%{name}/tools/doc/tcpdrop_example.txt -%exclude %{_mandir}/man8/tcpdrop.8.gz -%endif +# Do not include old versions of tools. +# Those that are needed were already installed as normal tools. +%exclude %{_datadir}/%{name}/tools/old %changelog -* Sun May 22 2022 Liwei Ge - 0.12.1-4.0.1 -- Rebuild with llvm13 +* Wed Nov 30 2022 Viktor Malik - 0.16.0-1 +- Rebase on bpftrace 0.16.0 +- Rebuild for LLVM15 +- Download the cereal library (not packaged into RHEL8) + +* Thu Jun 02 2022 Jerome Marchand - 0.13.1-1 +- Rebase on bpftrace 0.13.1 +- Rebuild on LLVM14 * Thu Dec 02 2021 Jerome Marchand - 0.12.1-4 - Rebuild on LLVM13 diff --git a/dist b/dist new file mode 100644 index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533 --- /dev/null +++ b/dist @@ -0,0 +1 @@ +an8 diff --git a/download b/download index 2d1b53a34f73b6fc244cd354593df6788b8377d9..73c352883689fc77650b411e0b89a9c47f5b2eb6 100644 --- a/download +++ b/download @@ -1 +1,2 @@ -289137794ca1cf7922229124c552a7c3 bpftrace-0.12.1.tar.gz +f7b4d27c747164307d20e2251a3e5809 bpftrace-0.16.0.tar.gz +ab6070fadc7c50072ef4153fb1c46a87 cereal-1.3.2.tar.gz