1 files changed, 10 insertions, 3 deletions

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 06ce377dcbc9..026db42a86c3 100644
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -113,12 +113,19 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type,
                 .config = config,
         };
 
+        attr.sample_period = (-pmc->counter) & pmc_bitmask(pmc);
+
         if (in_tx)
                 attr.config |= HSW_IN_TX;
-        if (in_tx_cp)
+        if (in_tx_cp) {
+                /*
+                 * HSW_IN_TX_CHECKPOINTED is not supported with nonzero
+                 * period. Just clear the sample period so at least
+                 * allocating the counter doesn't fail.
+                 */
+                attr.sample_period = 0;
                 attr.config |= HSW_IN_TX_CHECKPOINTED;
-
-        attr.sample_period = (-pmc->counter) & pmc_bitmask(pmc);
+        }
 
         event = perf_event_create_kernel_counter(&attr, -1, current,
                                                  intr ? kvm_perf_overflow_intr :