Re: [PATCH] perf: make perf.data more self-descriptive (v4)

From: Stephane Eranian
Date: Fri Sep 16 2011 - 12:34:56 EST


On Fri, Sep 16, 2011 at 5:33 PM, David Ahern <dsahern@xxxxxxxxx> wrote:
>
>
> On 09/16/2011 09:19 AM, Peter Zijlstra wrote:
>> On Fri, 2011-09-16 at 08:50 -0600, David Ahern wrote:
>>>
>>> ppc data file: header->magic 454c494646524550
>>> x86 data file: header->magic 454c494646524550
>>>
>> Ok then we need to fix that magic thing..
>
> Right, but it breaks backwards/forwards compatibility. e.g.,
>
Not necessarily, if you keep the current MAGIC, then you detect
a file with the old format, i.e., no flexibility on attr_size.

Then, you pick two new MAGIC numbers. They must, of course,
reflect the endianness. Those new perf.data files won't work with
older perf for sure, but at least you can maintain backward
compatibility. The new MAGIC must, of course, reflect the
endianness.



> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index 73fa59e..603a8bb9 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -65,9 +65,7 @@ char *perf_header__find_event(u64 id)
> Â Âreturn NULL;
> Â}
>
> -static const char *__perf_magic = "PERFFILE";
> -
> -#define PERF_MAGIC (*(u64 *)__perf_magic)
> +#define PERF_MAGIC 0x5045524646494c45ULL Â// "PERFFILE"
>
> Âstruct perf_file_attr {
> Â Âstruct perf_event_attr Âattr;
>
> That puts the magic in the file based on endianness of the recording
> system. e.g., on x86:
>
> $ od -c perf-magic.data | head -1
> 0000000 Â E Â L Â I Â F Â F Â R Â E Â P Â h Â\0 Â\0 Â\0 Â\0 Â\0 Â\0 Â\0
>
> Which means older perf binaries can't analyze new files (created with
> new magic order) and newer perf binaries can't analyze older perf files
> -- the new command will incorrectly want to do endian swapping on the
> old file.
>
> David
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/