Patch "perf branch: Fix interpretation of branch records" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    perf branch: Fix interpretation of branch records

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-branch-fix-interpretation-of-branch-records.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 9dcae7d2fc4c16ba1245a5e1b9d18d8c7639a57f
Author: James Clark <james.clark@xxxxxxx>
Date:   Wed Nov 30 16:51:58 2022 +0000

    perf branch: Fix interpretation of branch records
    
    [ Upstream commit 20ed9fa4965875fdde5bfd65d838465e38d46b22 ]
    
    Commit 93315e46b000fc80 ("perf/core: Add speculation info to branch
    entries") added a new field in between type and new_type. Perf has its
    own copy of this struct so update it to match the kernel side.
    
    This doesn't currently cause any issues because new_type is only used by
    the Arm BRBE driver which isn't merged yet.
    
    Committer notes:
    
    Is this really an ABI? How are we supposed to deal with old perf.data
    files with new tools and vice versa? :-\
    
    Fixes: 93315e46b000fc80 ("perf/core: Add speculation info to branch entries")
    Reviewed-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
    Signed-off-by: James Clark <james.clark@xxxxxxx>
    Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
    Cc: Ingo Molnar <mingo@xxxxxxxxxx>
    Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
    Cc: Mark Rutland <mark.rutland@xxxxxxx>
    Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
    Cc: Sandipan Das <sandipan.das@xxxxxxx>
    Link: https://lore.kernel.org/r/20221130165158.517385-1-james.clark@xxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/util/branch.h b/tools/perf/util/branch.h
index f838b23db180..dca75cad96f6 100644
--- a/tools/perf/util/branch.h
+++ b/tools/perf/util/branch.h
@@ -24,9 +24,10 @@ struct branch_flags {
 			u64 abort:1;
 			u64 cycles:16;
 			u64 type:4;
+			u64 spec:2;
 			u64 new_type:4;
 			u64 priv:3;
-			u64 reserved:33;
+			u64 reserved:31;
 		};
 	};
 };