On Fri, 6 Jun 2014 02:51:41 -0400
"Chen, Gong" <gong.c...@linux.intel.com> wrote:


> +/*
> + * MCE Extended Error Log trace event
> + *
> + * These events are generated when hardware detects a corrected or
> + * uncorrected event.
> + */
> +
> +/* memory trace event */
> +
> +TRACE_EVENT(extlog_mem_event,
> +     TP_PROTO(struct cper_sec_mem_err *mem,
> +              u32 err_seq,
> +              const uuid_le *fru_id,
> +              const char *fru_text,
> +              u8 sev),
> +
> +     TP_ARGS(mem, err_seq, fru_id, fru_text, sev),
> +
> +     TP_STRUCT__entry(
> +             __field(u32, err_seq)
> +             __field(u8, etype)
> +             __field(u8, sev)
> +             __field(u64, pa)
> +             __field(u8, pa_mask_lsb)
> +             __dynamic_array(char, fru, 48)
> +             __dynamic_array(u8, data, sizeof(struct cper_mem_err_compact))

For constant size arrays, don't use __dynamic_array() just use
__array().

Although I'd get rid of the fru and replace that with:

                __field(unsigned long, fru_id)
                __string(fru_text, fru_text)


> +     ),
> +
> +     TP_fast_assign(
> +             __entry->err_seq = err_seq;
> +             if (mem->validation_bits & CPER_MEM_VALID_ERROR_TYPE)
> +                     __entry->etype = mem->error_type;
> +             else
> +                     __entry->etype = ~0;
> +             __entry->sev = sev;
> +             if (mem->validation_bits & CPER_MEM_VALID_PA)
> +                     __entry->pa = mem->physical_addr;
> +             else
> +                     __entry->pa = ~0ull;
> +
> +             if (mem->validation_bits & CPER_MEM_VALID_PA_MASK)
> +                     __entry->pa_mask_lsb =
> +                             (u8)__ffs64(mem->physical_addr_mask);
> +             else
> +                     __entry->pa_mask_lsb = ~0;
> +             snprintf(__get_dynamic_array(fru), 47,
> +                      "FRU: %pUl %.20s", fru_id, fru_text);

Although, why not just save the id and text straight? Why format it
here?

        __entry->fru_id = fru_id;
        __assign_str(fru_text, fru_text);

> +             cper_mem_err_pack(mem, __get_dynamic_array(data));
> +     ),
> +
> +     TP_printk("{%d} %s error: %s physical addr: %016llx (mask lsb: %x) 
> %s%s",

        TP_printk("{%d} %s error: %s physical addr: %016llx (mask lsb: %x) %s 
FRU: %pUl %.20s",

> +               __entry->err_seq,
> +               cper_severity_str(__entry->sev),
> +               cper_mem_err_type_str(__entry->etype),
> +               __entry->pa,
> +               __entry->pa_mask_lsb,
> +               cper_mem_err_unpack(p, __get_dynamic_array(data)),
> +               __get_str(fru))

                __entry->fru_id,
                __get_str(fru_text))

-- Steve

> +);
>  
>  /*
>   * Hardware Events Report

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to