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 21/26] KVM: x86: Delete kvm_arch_hardware_enable/disable()
Date: Thu, 8 Sep 2022 16:25:37 -0700 [thread overview]
Message-ID: <c7b28e898623e22f9732c038d93366ecc70e2d33.1662679124.git.isaku.yamahata@intel.com> (raw)
In-Reply-To: <cover.1662679124.git.isaku.yamahata@intel.com>
From: Isaku Yamahata <isaku.yamahata@intel.com>
Now they're function call and there is no point to keep them.
Opportunistically make kvm_arch_pre_hardware_unsetup() empty.
Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
arch/x86/kvm/x86.c | 27 +++++++--------------------
include/linux/kvm_host.h | 6 ++++--
2 files changed, 11 insertions(+), 22 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 6dcc6ed90421..0c9d965859c6 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -354,7 +354,7 @@ static void kvm_on_user_return(struct user_return_notifier *urn)
/*
* Disabling irqs at this point since the following code could be
- * interrupted and executed through kvm_arch_hardware_disable()
+ * interrupted and executed through hardware_disable()
*/
local_irq_save(flags);
if (msrs->registered) {
@@ -11834,17 +11834,6 @@ void kvm_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)
}
EXPORT_SYMBOL_GPL(kvm_vcpu_deliver_sipi_vector);
-int kvm_arch_hardware_enable(void)
-{
- return static_call(kvm_x86_hardware_enable)();
-}
-
-void kvm_arch_hardware_disable(void)
-{
- static_call(kvm_x86_hardware_disable)();
- drop_user_return_notifiers();
-}
-
static cpumask_t cpus_hardware_enabled = CPU_MASK_NONE;
static int __hardware_enable(void *caller_name)
@@ -11856,7 +11845,7 @@ static int __hardware_enable(void *caller_name)
if (cpumask_test_cpu(cpu, &cpus_hardware_enabled))
return 0;
- r = kvm_arch_hardware_enable();
+ r = static_call(kvm_x86_hardware_enable)();
if (r)
pr_warn("kvm: enabling virtualization on CPU%d failed during %s()\n",
cpu, (const char *)caller_name);
@@ -11882,12 +11871,8 @@ static void hardware_disable(void *junk)
if (!cpumask_test_cpu(cpu, &cpus_hardware_enabled))
return;
cpumask_clear_cpu(cpu, &cpus_hardware_enabled);
- kvm_arch_hardware_disable();
-}
-
-void kvm_arch_pre_hardware_unsetup(void)
-{
- on_each_cpu(hardware_disable, NULL, 1);
+ static_call(kvm_x86_hardware_disable)();
+ drop_user_return_notifiers();
}
/*
@@ -12019,7 +12004,7 @@ void kvm_arch_resume(int usage_count)
return;
preempt_disable();
- if (kvm_arch_hardware_enable()) {
+ if (static_call(kvm_x86_hardware_enable)()) {
preempt_enable();
return;
}
@@ -12163,6 +12148,8 @@ int kvm_arch_hardware_setup(void *opaque)
void kvm_arch_hardware_unsetup(void)
{
+ on_each_cpu(hardware_disable, NULL, 1);
+
kvm_unregister_perf_callbacks();
static_call(kvm_x86_hardware_unsetup)();
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index f538fc3356a9..5f4d6f641b03 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1434,13 +1434,15 @@ void kvm_arch_create_vcpu_debugfs(struct kvm_vcpu *vcpu, struct dentry *debugfs_
static inline void kvm_create_vcpu_debugfs(struct kvm_vcpu *vcpu) {}
#endif
-#ifndef CONFIG_HAVE_KVM_OVERRIDE_HARDWARE_ENABLE
+#ifdef CONFIG_HAVE_KVM_OVERRIDE_HARDWARE_ENABLE
+static inline void kvm_arch_pre_hardware_unsetup(void) {}
+#else
+void kvm_arch_pre_hardware_unsetup(void);
int kvm_arch_hardware_enable(void);
void kvm_arch_hardware_disable(void);
#endif
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);
--
2.25.1
next prev parent reply other threads:[~2022-09-08 23:28 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 ` [PATCH v4 17/26] KVM: Introduce a arch wrapper to check all processor compatibility isaku.yamahata
2022-09-09 7:32 ` 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 ` isaku.yamahata [this message]
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=c7b28e898623e22f9732c038d93366ecc70e2d33.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;
as well as URLs for NNTP newsgroup(s).