perf: Add irq and exception return branch types

This expands generic branch type classification by adding two more entries
there in i.e irq and exception return. Also updates the x86 implementation
to process X86_BR_IRET and X86_BR_IRQ records as appropriate. This changes
branch types reported to user space on x86 platform but it should not be a
problem. The possible scenarios and impacts are enumerated here.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/1645681014-3346-1-git-send-email-anshuman.khandual@arm.com

diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c
index 669c2be14784fc18ffcebff9ead8cae9692a8b5c..fe1742c4ca4986cb3da2f46f6af101bf20d0b5c4 100644 (file)
--- a/arch/x86/events/intel/lbr.c
+++ b/arch/x86/events/intel/lbr.c
@@ -1329,10 +1329,10 @@ static int branch_map[X86_BR_TYPE_MAP_MAX] = {
        PERF_BR_SYSCALL,        /* X86_BR_SYSCALL */
        PERF_BR_SYSRET,         /* X86_BR_SYSRET */
        PERF_BR_UNKNOWN,        /* X86_BR_INT */
-       PERF_BR_UNKNOWN,        /* X86_BR_IRET */
+       PERF_BR_ERET,           /* X86_BR_IRET */
        PERF_BR_COND,           /* X86_BR_JCC */
        PERF_BR_UNCOND,         /* X86_BR_JMP */
-       PERF_BR_UNKNOWN,        /* X86_BR_IRQ */
+       PERF_BR_IRQ,            /* X86_BR_IRQ */
        PERF_BR_IND_CALL,       /* X86_BR_IND_CALL */
        PERF_BR_UNKNOWN,        /* X86_BR_ABORT */
        PERF_BR_UNKNOWN,        /* X86_BR_IN_TX */

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 1b65042ab1db8df48b3daa7940756e1d0e132abe..7dc71768749da38d63b69adb68ef51b77fc07993 100644 (file)
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -251,6 +251,8 @@ enum {
        PERF_BR_SYSRET          = 8,    /* syscall return */
        PERF_BR_COND_CALL       = 9,    /* conditional function call */
        PERF_BR_COND_RET        = 10,   /* conditional function return */
+       PERF_BR_ERET            = 11,   /* exception return */
+       PERF_BR_IRQ             = 12,   /* irq */
        PERF_BR_MAX,
 };
 

diff --git a/tools/include/uapi/linux/perf_event.h b/tools/include/uapi/linux/perf_event.h
index 4cd39aaccbe7b90491137ec2d9381b8b042ba5f4..d1324c427e8bb44c56c7d39754d2e957996a1ace 100644 (file)
--- a/tools/include/uapi/linux/perf_event.h
+++ b/tools/include/uapi/linux/perf_event.h
@@ -251,6 +251,8 @@ enum {
        PERF_BR_SYSRET          = 8,    /* syscall return */
        PERF_BR_COND_CALL       = 9,    /* conditional function call */
        PERF_BR_COND_RET        = 10,   /* conditional function return */
+       PERF_BR_ERET            = 11,   /* exception return */
+       PERF_BR_IRQ             = 12,   /* irq */
        PERF_BR_MAX,
 };
 

diff --git a/tools/perf/util/branch.c b/tools/perf/util/branch.c
index 2285b1eb3128d7eb2d9d8b710992cde074fe035e..a9a909db8cc7fd9f6aa37426b53945db32e9721f 100644 (file)
--- a/tools/perf/util/branch.c
+++ b/tools/perf/util/branch.c
@@ -49,7 +49,9 @@ const char *branch_type_name(int type)
                "SYSCALL",
                "SYSRET",
                "COND_CALL",
-               "COND_RET"
+               "COND_RET",
+               "ERET",
+               "IRQ"
        };
 
        if (type >= 0 && type < PERF_BR_MAX)