fix junk filenames (iovisor#775)

Limnotation · Oct 21, 2016 · be294db · be294db
1 parent 0ef9ec4
commit be294db
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/tools/btrfsslower.py b/tools/btrfsslower.py
@@ -211,19 +211,24 @@
  if (FILTER_US)
  return 0;
 
- // workaround (rewriter should handle file to d_iname in one step):
- struct dentry *de = NULL;
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
-
  // populate output struct
  u32 size = PT_REGS_RC(ctx);
  struct data_t data = {.type = type, .size = size, .delta_us = delta_us,
  .pid = pid};
  data.ts_us = ts / 1000;
  data.offset = valp->offset;
- bpf_probe_read(&data.file, sizeof(data.file), de->d_iname);
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
+ // workaround (rewriter should handle file to d_name in one step):
+ struct dentry *de = NULL;
+ struct qstr qs = {};
+ bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
+ bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ if (qs.len == 0)
+ return 0;
+ bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);
+
+ // output
  events.perf_submit(ctx, &data, sizeof(data));
 
  return 0;

diff --git a/tools/ext4slower.py b/tools/ext4slower.py
@@ -206,19 +206,24 @@
  if (FILTER_US)
  return 0;
 
- // workaround (rewriter should handle file to d_iname in one step):
- struct dentry *de = NULL;
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
-
  // populate output struct
  u32 size = PT_REGS_RC(ctx);
  struct data_t data = {.type = type, .size = size, .delta_us = delta_us,
  .pid = pid};
  data.ts_us = ts / 1000;
  data.offset = valp->offset;
- bpf_probe_read(&data.file, sizeof(data.file), de->d_iname);
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
+ // workaround (rewriter should handle file to d_name in one step):
+ struct dentry *de = NULL;
+ struct qstr qs = {};
+ bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
+ bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ if (qs.len == 0)
+ return 0;
+ bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);
+
+ // output
  events.perf_submit(ctx, &data, sizeof(data));
 
  return 0;

diff --git a/tools/xfsslower.py b/tools/xfsslower.py
@@ -176,19 +176,24 @@
  if (FILTER_US)
  return 0;
 
- // workaround (rewriter should handle file to d_iname in one step):
- struct dentry *de = NULL;
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
-
  // populate output struct
  u32 size = PT_REGS_RC(ctx);
  struct data_t data = {.type = type, .size = size, .delta_us = delta_us,
  .pid = pid};
  data.ts_us = ts / 1000;
  data.offset = valp->offset;
- bpf_probe_read(&data.file, sizeof(data.file), de->d_iname);
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
+ // workaround (rewriter should handle file to d_name in one step):
+ struct dentry *de = NULL;
+ struct qstr qs = {};
+ bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
+ bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ if (qs.len == 0)
+ return 0;
+ bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);
+
+ // output
  events.perf_submit(ctx, &data, sizeof(data));
 
  return 0;

diff --git a/tools/zfsslower.py b/tools/zfsslower.py
@@ -180,19 +180,24 @@
  if (FILTER_US)
  return 0;
 
- // workaround (rewriter should handle file to d_iname in one step):
- struct dentry *de = NULL;
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
-
  // populate output struct
  u32 size = PT_REGS_RC(ctx);
  struct data_t data = {.type = type, .size = size, .delta_us = delta_us,
  .pid = pid};
  data.ts_us = ts / 1000;
  data.offset = valp->offset;
- bpf_probe_read(&data.file, sizeof(data.file), de->d_iname);
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
+ // workaround (rewriter should handle file to d_name in one step):
+ struct dentry *de = NULL;
+ struct qstr qs = {};
+ bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
+ bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ if (qs.len == 0)
+ return 0;
+ bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);
+
+ // output
  events.perf_submit(ctx, &data, sizeof(data));
 
  return 0;