From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965071Ab2CBOZi (ORCPT ); Fri, 2 Mar 2012 09:25:38 -0500 Received: from s15943758.onlinehome-server.info ([217.160.130.188]:49363 "EHLO mail.x86-64.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757210Ab2CBOZe (ORCPT ); Fri, 2 Mar 2012 09:25:34 -0500 From: Borislav Petkov To: Tony Luck Cc: Ingo Molnar , EDAC devel , LKML , Borislav Petkov Subject: [PATCH 2/4] mce: Add a msg string to the MCE tracepoint Date: Fri, 2 Mar 2012 15:25:12 +0100 Message-Id: <1330698314-9863-3-git-send-email-bp@amd64.org> X-Mailer: git-send-email 1.7.8.rc0 In-Reply-To: <1330698314-9863-1-git-send-email-bp@amd64.org> References: <1330698314-9863-1-git-send-email-bp@amd64.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov The idea here is to pass an additional decoded MCE message through the tracepoint and into the ring buffer for userspace to consume. The designated consumers are RAS daemons and other tools collecting RAS information. Drop unneeded fields while at it, thus saving some room in the ring buffer. Signed-off-by: Borislav Petkov --- arch/x86/kernel/cpu/mcheck/mce.c | 2 +- include/trace/events/mce.h | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c index a30d7af18e66..b28800443045 100644 --- a/arch/x86/kernel/cpu/mcheck/mce.c +++ b/arch/x86/kernel/cpu/mcheck/mce.c @@ -143,7 +143,7 @@ void mce_log(struct mce *mce) int ret = 0; /* Emit the trace record: */ - trace_mce_record(mce); + trace_mce_record("", mce); ret = atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, mce); if (ret == NOTIFY_STOP) diff --git a/include/trace/events/mce.h b/include/trace/events/mce.h index 4c1740ac7889..517536de2458 100644 --- a/include/trace/events/mce.h +++ b/include/trace/events/mce.h @@ -10,11 +10,12 @@ TRACE_EVENT(mce_record, - TP_PROTO(struct mce *m), + TP_PROTO(const char *msg, struct mce *m), - TP_ARGS(m), + TP_ARGS(msg, m), TP_STRUCT__entry( + __string( msg, msg ) __field( u64, mcgcap ) __field( u64, mcgstatus ) __field( u64, status ) @@ -24,14 +25,13 @@ TRACE_EVENT(mce_record, __field( u64, tsc ) __field( u64, walltime ) __field( u32, cpu ) - __field( u32, cpuid ) __field( u16, socketid ) __field( u8, cs ) __field( u8, bank ) - __field( u8, cpuvendor ) ), TP_fast_assign( + __assign_str(msg, msg); __entry->mcgcap = m->mcgcap; __entry->mcgstatus = m->mcgstatus; __entry->status = m->status; @@ -41,21 +41,19 @@ TRACE_EVENT(mce_record, __entry->tsc = m->tsc; __entry->walltime = m->time; __entry->cpu = m->cpu; - __entry->cpuid = m->cpuid; __entry->socketid = m->socketid; __entry->cs = m->cs; __entry->bank = m->bank; - __entry->cpuvendor = m->cpuvendor; ), - TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, ADDR/MISC: %016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u", + TP_printk("%s" HW_ERR "CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, ADDR/MISC: %016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, TIME: %llu, SOCKET: %u", + __get_str(msg), __entry->cpu, __entry->mcgcap, __entry->mcgstatus, __entry->bank, __entry->status, __entry->addr, __entry->misc, __entry->cs, __entry->ip, __entry->tsc, - __entry->cpuvendor, __entry->cpuid, __entry->walltime, __entry->socketid) ); -- 1.7.8.rc0