s390x,ppc: Fix missing attachpoints for bio* tools

Also rebuild for libbpf 1.0.0.

Resolves: rhbz#2157829
Related: rhbz#2157592

Signed-off-by: Viktor Malik <vmalik@redhat.com>

bpftrace-0.16.0-RHEL9-remove-not-existing-attachpoints-from-tools.patch

@@ -1,74 +0,0 @@
-From 7ebf8a0a6f257770ad21bcea70d56a2671528238 Mon Sep 17 00:00:00 2001
-From: Viktor Malik <viktor.malik@gmail.com>
-Date: Fri, 16 Dec 2022 13:31:46 +0100
-Subject: [PATCH 2/2] RHEL9: remove not existing attachpoints from tools
-
-tools/bio* attempt to attach each probe to multiple kprobes to cover all
-possible systems. Remove probes which do not exist in RHEL9 to remove
-unnecessary warnings.
----
- tools/biolatency.bt | 2 --
- tools/biosnoop.bt   | 2 --
- tools/biostacks.bt  | 2 --
- 3 files changed, 6 deletions(-)
-
-diff --git a/tools/biolatency.bt b/tools/biolatency.bt
-index d5af1f29..8fb0490d 100755
---- a/tools/biolatency.bt
-+++ b/tools/biolatency.bt
-@@ -16,13 +16,11 @@ BEGIN
- 	printf("Tracing block device I/O... Hit Ctrl-C to end.\n");
- }
- 
--kprobe:blk_account_io_start,
- kprobe:__blk_account_io_start
- {
- 	@start[arg0] = nsecs;
- }
- 
--kprobe:blk_account_io_done,
- kprobe:__blk_account_io_done
- /@start[arg0]/
- {
-diff --git a/tools/biosnoop.bt b/tools/biosnoop.bt
-index 65e302fc..c26aa3be 100755
---- a/tools/biosnoop.bt
-+++ b/tools/biosnoop.bt
-@@ -20,7 +20,6 @@ BEGIN
- 	printf("%-12s %-7s %-16s %-6s %7s\n", "TIME(ms)", "DISK", "COMM", "PID", "LAT(ms)");
- }
- 
--kprobe:blk_account_io_start,
- kprobe:__blk_account_io_start
- {
- 	@start[arg0] = nsecs;
-@@ -29,7 +28,6 @@ kprobe:__blk_account_io_start
- 	@disk[arg0] = ((struct request *)arg0)->q->disk->disk_name;
- }
- 
--kprobe:blk_account_io_done,
- kprobe:__blk_account_io_done
- /@start[arg0] != 0 && @iopid[arg0] != 0 && @iocomm[arg0] != ""/
- 
-diff --git a/tools/biostacks.bt b/tools/biostacks.bt
-index 1bc9f819..0d848ada 100755
---- a/tools/biostacks.bt
-+++ b/tools/biostacks.bt
-@@ -18,14 +18,12 @@ BEGIN
- 	printf("Tracing block I/O with init stacks. Hit Ctrl-C to end.\n");
- }
- 
--kprobe:blk_account_io_start,
- kprobe:__blk_account_io_start
- {
- 	@reqstack[arg0] = kstack;
- 	@reqts[arg0] = nsecs;
- }
- 
--kprobe:blk_start_request,
- kprobe:blk_mq_start_request
- /@reqts[arg0]/
- {
--- 
-2.38.1
-

bpftrace.spec

@@ -1,6 +1,6 @@
 Name:           bpftrace
 Version:        0.16.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        High-level tracing language for Linux eBPF
 License:        ASL 2.0
 
@@ -15,7 +15,6 @@ Source1:        https://github.com/USCiLab/cereal/archive/v%{cereal_version}/cer
 
 Patch0:         %{name}-%{version}-IR-builder-get-rid-of-getPointerElementType-calls.patch
 Patch1:         %{name}-%{version}-tcpdrop-Fix-ERROR-Error-attaching-probe-kprobe-tcp_d.patch
-Patch2:         %{name}-%{version}-RHEL9-remove-not-existing-attachpoints-from-tools.patch
 
 Patch10:        %{name}-%{version}-RHEL-aarch64-fixes-statsnoop-and-opensnoop.patch
 
@@ -96,6 +95,12 @@ find %{buildroot}%{_datadir}/%{name}/tools -type f -exec \
 %exclude %{_datadir}/%{name}/tools/old
 
 %changelog
+* Tue Jan 03 2023 Viktor Malik <vmalik@redhat.com> - 0.16.0-2
+- Fix missing kprobe attachpoints for bio* tools (s390x, ppc64le)
+- Rebuild for libbpf 1.0.0
+- Resolves: rhbz#2157829
+- Related: rhbz#2157592
+
 * Fri Dec 16 2022 Viktor Malik <vmalik@redhat.com> - 0.16.0-1
 - Rebase on bpftrace 0.16.0 (rhbz#2121920)
 - Rebuild for LLVM 15 (rhbz#2118995)