From: isaku.yamahata@intel.com
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>,
Yuan Yao <yuan.yao@linux.intel.com>
Cc: isaku.yamahata@intel.com, 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>
Subject: [PATCH v4 17/26] KVM: Introduce a arch wrapper to check all processor compatibility
Date: Thu, 8 Sep 2022 16:25:33 -0700 [thread overview]
Message-ID: <bf667e324f45609c7ff6d06b49ca6bf767f77ae6.1662679124.git.isaku.yamahata@intel.com> (raw)
In-Reply-To: <cover.1662679124.git.isaku.yamahata@intel.com>
From: Isaku Yamahata <isaku.yamahata@intel.com>
Introduce a arch wrapper to check all processor compatibility and define
default implementation as weak symbol to keep the current logic.
The hardware feature compatibility check is arch dependent, only x86 KVM
does cpu feature check on all processors. It doesn't make much sense to
enforce the current implementation to invoke check function on each
processors. Introduce a arch callback,
kvm_arch_check_processor_compat_all(), so that arch code can override it.
Eventually feature check should be pushed down into arch callback,
(kvm_arch_hardware_setup(), kvm_arch_online_cpu(), and kvm_arch_resume()),
the two compatibility check, kvm_arch_check_processor_compat{,_all}(), will
be eliminated. This is a transitional step for it.
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
include/linux/kvm_host.h | 1 +
virt/kvm/kvm_arch.c | 18 ++++++++++++++++++
virt/kvm/kvm_main.c | 13 +++----------
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 60f4ae9d6f48..74cae99fbf09 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1440,6 +1440,7 @@ 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_check_processor_compat_all(void);
int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu);
bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
diff --git a/virt/kvm/kvm_arch.c b/virt/kvm/kvm_arch.c
index ad23537ebe3b..9476c500d571 100644
--- a/virt/kvm/kvm_arch.c
+++ b/virt/kvm/kvm_arch.c
@@ -98,6 +98,24 @@ __weak int kvm_arch_del_vm(int usage_count)
return 0;
}
+static void check_processor_compat(void *rtn)
+{
+ *(int *)rtn = kvm_arch_check_processor_compat();
+}
+
+__weak int kvm_arch_check_processor_compat_all(void)
+{
+ int cpu;
+ int r;
+
+ for_each_online_cpu(cpu) {
+ smp_call_function_single(cpu, check_processor_compat, &r, 1);
+ if (r < 0)
+ return r;
+ }
+ return 0;
+}
+
__weak int kvm_arch_online_cpu(unsigned int cpu, int usage_count)
{
int ret;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 5373127dcdb6..51315d454dc2 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -5752,11 +5752,6 @@ void kvm_unregister_perf_callbacks(void)
}
#endif
-static void check_processor_compat(void *rtn)
-{
- *(int *)rtn = kvm_arch_check_processor_compat();
-}
-
int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
struct module *module)
{
@@ -5782,11 +5777,9 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
if (r < 0)
goto out_free_1;
- for_each_online_cpu(cpu) {
- smp_call_function_single(cpu, check_processor_compat, &r, 1);
- if (r < 0)
- goto out_free_2;
- }
+ r = kvm_arch_check_processor_compat_all();
+ if (r < 0)
+ goto out_free_2;
r = cpuhp_setup_state_nocalls(CPUHP_AP_KVM_ONLINE, "kvm/cpu:online",
kvm_online_cpu, kvm_offline_cpu);
--
2.25.1
next prev parent reply other threads:[~2022-09-08 23:27 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-08 23:25 [PATCH v4 00/26] KVM: hardware enable/disable reorganize isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 01/26] KVM: x86: Drop kvm_user_return_msr_cpu_online() isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 02/26] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 03/26] KVM: x86: Move check_processor_compatibility from init ops to runtime ops isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 04/26] Partially revert "KVM: Pass kvm_init()'s opaque param to additional arch funcs" isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 05/26] KVM: Provide more information in kernel log if hardware enabling fails isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 06/26] KVM: arm64: Simplify the CPUHP logic isaku.yamahata
2022-09-12 15:07 ` Marc Zyngier
2022-09-08 23:25 ` [PATCH v4 07/26] KVM: Rename and move CPUHP_AP_KVM_STARTING to ONLINE section isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 08/26] KVM: Do compatibility checks on hotplugged CPUs isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 09/26] KVM: Do processor compatibility check on resume isaku.yamahata
2022-09-09 2:15 ` Chao Gao
2022-09-10 17:59 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 10/26] KVM: Drop kvm_count_lock and instead protect kvm_usage_count with kvm_lock isaku.yamahata
2022-09-09 3:05 ` Chao Gao
2022-09-10 18:11 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 11/26] KVM: Add arch hooks for PM events with empty stub isaku.yamahata
2022-09-09 4:34 ` Chao Gao
2022-09-11 2:39 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 12/26] KVM: x86: Move TSC fixup logic to KVM arch resume callback isaku.yamahata
2022-09-09 5:48 ` Chao Gao
2022-09-11 2:45 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 13/26] KVM: Add arch hook when VM is added/deleted isaku.yamahata
2022-09-09 6:08 ` Chao Gao
2022-09-11 2:50 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 14/26] KVM: Move out KVM arch PM hooks and hardware enable/disable logic isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 15/26] KVM: kvm_arch.c: Remove _nolock post fix isaku.yamahata
2022-09-09 6:30 ` Chao Gao
2022-09-08 23:25 ` [PATCH v4 16/26] KVM: kvm_arch.c: Remove a global variable, hardware_enable_failed isaku.yamahata
2022-09-09 6:54 ` Chao Gao
2022-09-11 3:00 ` Isaku Yamahata
2022-09-08 23:25 ` isaku.yamahata [this message]
2022-09-09 7:32 ` [PATCH v4 17/26] KVM: Introduce a arch wrapper to check all processor compatibility Chao Gao
2022-09-08 23:25 ` [PATCH v4 18/26] KVM: x86: Duplicate arch callbacks related to pm events and compat check isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 19/26] KVM: Eliminate kvm_arch_post_init_vm() isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 20/26] KVM: Add config to not compile kvm_arch.c isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 21/26] KVM: x86: Delete kvm_arch_hardware_enable/disable() isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 22/26] KVM: x86: Make x86 processor compat check callback empty isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 23/26] RFC: KVM: powerpc: Move processor compatibility check to hardware setup isaku.yamahata
2022-09-09 5:55 ` Christophe Leroy
2022-09-10 1:39 ` Isaku Yamahata
2022-09-08 23:25 ` [PATCH v4 24/26] KVM: Eliminate kvm_arch_check_processor_compat() isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 25/26] RFC: KVM: x86: Remove cpus_hardware_enabled and related sanity check isaku.yamahata
2022-09-08 23:25 ` [PATCH v4 26/26] RFC: KVM: " 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=bf667e324f45609c7ff6d06b49ca6bf767f77ae6.1662679124.git.isaku.yamahata@intel.com \
--to=isaku.yamahata@intel.com \
--cc=atishp@atishpatra.org \
--cc=chao.gao@intel.com \
--cc=chenhuacai@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=isaku.yamahata@gmail.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=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
all inboxes | Powered by JetHome®