From cb93dc6ac64225e09f44bac6c6cce1dae1b248b0 Mon Sep 17 00:00:00 2001
From: Anton Lindqvist <anton@basename.se>
Date: Sat, 25 Jul 2020 11:52:03 +0200
Subject: pkg/report: flag short uvm_fault reports as corrupted

They don't contain enough context to be useful.

This change makes `testdata/openbsd/report/0` to be treated as
corrupted, which is desirable since it also lacks context.
---
 pkg/report/openbsd.go                 |  15 +++++++++++----
 pkg/report/testdata/openbsd/report/0  |   3 ++-
 pkg/report/testdata/openbsd/report/29 |   5 +++++
 pkg/report/testdata/openbsd/report/30 |   4 ++++
 pkg/report/testdata/openbsd/report/31 | Bin 0 -> 9215 bytes
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 pkg/report/testdata/openbsd/report/29
 create mode 100644 pkg/report/testdata/openbsd/report/30
 create mode 100644 pkg/report/testdata/openbsd/report/31

(limited to 'pkg')

diff --git a/pkg/report/openbsd.go b/pkg/report/openbsd.go
index 9373b607b..92bdfa3fe 100644
--- a/pkg/report/openbsd.go
+++ b/pkg/report/openbsd.go
@@ -117,12 +117,19 @@ var openbsdOopses = append([]*oops{
 		[]byte("uvm_fault("),
 		[]oopsFormat{
 			{
-				title: compile("uvm_fault\\((?:.*\\n)+?.*Stopped at[ ]+{{ADDR}}"),
-				fmt:   "uvm_fault",
+				title:  compile("uvm_fault\\((?:.*\\n)+?.*Stopped at[ ]+{{ADDR}}"),
+				report: compile("uvm_fault\\((?:.*\\n)+?.*end trace frame"),
+				fmt:    "uvm_fault",
 			},
 			{
-				title: compile("uvm_fault\\((?:.*\\n)+?.*Stopped at[ ]+([^\\+]+)"),
-				fmt:   "uvm_fault: %[1]v",
+				title:  compile("uvm_fault\\((?:.*\\n)+?.*Stopped at[ ]+([^\\+]+)"),
+				report: compile("uvm_fault\\((?:.*\\n)+?.*Stopped at[ ]+([^\\+]+)\\((?:.*\\n)+?.*end trace frame"),
+				fmt:    "uvm_fault: %[1]v",
+			},
+			{
+				title:     compile("uvm_fault\\("),
+				fmt:       "uvm_fault",
+				corrupted: true,
 			},
 		},
 		[]*regexp.Regexp{},
diff --git a/pkg/report/testdata/openbsd/report/0 b/pkg/report/testdata/openbsd/report/0
index bb002c04d..27e236f9d 100644
--- a/pkg/report/testdata/openbsd/report/0
+++ b/pkg/report/testdata/openbsd/report/0
@@ -1,4 +1,5 @@
-TITLE: uvm_fault: vn_writechk
+TITLE: uvm_fault
+CORRUPTED: Y
 
 login: uvm_fault(0xffffff0018def850, 0x50, 0, 1) -> e
 
kernel: page fault trap, code=0
diff --git a/pkg/report/testdata/openbsd/report/29 b/pkg/report/testdata/openbsd/report/29
new file mode 100644
index 000000000..3eafe162d
--- /dev/null
+++ b/pkg/report/testdata/openbsd/report/29
@@ -0,0 +1,5 @@
+TITLE: uvm_fault
+CORRUPTED: Y
+
+
uvm_fault(0xfffffd806b5e3228, 0xa, 0, 1) -> e
+
kernel: page fault trap, code=0
diff --git a/pkg/report/testdata/openbsd/report/30 b/pkg/report/testdata/openbsd/report/30
new file mode 100644
index 000000000..076ee97c4
--- /dev/null
+++ b/pkg/report/testdata/openbsd/report/30
@@ -0,0 +1,4 @@
+TITLE: uvm_fault
+CORRUPTED: Y
+
+
uvm_fault(0xfffffd806bc0a440, 0x3, 0, 1) -> e
diff --git a/pkg/report/testdata/openbsd/report/31 b/pkg/report/testdata/openbsd/report/31
new file mode 100644
index 000000000..997832690
Binary files /dev/null and b/pkg/report/testdata/openbsd/report/31 differ
-- 
cgit mrf-deployment