]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
perf/x86/intel/pt: Fix address filter config for 32-bit kernel
authorAdrian Hunter <adrian.hunter@intel.com>
Mon, 31 Jan 2022 07:24:52 +0000 (09:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Apr 2022 12:14:44 +0000 (14:14 +0200)
[ Upstream commit e5524bf1047eb3b3f3f33b5f59897ba67b3ade87 ]

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@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220131072453.2839535-5-adrian.hunter@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/events/intel/pt.c

index 849f0ba53a9b9efe387c21ce9841dfb3e40ae984..49b3ea1c1ea19698673b25c0177da9bad044487d 100644 (file)
@@ -460,7 +460,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;