Compare commits

..

28 Commits

Author SHA1 Message Date
openeuler-ci-bot cadc2b0389 !71 Upgrade to 5.2
From: @wangxiao65 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2024-12-17 07:41:21 +00:00
wangxiao65 4821c98fab Upgrade to 5.2 2024-12-05 12:11:00 +00:00
openeuler-ci-bot f13998008c !66 [sync] PR-61: Make stp_task_work compatible with 6.11 kernels
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2024-11-05 08:03:08 +00:00
wangxiao65 7431e24c5a Make stp task work compatable with 6.11 kernels
(cherry picked from commit 608e39de48)
2024-10-20 21:44:58 +08:00
openeuler-ci-bot 5e421e85fb !54 [sync] PR-53: add loongarch64 support
From: @openeuler-sync-bot 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2024-08-15 07:30:16 +00:00
wangqiang 28733c94fe Add basic LoongArch64 support
(cherry picked from commit db9f088765)
2024-08-15 13:48:45 +08:00
openeuler-ci-bot 60ee7da866 !48 Upgrade to 5.0
From: @SuperSix173 
Reviewed-by: @wangbin224 
Signed-off-by: @wangbin224
2024-01-27 01:50:28 +00:00
SuperSix173 4c7d1732a4 Upgrade to 5.0
Signed-off-by: SuperSix173 <liuchao173@huawei.com>
2024-01-26 18:03:37 +08:00
openeuler-ci-bot 379b83b21b !46 Upgrade to 4.9
From: @langfei295455 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2023-09-11 12:51:08 +00:00
langfei295455 f84d06efbd Upgrade to 4.9
Signed-off-by: langfei <langfei@huawei.com>
2023-09-11 16:42:25 +08:00
openeuler-ci-bot 3beaee92c6 !43 Adapts to gcc-12 and python-3.11
From: @langfei295455 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2023-08-09 06:54:56 +00:00
langfei 89deba2dad Adapts to gcc-12 and python-3.11
Signed-off-by: langfei <langfei@huawei.com>
2023-08-08 14:40:34 +08:00
openeuler-ci-bot 3c31882c55 !41 Fix some test cases fail to be executed, Resolve the sc2168 warning detected by the shellcheck tool.
From: @langfei295455 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2023-07-06 01:59:06 +00:00
langfei 73a0b1c45b Fix some test cases fail to be executed, Resolve the sc2168 warning detected by the shellcheck tool. 2023-07-05 20:18:04 +08:00
openeuler-ci-bot 54586b5245 !39 Solve systemtap build problem in openEuler:MultiLanguage
From: @langfei295455 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2023-02-06 03:43:54 +00:00
langfei 0b6e381fcb Solve systemtap build problem in openEuler:MultiLanguage
Signed-off-by: langfei <langfei@huawei.com>
2023-02-06 10:38:58 +08:00
openeuler-ci-bot 161925cca3 !35 Resolve stap-exporter.service chenge to disable when upgraded systemtap-stap-exporter package
From: @langfei295455 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2022-12-20 08:56:45 +00:00
langfei d7bae1def5 Resolve stap-exporter.service chenge to disable when upgraded systemtap-stap-exporter package
Signed-off-by: langfei <langfei@huawei.com>
2022-12-20 08:16:52 +00:00
openeuler-ci-bot 7b468f9885 !29 [sync] PR-27: 【轻量级PR】修正changelog中的错误日期
From: @openeuler-sync-bot 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-06-20 01:17:29 +00:00
openeuler-ci-bot bcf91eabdf !26 【轻量级PR】修正changelog中的错误日期
From: @konglidong 
Reviewed-by: @liqingqing_1229 
Signed-off-by: @liqingqing_1229
2022-06-20 01:07:56 +00:00
konglidong f3a88dedc6 modify bad date in changelog
(cherry picked from commit 5c059dba34)
2022-06-20 09:06:45 +08:00
konglidong aeba2d99ae modify bad date in changelog 2022-06-16 14:51:16 +08:00
openeuler-ci-bot 729da1fb58 !25 同步22.03提交:ncurses升级到6.3后,wprintw函数的调用处会报出关于Wformat=的错误
From: @zhouwenpei 
Reviewed-by: @SuperSix173 
Signed-off-by: @SuperSix173
2022-04-08 02:25:40 +00:00
zhouwenpei 8e2f8c7b2d Add int type cast to resolve gcc issue for option Wformat=2 2022-04-08 09:18:31 +08:00
openeuler-ci-bot df5d2510f5 !20 Remove requires on gcc and systemtap-devel
From: @zhouwenpei 
Reviewed-by: @SuperSix173, @liqingqing_1229 
Signed-off-by: @SuperSix173
2022-02-21 06:43:34 +00:00
zhouwenpei ce4ee0272a Remove requires on gcc and systemtap-devel 2022-02-15 16:09:04 +08:00
openeuler-ci-bot c1b3e5bfd5 !18 update verion to 4.5
From: @zhouwenpei
Reviewed-by: @liqingqing_1229
Signed-off-by: @liqingqing_1229
2021-12-03 01:00:44 +00:00
zhouwenpei 530b3c58ec update verion to 4.5 2021-12-02 21:46:00 +08:00
6 changed files with 2630 additions and 6 deletions
File diff suppressed because it is too large Load Diff
+63
View File
@@ -0,0 +1,63 @@
From 5d0424e51857d5f706e78d6d962f380fa70f49f0 Mon Sep 17 00:00:00 2001
From: langfei <langfei@huawei.com>
Date: Wed, 5 Jul 2023 10:27:11 +0800
Subject: [PATCH] fix network tcp test error
Signed-off-by: langfei <langfei@huawei.com>
---
tapset/linux/ipmib.stp | 4 ++--
tapset/linux/linuxmib.stp | 2 +-
testsuite/systemtap.examples/network/tcp_trace.stp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tapset/linux/ipmib.stp b/tapset/linux/ipmib.stp
index 6f51dfd..603c5d4 100644
--- a/tapset/linux/ipmib.stp
+++ b/tapset/linux/ipmib.stp
@@ -271,7 +271,7 @@ probe ipmib.InAddrErrors=kernel.function("ip_route_input_noref").return!,
* IPSTATS_MIB_INUNKNOWNPROTOS)
*/
/* icmp_send() is called by ip_local_deliver_finish() */
-probe ipmib.InUnknownProtos=kernel.function("icmp_send")
+probe ipmib.InUnknownProtos=kernel.function("__icmp_send")
{
skb = $skb_in;
op = 1;
@@ -360,7 +360,7 @@ probe ipmib.OutRequests=kernel.function("ip_output"),
* counted in the global @ReasmTimeout (equivalent to SNMP's MIB
* IPSTATS_MIB_REASMTIMEOUT)
*/
-probe ipmib.ReasmTimeout=kernel.function("icmp_send")
+probe ipmib.ReasmTimeout=kernel.function("__icmp_send")
{
skb = $skb_in;
op = 0;
diff --git a/tapset/linux/linuxmib.stp b/tapset/linux/linuxmib.stp
index 63ec248..cb92875 100644
--- a/tapset/linux/linuxmib.stp
+++ b/tapset/linux/linuxmib.stp
@@ -30,7 +30,7 @@ probe linuxmib.DelayedACKs = _linuxmib.DelayedACKs.* {}
probe _linuxmib.DelayedACKs.A = kernel.function("tcp_send_ack")
{
- sk=$sk
+ sk=pointer_arg(1)
if ( !indelack_timer[sk] ) next
op=1
key = linuxmib_filter_key(sk,op);
diff --git a/testsuite/systemtap.examples/network/tcp_trace.stp b/testsuite/systemtap.examples/network/tcp_trace.stp
index 65a32f2..98c77c0 100755
--- a/testsuite/systemtap.examples/network/tcp_trace.stp
+++ b/testsuite/systemtap.examples/network/tcp_trace.stp
@@ -192,7 +192,7 @@ probe kernel.{function("tcp_rcv_established"),
}
}
-probe kernel.function("tcp_transmit_skb")
+probe kernel.function("__tcp_transmit_skb")
{
sk = $sk
key = filter_key(sk)
--
2.33.0
@@ -0,0 +1,26 @@
From cea3c6a744e5f0d2017e5cc11033b8d226b482f9 Mon Sep 17 00:00:00 2001
From: langfei <langfei@huawei.com>
Date: Wed, 5 Jul 2023 10:45:23 +0800
Subject: [PATCH] local is only valid in functions for shellcheck sc2168
Signed-off-by: langfei <langfei@huawei.com>
---
doc/Tapset_Reference_Guide/publicanize.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/Tapset_Reference_Guide/publicanize.sh b/doc/Tapset_Reference_Guide/publicanize.sh
index 330409e..97254fe 100755
--- a/doc/Tapset_Reference_Guide/publicanize.sh
+++ b/doc/Tapset_Reference_Guide/publicanize.sh
@@ -22,7 +22,7 @@ do
val=`printf %s $1 | awk -F= '{print $2}'`
shift
if test -z "$val"; then
- local possibleval=$1
+ possibleval=$1
printf %s $1 "$possibleval" | grep ^- >/dev/null 2>&1
if test "$?" != "0"; then
val=$possibleval
--
2.33.0
Binary file not shown.
Binary file not shown.
+99 -6
View File
@@ -21,19 +21,23 @@
%undefine __brp_mangle_shebangs
Name: systemtap
Version: 4.5
Version: 5.2
Release: 1
Summary: Linux trace and probe tool
License: GPLv2+ and Public Domain
URL: http://sourceware.org/systemtap
Source: https://sourceware.org/systemtap/ftp/releases/%{name}-%{version}.tar.gz
Patch9000: huawei-fix-network-tcp-test-error.patch
Patch9001: huawei-local-is-only-valid-in-functions-for-shellche-sc2168.patch
Patch9002: Add-basic-LoongArch64-support.patch
BuildRequires: gcc-c++ emacs systemd python3-setuptools
BuildRequires: gettext-devel rpm-devel readline-devel
BuildRequires: pkgconfig(nss) pkgconfig(avahi-client)
BuildRequires: pkgconfig(ncurses) pkgconfig(json-c)
BuildRequires: jpackage-utils python3-devel
BuildRequires: elfutils-devel >= 0.142
BuildRequires: elfutils-devel >= 0.142 elfutils-debuginfod-client elfutils-debuginfod-client-devel
BuildRequires: sqlite-devel > 3.7
%if %{with_dyninst}
BuildRequires: dyninst-devel >= 8.0
@@ -44,7 +48,6 @@ BuildRequires: crash-devel zlib-devel
%endif
Requires: systemtap-client = %{version}-%{release}
Requires: systemtap-devel = %{version}-%{release}
%description
SystemTap is an instrumentation system for systems running Linux.
@@ -55,7 +58,7 @@ the components needed to locally develop and execute systemtap scripts.
%package devel
Summary: Programmable system-wide instrumentation system - development headers, tools
License: GPLv2+
Requires: gcc make kernel-devel systemd
Requires: make kernel-devel systemd
%description devel
This package contains the components needed to compile a systemtap
@@ -130,6 +133,7 @@ Requires: dejagnu which elfutils grep nc
Requires: gcc gcc-c++ make glibc-devel
Requires: strace nc avahi perf
Requires: systemtap-runtime-python3 = %{version}-%{release}
Requires: elfutils-debuginfod
%if %{with_crash}
Requires: crash
%endif
@@ -160,6 +164,17 @@ This package includes files for a systemd service that manages
systemtap sessions and relays prometheus metrics from the sessions
to remote requesters on demand.
%package jupyter
Summary: ISystemtap jupyter kernel and examples
License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: systemtap = %{version}-%{release}
%description jupyter
This package includes files needed to build and run
the interactive systemtap Jupyter kernel, either locally
or within a container.
%package help
Summary: systemtap manual
License: GPLv2+
@@ -169,7 +184,7 @@ URL: http://sourceware.org/systemtap
This package include systemtap manual
%prep
%setup -q %{?setup_elfutils}
%autosetup -p1
%build
%configure \
@@ -261,6 +276,10 @@ install -m 644 stap-exporter/stap-exporter.8* $RPM_BUILD_ROOT%{_mandir}/man8
getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr
getent group stapsys >/dev/null || groupadd -g 157 -r stapsys 2>/dev/null || groupadd -r stapsys
getent group stapdev >/dev/null || groupadd -g 158 -r stapdev 2>/dev/null || groupadd -r stapdev
getent group stapunpriv >/dev/null || groupadd -g 159 -r stapunpriv 2>/dev/null || groupadd -r stapunpriv
getent passwd stapunpriv >/dev/null || \
useradd -c "Systemtap Unprivileged User" -u 159 -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv 2>/dev/null || \
useradd -c "Systemtap Unprivileged User" -g stapunpriv -d %{_localstatedir}/lib/stapunpriv -r -s /sbin/nologin stapunpriv
exit 0
%pre server
@@ -325,8 +344,11 @@ fi
exit 0
%preun stap-exporter
if [ "$1" -eq "0" ] ; then
/bin/systemctl stop stap-exporter.service >/dev/null 2>&1 || :
/bin/systemctl disable stap-exporter.service >/dev/null 2>&1 || :
fi
exit 0
%post
/bin/systemctl enable systemtap.service >/dev/null 2>&1 || :
@@ -382,6 +404,7 @@ exit 0
%files devel -f systemtap.lang
%{_bindir}/stap
%{_bindir}/stap-prep
%{_bindir}/stap-profile-annotate
%{_bindir}/stap-report
%dir %{_datadir}/systemtap
%{_datadir}/systemtap/runtime
@@ -448,17 +471,87 @@ exit 0
/usr/sbin/stap-exporter
/etc/sysconfig/stap-exporter
%files jupyter
%{_bindir}/stap-jupyter-container
%{_bindir}/stap-jupyter-install
%{_mandir}/man1/stap-jupyter.1*
%dir %{_datadir}/systemtap
%{_datadir}/systemtap/interactive-notebook
%files help
%{_mandir}/man[1378]/*
%changelog
* Thu Dec 05 2024 wangxiao <wangxiao184@h-partners.com> - 5.2-1
- Upgrade to 5.2
* Wed Sep 04 2024 wangxiao <wangxiao184@h-partners.com> - 5.0-3
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Make stp_task_work compatible with 6.11 kernels
* Fri Jul 05 2024 wangqiang <wangqiang1@kylinos.cn> - 5.0-2
- Type:update
- CVE:NA
- SUG:NA
- DESC:Add basic loongarch64 support
* Wed Jan 24 2024 liuchao <liuchao173@huawei.com> - 5.0-1
- Upgrade to 5.0:
- Performance improvements in uprobe registration and module startup.
- More probe point process details are printed in "-L" list mode with more "-v".
- For the case where newer kernels may break systemtap runtime APIs, better pass-4 failure diagnostics are printed.
- Tapset function print_ubacktrace_fileline() now understands DWARF5.
- The target(s) of process probes may be specified by path name globs, as located selected debuginfod servers.
- The kernel-user message transport system added framing codes, making the transport more reliable, but becoming incompatible across pre-5.0 versions. Use matching versions of stap and staprun.
- The testsuite Makefile has been simplified to remove concurrency, so "parallel" and "resume" modes are gone.
- New runtime macro STP_TIMING_NSECS is now supported for reporting probe timing stats in nsecs instead of cycles. This may become default later.
- Add new runtime macro STP_FORCE_STDOUT_TTY to override STP_STDOUT_NOT_ATTY.
* Wed Sep 6 2023 langfei<langfei@huawei.com> - 4.9-1
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Upgrade to 4.9
* Tue Aug 8 2023 langfei<langfei@huawei.com> - 4.5-7
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Adapts to gcc 12 and python 3.11
* Wed Jul 5 2023 langfei<langfei@huawei.com> - 4.5-6
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Fix some test cases fail to be executed, Resolve the sc2168 warning detected by the shellcheck tool.
* Mon Feb 6 2023 langfei<langfei@huawei.com> - 4.5-5
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Solve systemtap build problem in openEuler:MultiLanguage
* Mon Dec 5 2022 langfei<langfei@huawei.com> - 4.5-4
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:Resolve stap-exporter.service chenge to disable when upgraded systemtap-stap-exporter package
* Fri Apr 8 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-3
- Add int type cast to resolve gcc issue for option Wformat=2
* Tue Feb 15 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 4.5-2
- Remove requires on gcc and systemtap-devel
* Thu Dec 2 2021 zhouwenpei <zhouwenpei1@huawei.com> - 4.5-1
- upgrade to 4.5
* Mon Feb 1 2021 xinghe <xinghe1@huawei.com> - 4.4-1
- upgrade to 4.4
* Thu Jul 21 2020 jinzhimin <jinzhimin2@huawei.com> - 4.3-1
* Tue Jul 21 2020 jinzhimin <jinzhimin2@huawei.com> - 4.3-1
- upgrade to 4.3
* Fri Mar 13 2020 yuxiangyang <yuxiangyang4@huawei.com> - 4.1.3