From 0008f526786474f0aa5fdf2a4b3436e97ca7b018 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Fri, 27 Apr 2018 15:44:47 +0200 Subject: pkg/report: fix remaining lockdep report formats We fixed only 1, but new format affects all lockdep reports. Fix all of them. --- pkg/report/linux.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/report/linux.go') diff --git a/pkg/report/linux.go b/pkg/report/linux.go index e5b71486e..172a75b4d 100644 --- a/pkg/report/linux.go +++ b/pkg/report/linux.go @@ -840,17 +840,17 @@ var linuxOopses = []*oops{ }, { title: compile("WARNING: possible circular locking dependency detected"), - report: compile("WARNING: possible circular locking dependency detected(?:.*\\n)+?.*is trying to acquire lock(?:.*\\n)+?.*at: {{PC}} +{{FUNC}}"), + report: compile("WARNING: possible circular locking dependency detected(?:.*\\n)+?.*is trying to acquire lock(?:.*\\n)+?.*at: (?:{{PC}} +)?{{FUNC}}"), fmt: "possible deadlock in %[1]v", }, { title: compile("WARNING: possible irq lock inversion dependency detected"), - report: compile("WARNING: possible irq lock inversion dependency detected(?:.*\\n)+?.*just changed the state of lock(?:.*\\n)+?.*at: {{PC}} +{{FUNC}}"), + report: compile("WARNING: possible irq lock inversion dependency detected(?:.*\\n)+?.*just changed the state of lock(?:.*\\n)+?.*at: (?:{{PC}} +)?{{FUNC}}"), fmt: "possible deadlock in %[1]v", }, { title: compile("WARNING: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detecte"), - report: compile("WARNING: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected(?:.*\\n)+?.*is trying to acquire(?:.*\\n)+?.*at: {{PC}} +{{FUNC}}"), + report: compile("WARNING: SOFTIRQ-safe -> SOFTIRQ-unsafe lock order detected(?:.*\\n)+?.*is trying to acquire(?:.*\\n)+?.*at: (?:{{PC}} +)?{{FUNC}}"), fmt: "possible deadlock in %[1]v", }, { @@ -860,7 +860,7 @@ var linuxOopses = []*oops{ }, { title: compile("WARNING: inconsistent lock state"), - report: compile("WARNING: inconsistent lock state(?:.*\\n)+?.*takes(?:.*\\n)+?.*at: {{PC}} +{{FUNC}}"), + report: compile("WARNING: inconsistent lock state(?:.*\\n)+?.*takes(?:.*\\n)+?.*at: (?:{{PC}} +)?{{FUNC}}"), fmt: "inconsistent lock state in %[1]v", }, { -- cgit mrf-deployment