mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 07:23:20 +00:00
Merge pull request #327053 from martinetd/bpftrace_0_21
This commit is contained in:
Sandro
GitHub
commit
44a379ef11
@ -1,59 +0,0 @@
|
||||
From 76950d08a3da13dd9e51b2fbef3532c3de79265b Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 14 Jun 2024 23:19:05 +0900
|
||||
Subject: [PATCH] utils: fix kernel headers not found warning (#3242)
|
||||
|
||||
The code would make ksrc and kobj empty then try to print them,
|
||||
this would always print empty strings.
|
||||
Store is_dir() checks as bool instead and use these, the strings
|
||||
cannot be empty if the check passed.
|
||||
|
||||
(cherry picked from commit f937803c2ad156ab90b9194965dbfb62bef1ff80)
|
||||
---
|
||||
(mostly to avoid conflicts with the next patch)
|
||||
src/utils.cpp | 21 +++++++--------------
|
||||
1 file changed, 7 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/src/utils.cpp b/src/utils.cpp
|
||||
index bda722136588..c358a401fc83 100644
|
||||
--- a/src/utils.cpp
|
||||
+++ b/src/utils.cpp
|
||||
@@ -738,15 +738,11 @@ std::tuple<std::string, std::string> get_kernel_dirs(
|
||||
auto ksrc = kdir + "/source";
|
||||
auto kobj = kdir + "/build";
|
||||
|
||||
- // if one of source/ or build/ is not present - try to use the other one for both.
|
||||
- if (!is_dir(ksrc)) {
|
||||
- ksrc = "";
|
||||
- }
|
||||
- if (!is_dir(kobj)) {
|
||||
- kobj = "";
|
||||
- }
|
||||
- if (ksrc.empty() && kobj.empty())
|
||||
- {
|
||||
+ // if one of source/ or build/ is not present - try to use the other one for
|
||||
+ // both.
|
||||
+ auto has_ksrc = is_dir(ksrc);
|
||||
+ auto has_kobj = is_dir(kobj);
|
||||
+ if (!has_ksrc && !has_kobj) {
|
||||
LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or "
|
||||
<< kobj
|
||||
<< ". To specify a particular path to kernel headers, set the "
|
||||
@@ -757,12 +753,9 @@ std::tuple<std::string, std::string> get_kernel_dirs(
|
||||
"file at /sys/kernel/kheaders.tar.xz";
|
||||
return std::make_tuple("", "");
|
||||
}
|
||||
- if (ksrc.empty())
|
||||
- {
|
||||
+ if (!has_ksrc) {
|
||||
ksrc = kobj;
|
||||
- }
|
||||
- else if (kobj.empty())
|
||||
- {
|
||||
+ } else if (!has_kobj) {
|
||||
kobj = ksrc;
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@ -1,220 +0,0 @@
|
||||
From 5208c6275e65d94d0ed169ca2b253602c78c15a8 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 14 Jun 2024 22:32:43 +0900
|
||||
Subject: [PATCH] kernel headers: only print kheaders not found warning if
|
||||
parsing failed
|
||||
|
||||
Current code would print kheaders not found as soon as the code has any
|
||||
include, even if the include worked.
|
||||
|
||||
This delays printing the warning until we know if parsing succeeded or
|
||||
not, and only prints it if parsing failed.
|
||||
|
||||
Also update the message to give clearer extraction instructions
|
||||
---
|
||||
CHANGELOG.md | 2 ++
|
||||
src/CMakeLists.txt | 3 ++-
|
||||
src/main.cpp | 40 ++++++++++++++++++++++++----------------
|
||||
src/utils.cpp | 45 +++++++++++++++++++++------------------------
|
||||
src/utils.h | 5 +++--
|
||||
5 files changed, 52 insertions(+), 43 deletions(-)
|
||||
|
||||
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
||||
index a4aca8b6c85d..181c1bffc9f3 100644
|
||||
--- a/CHANGELOG.md
|
||||
+++ b/CHANGELOG.md
|
||||
@@ -10,6 +10,8 @@ ## Unreleased
|
||||
|
||||
#### Added
|
||||
#### Changed
|
||||
+- Only print kernel headers not found message if parsing fails
|
||||
+ - [#3265](https://github.com/bpftrace/bpftrace/pull/3265)
|
||||
#### Deprecated
|
||||
#### Removed
|
||||
#### Fixed
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index eadb11207052..7b637835afd9 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -90,11 +90,12 @@ endif()
|
||||
|
||||
if (KERNEL_HEADERS_DIR)
|
||||
MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}")
|
||||
- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
|
||||
endif()
|
||||
+target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
|
||||
if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto")
|
||||
MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}")
|
||||
endif()
|
||||
+target_compile_definitions(runtime PUBLIC SYSTEM_INCLUDE_PATHS="${SYSTEM_INCLUDE_PATHS}")
|
||||
|
||||
execute_process(
|
||||
COMMAND git describe --abbrev=4 --dirty --tags
|
||||
diff --git a/src/main.cpp b/src/main.cpp
|
||||
index 3c532b3aa767..7918f90b90ab 100644
|
||||
--- a/src/main.cpp
|
||||
+++ b/src/main.cpp
|
||||
@@ -420,24 +420,20 @@ static std::optional<struct timespec> get_delta_taitime()
|
||||
|
||||
bool should_clang_parse = !(driver.root.get()->c_definitions.empty() &&
|
||||
bpftrace.btf_set_.empty());
|
||||
-
|
||||
- if (should_clang_parse)
|
||||
- {
|
||||
+ if (should_clang_parse) {
|
||||
ClangParser clang;
|
||||
+ bool found_kernel_headers;
|
||||
+ std::string ksrc, kobj;
|
||||
+ struct utsname utsname;
|
||||
std::vector<std::string> extra_flags;
|
||||
- {
|
||||
- struct utsname utsname;
|
||||
- uname(&utsname);
|
||||
- std::string ksrc, kobj;
|
||||
- auto kdirs = get_kernel_dirs(utsname);
|
||||
- ksrc = std::get<0>(kdirs);
|
||||
- kobj = std::get<1>(kdirs);
|
||||
+ uname(&utsname);
|
||||
+ found_kernel_headers = get_kernel_dirs(utsname, ksrc, kobj);
|
||||
|
||||
- if (ksrc != "")
|
||||
- {
|
||||
- extra_flags = get_kernel_cflags(
|
||||
- utsname.machine, ksrc, kobj, bpftrace.kconfig);
|
||||
- }
|
||||
+ if (found_kernel_headers)
|
||||
+ {
|
||||
+ extra_flags = get_kernel_cflags(
|
||||
+ utsname.machine, ksrc, kobj, bpftrace.kconfig);
|
||||
+ found_kernel_headers = true;
|
||||
}
|
||||
extra_flags.push_back("-include");
|
||||
extra_flags.push_back(CLANG_WORKAROUNDS_H);
|
||||
@@ -453,8 +449,20 @@ static std::optional<struct timespec> get_delta_taitime()
|
||||
extra_flags.push_back(file);
|
||||
}
|
||||
|
||||
- if (!clang.parse(driver.root.get(), bpftrace, extra_flags))
|
||||
+ if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) {
|
||||
+ if (!found_kernel_headers) {
|
||||
+ LOG(WARNING)
|
||||
+ << "Could not find kernel headers in " << ksrc << " / " << kobj
|
||||
+ << ". To specify a particular path to kernel headers, set the env "
|
||||
+ << "variables BPFTRACE_KERNEL_SOURCE and, optionally, "
|
||||
+ << "BPFTRACE_KERNEL_BUILD if the kernel was built in a different "
|
||||
+ << "directory than its source. You can also point the variable to "
|
||||
+ << "a directory with built-in headers extracted from the following "
|
||||
+ << "snippet:\nmodprobe kheaders && tar -C <directory> -xf "
|
||||
+ << "/sys/kernel/kheaders.tar.xz";
|
||||
+ }
|
||||
return nullptr;
|
||||
+ }
|
||||
}
|
||||
|
||||
err = driver.parse();
|
||||
diff --git a/src/utils.cpp b/src/utils.cpp
|
||||
index c358a401fc83..06d7fa95ff6e 100644
|
||||
--- a/src/utils.cpp
|
||||
+++ b/src/utils.cpp
|
||||
@@ -700,8 +700,8 @@ bool is_dir(const std::string& path)
|
||||
return std_filesystem::is_directory(buf, ec);
|
||||
}
|
||||
|
||||
-// get_kernel_dirs returns {ksrc, kobj} - directories for pristine and
|
||||
-// generated kernel sources.
|
||||
+// get_kernel_dirs fills {ksrc, kobj} - directories for pristine and
|
||||
+// generated kernel sources - and returns if they were found.
|
||||
//
|
||||
// When the kernel was built in its source tree ksrc == kobj, however when
|
||||
// the kernel was build in a different directory than its source, ksrc != kobj.
|
||||
@@ -714,44 +714,41 @@ bool is_dir(const std::string& path)
|
||||
//
|
||||
// /lib/modules/`uname -r`/build/
|
||||
//
|
||||
-// {"", ""} is returned if no trace of kernel headers was found at all.
|
||||
-// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
|
||||
-std::tuple<std::string, std::string> get_kernel_dirs(
|
||||
- const struct utsname &utsname)
|
||||
+// false is returned if no trace of kernel headers was found at all, with the guessed
|
||||
+// location set anyway for later warning.
|
||||
+// Both ksrc and kobj are guaranteed to be != ""
|
||||
+bool get_kernel_dirs(const struct utsname &utsname,
|
||||
+ std::string &ksrc,
|
||||
+ std::string &kobj)
|
||||
{
|
||||
-#ifdef KERNEL_HEADERS_DIR
|
||||
- return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR};
|
||||
-#endif
|
||||
+ ksrc = kobj = std::string(KERNEL_HEADERS_DIR);
|
||||
+ if (!ksrc.empty())
|
||||
+ return true;
|
||||
|
||||
const char *kpath_env = ::getenv("BPFTRACE_KERNEL_SOURCE");
|
||||
if (kpath_env)
|
||||
{
|
||||
+ ksrc = std::string(kpath_env);
|
||||
const char *kpath_build_env = ::getenv("BPFTRACE_KERNEL_BUILD");
|
||||
- if (!kpath_build_env)
|
||||
+ if (kpath_build_env)
|
||||
{
|
||||
- kpath_build_env = kpath_env;
|
||||
+ kobj = std::string(kpath_build_env);
|
||||
+ } else {
|
||||
+ kobj = ksrc;
|
||||
}
|
||||
- return std::make_tuple(kpath_env, kpath_build_env);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
std::string kdir = std::string("/lib/modules/") + utsname.release;
|
||||
- auto ksrc = kdir + "/source";
|
||||
- auto kobj = kdir + "/build";
|
||||
+ ksrc = kdir + "/source";
|
||||
+ kobj = kdir + "/build";
|
||||
|
||||
// if one of source/ or build/ is not present - try to use the other one for
|
||||
// both.
|
||||
auto has_ksrc = is_dir(ksrc);
|
||||
auto has_kobj = is_dir(kobj);
|
||||
if (!has_ksrc && !has_kobj) {
|
||||
- LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or "
|
||||
- << kobj
|
||||
- << ". To specify a particular path to kernel headers, set the "
|
||||
- "env variables BPFTRACE_KERNEL_SOURCE and, optionally, "
|
||||
- "BPFTRACE_KERNEL_BUILD if the kernel was built in a "
|
||||
- "different directory than its source. To create kernel "
|
||||
- "headers run 'modprobe kheaders', which will create a tar "
|
||||
- "file at /sys/kernel/kheaders.tar.xz";
|
||||
- return std::make_tuple("", "");
|
||||
+ return false;
|
||||
}
|
||||
if (!has_ksrc) {
|
||||
ksrc = kobj;
|
||||
@@ -759,7 +756,7 @@ std::tuple<std::string, std::string> get_kernel_dirs(
|
||||
kobj = ksrc;
|
||||
}
|
||||
|
||||
- return std::make_tuple(ksrc, kobj);
|
||||
+ return true;
|
||||
}
|
||||
|
||||
const std::string &is_deprecated(const std::string &str)
|
||||
diff --git a/src/utils.h b/src/utils.h
|
||||
index bc78bd2176b5..9bd5395eab22 100644
|
||||
--- a/src/utils.h
|
||||
+++ b/src/utils.h
|
||||
@@ -186,8 +186,9 @@ std::vector<int> get_online_cpus();
|
||||
std::vector<int> get_possible_cpus();
|
||||
bool is_dir(const std::string &path);
|
||||
bool file_exists_and_ownedby_root(const char *f);
|
||||
-std::tuple<std::string, std::string> get_kernel_dirs(
|
||||
- const struct utsname &utsname);
|
||||
+bool get_kernel_dirs(const struct utsname &utsname,
|
||||
+ std::string &ksrc,
|
||||
+ std::string &kobj);
|
||||
std::vector<std::string> get_kernel_cflags(const char *uname_machine,
|
||||
const std::string &ksrc,
|
||||
const std::string &kobj,
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@ -1,94 +0,0 @@
|
||||
From c1737d4ab6ab263932caa9e3ac170ebe3e28d404 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 14 Jun 2024 21:56:46 +0900
|
||||
Subject: [PATCH] clang_parser system_include_paths: allow overriding at
|
||||
compile time
|
||||
|
||||
While bpftrace depends on libclang it can be installed without a clang
|
||||
frontend, so some distributions might want to make these paths fixed as
|
||||
they are unlikely to change.
|
||||
|
||||
In particular, this is necessary to include system libraries as used by
|
||||
older versions of tcpaccept.bt (they now no longer require these since
|
||||
#3152, but that illustrate this was a recurring problem)
|
||||
|
||||
(cherry picked from commit 5bf5f86313600b16c8c23e03b31337941cbefdd0)
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
src/CMakeLists.txt | 4 +++-
|
||||
src/clang_parser.cpp | 19 +++++++++++++++----
|
||||
3 files changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index cd620d0e56e5..ade33c503efb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -21,6 +21,8 @@ set(VENDOR_GTEST OFF CACHE BOOL "Clone gtest from github")
|
||||
set(BUILD_FUZZ OFF CACHE BOOL "Build bpftrace for fuzzing")
|
||||
set(USE_LIBFUZZER OFF CACHE BOOL "Use libfuzzer for fuzzing")
|
||||
set(FUZZ_TARGET "codegen" CACHE STRING "Fuzzing target")
|
||||
+set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
|
||||
+set(SYSTEM_INCLUDE_PATHS "auto" CACHE STRING "Hard-code system include paths (colon separated, the default value \"auto\" queries clang at runtime)")
|
||||
|
||||
set(ENABLE_SKB_OUTPUT ON CACHE BOOL "Enable skb_output, will include libpcap")
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 88f5928c8a75..eadb11207052 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -88,11 +88,13 @@ endif()
|
||||
|
||||
# compile definitions
|
||||
|
||||
-set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
|
||||
if (KERNEL_HEADERS_DIR)
|
||||
MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}")
|
||||
target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
|
||||
endif()
|
||||
+if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto")
|
||||
+ MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}")
|
||||
+endif()
|
||||
|
||||
execute_process(
|
||||
COMMAND git describe --abbrev=4 --dirty --tags
|
||||
diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
|
||||
index 8b6689454267..9367e6692eb0 100644
|
||||
--- a/src/clang_parser.cpp
|
||||
+++ b/src/clang_parser.cpp
|
||||
@@ -882,11 +882,9 @@ std::string ClangParser::get_arch_include_path()
|
||||
return "/usr/include/" + std::string(utsname.machine) + "-linux-gnu";
|
||||
}
|
||||
|
||||
-std::vector<std::string> ClangParser::system_include_paths()
|
||||
+static void query_clang_include_dirs(std::vector<std::string> &result)
|
||||
{
|
||||
- std::vector<std::string> result;
|
||||
- try
|
||||
- {
|
||||
+ try {
|
||||
auto clang = "clang-" + std::to_string(LLVM_VERSION_MAJOR);
|
||||
auto cmd = clang + " -Wp,-v -x c -fsyntax-only /dev/null 2>&1";
|
||||
auto check = exec_system(cmd.c_str());
|
||||
@@ -902,6 +900,19 @@ std::vector<std::string> ClangParser::system_include_paths()
|
||||
catch (std::runtime_error &)
|
||||
{ // If exec_system fails, just ignore it
|
||||
}
|
||||
+}
|
||||
+
|
||||
+std::vector<std::string> ClangParser::system_include_paths()
|
||||
+{
|
||||
+ std::vector<std::string> result;
|
||||
+ std::istringstream lines(SYSTEM_INCLUDE_PATHS);
|
||||
+ std::string line;
|
||||
+ while (std::getline(lines, line, ':')) {
|
||||
+ if (line == "auto")
|
||||
+ query_clang_include_dirs(result);
|
||||
+ else
|
||||
+ result.push_back(trim(line));
|
||||
+ }
|
||||
|
||||
if (result.empty())
|
||||
result = { "/usr/local/include", "/usr/include" };
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@ -4,18 +4,19 @@
|
||||
, cereal, asciidoctor
|
||||
, cmake, pkg-config, flex, bison
|
||||
, util-linux
|
||||
, fetchpatch
|
||||
, nixosTests
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bpftrace";
|
||||
version = "0.20.4";
|
||||
version = "0.21.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iovisor";
|
||||
repo = "bpftrace";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-GJSUHMOp3vCWj8C+1mBHcnUgxLUWUz8Jd8wpq7u0q3s=";
|
||||
hash = "sha256-/2m+5iFE7R+ZEc/VcgWAhkLD/jEK88roUUOUyYODi0U=";
|
||||
};
|
||||
|
||||
|
||||
@ -45,16 +46,17 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
patches = [
|
||||
# https://github.com/bpftrace/bpftrace/pull/3243 (merged)
|
||||
./override-system-headers.patch
|
||||
# https://github.com/bpftrace/bpftrace/pull/3152 (merged)
|
||||
./tcp-bt-no-includes.patch
|
||||
# https://github.com/bpftrace/bpftrace/pull/3262 (merged)
|
||||
./runqlat-bt-no-includes.patch
|
||||
# https://github.com/bpftrace/bpftrace/pull/3242 (merged)
|
||||
./kheaders-not-found-message-fix.patch
|
||||
# https://github.com/bpftrace/bpftrace/pull/3265
|
||||
./kheaders-not-found-message-only-on-error.patch
|
||||
(fetchpatch {
|
||||
name = "runqlat-bt-no-includes.patch";
|
||||
url = "https://github.com/bpftrace/bpftrace/pull/3262.patch";
|
||||
hash = "sha256-9yqaZeG1Uf2cC9Aa40c2QUTQRl8n2NO1nq278hf9P4M=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "kheaders-not-found-message-only-on-error.patch";
|
||||
url = "https://github.com/bpftrace/bpftrace/pull/3265.patch";
|
||||
hash = "sha256-8AICMzwq5Evy9+hmZhFjccw/HmgZ9t+YIoHApjLv6Uc=";
|
||||
excludes = [ "CHANGELOG.md" ];
|
||||
})
|
||||
];
|
||||
|
||||
# Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 9b5f22854297aabb924969c25af66461d8d2fcb9 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Fri, 21 Jun 2024 21:02:09 +0900
|
||||
Subject: [PATCH] tools/runqlat: provide TASK_RUNNING as a define
|
||||
|
||||
runqlat requires kernel headers to run even with BTF, just because of a
|
||||
define.
|
||||
TASK_RUNNING isn't part of the stable API but it's never changed in all
|
||||
of the linux git history so let's pretend it's stable and just define
|
||||
it.
|
||||
|
||||
If we find a way to handle kheaders again in the future we might want to
|
||||
consider reverting this.
|
||||
|
||||
Fixes: #3255
|
||||
(cherry picked from commit aa041d9d85f9ec11235c39fdcb5833412ec27083)
|
||||
---
|
||||
tools/runqlat.bt | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/tools/runqlat.bt b/tools/runqlat.bt
|
||||
index 3d71b76062eb..1298f399aee7 100755
|
||||
--- a/tools/runqlat.bt
|
||||
+++ b/tools/runqlat.bt
|
||||
@@ -11,7 +11,17 @@
|
||||
* 17-Sep-2018 Brendan Gregg Created this.
|
||||
*/
|
||||
|
||||
+#ifndef BPFTRACE_HAVE_BTF
|
||||
#include <linux/sched.h>
|
||||
+#else
|
||||
+/*
|
||||
+ * With BTF providing types, full headers are not needed.
|
||||
+ * We only need to supply the preprocessor defines used in this script.
|
||||
+ * TASK_RUNNING is not arch-dependant and has not changed in the linux
|
||||
+ * git history (it is not part of the stable API though)
|
||||
+ */
|
||||
+#define TASK_RUNNING 0
|
||||
+#endif
|
||||
|
||||
BEGIN
|
||||
{
|
||||
--
|
||||
2.45.2
|
||||
|
||||
@ -1,114 +0,0 @@
|
||||
From ebb12512f6ea0a1113ad8ddf30db26128f7a3426 Mon Sep 17 00:00:00 2001
|
||||
From: Dominique Martinet <asmadeus@codewreck.org>
|
||||
Date: Sun, 23 Jun 2024 20:41:01 +0900
|
||||
Subject: [PATCH] With BTF, users do not need libc headers installed for
|
||||
AF_INET/AF_INET6
|
||||
|
||||
Signed-off-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
|
||||
(cherry picked from commit c0b9d252a43f99b9091245dedb178a6874803306)
|
||||
---
|
||||
tools/tcpaccept.bt | 8 +++++++-
|
||||
tools/tcpconnect.bt | 8 +++++++-
|
||||
tools/tcpdrop.bt | 8 +++++++-
|
||||
tools/tcplife.bt | 8 +++++++-
|
||||
tools/tcpretrans.bt | 8 +++++++-
|
||||
5 files changed, 35 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/tools/tcpaccept.bt b/tools/tcpaccept.bt
|
||||
index 08e6af0158fc..cbffe36889ee 100755
|
||||
--- a/tools/tcpaccept.bt
|
||||
+++ b/tools/tcpaccept.bt
|
||||
@@ -20,7 +20,13 @@
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#else
|
||||
-#include <sys/socket.h>
|
||||
+/*
|
||||
+ * With BTF providing types, socket headers are not needed.
|
||||
+ * We only need to supply the preprocessor defines in this script.
|
||||
+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
|
||||
+ */
|
||||
+#define AF_INET 2
|
||||
+#define AF_INET6 10
|
||||
#endif
|
||||
|
||||
BEGIN
|
||||
diff --git a/tools/tcpconnect.bt b/tools/tcpconnect.bt
|
||||
index 1ac1eb99e9ad..636337275cd8 100755
|
||||
--- a/tools/tcpconnect.bt
|
||||
+++ b/tools/tcpconnect.bt
|
||||
@@ -22,7 +22,13 @@
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#else
|
||||
-#include <sys/socket.h>
|
||||
+/*
|
||||
+ * BTF provides the types, we just need to define AF_INET and AF_INET6.
|
||||
+ * These are Linux ABI defines, and are not architecture-specific.
|
||||
+ * With BTF, this allows tcpconnect.bt to work without glibc headers:
|
||||
+ */
|
||||
+#define AF_INET 2 /* IPv4 */
|
||||
+#define AF_INET6 10 /* IPv6 */
|
||||
#endif
|
||||
|
||||
BEGIN
|
||||
diff --git a/tools/tcpdrop.bt b/tools/tcpdrop.bt
|
||||
index fd3e55f490bf..a56bf69fcc6c 100755
|
||||
--- a/tools/tcpdrop.bt
|
||||
+++ b/tools/tcpdrop.bt
|
||||
@@ -24,7 +24,13 @@
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#else
|
||||
-#include <sys/socket.h>
|
||||
+/*
|
||||
+ * With BTF providing types, socket headers are not needed.
|
||||
+ * We only need to supply the preprocessor defines in this script.
|
||||
+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
|
||||
+ */
|
||||
+#define AF_INET 2
|
||||
+#define AF_INET6 10
|
||||
#endif
|
||||
|
||||
BEGIN
|
||||
diff --git a/tools/tcplife.bt b/tools/tcplife.bt
|
||||
index dd4c1d68284e..d5a09c4e5da9 100755
|
||||
--- a/tools/tcplife.bt
|
||||
+++ b/tools/tcplife.bt
|
||||
@@ -19,7 +19,13 @@
|
||||
#include <linux/socket.h>
|
||||
#include <linux/tcp.h>
|
||||
#else
|
||||
-#include <sys/socket.h>
|
||||
+/*
|
||||
+ * With BTF providing types, socket headers are not needed.
|
||||
+ * We only need to supply the preprocessor defines in this script.
|
||||
+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
|
||||
+ */
|
||||
+#define AF_INET 2
|
||||
+#define AF_INET6 10
|
||||
#endif
|
||||
|
||||
BEGIN
|
||||
diff --git a/tools/tcpretrans.bt b/tools/tcpretrans.bt
|
||||
index ee2975d6e545..32a11bfa81b2 100755
|
||||
--- a/tools/tcpretrans.bt
|
||||
+++ b/tools/tcpretrans.bt
|
||||
@@ -21,7 +21,13 @@
|
||||
#include <linux/socket.h>
|
||||
#include <net/sock.h>
|
||||
#else
|
||||
-#include <sys/socket.h>
|
||||
+/*
|
||||
+ * With BTF providing types, socket headers are not needed.
|
||||
+ * We only need to supply the preprocessor defines in this script.
|
||||
+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
|
||||
+ */
|
||||
+#define AF_INET 2
|
||||
+#define AF_INET6 10
|
||||
#endif
|
||||
|
||||
BEGIN
|
||||
--
|
||||
2.45.2
|
||||
|
||||
Loading…
Reference in New Issue
Block a user