|
@@ -4460,7 +4460,7 @@ perf_output_sample_regs(struct perf_output_handle *handle,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-static void perf_sample_regs_user(struct perf_regs_user *regs_user,
|
|
|
+static void perf_sample_regs_user(struct perf_regs *regs_user,
|
|
|
struct pt_regs *regs)
|
|
|
{
|
|
|
if (!user_mode(regs)) {
|
|
@@ -4476,6 +4476,14 @@ static void perf_sample_regs_user(struct perf_regs_user *regs_user,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static void perf_sample_regs_intr(struct perf_regs *regs_intr,
|
|
|
+ struct pt_regs *regs)
|
|
|
+{
|
|
|
+ regs_intr->regs = regs;
|
|
|
+ regs_intr->abi = perf_reg_abi(current);
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
/*
|
|
|
* Get remaining task size from user stack pointer.
|
|
|
*
|
|
@@ -4857,6 +4865,23 @@ void perf_output_sample(struct perf_output_handle *handle,
|
|
|
if (sample_type & PERF_SAMPLE_TRANSACTION)
|
|
|
perf_output_put(handle, data->txn);
|
|
|
|
|
|
+ if (sample_type & PERF_SAMPLE_REGS_INTR) {
|
|
|
+ u64 abi = data->regs_intr.abi;
|
|
|
+ /*
|
|
|
+ * If there are no regs to dump, notice it through
|
|
|
+ * first u64 being zero (PERF_SAMPLE_REGS_ABI_NONE).
|
|
|
+ */
|
|
|
+ perf_output_put(handle, abi);
|
|
|
+
|
|
|
+ if (abi) {
|
|
|
+ u64 mask = event->attr.sample_regs_intr;
|
|
|
+
|
|
|
+ perf_output_sample_regs(handle,
|
|
|
+ data->regs_intr.regs,
|
|
|
+ mask);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (!event->attr.watermark) {
|
|
|
int wakeup_events = event->attr.wakeup_events;
|
|
|
|
|
@@ -4943,7 +4968,7 @@ void perf_prepare_sample(struct perf_event_header *header,
|
|
|
* in case new sample type is added, because we could eat
|
|
|
* up the rest of the sample size.
|
|
|
*/
|
|
|
- struct perf_regs_user *uregs = &data->regs_user;
|
|
|
+ struct perf_regs *uregs = &data->regs_user;
|
|
|
u16 stack_size = event->attr.sample_stack_user;
|
|
|
u16 size = sizeof(u64);
|
|
|
|
|
@@ -4964,6 +4989,21 @@ void perf_prepare_sample(struct perf_event_header *header,
|
|
|
data->stack_user_size = stack_size;
|
|
|
header->size += size;
|
|
|
}
|
|
|
+
|
|
|
+ if (sample_type & PERF_SAMPLE_REGS_INTR) {
|
|
|
+ /* regs dump ABI info */
|
|
|
+ int size = sizeof(u64);
|
|
|
+
|
|
|
+ perf_sample_regs_intr(&data->regs_intr, regs);
|
|
|
+
|
|
|
+ if (data->regs_intr.regs) {
|
|
|
+ u64 mask = event->attr.sample_regs_intr;
|
|
|
+
|
|
|
+ size += hweight64(mask) * sizeof(u64);
|
|
|
+ }
|
|
|
+
|
|
|
+ header->size += size;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
static void perf_event_output(struct perf_event *event,
|
|
@@ -7151,6 +7191,8 @@ static int perf_copy_attr(struct perf_event_attr __user *uattr,
|
|
|
ret = -EINVAL;
|
|
|
}
|
|
|
|
|
|
+ if (attr->sample_type & PERF_SAMPLE_REGS_INTR)
|
|
|
+ ret = perf_reg_validate(attr->sample_regs_intr);
|
|
|
out:
|
|
|
return ret;
|
|
|
|