import systemtap-4.6-13.el9_0
This commit is contained in:
parent
4dd5486a03
commit
90d759d2a7
|
@ -0,0 +1,38 @@
|
||||||
|
commit 9b6f4d4e4f2649b05459be4ecf48a42661163fd1
|
||||||
|
Author: Stan Cox <scox@redhat.com>
|
||||||
|
Date: Fri Feb 25 14:09:26 2022 -0500
|
||||||
|
|
||||||
|
PR28557: module probe insertion on modern kernels
|
||||||
|
|
||||||
|
Similar to commit 0425c60d7 but for return probes. Try to fully relocate
|
||||||
|
addresses, before letting the kernel try it with symbols / kallsyms.
|
||||||
|
|
||||||
|
diff --git a/runtime/linux/kprobes.c b/runtime/linux/kprobes.c
|
||||||
|
index d59935d06..09f0e0665 100644
|
||||||
|
--- a/runtime/linux/kprobes.c
|
||||||
|
+++ b/runtime/linux/kprobes.c
|
||||||
|
@@ -269,15 +269,17 @@ stapkp_prepare_kretprobe(struct stap_kprobe_probe *skp)
|
||||||
|
struct kretprobe *krp = &skp->kprobe->u.krp;
|
||||||
|
unsigned long addr = 0;
|
||||||
|
|
||||||
|
- if (! skp->symbol_name) {
|
||||||
|
- addr = stapkp_relocate_addr(skp);
|
||||||
|
- if (addr == 0)
|
||||||
|
- return 1;
|
||||||
|
- krp->kp.addr = (void *) addr;
|
||||||
|
+ // PR28557 Try a pass resolving the address now with the currently
|
||||||
|
+ // known module/section addresses within our own stap-symbols tables.
|
||||||
|
+ addr = stapkp_relocate_addr(skp);
|
||||||
|
+ if (addr != 0) {
|
||||||
|
+ krp->kp.addr = (void*) addr;
|
||||||
|
}
|
||||||
|
- else {
|
||||||
|
+ // fall back to kallsyms-based or kernel kprobes-delegated symbolic
|
||||||
|
+ // registration
|
||||||
|
+ else if (skp->symbol_name) {
|
||||||
|
if (USE_KALLSYMS_ON_EACH_SYMBOL && krp->kp.addr == 0)
|
||||||
|
- return 1;
|
||||||
|
+ return 4;
|
||||||
|
else if (!USE_KALLSYMS_ON_EACH_SYMBOL) {
|
||||||
|
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,11,0)
|
||||||
|
if (krp->kp.symbol_name == NULL)
|
|
@ -118,7 +118,7 @@ m stapdev stapdev
|
||||||
|
|
||||||
Name: systemtap
|
Name: systemtap
|
||||||
Version: 4.6
|
Version: 4.6
|
||||||
Release: 12%{?release_override}%{?dist}
|
Release: 13%{?release_override}%{?dist}
|
||||||
# for version, see also configure.ac
|
# for version, see also configure.ac
|
||||||
|
|
||||||
|
|
||||||
|
@ -162,6 +162,7 @@ Patch5: rhbz2027683.patch
|
||||||
Patch6: rhbz2047256.patch
|
Patch6: rhbz2047256.patch
|
||||||
Patch7: rhbz2039207.patch
|
Patch7: rhbz2039207.patch
|
||||||
Patch8: rhbz2058908.patch
|
Patch8: rhbz2058908.patch
|
||||||
|
Patch9: rhbz2083727.patch
|
||||||
|
|
||||||
# Build*
|
# Build*
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
@ -591,6 +592,7 @@ systemtap-runtime-virthost machine to execute systemtap scripts.
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -1287,6 +1289,9 @@ exit 0
|
||||||
|
|
||||||
# PRERELEASE
|
# PRERELEASE
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 12 2022 Frank Ch. Eigler <fche@redhat.com> - 4.6-13
|
||||||
|
- rhbz2083727: fix kernel module .return probes
|
||||||
|
|
||||||
* Fri Mar 11 2022 Frank Ch. Eigler <fche@redhat.com> - 4.6-12
|
* Fri Mar 11 2022 Frank Ch. Eigler <fche@redhat.com> - 4.6-12
|
||||||
- rhbz2058908: Change sys/sdt.h on x86-64 to stop allowing xmm registers
|
- rhbz2058908: Change sys/sdt.h on x86-64 to stop allowing xmm registers
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue