Skip to content

Commit f60fa59

Browse files
douglas-raillard-armmarcbonnici
authored andcommitted
collector/ftrace: Handle missing kprobe_events file
Deal cleanly with kernels that are compiled without kprobe events.
1 parent 499ea47 commit f60fa59

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

devlib/collector/ftrace.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,10 @@ def available_functions(self):
242242

243243
def reset(self):
244244
# Save kprobe events
245-
kprobe_events = self.target.read_value(self.kprobe_events_file)
245+
try:
246+
kprobe_events = self.target.read_value(self.kprobe_events_file)
247+
except TargetStableError:
248+
kprobe_events = None
246249

247250
self.target.execute('{} reset -B devlib'.format(self.target_binary),
248251
as_root=True, timeout=TIMEOUT)
@@ -262,7 +265,8 @@ def reset(self):
262265
self.target.write_value(self.function_profile_file, 0, verify=False)
263266

264267
# Restore kprobe events
265-
self.target.write_value(self.kprobe_events_file, kprobe_events)
268+
if kprobe_events:
269+
self.target.write_value(self.kprobe_events_file, kprobe_events)
266270

267271
self._reset_needed = False
268272

0 commit comments

Comments
 (0)