tools: Fix misuse of kernel_struct_has_field in bio* tools

yingtaojuzi · Apr 26, 2022 · 3b69447 · 3b69447
1 parent 2c389db
commit 3b69447
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tools/biolatency.py b/tools/biolatency.py
@@ -134,7 +134,7 @@
  bpf_probe_read(&key.disk, sizeof(key.disk), __tmp);
  dist.atomic_increment(key);
  """
- if BPF.kernel_struct_has_field(b'request', b'rq_disk'):
+ if BPF.kernel_struct_has_field(b'request', b'rq_disk') == 1:
  store_str += disks_str.replace('__RQ_DISK__', 'rq_disk')
  else:
  store_str += disks_str.replace('__RQ_DISK__', 'q->disk')

diff --git a/tools/biolatpcts.py b/tools/biolatpcts.py
@@ -142,7 +142,7 @@
 bpf_source = bpf_source.replace('__MAJOR__', str(major))
 bpf_source = bpf_source.replace('__MINOR__', str(minor))
 
-if BPF.kernel_struct_has_field(b'request', b'rq_disk'):
+if BPF.kernel_struct_has_field(b'request', b'rq_disk') == 1:
  bpf_source = bpf_source.replace('__RQ_DISK__', 'rq_disk')
 else:
  bpf_source = bpf_source.replace('__RQ_DISK__', 'q->disk')

diff --git a/tools/biosnoop.py b/tools/biosnoop.py
@@ -156,7 +156,7 @@
  bpf_text = bpf_text.replace('##QUEUE##', '1')
 else:
  bpf_text = bpf_text.replace('##QUEUE##', '0')
-if BPF.kernel_struct_has_field(b'request', b'rq_disk'):
+if BPF.kernel_struct_has_field(b'request', b'rq_disk') == 1:
  bpf_text = bpf_text.replace('__RQ_DISK__', 'rq_disk')
 else:
  bpf_text = bpf_text.replace('__RQ_DISK__', 'q->disk')

diff --git a/tools/biotop.py b/tools/biotop.py
@@ -194,7 +194,7 @@
  print(bpf_text)
  exit()
 
-if BPF.kernel_struct_has_field(b'request', b'rq_disk'):
+if BPF.kernel_struct_has_field(b'request', b'rq_disk') == 1:
  bpf_text = bpf_text.replace('__RQ_DISK__', 'rq_disk')
 else:
  bpf_text = bpf_text.replace('__RQ_DISK__', 'q->disk')