|
 |
1304d5 |
From 6476a7e81eba04a729380b813d6555cdca2acb1a Mon Sep 17 00:00:00 2001
|
|
|
1304d5 |
From: Marko Myllynen <myllynen@redhat.com>
|
|
|
1304d5 |
Date: Thu, 5 Jul 2018 08:59:35 +0300
|
|
|
1304d5 |
Subject: [PATCH] pmdabcc: fix ext4dist/xfsdist for RHEL 7 kernel
|
|
|
1304d5 |
|
|
|
1304d5 |
RHEL 7 kernel is unlike Fedora / upstream kernels, apply the
|
|
|
1304d5 |
corresponding change done in latest RHEL 7 bcc as well.
|
|
|
1304d5 |
---
|
|
|
1304d5 |
src/pmdas/bcc/modules/fs/ext4dist.bpf | 1 +
|
|
|
1304d5 |
src/pmdas/bcc/modules/fs/ext4dist.python | 8 ++++----
|
|
|
1304d5 |
src/pmdas/bcc/modules/fs/xfsdist.bpf | 1 +
|
|
|
1304d5 |
src/pmdas/bcc/modules/fs/xfsdist.python | 8 ++++----
|
|
|
1304d5 |
4 files changed, 10 insertions(+), 8 deletions(-)
|
|
|
1304d5 |
|
|
|
1304d5 |
diff --git a/src/pmdas/bcc/modules/fs/ext4dist.bpf b/src/pmdas/bcc/modules/fs/ext4dist.bpf
|
|
|
1304d5 |
index 4f41d62..dd57cf3 100644
|
|
|
1304d5 |
--- a/src/pmdas/bcc/modules/fs/ext4dist.bpf
|
|
|
1304d5 |
+++ b/src/pmdas/bcc/modules/fs/ext4dist.bpf
|
|
|
1304d5 |
@@ -3,6 +3,7 @@
|
|
|
1304d5 |
|
|
|
1304d5 |
#include <uapi/linux/ptrace.h>
|
|
|
1304d5 |
#include <linux/fs.h>
|
|
|
1304d5 |
+#include <linux/aio.h>
|
|
|
1304d5 |
#include <linux/sched.h>
|
|
|
1304d5 |
|
|
|
1304d5 |
#define OP_NAME_LEN 8
|
|
|
1304d5 |
diff --git a/src/pmdas/bcc/modules/fs/ext4dist.python b/src/pmdas/bcc/modules/fs/ext4dist.python
|
|
|
1304d5 |
index 610abd3..961a03c 100644
|
|
|
1304d5 |
--- a/src/pmdas/bcc/modules/fs/ext4dist.python
|
|
|
1304d5 |
+++ b/src/pmdas/bcc/modules/fs/ext4dist.python
|
|
|
1304d5 |
@@ -91,12 +91,12 @@ class PCPBCCModule(PCPBCCBase):
|
|
|
1304d5 |
self.log("\n" + bpf_text)
|
|
|
1304d5 |
|
|
|
1304d5 |
self.bpf = BPF(text=bpf_text)
|
|
|
1304d5 |
- self.bpf.attach_kprobe(event="generic_file_read_iter", fn_name="trace_read_entry")
|
|
|
1304d5 |
- self.bpf.attach_kprobe(event="ext4_file_write_iter", fn_name="trace_entry")
|
|
|
1304d5 |
+ self.bpf.attach_kprobe(event="generic_file_aio_read", fn_name="trace_read_entry")
|
|
|
1304d5 |
+ self.bpf.attach_kprobe(event="ext4_file_write", fn_name="trace_entry")
|
|
|
1304d5 |
self.bpf.attach_kprobe(event="ext4_file_open", fn_name="trace_entry")
|
|
|
1304d5 |
self.bpf.attach_kprobe(event="ext4_sync_file", fn_name="trace_entry")
|
|
|
1304d5 |
- self.bpf.attach_kretprobe(event="generic_file_read_iter", fn_name="trace_read_return")
|
|
|
1304d5 |
- self.bpf.attach_kretprobe(event="ext4_file_write_iter", fn_name="trace_write_return")
|
|
|
1304d5 |
+ self.bpf.attach_kretprobe(event="generic_file_aio_read", fn_name="trace_read_return")
|
|
|
1304d5 |
+ self.bpf.attach_kretprobe(event="ext4_file_write", fn_name="trace_write_return")
|
|
|
1304d5 |
self.bpf.attach_kretprobe(event="ext4_file_open", fn_name="trace_open_return")
|
|
|
1304d5 |
self.bpf.attach_kretprobe(event="ext4_sync_file", fn_name="trace_fsync_return")
|
|
|
1304d5 |
self.log("Compiled.")
|
|
|
1304d5 |
diff --git a/src/pmdas/bcc/modules/fs/xfsdist.bpf b/src/pmdas/bcc/modules/fs/xfsdist.bpf
|
|
|
1304d5 |
index 66aeae5..4c539f9 100644
|
|
|
1304d5 |
--- a/src/pmdas/bcc/modules/fs/xfsdist.bpf
|
|
|
1304d5 |
+++ b/src/pmdas/bcc/modules/fs/xfsdist.bpf
|
|
|
1304d5 |
@@ -3,6 +3,7 @@
|
|
|
1304d5 |
|
|
|
1304d5 |
#include <uapi/linux/ptrace.h>
|
|
|
1304d5 |
#include <linux/fs.h>
|
|
|
1304d5 |
+#include <linux/aio.h>
|
|
|
1304d5 |
#include <linux/sched.h>
|
|
|
1304d5 |
|
|
|
1304d5 |
#define OP_NAME_LEN 8
|
|
|
1304d5 |
diff --git a/src/pmdas/bcc/modules/fs/xfsdist.python b/src/pmdas/bcc/modules/fs/xfsdist.python
|
|
|
1304d5 |
index a1ebc62..d460983 100644
|
|
|
1304d5 |
--- a/src/pmdas/bcc/modules/fs/xfsdist.python
|
|
|
1304d5 |
+++ b/src/pmdas/bcc/modules/fs/xfsdist.python
|
|
|
1304d5 |
@@ -73,12 +73,12 @@ class PCPBCCModule(PCPBCCBase):
|
|
|
1304d5 |
self.log("\n" + bpf_text)
|
|
|
1304d5 |
|
|
|
1304d5 |
self.bpf = BPF(text=bpf_text)
|
|
|
1304d5 |
- self.bpf.attach_kprobe(event="xfs_file_read_iter", fn_name="trace_entry")
|
|
|
1304d5 |
- self.bpf.attach_kprobe(event="xfs_file_write_iter", fn_name="trace_entry")
|
|
|
1304d5 |
+ self.bpf.attach_kprobe(event="xfs_file_aio_read", fn_name="trace_entry")
|
|
|
1304d5 |
+ self.bpf.attach_kprobe(event="xfs_file_aio_write", fn_name="trace_entry")
|
|
|
1304d5 |
self.bpf.attach_kprobe(event="xfs_file_open", fn_name="trace_entry")
|
|
|
1304d5 |
self.bpf.attach_kprobe(event="xfs_file_fsync", fn_name="trace_entry")
|
|
|
1304d5 |
- self.bpf.attach_kretprobe(event="xfs_file_read_iter", fn_name="trace_read_return")
|
|
|
1304d5 |
- self.bpf.attach_kretprobe(event="xfs_file_write_iter", fn_name="trace_write_return")
|
|
|
1304d5 |
+ self.bpf.attach_kretprobe(event="xfs_file_aio_read", fn_name="trace_read_return")
|
|
|
1304d5 |
+ self.bpf.attach_kretprobe(event="xfs_file_aio_write", fn_name="trace_write_return")
|
|
|
1304d5 |
self.bpf.attach_kretprobe(event="xfs_file_open", fn_name="trace_open_return")
|
|
|
1304d5 |
self.bpf.attach_kretprobe(event="xfs_file_fsync", fn_name="trace_fsync_return")
|
|
|
1304d5 |
self.log("Compiled.")
|
|
|
1304d5 |
--
|
|
|
1304d5 |
1.8.3.1
|
|
|
1304d5 |
|