Skip to content

B
bcc
Commit c8b9ae3a authored by Dina Goldshtein's avatar Dina Goldshtein Committed by 4ast
Browse files
Options

Support filtering by process ID in the filesystem slower tools (#756) 

* Filter by process ID in ex4slower

* Updated the rest of the tools to filter by process ID
parent 6049d3ff
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 71 deletions
tools/btrfsslower.py
View file @ c8b9ae3a
......@@ -22,6 +22,7 @@
# Licensed under the Apache License, Version 2.0 (the "License")
#
# 15-Feb-2016 Brendan Gregg Created this.
# 16-Oct-2016 Dina Goldshtein -p to filter by process ID.
from __future__ import print_function
from bcc import BPF
......@@ -87,7 +88,7 @@ struct data_t {
char file[DNAME_INLINE_LEN];
};
BPF_HASH(entryinfo, pid_t, struct val_t);
BPF_HASH(entryinfo, u64, struct val_t);
BPF_PERF_OUTPUT(events);
//
......@@ -99,8 +100,9 @@ BPF_PERF_OUTPUT(events);
// I do by checking file->f_op.
int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
......@@ -115,7 +117,7 @@ int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
val.fp = fp;
val.offset = iocb->ki_pos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -123,18 +125,19 @@ int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
// btrfs_file_write_iter():
int trace_write_entry(struct pt_regs *ctx, struct kiocb *iocb)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = iocb->ki_filp;
val.offset = iocb->ki_pos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -144,8 +147,9 @@ int trace_write_entry(struct pt_regs *ctx, struct kiocb *iocb)
int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
......@@ -153,13 +157,13 @@ int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
if ((u64)file->f_op != BTRFS_FILE_OPERATIONS)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -167,18 +171,19 @@ int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
// btrfs_sync_file():
int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -190,9 +195,10 @@ int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
static int trace_return(struct pt_regs *ctx, int type)
{
struct val_t *valp;
u32 pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
valp = entryinfo.lookup(&pid);
valp = entryinfo.lookup(&id);
if (valp == 0) {
// missed tracing issue or filtered
return 0;
......@@ -201,7 +207,7 @@ static int trace_return(struct pt_regs *ctx, int type)
// calculate delta
u64 ts = bpf_ktime_get_ns();
u64 delta_us = (ts - valp->ts) / 1000;
entryinfo.delete(&pid);
entryinfo.delete(&id);
if (FILTER_US)
return 0;
......
tools/ext4slower.py
View file @ c8b9ae3a
......@@ -22,6 +22,7 @@
# Licensed under the Apache License, Version 2.0 (the "License")
#
# 11-Feb-2016 Brendan Gregg Created this.
# 15-Oct-2016 Dina Goldshtein -p to filter by process ID.
from __future__ import print_function
from bcc import BPF
......@@ -87,7 +88,7 @@ struct data_t {
char file[DNAME_INLINE_LEN];
};
BPF_HASH(entryinfo, pid_t, struct val_t);
BPF_HASH(entryinfo, u64, struct val_t);
BPF_PERF_OUTPUT(events);
//
......@@ -99,8 +100,9 @@ BPF_PERF_OUTPUT(events);
// which I do by checking file->f_op.
int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
......@@ -109,13 +111,13 @@ int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
if ((u64)fp->f_op != EXT4_FILE_OPERATIONS)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = fp;
val.offset = iocb->ki_pos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -123,18 +125,19 @@ int trace_read_entry(struct pt_regs *ctx, struct kiocb *iocb)
// ext4_file_write_iter():
int trace_write_entry(struct pt_regs *ctx, struct kiocb *iocb)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = iocb->ki_filp;
val.offset = iocb->ki_pos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -143,18 +146,19 @@ int trace_write_entry(struct pt_regs *ctx, struct kiocb *iocb)
int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -162,18 +166,19 @@ int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
// ext4_sync_file():
int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -185,9 +190,10 @@ int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
static int trace_return(struct pt_regs *ctx, int type)
{
struct val_t *valp;
u32 pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
valp = entryinfo.lookup(&pid);
valp = entryinfo.lookup(&id);
if (valp == 0) {
// missed tracing issue or filtered
return 0;
......@@ -196,7 +202,7 @@ static int trace_return(struct pt_regs *ctx, int type)
// calculate delta
u64 ts = bpf_ktime_get_ns();
u64 delta_us = (ts - valp->ts) / 1000;
entryinfo.delete(&pid);
entryinfo.delete(&id);
if (FILTER_US)
return 0;
......
tools/xfsslower.py
View file @ c8b9ae3a
......@@ -22,6 +22,7 @@
# Licensed under the Apache License, Version 2.0 (the "License")
#
# 11-Feb-2016 Brendan Gregg Created this.
# 16-Oct-2016 Dina Goldshtein -p to filter by process ID.
from __future__ import print_function
from bcc import BPF
......@@ -84,7 +85,7 @@ struct data_t {
char file[DNAME_INLINE_LEN];
};
BPF_HASH(entryinfo, pid_t, struct val_t);
BPF_HASH(entryinfo, u64, struct val_t);
BPF_PERF_OUTPUT(events);
//
......@@ -94,18 +95,19 @@ BPF_PERF_OUTPUT(events);
// xfs_file_read_iter(), xfs_file_write_iter():
int trace_rw_entry(struct pt_regs *ctx, struct kiocb *iocb)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = iocb->ki_filp;
val.offset = iocb->ki_pos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -114,18 +116,19 @@ int trace_rw_entry(struct pt_regs *ctx, struct kiocb *iocb)
int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -133,18 +136,19 @@ int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
// xfs_file_fsync():
int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = file;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -156,9 +160,10 @@ int trace_fsync_entry(struct pt_regs *ctx, struct file *file)
static int trace_return(struct pt_regs *ctx, int type)
{
struct val_t *valp;
u32 pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
valp = entryinfo.lookup(&pid);
valp = entryinfo.lookup(&id);
if (valp == 0) {
// missed tracing issue or filtered
return 0;
......@@ -167,7 +172,7 @@ static int trace_return(struct pt_regs *ctx, int type)
// calculate delta
u64 ts = bpf_ktime_get_ns();
u64 delta_us = (ts - valp->ts) / 1000;
entryinfo.delete(&pid);
entryinfo.delete(&id);
if (FILTER_US)
return 0;
......
tools/zfsslower.py
View file @ c8b9ae3a
......@@ -25,6 +25,7 @@
# Licensed under the Apache License, Version 2.0 (the "License")
#
# 14-Feb-2016 Brendan Gregg Created this.
# 16-Oct-2016 Dina Goldshtein -p to filter by process ID.
from __future__ import print_function
from bcc import BPF
......@@ -87,7 +88,7 @@ struct data_t {
char file[DNAME_INLINE_LEN];
};
BPF_HASH(entryinfo, pid_t, struct val_t);
BPF_HASH(entryinfo, u64, struct val_t);
BPF_PERF_OUTPUT(events);
//
......@@ -98,18 +99,19 @@ BPF_PERF_OUTPUT(events);
int trace_rw_entry(struct pt_regs *ctx, struct file *filp, char __user *buf,
size_t len, loff_t *ppos)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = filp;
val.offset = *ppos;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -118,18 +120,19 @@ int trace_rw_entry(struct pt_regs *ctx, struct file *filp, char __user *buf,
int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
struct file *filp)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filep and timestamp by pid
// store filep and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = filp;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -137,18 +140,19 @@ int trace_open_entry(struct pt_regs *ctx, struct inode *inode,
// zpl_fsync():
int trace_fsync_entry(struct pt_regs *ctx, struct file *filp)
{
u32 pid;
pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
if (FILTER_PID)
return 0;
// store filp and timestamp by pid
// store filp and timestamp by id
struct val_t val = {};
val.ts = bpf_ktime_get_ns();
val.fp = filp;
val.offset = 0;
if (val.fp)
entryinfo.update(&pid, &val);
entryinfo.update(&id, &val);
return 0;
}
......@@ -160,9 +164,10 @@ int trace_fsync_entry(struct pt_regs *ctx, struct file *filp)
static int trace_return(struct pt_regs *ctx, int type)
{
struct val_t *valp;
u32 pid = bpf_get_current_pid_tgid();
u64 id = bpf_get_current_pid_tgid();
u32 pid = id >> 32; // PID is higher part
valp = entryinfo.lookup(&pid);
valp = entryinfo.lookup(&id);
if (valp == 0) {
// missed tracing issue or filtered
return 0;
......@@ -171,7 +176,7 @@ static int trace_return(struct pt_regs *ctx, int type)
// calculate delta
u64 ts = bpf_ktime_get_ns();
u64 delta_us = (ts - valp->ts) / 1000;
entryinfo.delete(&pid);
entryinfo.delete(&id);
if (FILTER_US)
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7