Skip to content

Commit bba82fd

Browse files
rocallahanrkrcmar
authored andcommitted
KVM: x86: never specify a sample period for virtualized in_tx_cp counters
pmc_reprogram_counter() always sets a sample period based on the value of pmc->counter. However, hsw_hw_config() rejects sample periods less than 2^31 - 1. So for example, if a KVM guest does struct perf_event_attr attr; memset(&attr, 0, sizeof(attr)); attr.type = PERF_TYPE_RAW; attr.size = sizeof(attr); attr.config = 0x2005101c4; // conditional branches retired IN_TXCP attr.sample_period = 0; int fd = syscall(__NR_perf_event_open, &attr, 0, -1, -1, 0); ioctl(fd, PERF_EVENT_IOC_DISABLE, 0); ioctl(fd, PERF_EVENT_IOC_ENABLE, 0); the guest kernel counts some conditional branch events, then updates the virtual PMU register with a nonzero count. The host reaches pmc_reprogram_counter() with nonzero pmc->counter, triggers EOPNOTSUPP in hsw_hw_config(), prints "kvm_pmu: event creation failed" in pmc_reprogram_counter(), and silently (from the guest's point of view) stops counting events. We fix event counting by forcing attr.sample_period to always be zero for in_tx_cp counters. Sampling doesn't work, but it already didn't work and can't be fixed without major changes to the approach in hsw_hw_config(). Signed-off-by: Robert O'Callahan <robert@ocallahan.org> Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
1 parent fd7e9a8 commit bba82fd

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

arch/x86/kvm/pmu.c

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,19 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type,
113113
.config = config,
114114
};
115115

116+
attr.sample_period = (-pmc->counter) & pmc_bitmask(pmc);
117+
116118
if (in_tx)
117119
attr.config |= HSW_IN_TX;
118-
if (in_tx_cp)
120+
if (in_tx_cp) {
121+
/*
122+
* HSW_IN_TX_CHECKPOINTED is not supported with nonzero
123+
* period. Just clear the sample period so at least
124+
* allocating the counter doesn't fail.
125+
*/
126+
attr.sample_period = 0;
119127
attr.config |= HSW_IN_TX_CHECKPOINTED;
120-
121-
attr.sample_period = (-pmc->counter) & pmc_bitmask(pmc);
128+
}
122129

123130
event = perf_event_create_kernel_counter(&attr, -1, current,
124131
intr ? kvm_perf_overflow_intr :

0 commit comments

Comments
 (0)