From: Like Xu <like.xu.linux@gmail.com>
To: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [kvm-unit-tests PATCH 1/2] x86/pmu: Update rdpmc testcase to cover #GP and emulation path
Date: Wed, 19 Oct 2022 16:50:53 +0800 [thread overview]
Message-ID: <c4e78b67-bfcb-3671-3de9-252b97062c27@gmail.com> (raw)
In-Reply-To: <Yz347iKzq7cbjMdw@google.com>
On 6/10/2022 5:36 am, Sean Christopherson wrote:
> On Mon, Sep 05, 2022, Like Xu wrote:
>> From: Like Xu <likexu@tencent.com>
>>
>> Specifying an unsupported PMC encoding will cause a #GP(0).
>> All testcases should be passed when the KVM_FEP prefix is added.
>>
>> Signed-off-by: Like Xu <likexu@tencent.com>
>> ---
>> lib/x86/processor.h | 5 ++++-
>> x86/pmu.c | 13 +++++++++++++
>> 2 files changed, 17 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/x86/processor.h b/lib/x86/processor.h
>> index 10bca27..9c490d9 100644
>> --- a/lib/x86/processor.h
>> +++ b/lib/x86/processor.h
>> @@ -441,7 +441,10 @@ static inline int wrmsr_safe(u32 index, u64 val)
>> static inline uint64_t rdpmc(uint32_t index)
>> {
>> uint32_t a, d;
>> - asm volatile ("rdpmc" : "=a"(a), "=d"(d) : "c"(index));
>> + if (is_fep_available())
>> + asm volatile (KVM_FEP "rdpmc" : "=a"(a), "=d"(d) : "c"(index));
>> + else
>> + asm volatile ("rdpmc" : "=a"(a), "=d"(d) : "c"(index));
>
> Hmm, not sure how I feel about the idea of always use FEP in a common helper when
> it's available. Part of me likes the idea, but part of me is worried that it
> will cause confusion due to not being explicit.
>
> Unless there's a pressing need to force emulation, let's punt the FEP stuff for
> now. More below.
Some security researchers are very interested in these corners.
To my limited testing, most KVM emulation code (at least arch/x86/kvm/emulate.c)
are not
adequately covered by test cases, and perhaps some will move them to the user space.
>
>> return a | ((uint64_t)d << 32);
>> }
>>
>> diff --git a/x86/pmu.c b/x86/pmu.c
>> index 203a9d4..11607c0 100644
>> --- a/x86/pmu.c
>> +++ b/x86/pmu.c
>> @@ -758,12 +758,25 @@ static bool pmu_is_detected(void)
>> return detect_intel_pmu();
>> }
>>
>> +static void rdpmc_unsupported_counter(void *data)
>> +{
>> + rdpmc(64);
>> +}
>> +
>> +static void check_rdpmc_cause_gp(void)
>
> Maybe check_invalid_rdpmc_gp()? There are multiple reasons RDPMC can #GP, the
> one that is being relied on to guarantee #GP is specifically that the PMC is
> invalid.
Applied.
> dd
p, :D
>
>> +{
>> + report(test_for_exception(GP_VECTOR, rdpmc_unsupported_counter, NULL),
>
> I'd really like to move away from test_for_exception() and use ASM_TRY(). Ignoring
> FEP for the moment, the most extensible solution is to provide a safe variant:
>
> static inline int rdpmc_safe(u32 index, uint64_t *val)
> {
> uint32_t a, d;
>
> asm volatile (ASM_TRY("1f")
> "rdpmc"
> : "=a"(a), "=d"(d) : "c"(index));
asm volatile (ASM_TRY("1f")
"rdpmc\n\t"
"1:"
: "=a"(a), "=d"(d) : "c"(index) : "memory");
, otherwise the compiler will complain.
> *val = (uint64_t)a | ((uint64_t)d << 32);
> return exception_vector();
> }
>
> static inline uint64_t rdpmc(uint32_t index)
> {
> uint64_t val;
> int vector = rdpmc_safe(index, &val);
>
> assert_msg(!vector, "Unexpected %s on RDPMC(%d)",
> exception_mnemonic(vector), index);
> return val;
> }
Applied.
>
>
> For long-term emulation validation, the best idea I have at this point is to do
> add a config knob to opt-in to using FEP in _all_ common helpers (where "all"
> means everything KVM actually emulates). It'd take some macro magic, but it'd
> be easier to maintain (no need to have two paths in every helper) and would be
> controllable.
With both hands up in favour. Leave it to you, as this involves a wider change.
>
>> + "rdpmc with invalid PMC index raises #GP");
>> +}
>> +
>> int main(int ac, char **av)
>> {
>> setup_vm();
>> handle_irq(PC_VECTOR, cnt_overflow);
>> buf = malloc(N*64);
>>
>> + check_rdpmc_cause_gp();
>> +
>> if (!pmu_is_detected())
>> return report_summary();
>>
>> --
>> 2.37.3
>>
next prev parent reply other threads:[~2022-10-19 9:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 12:39 [PATCH 0/4] KVM: x86/svm/pmu: Add AMD Guest PerfMonV2 support Like Xu
2022-09-05 12:39 ` [PATCH 1/4] KVM: x86/svm/pmu: Limit the maximum number of supported GP counters Like Xu
2022-09-05 17:26 ` Jim Mattson
2022-09-06 12:38 ` Like Xu
2022-09-05 12:39 ` [PATCH 2/4] KVM: x86/pmu: Make part of the Intel v2 PMU MSRs handling x86 generic Like Xu
2022-09-05 12:39 ` [PATCH 3/4] KVM: x86/svm/pmu: Add AMD PerfMonV2 support Like Xu
2022-09-05 18:00 ` Jim Mattson
2022-09-06 12:45 ` Like Xu
2022-09-06 20:19 ` Jim Mattson
2022-09-07 3:50 ` Like Xu
2022-09-07 4:15 ` Jim Mattson
2022-09-05 12:39 ` [PATCH 4/4] KVM: x86/cpuid: Add AMD CPUID ExtPerfMonAndDbg leaf 0x80000022 Like Xu
2022-09-05 17:36 ` Jim Mattson
2022-09-06 12:53 ` Like Xu
2022-09-06 20:08 ` Jim Mattson
2022-09-07 3:59 ` Like Xu
2022-09-07 4:11 ` Jim Mattson
2022-09-07 5:52 ` Sandipan Das
2022-09-07 6:39 ` Like Xu
2022-09-08 6:00 ` Sandipan Das
2022-09-08 23:14 ` Jim Mattson
2022-09-05 12:39 ` [kvm-unit-tests PATCH 1/2] x86/pmu: Update rdpmc testcase to cover #GP and emulation path Like Xu
2022-10-05 21:36 ` Sean Christopherson
2022-10-19 8:50 ` Like Xu [this message]
2022-09-05 12:39 ` [kvm-unit-tests PATCH 2/2] x86/pmu: Add AMD Guest PerfMonV2 testcases Like Xu
2022-10-05 22:08 ` Sean Christopherson
2022-10-19 9:40 ` Like Xu
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=c4e78b67-bfcb-3671-3de9-252b97062c27@gmail.com \
--to=like.xu.linux@gmail.com \
--cc=kvm@vger.kernel.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox