[PATCH v8 4/5] x86: perf: Refactor misc flag assignments

[Colton Lewis]

Break the assignment logic for misc flags into their own respective
functions to reduce the complexity of the nested logic.

Signed-off-by: Colton Lewis <coltonle...@google.com>
Acked-by: Kan Liang <kan.li...@linux.intel.com>
Reviewed-by: Oliver Upton <oliver.up...@linux.dev>
---
 arch/x86/events/core.c            | 59 ++++++++++++++++++++++---------
 arch/x86/include/asm/perf_event.h |  2 ++
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index d19e939f39983..bfc0a35fe3993 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -3011,27 +3011,52 @@ unsigned long perf_arch_instruction_pointer(struct 
pt_regs *regs)
        return regs->ip + code_segment_base(regs);
 }
 
-unsigned long perf_arch_misc_flags(struct pt_regs *regs)
+static unsigned long common_misc_flags(struct pt_regs *regs)
 {
-       unsigned int guest_state = perf_guest_state();
-       int misc = 0;
+       if (regs->flags & PERF_EFLAGS_EXACT)
+               return PERF_RECORD_MISC_EXACT_IP;
 
-       if (guest_state) {
-               if (guest_state & PERF_GUEST_USER)
-                       misc |= PERF_RECORD_MISC_GUEST_USER;
-               else
-                       misc |= PERF_RECORD_MISC_GUEST_KERNEL;
-       } else {
-               if (user_mode(regs))
-                       misc |= PERF_RECORD_MISC_USER;
-               else
-                       misc |= PERF_RECORD_MISC_KERNEL;
-       }
+       return 0;
+}
 
-       if (regs->flags & PERF_EFLAGS_EXACT)
-               misc |= PERF_RECORD_MISC_EXACT_IP;
+static unsigned long guest_misc_flags(struct pt_regs *regs)
+{
+       unsigned long guest_state = perf_guest_state();
+
+       if (!(guest_state & PERF_GUEST_ACTIVE))
+               return 0;
+
+       if (guest_state & PERF_GUEST_USER)
+               return PERF_RECORD_MISC_GUEST_USER;
+       else
+               return PERF_RECORD_MISC_GUEST_KERNEL;
+
+}
+
+static unsigned long host_misc_flags(struct pt_regs *regs)
+{
+       if (user_mode(regs))
+               return PERF_RECORD_MISC_USER;
+       else
+               return PERF_RECORD_MISC_KERNEL;
+}
+
+unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs)
+{
+       unsigned long flags = common_misc_flags(regs);
+
+       flags |= guest_misc_flags(regs);
+
+       return flags;
+}
+
+unsigned long perf_arch_misc_flags(struct pt_regs *regs)
+{
+       unsigned long flags = common_misc_flags(regs);
+
+       flags |= host_misc_flags(regs);
 
-       return misc;
+       return flags;
 }
 
 void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap)
diff --git a/arch/x86/include/asm/perf_event.h 
b/arch/x86/include/asm/perf_event.h
index feb87bf3d2e9c..d95f902acc521 100644
--- a/arch/x86/include/asm/perf_event.h
+++ b/arch/x86/include/asm/perf_event.h
@@ -538,7 +538,9 @@ struct x86_perf_regs {
 
 extern unsigned long perf_arch_instruction_pointer(struct pt_regs *regs);
 extern unsigned long perf_arch_misc_flags(struct pt_regs *regs);
+extern unsigned long perf_arch_guest_misc_flags(struct pt_regs *regs);
 #define perf_arch_misc_flags(regs)     perf_arch_misc_flags(regs)
+#define perf_arch_guest_misc_flags(regs)       perf_arch_guest_misc_flags(regs)
 
 #include <asm/stacktrace.h>
 
-- 
2.47.0.338.g60cca15819-goog