mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-07 22:03:14 +00:00
PM: tools: sleepgraph: Recognize "CPU killed" messages
On the arm64 platform with PSCI, the core log of CPU offline is as follows: [ 100.431501] CPU1: shutdown [ 100.454820] psci: CPU1 killed (polled 20 ms) [ 100.459266] CPU2: shutdown [ 100.482575] psci: CPU2 killed (polled 20 ms) [ 100.486057] CPU3: shutdown [ 100.513974] psci: CPU3 killed (polled 28 ms) [ 100.518068] CPU4: shutdown [ 100.541481] psci: CPU4 killed (polled 24 ms) Prevent sleepgraph from mistakenly treating the "CPU up" message as part of the suspend flow (because it should be regarded as part of the resume flow) by making it recognize the "CPU* killed" messages above. Signed-off-by: Xueqin Luo <luoxueqin@kylinos.cn> [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
0417552730
commit
34ea427e01
@ -4151,9 +4151,12 @@ def parseKernelLog(data):
|
||||
elif(re.match('Enabling non-boot CPUs .*', msg)):
|
||||
# start of first cpu resume
|
||||
cpu_start = ktime
|
||||
elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)):
|
||||
elif(re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)) \
|
||||
or re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)):
|
||||
# end of a cpu suspend, start of the next
|
||||
m = re.match('smpboot: CPU (?P<cpu>[0-9]*) is now offline', msg)
|
||||
if(not m):
|
||||
m = re.match('psci: CPU(?P<cpu>[0-9]*) killed.*', msg)
|
||||
cpu = 'CPU'+m.group('cpu')
|
||||
if(cpu not in actions):
|
||||
actions[cpu] = []
|
||||
|
Loading…
Reference in New Issue
Block a user