| Revision | 2099353f7a187ba0eb44cf955c741edfa2b5ab94 (tree) |
|---|---|
| Zeit | 2019-09-21 14:14:19 |
| Autor | Kim Phillips <kim.phillips@amd....> |
| Commiter | Greg Kroah-Hartman |
perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
[ Upstream commit 0f4cd769c410e2285a4e9873a684d90423f03090 ]
When counting dispatched micro-ops with cnt_ctl=1, in order to prevent
sample bias, IBS hardware preloads the least significant 7 bits of
current count (IbsOpCurCnt) with random values, such that, after the
interrupt is handled and counting resumes, the next sample taken
will be slightly perturbed.
The current count bitfield is in the IBS execution control h/w register,
alongside the maximum count field.
Currently, the IBS driver writes that register with the maximum count,
leaving zeroes to fill the current count field, thereby overwriting
the random bits the hardware preloaded for itself.
Fix the driver to actually retain and carry those random bits from the
read of the IBS control register, through to its write, instead of
overwriting the lower current count bits with zeroes.
Tested with:
perf record -c 100001 -e ibs_op/cnt_ctl=1/pp -a -C 0 taskset -c 0 <workload>
'perf annotate' output before:
'perf annotate' output after:
Tested on Family 15h and 17h machines.
Machines prior to family 10h Rev. C don't have the RDWROPCNT capability,
and have the IbsOpCurCnt bitfield reserved, so this patch shouldn't
affect their operation.
It is unknown why commit db98c5faf8cb ("perf/x86: Implement 64-bit
counter support for IBS") ignored the lower 4 bits of the IbsOpCurCnt
field; the number of preloaded random bits has always been 7, AFAICT.
Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: "Arnaldo Carvalho de Melo" <acme@kernel.org>
Cc: <x86@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "Borislav Petkov" <bp@alien8.de>
Cc: Stephane Eranian <eranian@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: "Namhyung Kim" <namhyung@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Link: https://lkml.kernel.org/r/20190826195730.30614-1-kim.phillips@amd.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/events/amd/ibs.c (diff)
arch/x86/include/asm/perf_event.h (diff)| @@ -671,10 +671,17 @@ fail: | ||
| 671 | 671 | |
| 672 | 672 | throttle = perf_event_overflow(event, &data, ®s); |
| 673 | 673 | out: |
| 674 | - if (throttle) | |
| 674 | + if (throttle) { | |
| 675 | 675 | perf_ibs_stop(event, 0); |
| 676 | - else | |
| 677 | - perf_ibs_enable_event(perf_ibs, hwc, period >> 4); | |
| 676 | + } else { | |
| 677 | + period >>= 4; | |
| 678 | + | |
| 679 | + if ((ibs_caps & IBS_CAPS_RDWROPCNT) && | |
| 680 | + (*config & IBS_OP_CNT_CTL)) | |
| 681 | + period |= *config & IBS_OP_CUR_CNT_RAND; | |
| 682 | + | |
| 683 | + perf_ibs_enable_event(perf_ibs, hwc, period); | |
| 684 | + } | |
| 678 | 685 | |
| 679 | 686 | perf_event_update_userpage(event); |
| 680 | 687 |
| @@ -200,16 +200,20 @@ struct x86_pmu_capability { | ||
| 200 | 200 | #define IBSCTL_LVT_OFFSET_VALID (1ULL<<8) |
| 201 | 201 | #define IBSCTL_LVT_OFFSET_MASK 0x0F |
| 202 | 202 | |
| 203 | -/* ibs fetch bits/masks */ | |
| 203 | +/* IBS fetch bits/masks */ | |
| 204 | 204 | #define IBS_FETCH_RAND_EN (1ULL<<57) |
| 205 | 205 | #define IBS_FETCH_VAL (1ULL<<49) |
| 206 | 206 | #define IBS_FETCH_ENABLE (1ULL<<48) |
| 207 | 207 | #define IBS_FETCH_CNT 0xFFFF0000ULL |
| 208 | 208 | #define IBS_FETCH_MAX_CNT 0x0000FFFFULL |
| 209 | 209 | |
| 210 | -/* ibs op bits/masks */ | |
| 211 | -/* lower 4 bits of the current count are ignored: */ | |
| 212 | -#define IBS_OP_CUR_CNT (0xFFFF0ULL<<32) | |
| 210 | +/* | |
| 211 | + * IBS op bits/masks | |
| 212 | + * The lower 7 bits of the current count are random bits | |
| 213 | + * preloaded by hardware and ignored in software | |
| 214 | + */ | |
| 215 | +#define IBS_OP_CUR_CNT (0xFFF80ULL<<32) | |
| 216 | +#define IBS_OP_CUR_CNT_RAND (0x0007FULL<<32) | |
| 213 | 217 | #define IBS_OP_CNT_CTL (1ULL<<19) |
| 214 | 218 | #define IBS_OP_VAL (1ULL<<18) |
| 215 | 219 | #define IBS_OP_ENABLE (1ULL<<17) |
Android-x86
Fork