lkml.org 
[lkml]   [2012]   [Mar]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] mce: Add a msg string to the MCE tracepoint
    Date
    From: Borislav Petkov <borislav.petkov@amd.com>

    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 <borislav.petkov@amd.com>
    ---
    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


    \
     
     \ /
      Last update: 2012-03-02 15:27    [W:0.024 / U:94.284 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site