]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.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)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:38:06 +0000 (14:38 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969110
[ 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>
(cherry picked from commit df5e0a0b3a4eefe4845c21e5ea586d0c73057959)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/x86/events/intel/pt.c

index 2d33bba9a144048f298053714ab59bfc074e6ae8..215aed65e97829ac5e6711490151d1e0a7131c22 100644 (file)
@@ -472,7 +472,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;