[PATCH 04/13] perf/core: Extend perf_output_sample_regs() to include perf_arch_regs

[Madhavan Srinivasan]

Extend perf_output_sample_regs() to take in perf_regs structure as
a parameter instead of pt_regs. Add code to check for arch_regs_mask
and dump the arch registers to the output sample.

Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
Cc: Stephane Eranian <eran...@gmail.com>
Cc: Russell King <li...@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com>
Signed-off-by: Madhavan Srinivasan <ma...@linux.vnet.ibm.com>
---
 kernel/events/core.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 274288819829..e16bf4d057d1 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5371,16 +5371,24 @@ u64 __attribute__((weak)) perf_arch_reg_value(struct 
perf_arch_regs *regs,
 
 static void
 perf_output_sample_regs(struct perf_output_handle *handle,
-                       struct pt_regs *regs, u64 mask)
+                               struct perf_regs *regs, u64 mask)
 {
        int bit;
        DECLARE_BITMAP(_mask, 64);
+       u64 arch_regs_mask = regs->arch_regs_mask;
 
        bitmap_from_u64(_mask, mask);
        for_each_set_bit(bit, _mask, sizeof(mask) * BITS_PER_BYTE) {
                u64 val;
 
-               val = perf_reg_value(regs, bit);
+               val = perf_reg_value(regs->regs, bit);
+               perf_output_put(handle, val);
+       }
+
+       bitmap_from_u64(_mask, arch_regs_mask);
+       for_each_set_bit(bit, _mask, sizeof(mask) * BITS_PER_BYTE) {
+               u64 val;
+               val = perf_arch_reg_value(regs->arch_regs, bit);
                perf_output_put(handle, val);
        }
 }
@@ -5792,7 +5800,7 @@ void perf_output_sample(struct perf_output_handle *handle,
                if (abi) {
                        u64 mask = event->attr.sample_regs_user;
                        perf_output_sample_regs(handle,
-                                               data->regs_user.regs,
+                                               &data->regs_user,
                                                mask);
                }
        }
@@ -5827,7 +5835,7 @@ void perf_output_sample(struct perf_output_handle *handle,
                        u64 mask = event->attr.sample_regs_intr;
 
                        perf_output_sample_regs(handle,
-                                               data->regs_intr.regs,
+                                               &data->regs_intr,
                                                mask);
                }
        }
-- 
2.7.4