Upstream patches for PR23879, PR24875,PR24904

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,3 +1,4 @@
+*~
 /systemtap-3.1.tar.gz
 /systemtap-3.2-0.20170321git272146660f54.tar.gz
 /systemtap-3.2-0.20170406git83d186dc7f5c.tar.gz
@@ -30,86 +31,3 @@
 /systemtap-4.1-0.20190327git2ede4cecb20c.tar.gz
 /systemtap-4.1-0.20190502git446e7c358247.tar.gz
 /systemtap-4.1.tar.gz
-/systemtap-4.2-0.20190513git8b868f3dd030.tar.gz
-/systemtap-4.2-0.20190613git2d77f531a5d1.tar.gz
-/systemtap-4.2-0.20190618git47c3f6c60174.tar.gz
-/systemtap-4.2-0.20190807gitebfc300ec2ad.tar.gz
-/systemtap-4.2-0.20190827git8ffab23ff.tar.gz
-/systemtap-4.2.tar.gz
-/systemtap-4.3-0.20200112gitb1e6a6645bba.tar.gz
-/systemtap-4.3-0.20200203git6c0b74f5910a.tar.gz
-/systemtap-4.3-0.20200211git91ffb97ad335.tar.gz
-/systemtap-4.3-0.20200529git6d50a5cadb64.tar.gz
-/systemtap-4.3.tar.gz
-/systemtap-4.4-0.20200714git8212024da2ae.tar.gz
-/systemtap-4.4-0.20200714gite5a63d9c000a.tar.gz
-/systemtap-4.4-0.20200715gitce0fa621eb35.tar.gz
-/systemtap-4.4-0.20200731git87344e948606.tar.gz
-/systemtap-4.4-0.20200805git82b8e1a07.tar.gz
-/systemtap-4.4-0.20200922git05179173e71c.tar.gz
-/systemtap-4.4.tar.gz
-/systemtap-4.4-0.20201203gitf02f08bc6eff.tar.gz
-/systemtap-4.5-0.20201203git963c215e781e.tar.gz
-/systemtap-4.5-0.20201204git0d80048e02ec.tar.gz
-/systemtap-4.5-0.20201210gitd86b64029598.tar.gz
-/systemtap-4.5-0.20210105git6cb54128e005.tar.gz
-/systemtap-4.5-0.20210107gita4d01e48d435.tar.gz
-/systemtap-4.5-0.20210128gita790dc64a9d8.tar.gz
-/systemtap-4.5-0.20210129gitea81249b90b9.tar.gz
-/systemtap-4.5-0.202101291559git9e1a0f5703ad.tar.gz
-/systemtap-4.5-0.202102101544git8d5e0abc542c.tar.gz
-/systemtap-4.5-0.202102191905git0f623095ee3e.tar.gz
-/systemtap-4.5-0.202102231232git663a93e8b82b.tar.gz
-/systemtap-4.5-0.202104140931gitad00fb87e.tar.gz
-/systemtap-4.5-0.202104140933gitad00fb87e.tar.gz
-/systemtap-4.5-0.202105041345git02b6be05fb76.tar.gz
-/systemtap-4.5.tar.gz
-/systemtap-4.6-16261989g7c2751e3.tar.gz
-/systemtap-4.6~pre16262008gbff2b2ff.tar.gz
-/systemtap-4.6~pre16262012gc7f1c12e.tar.gz
-/systemtap-4.6~pre16262021g84ef6bd9.tar.gz
-/systemtap-4.6~pre16291338gf2c14776.tar.gz
-/systemtap-4.6.tar.gz
-/systemtap-4.7~pre16378386g61a4c8f8.tar.gz
-/systemtap-4.7~pre16383943gecab2afe.tar.gz
-/systemtap-4.7~pre16388948g209b5a19.tar.gz
-/systemtap-4.7~pre16395042gefae8a3d.tar.gz
-/systemtap-4.7~pre16432070g1d2cb8b3.tar.gz
-/systemtap-4.7~pre16433134g7d871ab5.tar.gz
-/systemtap-4.7~pre16468670g9f253544.tar.gz
-/systemtap-4.7.tar.gz
-/systemtap-4.8~pre16557277g2882dcc9.tar.gz
-/systemtap-4.8~pre16578235g069e109c.tar.gz
-/systemtap-4.8~pre16594727g09f1b7bb.tar.gz
-/systemtap-4.8~pre16594741g5bdc37b9.tar.gz
-/systemtap-4.8~pre16650659g6a096a7d.tar.gz
-/systemtap-4.8.tar.gz
-/systemtap-4.9.tar.gz
-/systemtap-5.0~pre16885197g6b17715f.tar.gz
-/systemtap-5.0~pre16885234gd98d6c2d.tar.gz
-/systemtap-5.0~pre16890184ge891a37e.tar.gz
-/systemtap-5.0~pre16891249ge891a37e.tar.gz
-/systemtap-5.0~pre16958465gca71442b.tar.gz
-/systemtap-5.0.tar.gz
-/systemtap-5.1~pre17056120g2ccc0c4c.tar.gz
-/systemtap-5.1~pre17056139g6c0b92b3.tar.gz
-/systemtap-5.1~pre17059382g67086c54.tar.gz
-/systemtap-5.1~pre17060399gb6abf4bd.tar.gz
-/systemtap-5.1~pre17062114g2604d135.tar.gz
-/systemtap-5.1~pre17062192g5fd8daba.tar.gz
-/systemtap-5.1.tar.gz
-/systemtap-5.1~pre17206206ge48abca5.tar.gz
-/systemtap-5.2~pre17206355g1a07290a.tar.gz
-/systemtap-5.2~pre17224323g98d1ea34.tar.gz
-/systemtap-5.2~pre17250223gd07e4284.tar.gz
-/systemtap-5.2~pre17277956g0b7f6722.tar.gz
-/systemtap-5.2~pre17283218gc5774e18.tar.gz
-/systemtap-5.2.tar.gz
-/systemtap-5.2~pre17373420g1e894ff0.tar.gz
-/systemtap-5.3~pre17373422g9a48fbea.tar.gz
-/systemtap-5.3~pre17373794g3efe129d.tar.gz
-/systemtap-5.3~pre17373816g7a71d34b.tar.gz
-/systemtap-5.3.tar.gz
-/systemtap-5.4~pre17585473g1fe4178d.tar.gz
-/systemtap-5.4~pre17585496g86ab88eb.tar.gz
-/systemtap-5.4.tar.gz

