From: Sean Christopherson <seanjc@google.com>
To: Like Xu <like.xu.linux@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Jim Mattson <jmattson@google.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Wanpeng Li <wanpengli@tencent.com>
Subject: Re: [PATCH RESEND v2 6/8] KVM: x86/pmu: Defer counter emulated overflow via pmc->stale_counter
Date: Tue, 30 Aug 2022 17:59:20 +0000 [thread overview]
Message-ID: <Yw5P+COQIf/UPNuY@google.com> (raw)
In-Reply-To: <20220823093221.38075-7-likexu@tencent.com>
On Tue, Aug 23, 2022, Like Xu wrote:
> From: Like Xu <likexu@tencent.com>
>
> There are contextual restrictions on the functions that can be called
> in the *_exit_handlers_fastpath path, for example calling
> pmc_reprogram_counter() brings up a host complaint like:
State the actual problem instead of forcing the reader to decipher that from the
stacktrace.
> [*] BUG: sleeping function called from invalid context at kernel/locking/mutex.c:580
> [*] in_atomic(): 1, irqs_disabled(): 1, non_block: 0, pid: 2981888, name: CPU 15/KVM
> [*] preempt_count: 1, expected: 0
> [*] RCU nest depth: 0, expected: 0
> [*] INFO: lockdep is turned off.
> [*] irq event stamp: 0
> [*] hardirqs last enabled at (0): [<0000000000000000>] 0x0
> [*] hardirqs last disabled at (0): [<ffffffff8121222a>] copy_process+0x146a/0x62d0
> [*] softirqs last enabled at (0): [<ffffffff81212269>] copy_process+0x14a9/0x62d0
> [*] softirqs last disabled at (0): [<0000000000000000>] 0x0
> [*] Preemption disabled at:
> [*] [<ffffffffc2063fc1>] vcpu_enter_guest+0x1001/0x3dc0 [kvm]
> [*] CPU: 17 PID: 2981888 Comm: CPU 15/KVM Kdump: 5.19.0-rc1-g239111db364c-dirty #2
> [*] Call Trace:
> [*] <TASK>
> [*] dump_stack_lvl+0x6c/0x9b
> [*] __might_resched.cold+0x22e/0x297
> [*] __mutex_lock+0xc0/0x23b0
> [*] perf_event_ctx_lock_nested+0x18f/0x340
> [*] perf_event_pause+0x1a/0x110
> [*] reprogram_counter+0x2af/0x1490 [kvm]
> [*] kvm_pmu_trigger_event+0x429/0x950 [kvm]
> [*] kvm_skip_emulated_instruction+0x48/0x90 [kvm]
> [*] handle_fastpath_set_msr_irqoff+0x349/0x3b0 [kvm]
> [*] vmx_vcpu_run+0x268e/0x3b80 [kvm_intel]
> [*] vcpu_enter_guest+0x1d22/0x3dc0 [kvm]
>
> A new stale_counter field is introduced to keep this part of the semantics
> invariant. It records the current counter value and it's used to determine
> whether to inject an emulated overflow interrupt in the later
> kvm_pmu_handle_event(), given that the internal count value from its
> perf_event has not been added to pmc->counter in time, or the guest
> will update the value of a running counter directly.
Describe what the change is at a high level, don't give a play-by-play of the
code changes.
Defer reprogramming counters and handling overflow via KVM_REQ_PMU
when incrementing counters. KVM skips emulated WRMSR in the VM-Exit
fastpath, the fastpath runs with IRQs disabled, skipping instructions
can increment and reprogram counters, reprogramming counters can
sleep, and sleeping is disallowed while IRQs are disabled.
<stack trace>
Add a field to kvm_pmc to track the previous counter value in order
to defer overflow detection to kvm_pmu_handle_event() (reprogramming
must be done before handling overflow).
> Opportunistically shrink sizeof(struct kvm_pmc) a bit.
>
> Suggested-by: Wanpeng Li <wanpengli@tencent.com>
> Fixes: 9cd803d496e7 ("KVM: x86: Update vPMCs when retiring instructions")
> Signed-off-by: Like Xu <likexu@tencent.com>
> ---
> arch/x86/include/asm/kvm_host.h | 5 +++--
> arch/x86/kvm/pmu.c | 15 ++++++++-------
> arch/x86/kvm/svm/pmu.c | 2 +-
> arch/x86/kvm/vmx/pmu_intel.c | 4 ++--
> 4 files changed, 14 insertions(+), 12 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index 4e568a7ef464..ffd982bf015d 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -488,7 +488,10 @@ enum pmc_type {
> struct kvm_pmc {
> enum pmc_type type;
> u8 idx;
> + bool is_paused;
> + bool intr;
> u64 counter;
> + u64 stale_counter;
Use "prev_counter", "stale" makes it sound like a flag, e.g. "this counter is
stale".
> u64 eventsel;
> struct perf_event *perf_event;
> struct kvm_vcpu *vcpu;
> @@ -498,8 +501,6 @@ struct kvm_pmc {
> * ctrl value for fixed counters.
> */
> u64 current_config;
> - bool is_paused;
> - bool intr;
> };
>
> #define KVM_PMC_MAX_FIXED 3
> diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
> index 6940cbeee54d..45d062cb1dd5 100644
> --- a/arch/x86/kvm/pmu.c
> +++ b/arch/x86/kvm/pmu.c
> @@ -350,6 +350,12 @@ void kvm_pmu_handle_event(struct kvm_vcpu *vcpu)
> }
>
> __reprogram_counter(pmc);
> +
> + if (pmc->stale_counter) {
This check is unnecessary. The values are unsigned, so counter can't be less than
the previous value if the previous value was '0'.
> + if (pmc->counter < pmc->stale_counter)
> + __kvm_perf_overflow(pmc, false);
> + pmc->stale_counter = 0;
> + }
next prev parent reply other threads:[~2022-08-30 18:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 9:32 [PATCH RESEND v2 0/8] x86/pmu: Corner cases fixes and optimization Like Xu
2022-08-23 9:32 ` [PATCH RESEND v2 1/8] perf/x86/core: Completely disable guest PEBS via guest's global_ctrl Like Xu
2022-08-30 17:40 ` Sean Christopherson
2022-08-23 9:32 ` [PATCH RESEND v2 2/8] KVM: x86/pmu: Avoid setting BIT_ULL(-1) to pmu->host_cross_mapped_mask Like Xu
2022-08-23 9:32 ` [PATCH RESEND v2 3/8] KVM: x86/pmu: Don't generate PEBS records for emulated instructions Like Xu
2022-08-23 9:32 ` [PATCH RESEND v2 4/8] KVM: x86/pmu: Avoid using PEBS perf_events for normal counters Like Xu
2022-08-23 9:32 ` [PATCH RESEND v2 5/8] KVM: x86/pmu: Defer reprogram_counter() to kvm_pmu_handle_event() Like Xu
2022-08-30 17:50 ` Sean Christopherson
2022-08-23 9:32 ` [PATCH RESEND v2 6/8] KVM: x86/pmu: Defer counter emulated overflow via pmc->stale_counter Like Xu
2022-08-30 17:59 ` Sean Christopherson [this message]
2022-08-23 9:32 ` [PATCH RESEND v2 7/8] KVM: x86/svm/pmu: Direct access pmu->gp_counter[] to implement amd_*_to_pmc() Like Xu
2022-08-30 18:07 ` Sean Christopherson
2022-08-23 9:32 ` [PATCH RESEND v2 8/8] KVM: x86/svm/pmu: Rewrite get_gp_pmc_amd() for more counters scalability Like Xu
2022-08-30 18:24 ` Sean Christopherson
2022-08-30 17:29 ` [PATCH RESEND v2 0/8] x86/pmu: Corner cases fixes and optimization Sean Christopherson
2022-08-31 8:05 ` 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=Yw5P+COQIf/UPNuY@google.com \
--to=seanjc@google.com \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=like.xu.linux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=wanpengli@tencent.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.