From: Isaku Yamahata <isaku.yamahata@gmail.com>
To: Yuan Yao <yuan.yao@linux.intel.com>
Cc: isaku.yamahata@intel.com, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>,
isaku.yamahata@gmail.com, Kai Huang <kai.huang@intel.com>,
Chao Gao <chao.gao@intel.com>,
Atish Patra <atishp@atishpatra.org>,
Shaokun Zhang <zhangshaokun@hisilicon.com>,
Qi Liu <liuqi115@huawei.com>, John Garry <john.garry@huawei.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Huang Ying <ying.huang@intel.com>,
Huacai Chen <chenhuacai@kernel.org>,
Dave Hansen <dave.hansen@linux.intel.com>,
Borislav Petkov <bp@alien8.de>
Subject: Re: [PATCH v3 14/22] KVM: Move out KVM arch PM hooks and hardware enable/disable logic
Date: Thu, 8 Sep 2022 12:15:20 -0700 [thread overview]
Message-ID: <20220908191520.GD470011@ls.amr.corp.intel.com> (raw)
In-Reply-To: <20220906074358.hwchunz6vdxefzb6@yy-desk-7060>
On Tue, Sep 06, 2022 at 03:43:58PM +0800,
Yuan Yao <yuan.yao@linux.intel.com> wrote:
> On Thu, Sep 01, 2022 at 07:17:49PM -0700, isaku.yamahata@intel.com wrote:
> > From: Isaku Yamahata <isaku.yamahata@intel.com>
> >
> > To make clear that those files are default implementation that KVM/x86 (and
> > other KVM arch in future) will override them, split out those into a single
> > file. Once conversions for all kvm archs are done, the file will be
> > deleted. kvm_arch_pre_hardware_unsetup() is introduced to avoid cross-arch
> > code churn for now. Once it's settled down,
> > kvm_arch_pre_hardware_unsetup() can be merged into
> > kvm_arch_hardware_unsetup() in each arch code.
> >
> > Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> > ---
> > include/linux/kvm_host.h | 1 +
> > virt/kvm/kvm_arch.c | 103 ++++++++++++++++++++++-
> > virt/kvm/kvm_main.c | 172 +++++----------------------------------
> > 3 files changed, 124 insertions(+), 152 deletions(-)
> >
> > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> > index f78364e01ca9..60f4ae9d6f48 100644
> > --- a/include/linux/kvm_host.h
> > +++ b/include/linux/kvm_host.h
> > @@ -1437,6 +1437,7 @@ static inline void kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) {}
> > int kvm_arch_hardware_enable(void);
> > void kvm_arch_hardware_disable(void);
> > int kvm_arch_hardware_setup(void *opaque);
> > +void kvm_arch_pre_hardware_unsetup(void);
> > void kvm_arch_hardware_unsetup(void);
> > int kvm_arch_check_processor_compat(void);
> > int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
> > diff --git a/virt/kvm/kvm_arch.c b/virt/kvm/kvm_arch.c
> > index 0eac996f4981..0648d4463d9e 100644
> > --- a/virt/kvm/kvm_arch.c
> > +++ b/virt/kvm/kvm_arch.c
> > @@ -6,49 +6,148 @@
> > * Author:
> > * Isaku Yamahata <isaku.yamahata@intel.com>
> > * <isaku.yamahata@gmail.com>
> > + *
> > + * TODO: Delete this file once the conversion of all KVM arch is done.
> > */
> >
> > #include <linux/kvm_host.h>
> >
> > +static cpumask_t cpus_hardware_enabled = CPU_MASK_NONE;
> > +static atomic_t hardware_enable_failed;
> > +
> > __weak int kvm_arch_post_init_vm(struct kvm *kvm)
> > {
> > return 0;
> > }
> >
> > +static void hardware_enable_nolock(void *caller_name)
> > +{
> > + int cpu = raw_smp_processor_id();
> > + int r;
> > +
> > + WARN_ON_ONCE(preemptible());
> > +
> > + if (cpumask_test_cpu(cpu, &cpus_hardware_enabled))
> > + return;
> > +
> > + cpumask_set_cpu(cpu, &cpus_hardware_enabled);
> > +
> > + r = kvm_arch_hardware_enable();
> > +
> > + if (r) {
> > + cpumask_clear_cpu(cpu, &cpus_hardware_enabled);
> > + atomic_inc(&hardware_enable_failed);
> > + pr_warn("kvm: enabling virtualization on CPU%d failed during %s()\n",
> > + cpu, (const char *)caller_name);
> > + }
> > +}
> > +
> > +static void hardware_disable_nolock(void *junk)
> > +{
> > + int cpu = raw_smp_processor_id();
> > +
> > + WARN_ON_ONCE(preemptible());
> > +
> > + if (!cpumask_test_cpu(cpu, &cpus_hardware_enabled))
> > + return;
> > + cpumask_clear_cpu(cpu, &cpus_hardware_enabled);
> > + kvm_arch_hardware_disable();
> > +}
> > +
> > +__weak void kvm_arch_pre_hardware_unsetup(void)
> > +{
> > + on_each_cpu(hardware_disable_nolock, NULL, 1);
> > +}
> > +
> > /*
> > * Called after the VM is otherwise initialized, but just before adding it to
> > * the vm_list.
> > */
> > __weak int kvm_arch_add_vm(struct kvm *kvm, int usage_count)
> > {
> > - return kvm_arch_post_init_vm(kvm);
> > + int r = 0;
> > +
> > + if (usage_count != 1)
> > + return 0;
> > +
> > + atomic_set(&hardware_enable_failed, 0);
> > + on_each_cpu(hardware_enable_nolock, (void *)__func__, 1);
>
>
> This function is called in kvm_create_vm:
>
> kvm_create_vm {
> ...
> enable_hardware_all()
> ...
> kvm_arch_add_vm()
> ...
> }
>
> so don't need on_each_cpu(enable_hardware_nolock) here, or the
> enable_hardware_all() shuold be removed from kvm_create_vm().
Yes, it's removed. Please notice the following hunk.
@@ -1196,10 +1191,6 @@ static struct kvm *kvm_create_vm(unsigned long type, const char *fdname)
if (r)
goto out_err_no_arch_destroy_vm;
- r = hardware_enable_all();
- if (r)
- goto out_err_no_disable;
-
#ifdef CONFIG_HAVE_KVM_IRQFD
INIT_HLIST_HEAD(&kvm->irq_ack_notifier_list);
#endif
--
Isaku Yamahata <isaku.yamahata@gmail.com>
next prev parent reply other threads:[~2022-09-08 19:15 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-02 2:17 [PATCH v3 00/22] KVM: hardware enable/disable reorganize isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 01/22] KVM: x86: Drop kvm_user_return_msr_cpu_online() isaku.yamahata
2022-09-05 1:59 ` Chao Gao
2022-09-05 5:30 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 02/22] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) isaku.yamahata
2022-09-05 5:35 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 03/22] KVM: x86: Move check_processor_compatibility from init ops to runtime ops isaku.yamahata
2022-09-05 5:42 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 04/22] Partially revert "KVM: Pass kvm_init()'s opaque param to additional arch funcs" isaku.yamahata
2022-09-05 5:48 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 05/22] KVM: Provide more information in kernel log if hardware enabling fails isaku.yamahata
2022-09-05 5:56 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 06/22] KVM: arm64: Simplify the CPUHP logic isaku.yamahata
2022-09-05 7:05 ` Yuan Yao
2022-09-05 9:29 ` Marc Zyngier
2022-09-05 12:39 ` Marc Zyngier
2022-09-07 15:12 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 07/22] KVM: Rename and move CPUHP_AP_KVM_STARTING to ONLINE section isaku.yamahata
2022-09-05 7:49 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 08/22] KVM: Do compatibility checks on hotplugged CPUs isaku.yamahata
2022-09-06 1:25 ` Yuan Yao
2022-09-02 2:17 ` [PATCH v3 09/22] KVM: Do processor compatibility check on resume isaku.yamahata
2022-09-05 8:40 ` Yuan Yao
2022-09-05 9:27 ` Yuan Yao
2022-09-08 18:21 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 10/22] KVM: Drop kvm_count_lock and instead protect kvm_usage_count with kvm_lock isaku.yamahata
2022-09-06 2:46 ` Yuan Yao
2022-09-06 6:32 ` Marc Zyngier
2022-09-06 21:44 ` Isaku Yamahata
2022-09-08 18:24 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 11/22] KVM: Add arch hooks for PM events with empty stub isaku.yamahata
2022-09-06 6:25 ` Yuan Yao
2022-09-08 19:11 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 12/22] KVM: x86: Move TSC fixup logic to KVM arch resume callback isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 13/22] KVM: Add arch hook when VM is added/deleted isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 14/22] KVM: Move out KVM arch PM hooks and hardware enable/disable logic isaku.yamahata
2022-09-06 7:43 ` Yuan Yao
2022-09-08 19:15 ` Isaku Yamahata [this message]
2022-09-02 2:17 ` [PATCH v3 15/22] KVM: kvm_arch.c: Remove _nolock post fix isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 16/22] KVM: kvm_arch.c: Remove a global variable, hardware_enable_failed isaku.yamahata
2022-09-07 5:56 ` Yuan Yao
2022-09-08 22:51 ` Isaku Yamahata
2022-09-02 2:17 ` [PATCH v3 17/22] KVM: x86: Duplicate arch callbacks related to pm events isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 18/22] KVM: Eliminate kvm_arch_post_init_vm() isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 19/22] KVM: x86: Delete kvm_arch_hardware_enable/disable() isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 20/22] KVM: Add config to not compile kvm_arch.c isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 21/22] RFC: KVM: x86: Remove cpus_hardware_enabled and related sanity check isaku.yamahata
2022-09-02 2:17 ` [PATCH v3 22/22] RFC: KVM: " isaku.yamahata
2022-09-05 15:38 ` [PATCH v3 00/22] KVM: hardware enable/disable reorganize Marc Zyngier
2022-09-06 22:25 ` Isaku Yamahata
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=20220908191520.GD470011@ls.amr.corp.intel.com \
--to=isaku.yamahata@gmail.com \
--cc=atishp@atishpatra.org \
--cc=bp@alien8.de \
--cc=chao.gao@intel.com \
--cc=chenhuacai@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=dave.hansen@linux.intel.com \
--cc=isaku.yamahata@intel.com \
--cc=john.garry@huawei.com \
--cc=kai.huang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liuqi115@huawei.com \
--cc=maz@kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=ying.huang@intel.com \
--cc=yuan.yao@linux.intel.com \
--cc=zhangshaokun@hisilicon.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;
as well as URLs for NNTP newsgroup(s).