PR23879-PR24875.patch

@@ -0,0 +1,42 @@
+From 4ae4592f1106e941023a5768d34c2381cc869631 Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@redhat.com>
+Date: Wed, 21 Aug 2019 19:29:45 -0400
+Subject: [PATCH] PR23879, PR24875: fix task-finder-vma on f29+
+
+It was reported & rediscovered that some vma-dependent runtime
+facilities have been broken: @vma() and *ubacktrace().  It turns out
+that modern gcc/ld.so links/loads binaries in slightly different ways
+than older toolchains.  Specifically, the first page of ELF files is
+now loaded only r--p instead of r-xp protection flags.  The
+_stp_vma_mmap_cb() routine now accepts the r--p case too.  It now
+ignores the flags entirely.
+---
+ runtime/vma.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/runtime/vma.c b/runtime/vma.c
+index 7021725d6..02f9bf849 100644
+--- a/runtime/vma.c
++++ b/runtime/vma.c
+@@ -157,10 +157,15 @@ static int _stp_vma_mmap_cb(struct stap_task_finder_target *tgt,
+ 	dbug_task_vma(1,
+ 		  "mmap_cb: tsk %d:%d path %s, addr 0x%08lx, length 0x%08lx, offset 0x%lx, flags 0x%lx\n",
+ 		  tsk->pid, tsk->tgid, path, addr, length, offset, vm_flags);
+-	// We are only interested in the first load of the whole module that
+-	// is executable. We register whether or not we know the module,
++        
++	// We used to be only interested in the first load of the whole module that
++	// is executable.  But with modern enough gcc/ld.so, executables are mapped
++        // in more small pieces (r--p,r-xp,rw-p, instead of r-xp, rw-p).  To establish
++        // the virtual base address, we initially look for an offset=0 mapping.
++        //
++        // We register whether or not we know the module,
+ 	// so we can later lookup the name given an address for this task.
+-	if (path != NULL && offset == 0 && (vm_flags & VM_EXEC)
++	if (path != NULL && offset == 0
+ 	    && stap_find_vma_map_info(tsk, addr, NULL, NULL, NULL, NULL) != 0) {
+ 		for (i = 0; i < _stp_num_modules; i++) {
+ 			// PR20433: papering over possibility of NULL pointers
+-- 
+2.21.0
+

PR24904-changes-wit.patch

@@ -0,0 +1,26 @@
+From f4f0da6db3be523472b25a219ea245fd6d3489f9 Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@redhat.com>
+Date: Tue, 20 Aug 2019 22:17:02 -0400
+Subject: [PATCH] PR24904: support linux 5.2's stacktrace.c changes with
+ -DDEBUG_UNWIND too
+
+---
+ runtime/stack.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/stack.c b/runtime/stack.c
+index bf59b2909..6ec7b2602 100644
+--- a/runtime/stack.c
++++ b/runtime/stack.c
+@@ -56,7 +56,7 @@ _stp_init_stack(void)
+ {
+ 	stack_trace_save_regs_fn = (void*) kallsyms_lookup_name("stack_trace_save_regs");
+ 	dbug_unwind(1, "stack_trace_saves_regs_fn=%lx for _stp_stack_print_fallback().\n",
+-		    (unsigned long) save_trace_save_regs_fn);
++		    (unsigned long) stack_trace_save_regs_fn);
+ 	return 0;
+ }
+ 
+-- 
+2.21.0
+

PR24904-changes.patch

@@ -0,0 +1,130 @@
+From 49fa913a61e7f2941bb59c11d72a1aafa6930162 Mon Sep 17 00:00:00 2001
+From: "Frank Ch. Eigler" <fche@redhat.com>
+Date: Tue, 20 Aug 2019 21:20:40 -0400
+Subject: [PATCH] PR24904: support linux 5.2's stacktrace.c changes
+
+The following kernel commit disabled the older struct stack_trace APIs
+on architectures that support the newer stackwalk APIs.  Provide an
+adaptation layer to stack_trace_save_regs().
+
+commit 214d8ca6ee854f696f75e75511fe66b409e656db
+Author: Thomas Gleixner <tglx@linutronix.de>
+Date:   Thu Apr 25 11:45:21 2019 +0200
+
+    stacktrace: Provide common infrastructure
+---
+ buildrun.cxx                                  |  2 +
+ .../linux/autoconf-stack-trace-save-regs.c    |  8 ++++
+ runtime/stack.c                               | 37 +++++++++++++++++--
+ 3 files changed, 44 insertions(+), 3 deletions(-)
+ create mode 100644 runtime/linux/autoconf-stack-trace-save-regs.c
+
+diff --git a/buildrun.cxx b/buildrun.cxx
+index 5e8d3b961..6ed744707 100644
+--- a/buildrun.cxx
++++ b/buildrun.cxx
+@@ -485,6 +485,8 @@ compile_pass (systemtap_session& s)
+   output_autoconf(s, o, "autoconf-bio-bi_opf.c", "STAPCONF_BIO_BI_OPF", NULL);
+   output_autoconf(s, o, "autoconf-linux-sched_headers.c",
+ 		  "STAPCONF_LINUX_SCHED_HEADERS", NULL);
++  output_autoconf(s, o, "autoconf-stack-trace-save-regs.c",
++		  "STAPCONF_STACK_TRACE_SAVE_REGS", NULL);
+ 
+   // used by runtime/linux/netfilter.c
+   output_exportconf(s, o, "nf_register_hook", "STAPCONF_NF_REGISTER_HOOK");
+diff --git a/runtime/linux/autoconf-stack-trace-save-regs.c b/runtime/linux/autoconf-stack-trace-save-regs.c
+new file mode 100644
+index 000000000..8bf33391f
+--- /dev/null
++++ b/runtime/linux/autoconf-stack-trace-save-regs.c
+@@ -0,0 +1,8 @@
++#include <linux/stacktrace.h>
++
++unsigned int foo ()
++{
++        unsigned long e[10];
++        struct pt_regs* r = 0;
++        return stack_trace_save_regs (r, & e[0], 10, 0);
++}
+diff --git a/runtime/stack.c b/runtime/stack.c
+index 0f649e8da..bf59b2909 100644
+--- a/runtime/stack.c
++++ b/runtime/stack.c
+@@ -39,6 +39,7 @@
+ #include "linux/uprobes-inc.h"
+ 
+ #include <linux/stacktrace.h>
++
+ #if defined(STAPCONF_KERNEL_STACKTRACE) || defined(STAPCONF_KERNEL_STACKTRACE_NO_BP)
+ #include <asm/stacktrace.h>
+ #endif
+@@ -47,6 +48,20 @@
+ #include <asm/unwind.h>
+ #endif
+ 
++#if defined(STAPCONF_STACK_TRACE_SAVE_REGS) /* linux 5.2+ apprx. */
++static __typeof__(stack_trace_save_regs) (*stack_trace_save_regs_fn); /* not exported */
++
++static int
++_stp_init_stack(void)
++{
++	stack_trace_save_regs_fn = (void*) kallsyms_lookup_name("stack_trace_save_regs");
++	dbug_unwind(1, "stack_trace_saves_regs_fn=%lx for _stp_stack_print_fallback().\n",
++		    (unsigned long) save_trace_save_regs_fn);
++	return 0;
++}
++
++#else /* ! STAPCONF_STACK_TRACE_SAVE_REGS */
++
+ static void (*(save_stack_trace_regs_fn))(struct pt_regs *regs,
+ 				  struct stack_trace *trace);
+ 
+@@ -60,6 +75,10 @@ _stp_init_stack(void)
+ 	return 0;
+ }
+ 
++#endif /* STAPCONF_STACK_TRACE_SAVE_REGS */
++
++
++
+ static void _stp_stack_print_fallback(unsigned long, struct pt_regs*, int, int, int);
+ 
+ #ifdef STP_USE_DWARF_UNWINDER
+@@ -168,9 +187,19 @@ static void _stp_stack_print_fallback(unsigned long sp, struct pt_regs *regs,
+ 				      int sym_flags,
+ 				      int levels, int skip) {
+ 	unsigned long entries[MAXBACKTRACE];
+-	struct stack_trace trace;
+-	int i;
++        unsigned i;
++        unsigned num_entries;
++        
++#if defined(STAPCONF_STACK_TRACE_SAVE_REGS) /* linux 5.2+ apprx. */
++	if (!stack_trace_save_regs_fn) {
++		dbug_unwind(1, "no fallback kernel stacktrace (giving up)\n");
++		_stp_print_addr(0, sym_flags | _STP_SYM_INEXACT, NULL);
++		return;
++	}
+ 
++        num_entries = (*stack_trace_save_regs_fn)(regs, &entries[0], MAXBACKTRACE, skip);
++#else
++	struct stack_trace trace;
+ 	/* If don't have save_stack_trace_regs unwinder, just give up. */
+ 	if (!save_stack_trace_regs_fn) {
+ 		dbug_unwind(1, "no fallback kernel stacktrace (giving up)\n");
+@@ -189,9 +218,11 @@ static void _stp_stack_print_fallback(unsigned long sp, struct pt_regs *regs,
+ 	dbug_unwind(1, "trace.nr_entries: %d\n", trace.nr_entries);
+ 	dbug_unwind(1, "trace.max_entries: %d\n", trace.max_entries);
+ 	dbug_unwind(1, "trace.skip %d\n", trace.skip);
++        num_entries = trace.nr_entries;
++#endif
+ 
+ 	/* save_stack_trace_reg() adds a ULONG_MAX after last valid entry. Ignore it. */
+-	for (i=0; i<MAXBACKTRACE && i<trace.nr_entries && entries[i]!=ULONG_MAX; ++i) {
++	for (i=0; i<MAXBACKTRACE && i<num_entries && entries[i]!=ULONG_MAX; ++i) {
+ 		/* When we have frame pointers, the unwind addresses can be
+ 		   (mostly) trusted, otherwise it is all guesswork.  */
+ #ifdef CONFIG_FRAME_POINTER
+-- 
+2.21.0
+

gating.yaml

@@ -1,30 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_testing]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
---- !Policy
-product_versions:
-  - fedora-*
-decision_contexts: [bodhi_update_push_stable]
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation}
---- !Policy
-product_versions:
-  - rhel-8
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.rebuild.validation}

plans/ci.fmf

@@ -1,12 +0,0 @@
-summary: CI Gating Plan
-discover:
-  how: fmf
-  url: https://src.fedoraproject.org/tests/systemtap-gating.git
-  ref: main
-  directory: tests
-prepare:
-  - name: prepare
-    how: shell
-    script: ./plans/prepare.sh
-execute:
-  how: tmt

plans/prepare.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# On Rawhide, the running kernel packages won't probably be avail in
-# configured repos.  Debuginfo isn't a problem, we access that using
-# the debuginfod.
-__fedora_install_deps ()
-{
-    TMPD=$(mktemp -d)
-    pushd $TMPD
-    koji download-build --rpm kernel-`uname -r` --arch `uname -i`
-    koji download-build --rpm kernel-devel-`uname -r` --arch `uname -i`
-    koji download-build --rpm kernel-modules-`uname -r` --arch `uname -i`
-    dnf -y install kernel{,-devel,-modules}-`uname -r`.rpm
-    popd
-    rm -rf $TMPD
-}
-
-set -xe
-
-source /etc/os-release
-
-# Install needed packages
-if [ "$ID" == "fedora" ]; then
-    stap-prep || __fedora_install_deps
-fi
-stap-prep
-
-# Report installed packages
-stap-report
-
-# Set up SELinux so that it allows for userspace probing
-setsebool allow_execmod on
-setsebool allow_execstack on
-setsebool deny_ptrace off
-
-set +xe

rpminspect.yaml

@@ -1,26 +0,0 @@
-
-
-# exclude ownership tests; we need setuid/gids as is
-ownership:
-  ignore:
-    - /usr/bin/staprun
-
-# this SO is for JNI only, so annobin/etc. don't know what to do with it
-annocheck:
-  ignore:
-    - /usr/libexec/systemtap/libHelperSDT.so
-
-# bytecode version 43 vs 55 complaint is a misconfiguration according to msrb
-javabytecode:
-  ignore:
-    - /usr/libexec/systemtap/HelperSDT.jar
-
-# setuid binary
-permissions:
-  ignore:
-    - /usr/bin/staprun
-
-# some stap scripts are wrapped within /bin/sh that confuses rpminspect
-shellsyntax:
-  ignore:
-    - *.stp

sources

@@ -1 +1 @@
-SHA512 (systemtap-5.4.tar.gz) = 5869fe3735e44be65ba7895a46b4ea66fcdcc21ed2ab0673c62d822730553837f816d82fd78eeca4bfe6f17fdeaa12eb2f94c0b0b7ebb8c495c961f0b6935785
+SHA512 (systemtap-4.1.tar.gz) = bc31a817fb58dcb95ad0715a9b3524c2206f08c36f6590c112088e813ef12b4398cbba9abc81dde1709e11a6b18556768d4317a52a4fc75c6812397450ea77b7

systemtap-gcc16.patch

@@ -1,13 +0,0 @@
---- systemtap-5.4/configure~	2025-10-30 14:47:35.000000000 +0000
-+++ systemtap-5.4/configure	2026-01-13 18:53:20.466037572 +0000
-@@ -3121,8 +3121,8 @@
- }
- {
-   // Unicode literals
--  char const *utf8 = u8"UTF-8 string \u2500";
--  char16_t const *utf16 = u"UTF-8 string \u2500";
-+  auto const *utf8 = u8"UTF-8 string \u2500";
-+  char16_t const *utf16 = u"UTF-16 string \u2500";
-   char32_t const *utf32 = U"UTF-32 string \u2500";
- }
- '

tests/dejagnu-smoketest/Makefile

@@ -0,0 +1,38 @@
+TOPLEVEL_NAMESPACE=fedora
+PACKAGE_NAME=systemtap
+RELATIVE_PATH=Sanity/dejagnu-smoketest
+export TESTVERSION=1.0
+export TEST=/$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
+
+.PHONY: all install download clean
+BUILT_FILES= 
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x ./runtest.sh
+
+clean:
+	rm -f *~ *.rpm $(BUILT_FILES)
+
+include /usr/share/rhts/lib/rhts-make.include
+
+# Generate the testinfo.desc here:
+$(METADATA): Makefile
+	@touch $(METADATA)
+# Change to the test owner's name
+	@echo "Owner:        Frank Ch. Eigler <fche@redhat.com>" > $(METADATA)
+	@echo "Name:         $(TEST)" >> $(METADATA)
+	@echo "Path:         $(TEST_DIR)" >> $(METADATA)
+	@echo "TestVersion:  $(TESTVERSION)" >> $(METADATA)
+	@echo "Type:         Sanity" >> $(METADATA)
+	@echo "Description:  smoke test" >> $(METADATA)
+	@echo "TestTime:     10m" >> $(METADATA)
+	@echo "RunFor:       $(PACKAGE_NAME)" >> $(METADATA)  
+	@echo "Requires:     $(PACKAGE_NAME)" >> $(METADATA)  
+	@echo "License:      GPLv2" >> $(METADATA)
+
+# You may need other fields here; see the documentation
+	rhts-lint $(METADATA)

tests/dejagnu-smoketest/PURPOSE

@@ -0,0 +1,3 @@
+Test Name: dejagnu-smoketest
+Author: 
+Short Description: Run a minimal systemtap testsuite

tests/dejagnu-smoketest/runtest.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+set -x
+
+dnf debuginfo-install -y kernel
+
+# on Fedora CI, can only assume about 1GB RAM to run these tests
+
+stap -L 'process("stap").mark("*")' | grep pass
+# stap -L 'kernel.trace("sys_enter")'
+stap -v --example helloworld.stp
+stap -v -T 10 -p4 -e 'probe kernel.function("do_exit") {println($$vars)}'
+# stap -v -T 10 -e 'probe syscall.* ? {println(argstr)}'
+
+echo
+echo RESULT: PASS

tests/tests.yml

@@ -0,0 +1,11 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-beakerlib
+    tags:
+    - classic
+    tests:
+    - dejagnu-smoketest
+    required_packages:
+    - systemtap-testsuite
+    - kernel-devel