[tip: perf/core] perf/x86/intel/pt: Fix address filter config for 32-bit kernel

From: tip-bot2 for Adrian Hunter
Date: Thu Feb 03 2022 - 09:34:13 EST


The following commit has been merged into the perf/core branch of tip:

Commit-ID: e5524bf1047eb3b3f3f33b5f59897ba67b3ade87
Gitweb: https://git.kernel.org/tip/e5524bf1047eb3b3f3f33b5f59897ba67b3ade87
Author: Adrian Hunter <adrian.hunter@xxxxxxxxx>
AuthorDate: Mon, 31 Jan 2022 09:24:52 +02:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Wed, 02 Feb 2022 13:11:43 +01:00

perf/x86/intel/pt: Fix address filter config for 32-bit kernel

Change from shifting 'unsigned long' to 'u64' to prevent the config bits
being lost on a 32-bit kernel.

Fixes: eadf48cab4b6b0 ("perf/x86/intel/pt: Add support for address range filtering in PT")
Signed-off-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20220131072453.2839535-5-adrian.hunter@xxxxxxxxx
---
arch/x86/events/intel/pt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index 93676a5..f061dc2 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -474,7 +474,7 @@ static u64 pt_config_filters(struct perf_event *event)
pt->filters.filter[range].msr_b = filter->msr_b;
}

- rtit_ctl |= filter->config << pt_address_ranges[range].reg_off;
+ rtit_ctl |= (u64)filter->config << pt_address_ranges[range].reg_off;
}

return rtit_ctl;