From: "Mi, Dapeng" <dapeng1.mi@linux.intel.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Kan Liang <kan.liang@linux.intel.com>,
Jim Mattson <jmattson@google.com>,
Jinrong Liang <cloudliang@tencent.com>,
Aaron Lewis <aaronlewis@google.com>, Like Xu <likexu@tencent.com>
Subject: Re: [PATCH v7 19/19] KVM: selftests: Test PMC virtualization with forced emulation
Date: Thu, 9 Nov 2023 15:51:21 +0800 [thread overview]
Message-ID: <93a3da96-2e36-4ee9-a384-9dcc28c9f4ba@linux.intel.com> (raw)
In-Reply-To: <20231108003135.546002-20-seanjc@google.com>
On 11/8/2023 8:31 AM, Sean Christopherson wrote:
> Extend the PMC counters test to use forced emulation to verify that KVM
> emulates counter events for instructions retired and branches retired.
> Force emulation for only a subset of the measured code to test that KVM
> does the right thing when mixing perf events with emulated events.
>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
> .../selftests/kvm/x86_64/pmu_counters_test.c | 44 +++++++++++++------
> 1 file changed, 30 insertions(+), 14 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
> index d775cc7e8fab..09332b3c0a69 100644
> --- a/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/pmu_counters_test.c
> @@ -21,6 +21,7 @@
>
> static uint8_t kvm_pmu_version;
> static bool kvm_has_perf_caps;
> +static bool is_forced_emulation_enabled;
>
> static struct kvm_vm *pmu_vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,
> void *guest_code,
> @@ -34,6 +35,7 @@ static struct kvm_vm *pmu_vm_create_with_one_vcpu(struct kvm_vcpu **vcpu,
> vcpu_init_descriptor_tables(*vcpu);
>
> sync_global_to_guest(vm, kvm_pmu_version);
> + sync_global_to_guest(vm, is_forced_emulation_enabled);
>
> /*
> * Set PERF_CAPABILITIES before PMU version as KVM disallows enabling
> @@ -138,37 +140,50 @@ static void guest_assert_event_count(uint8_t idx,
> * If CLFUSH{,OPT} is supported, flush the cacheline containing (at least) the
> * start of the loop to force LLC references and misses, i.e. to allow testing
> * that those events actually count.
> + *
> + * If forced emulation is enabled (and specified), force emulation on a subset
> + * of the measured code to verify that KVM correctly emulates instructions and
> + * branches retired events in conjunction with hardware also counting said
> + * events.
> */
> -#define GUEST_MEASURE_EVENT(_msr, _value, clflush) \
> +#define GUEST_MEASURE_EVENT(_msr, _value, clflush, FEP) \
> do { \
> __asm__ __volatile__("wrmsr\n\t" \
> clflush "\n\t" \
> "mfence\n\t" \
> "1: mov $" __stringify(NUM_BRANCHES) ", %%ecx\n\t" \
> - "loop .\n\t" \
> - "mov %%edi, %%ecx\n\t" \
> - "xor %%eax, %%eax\n\t" \
> - "xor %%edx, %%edx\n\t" \
> + FEP "loop .\n\t" \
> + FEP "mov %%edi, %%ecx\n\t" \
> + FEP "xor %%eax, %%eax\n\t" \
> + FEP "xor %%edx, %%edx\n\t" \
> "wrmsr\n\t" \
> :: "a"((uint32_t)_value), "d"(_value >> 32), \
> "c"(_msr), "D"(_msr) \
> ); \
> } while (0)
>
> +#define GUEST_TEST_EVENT(_idx, _event, _pmc, _pmc_msr, _ctrl_msr, _value, FEP) \
> +do { \
> + wrmsr(pmc_msr, 0); \
> + \
> + if (this_cpu_has(X86_FEATURE_CLFLUSHOPT)) \
> + GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflushopt 1f", FEP); \
> + else if (this_cpu_has(X86_FEATURE_CLFLUSH)) \
> + GUEST_MEASURE_EVENT(_ctrl_msr, _value, "clflush 1f", FEP); \
> + else \
> + GUEST_MEASURE_EVENT(_ctrl_msr, _value, "nop", FEP); \
> + \
> + guest_assert_event_count(_idx, _event, _pmc, _pmc_msr); \
> +} while (0)
> +
> static void __guest_test_arch_event(uint8_t idx, struct kvm_x86_pmu_feature event,
> uint32_t pmc, uint32_t pmc_msr,
> uint32_t ctrl_msr, uint64_t ctrl_msr_value)
> {
> - wrmsr(pmc_msr, 0);
> + GUEST_TEST_EVENT(idx, event, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, "");
>
> - if (this_cpu_has(X86_FEATURE_CLFLUSHOPT))
> - GUEST_MEASURE_EVENT(ctrl_msr, ctrl_msr_value, "clflushopt 1f");
> - else if (this_cpu_has(X86_FEATURE_CLFLUSH))
> - GUEST_MEASURE_EVENT(ctrl_msr, ctrl_msr_value, "clflush 1f");
> - else
> - GUEST_MEASURE_EVENT(ctrl_msr, ctrl_msr_value, "nop");
> -
> - guest_assert_event_count(idx, event, pmc, pmc_msr);
> + if (is_forced_emulation_enabled)
> + GUEST_TEST_EVENT(idx, event, pmc, pmc_msr, ctrl_msr, ctrl_msr_value, KVM_FEP);
> }
>
> #define X86_PMU_FEATURE_NULL \
> @@ -545,6 +560,7 @@ int main(int argc, char *argv[])
>
> kvm_pmu_version = kvm_cpu_property(X86_PROPERTY_PMU_VERSION);
> kvm_has_perf_caps = kvm_cpu_has(X86_FEATURE_PDCM);
> + is_forced_emulation_enabled = kvm_is_forced_emulation_enabled();
>
> test_intel_counters();
>
Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com>
prev parent reply other threads:[~2023-11-09 7:51 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-08 0:31 [PATCH v7 00/19] KVM: x86/pmu: selftests: Fixes and new tests Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 01/19] KVM: x86/pmu: Always treat Fixed counters as available when supported Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 02/19] KVM: x86/pmu: Allow programming events that match unsupported arch events Sean Christopherson
2023-11-08 1:24 ` Jim Mattson
2023-11-08 20:41 ` Liang, Kan
2023-11-08 0:31 ` [PATCH v7 03/19] KVM: x86/pmu: Remove KVM's enumeration of Intel's architectural encodings Sean Christopherson
2023-11-08 16:06 ` Liang, Kan
2023-11-08 19:35 ` Sean Christopherson
2023-11-08 20:38 ` Liang, Kan
2023-11-08 0:31 ` [PATCH v7 04/19] KVM: x86/pmu: Setup fixed counters' eventsel during PMU initialization Sean Christopherson
2023-11-08 1:28 ` Jim Mattson
2023-11-08 14:39 ` Sean Christopherson
2023-11-08 19:00 ` Jim Mattson
2023-11-08 0:31 ` [PATCH v7 05/19] KVM: selftests: Add vcpu_set_cpuid_property() to set properties Sean Christopherson
2023-11-08 19:11 ` Jim Mattson
2023-11-08 0:31 ` [PATCH v7 06/19] KVM: selftests: Drop the "name" param from KVM_X86_PMU_FEATURE() Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 07/19] KVM: selftests: Extend {kvm,this}_pmu_has() to support fixed counters Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 08/19] KVM: selftests: Add pmu.h and lib/pmu.c for common PMU assets Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 09/19] KVM: selftests: Test Intel PMU architectural events on gp counters Sean Christopherson
2023-11-09 7:28 ` Mi, Dapeng
2023-11-08 0:31 ` [PATCH v7 10/19] KVM: selftests: Test Intel PMU architectural events on fixed counters Sean Christopherson
2023-11-09 7:30 ` Mi, Dapeng
2023-11-09 15:23 ` Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 11/19] KVM: selftests: Test consistency of CPUID with num of gp counters Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 12/19] KVM: selftests: Test consistency of CPUID with num of fixed counters Sean Christopherson
2023-11-09 7:34 ` Mi, Dapeng
2023-11-09 15:19 ` Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 13/19] KVM: selftests: Add functional test for Intel's fixed PMU counters Sean Christopherson
2023-11-09 7:39 ` Mi, Dapeng
2023-11-08 0:31 ` [PATCH v7 14/19] KVM: selftests: Expand PMU counters test to verify LLC events Sean Christopherson
2023-11-09 7:43 ` Mi, Dapeng
2023-11-08 0:31 ` [PATCH v7 15/19] KVM: selftests: Add a helper to query if the PMU module param is enabled Sean Christopherson
2023-11-09 7:45 ` Mi, Dapeng
2023-11-08 0:31 ` [PATCH v7 16/19] KVM: selftests: Add helpers to read integer module params Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 17/19] KVM: selftests: Query module param to detect FEP in MSR filtering test Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 18/19] KVM: selftests: Move KVM_FEP macro into common library header Sean Christopherson
2023-11-08 0:31 ` [PATCH v7 19/19] KVM: selftests: Test PMC virtualization with forced emulation Sean Christopherson
2023-11-09 7:51 ` Mi, Dapeng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=93a3da96-2e36-4ee9-a384-9dcc28c9f4ba@linux.intel.com \
--to=dapeng1.mi@linux.intel.com \
--cc=aaronlewis@google.com \
--cc=cloudliang@tencent.com \
--cc=jmattson@google.com \
--cc=kan.liang@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=likexu@tencent.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.