Patchwork data: klog.json: thermal overrun messages should be checked on klog test (LP: #1253146)

login
register
mail settings
Submitter Colin King
Date Nov. 20, 2013, 4:42 p.m.
Message ID <1384965753-15554-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/292817/
State Accepted
Headers show

Comments

Colin King - Nov. 20, 2013, 4:42 p.m.
From: Colin Ian King <colin.king@canonical.com>

Update klog.json to incorporate thermal CPU messages from the kernel (old
and new kernels).

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 data/klog.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
Alex Hung - Nov. 27, 2013, 2:54 a.m.
On 11/21/2013 12:42 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Update klog.json to incorporate thermal CPU messages from the kernel (old
> and new kernels).
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   data/klog.json | 12 ++++++++++--
>   1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 5d18c01..977e51d 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -418,11 +418,19 @@
>      "label": "KlogAcpiNoIoapicForGsi"
>     },
>     {
> +   "compare_mode": "regex",
> +   "log_level": "LOG_LEVEL_CRITICAL",
> +   "tag": "FWTS_TAG_BIOS_THERMAL",
> +   "pattern": "[T|t]emperature above threshold, cpu clock throttled",
> +   "advice": "Test caused CPU temperature above critical threshold. The CPU has been throttled to run slower because of over-heating above the critical threshold. CPU throttling will be turned off once the CPU has cooled sufficiently.  Frequent throttling may indicate poor thermal design on the machine.",
> +   "label": "KlogThermalOverrun"
> +  },
> +  {
>      "compare_mode": "string",
>      "log_level": "LOG_LEVEL_CRITICAL",
>      "tag": "FWTS_TAG_BIOS_THERMAL",
> -   "pattern": "Temperature above threshold, cpu clock throttled",
> -   "advice": "Test caused CPU temperature above critical threshold. Insufficient cooling?",
> +   "pattern": "Possible thermal failure",
> +   "advice": "A Pentium class Intel CPU has had a thermal machine check exception caused by hot CPU.  If this persists it may indicate poor thermal design on the machine.",
>      "label": "KlogThermalOverrun"
>     },
>     {
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Keng-Yu Lin - Dec. 2, 2013, 2:17 a.m.
On Thu, Nov 21, 2013 at 12:42 AM, Colin King <colin.king@canonical.com> wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Update klog.json to incorporate thermal CPU messages from the kernel (old
> and new kernels).
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  data/klog.json | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/data/klog.json b/data/klog.json
> index 5d18c01..977e51d 100644
> --- a/data/klog.json
> +++ b/data/klog.json
> @@ -418,11 +418,19 @@
>     "label": "KlogAcpiNoIoapicForGsi"
>    },
>    {
> +   "compare_mode": "regex",
> +   "log_level": "LOG_LEVEL_CRITICAL",
> +   "tag": "FWTS_TAG_BIOS_THERMAL",
> +   "pattern": "[T|t]emperature above threshold, cpu clock throttled",
> +   "advice": "Test caused CPU temperature above critical threshold. The CPU has been throttled to run slower because of over-heating above the critical threshold. CPU throttling will be turned off once the CPU has cooled sufficiently.  Frequent throttling may indicate poor thermal design on the machine.",
> +   "label": "KlogThermalOverrun"
> +  },
> +  {
>     "compare_mode": "string",
>     "log_level": "LOG_LEVEL_CRITICAL",
>     "tag": "FWTS_TAG_BIOS_THERMAL",
> -   "pattern": "Temperature above threshold, cpu clock throttled",
> -   "advice": "Test caused CPU temperature above critical threshold. Insufficient cooling?",
> +   "pattern": "Possible thermal failure",
> +   "advice": "A Pentium class Intel CPU has had a thermal machine check exception caused by hot CPU.  If this persists it may indicate poor thermal design on the machine.",
>     "label": "KlogThermalOverrun"
>    },
>    {
> --
> 1.8.3.2
>

Acked-by: Keng-Yu Lin <kengyu@canonical.com>

Patch

diff --git a/data/klog.json b/data/klog.json
index 5d18c01..977e51d 100644
--- a/data/klog.json
+++ b/data/klog.json
@@ -418,11 +418,19 @@ 
    "label": "KlogAcpiNoIoapicForGsi"
   },
   {
+   "compare_mode": "regex",
+   "log_level": "LOG_LEVEL_CRITICAL",
+   "tag": "FWTS_TAG_BIOS_THERMAL",
+   "pattern": "[T|t]emperature above threshold, cpu clock throttled",
+   "advice": "Test caused CPU temperature above critical threshold. The CPU has been throttled to run slower because of over-heating above the critical threshold. CPU throttling will be turned off once the CPU has cooled sufficiently.  Frequent throttling may indicate poor thermal design on the machine.",
+   "label": "KlogThermalOverrun"
+  },
+  {
    "compare_mode": "string",
    "log_level": "LOG_LEVEL_CRITICAL",
    "tag": "FWTS_TAG_BIOS_THERMAL",
-   "pattern": "Temperature above threshold, cpu clock throttled",
-   "advice": "Test caused CPU temperature above critical threshold. Insufficient cooling?",
+   "pattern": "Possible thermal failure",
+   "advice": "A Pentium class Intel CPU has had a thermal machine check exception caused by hot CPU.  If this persists it may indicate poor thermal design on the machine.",
    "label": "KlogThermalOverrun"
   },
   {