Skip to content

Commit cf3e025

Browse files
Ross Zwislerrafaeljw
authored andcommitted
PM: tools: use canonical ftrace path
The canonical location for the tracefs filesystem is at /sys/kernel/tracing. But, from Documentation/trace/ftrace.rst: Before 4.1, all ftrace tracing control files were within the debugfs file system, which is typically located at /sys/kernel/debug/tracing. For backward compatibility, when mounting the debugfs file system, the tracefs file system will be automatically mounted at: /sys/kernel/debug/tracing A few scripts in tools/power still refer to this older debugfs path, so let's update them to avoid confusion. Signed-off-by: Ross Zwisler <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 6d796c5 commit cf3e025

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

tools/power/pm-graph/sleepgraph.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ class SystemValues:
120120
cgexp = False
121121
testdir = ''
122122
outdir = ''
123-
tpath = '/sys/kernel/debug/tracing/'
123+
tpath = '/sys/kernel/tracing/'
124124
fpdtpath = '/sys/firmware/acpi/tables/FPDT'
125-
epath = '/sys/kernel/debug/tracing/events/power/'
125+
epath = '/sys/kernel/tracing/events/power/'
126126
pmdpath = '/sys/power/pm_debug_messages'
127127
s0ixpath = '/sys/module/intel_pmc_core/parameters/warn_on_s0ix_failures'
128128
s0ixres = '/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us'

tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def signal_handler(signal, frame):
248248
ipt.free_trace_buffer()
249249
sys.exit(0)
250250

251-
trace_file = "/sys/kernel/debug/tracing/events/amd_cpu/enable"
251+
trace_file = "/sys/kernel/tracing/events/amd_cpu/enable"
252252
signal.signal(signal.SIGINT, signal_handler)
253253

254254
interval = ""
@@ -319,7 +319,7 @@ def signal_handler(signal, frame):
319319
cleanup_data_files()
320320

321321
if interval:
322-
file_name = "/sys/kernel/debug/tracing/trace"
322+
file_name = "/sys/kernel/tracing/trace"
323323
ipt.clear_trace_file()
324324
ipt.set_trace_buffer_size(memory)
325325
ipt.enable_trace(trace_file)

tools/power/x86/intel_pstate_tracer/intel_pstate_tracer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ def clear_trace_file():
373373
""" Clear trace file """
374374

375375
try:
376-
f_handle = open('/sys/kernel/debug/tracing/trace', 'w')
376+
f_handle = open('/sys/kernel/tracing/trace', 'w')
377377
f_handle.close()
378378
except:
379379
print('IO error clearing trace file ')
@@ -401,7 +401,7 @@ def set_trace_buffer_size(memory):
401401
""" Set trace buffer size """
402402

403403
try:
404-
with open('/sys/kernel/debug/tracing/buffer_size_kb', 'w') as fp:
404+
with open('/sys/kernel/tracing/buffer_size_kb', 'w') as fp:
405405
fp.write(memory)
406406
except:
407407
print('IO error setting trace buffer size ')
@@ -411,7 +411,7 @@ def free_trace_buffer():
411411
""" Free the trace buffer memory """
412412

413413
try:
414-
open('/sys/kernel/debug/tracing/buffer_size_kb'
414+
open('/sys/kernel/tracing/buffer_size_kb'
415415
, 'w').write("1")
416416
except:
417417
print('IO error freeing trace buffer ')
@@ -495,7 +495,7 @@ def signal_handler(signal, frame):
495495
sys.exit(0)
496496

497497
if __name__ == "__main__":
498-
trace_file = "/sys/kernel/debug/tracing/events/power/pstate_sample/enable"
498+
trace_file = "/sys/kernel/tracing/events/power/pstate_sample/enable"
499499
signal.signal(signal.SIGINT, signal_handler)
500500

501501
interval = ""
@@ -569,7 +569,7 @@ def signal_handler(signal, frame):
569569
cleanup_data_files()
570570

571571
if interval:
572-
filename = "/sys/kernel/debug/tracing/trace"
572+
filename = "/sys/kernel/tracing/trace"
573573
clear_trace_file()
574574
set_trace_buffer_size(memory)
575575
enable_trace(trace_file)

0 commit comments

Comments
 (0)