Fix gating failures
A few fixes needed to pass gating. Some failures were also fixed in the testsuite. - Threadsnoop need to points to libpthread.so.0 instead of libpthread.so - aarch64 specific fixes: some syscall are not present on all arches. Related: rhbz#1967567 Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
This commit is contained in:
parent
5dd43e52fc
commit
d733367985
@ -47,7 +47,7 @@ index 3824bc6d..bdc6e4df 100755
|
|||||||
}
|
}
|
||||||
|
|
||||||
-uprobe:/lib/x86_64-linux-gnu/libpthread.so.0:pthread_create
|
-uprobe:/lib/x86_64-linux-gnu/libpthread.so.0:pthread_create
|
||||||
+uprobe:/usr/lib64/libpthread.so:pthread_create
|
+uprobe:/usr/lib64/libpthread.so.0:pthread_create
|
||||||
{
|
{
|
||||||
printf("%-10u %-6d %-16s %s\n", elapsed / 1e6, pid, comm,
|
printf("%-10u %-6d %-16s %s\n", elapsed / 1e6, pid, comm,
|
||||||
usym(arg2));
|
usym(arg2));
|
||||||
|
64
bpftrace-0.12.1-aarch64-fixes-statsnoop-and-opensnoop.patch
Normal file
64
bpftrace-0.12.1-aarch64-fixes-statsnoop-and-opensnoop.patch
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
From 69f6d7ff04f43451eea2fb028a84a76331bbf6ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jerome Marchand <jmarchan@redhat.com>
|
||||||
|
Date: Thu, 11 Jun 2020 14:56:36 +0200
|
||||||
|
Subject: [PATCH] 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.
|
||||||
|
|
||||||
|
The state of *stat* syscalls, is a mess. They are several generations
|
||||||
|
of the system calls, and not all arches provides all of them. For
|
||||||
|
instance, new(l)stat are missing from aarch64.
|
||||||
|
|
||||||
|
The only way I can think of fixing thess is RHEL-8 only arch specific
|
||||||
|
patches.
|
||||||
|
---
|
||||||
|
tools/opensnoop.bt | 2 --
|
||||||
|
tools/statsnoop.bt | 8 ++------
|
||||||
|
2 files changed, 2 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/opensnoop.bt b/tools/opensnoop.bt
|
||||||
|
index a7de8026..d99db93e 100755
|
||||||
|
--- a/tools/opensnoop.bt
|
||||||
|
+++ b/tools/opensnoop.bt
|
||||||
|
@@ -21,13 +21,11 @@ BEGIN
|
||||||
|
printf("%-6s %-16s %4s %3s %s\n", "PID", "COMM", "FD", "ERR", "PATH");
|
||||||
|
}
|
||||||
|
|
||||||
|
-tracepoint:syscalls:sys_enter_open,
|
||||||
|
tracepoint:syscalls:sys_enter_openat
|
||||||
|
{
|
||||||
|
@filename[tid] = args->filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
-tracepoint:syscalls:sys_exit_open,
|
||||||
|
tracepoint:syscalls:sys_exit_openat
|
||||||
|
/@filename[tid]/
|
||||||
|
{
|
||||||
|
diff --git a/tools/statsnoop.bt b/tools/statsnoop.bt
|
||||||
|
index b2d529e2..f612ea94 100755
|
||||||
|
--- a/tools/statsnoop.bt
|
||||||
|
+++ b/tools/statsnoop.bt
|
||||||
|
@@ -30,17 +30,13 @@ tracepoint:syscalls:sys_enter_statfs
|
||||||
|
@filename[tid] = args->pathname;
|
||||||
|
}
|
||||||
|
|
||||||
|
-tracepoint:syscalls:sys_enter_statx,
|
||||||
|
-tracepoint:syscalls:sys_enter_newstat,
|
||||||
|
-tracepoint:syscalls:sys_enter_newlstat
|
||||||
|
+tracepoint:syscalls:sys_enter_statx
|
||||||
|
{
|
||||||
|
@filename[tid] = args->filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
tracepoint:syscalls:sys_exit_statfs,
|
||||||
|
-tracepoint:syscalls:sys_exit_statx,
|
||||||
|
-tracepoint:syscalls:sys_exit_newstat,
|
||||||
|
-tracepoint:syscalls:sys_exit_newlstat
|
||||||
|
+tracepoint:syscalls:sys_exit_statx
|
||||||
|
/@filename[tid]/
|
||||||
|
{
|
||||||
|
$ret = args->ret;
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: bpftrace
|
Name: bpftrace
|
||||||
Version: 0.12.1
|
Version: 0.12.1
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: High-level tracing language for Linux eBPF
|
Summary: High-level tracing language for Linux eBPF
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
|
|
||||||
@ -9,6 +9,8 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
|||||||
Patch0: %{name}-%{version}-RHEL-9-fixes.patch
|
Patch0: %{name}-%{version}-RHEL-9-fixes.patch
|
||||||
Patch1: %{name}-%{version}-Fix-mdflush.patch
|
Patch1: %{name}-%{version}-Fix-mdflush.patch
|
||||||
|
|
||||||
|
Patch10: %{name}-%{version}-aarch64-fixes-statsnoop-and-opensnoop.patch
|
||||||
|
|
||||||
# Arches will be included as upstream support is added and dependencies are
|
# Arches will be included as upstream support is added and dependencies are
|
||||||
# satisfied in the respective arches
|
# satisfied in the respective arches
|
||||||
ExclusiveArch: x86_64 %{power64} aarch64 s390x
|
ExclusiveArch: x86_64 %{power64} aarch64 s390x
|
||||||
@ -38,8 +40,12 @@ and predecessor tracers such as DTrace and SystemTap
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -N
|
||||||
|
%autopatch -p1 -M 9
|
||||||
|
|
||||||
|
%ifarch aarch64
|
||||||
|
%patch10 -p1
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake . \
|
%cmake . \
|
||||||
@ -76,6 +82,10 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
|
|||||||
%{_datadir}/%{name}/tools/doc/*.txt
|
%{_datadir}/%{name}/tools/doc/*.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.12.1.5
|
||||||
|
- threadsnoop: probe libpthread.so.0
|
||||||
|
- Fix aarch64 failures
|
||||||
|
|
||||||
* Mon Oct 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.12.1.4
|
* Mon Oct 18 2021 Jerome Marchand <jmarchan@redhat.com> - 0.12.1.4
|
||||||
- Fix gating
|
- Fix gating
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user