linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Thomas Gleixner <tglx@linutronix.de>,
	Marc Zyngier <maz@kernel.org>, Will Deacon <will@kernel.org>
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>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Borislav Petkov <bp@alien8.de>
Subject: [PATCH v3 17/22] KVM: x86: Duplicate arch callbacks related to pm events
Date: Thu,  1 Sep 2022 19:17:52 -0700	[thread overview]
Message-ID: <903be9503d38e1bfbc4023ef24753f4eba76bc87.1662084396.git.isaku.yamahata@intel.com> (raw)
In-Reply-To: <cover.1662084396.git.isaku.yamahata@intel.com>

From: Isaku Yamahata <isaku.yamahata@intel.com>

KVM/X86 can change those callbacks without worrying about breaking other
archs.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
 arch/x86/kvm/x86.c | 131 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 126 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f5f4d8eed588..9a28eb5fbb76 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -11845,6 +11845,130 @@ void kvm_arch_hardware_disable(void)
 	drop_user_return_notifiers();
 }
 
+static cpumask_t cpus_hardware_enabled = CPU_MASK_NONE;
+
+int kvm_arch_post_init_vm(struct kvm *kvm)
+{
+	return kvm_mmu_post_init_vm(kvm);
+}
+
+static int __hardware_enable(void *caller_name)
+{
+	int cpu = raw_smp_processor_id();
+	int r;
+
+	WARN_ON_ONCE(preemptible());
+
+	if (cpumask_test_cpu(cpu, &cpus_hardware_enabled))
+		return 0;
+	r = kvm_arch_hardware_enable();
+	if (r)
+		pr_warn("kvm: enabling virtualization on CPU%d failed during %s()\n",
+			cpu, (const char *)caller_name);
+	else
+		cpumask_set_cpu(cpu, &cpus_hardware_enabled);
+	return r;
+}
+
+static void hardware_enable(void *arg)
+{
+	atomic_t *failed = arg;
+
+	if (__hardware_enable((void *)__func__))
+		atomic_inc(failed);
+}
+
+static void hardware_disable(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();
+}
+
+void kvm_arch_pre_hardware_unsetup(void)
+{
+	on_each_cpu(hardware_disable, NULL, 1);
+}
+
+/*
+ * Called after the VM is otherwise initialized, but just before adding it to
+ * the vm_list.
+ */
+int kvm_arch_add_vm(struct kvm *kvm, int usage_count)
+{
+	atomic_t failed;
+	int r = 0;
+
+	if (usage_count != 1)
+		return 0;
+
+	atomic_set(&failed, 0);
+	on_each_cpu(hardware_enable, &failed, 1);
+
+	if (atomic_read(&failed)) {
+		r = -EBUSY;
+		goto err;
+	}
+
+	r = kvm_arch_post_init_vm(kvm);
+err:
+	if (r)
+		on_each_cpu(hardware_disable, NULL, 1);
+	return r;
+}
+
+int kvm_arch_del_vm(int usage_count)
+{
+	if (usage_count)
+		return 0;
+
+	on_each_cpu(hardware_disable, NULL, 1);
+	return 0;
+}
+
+int kvm_arch_online_cpu(unsigned int cpu, int usage_count)
+{
+	int r;
+
+	r = kvm_arch_check_processor_compat();
+	if (r)
+		return r;
+
+	if (!usage_count)
+		return 0;
+	/*
+	 * Abort the CPU online process if hardware virtualization cannot
+	 * be enabled. Otherwise running VMs would encounter unrecoverable
+	 * errors when scheduled to this CPU.
+	 */
+	return __hardware_enable((void *)__func__);
+}
+
+int kvm_arch_offline_cpu(unsigned int cpu, int usage_count)
+{
+	if (usage_count)
+		hardware_disable(NULL);
+	return 0;
+}
+
+int kvm_arch_reboot(int val)
+{
+	on_each_cpu(hardware_disable, NULL, 1);
+	return NOTIFY_OK;
+}
+
+int kvm_arch_suspend(int usage_count)
+{
+	if (usage_count)
+		hardware_disable(NULL);
+	return 0;
+}
+
 void kvm_arch_resume(int usage_count)
 {
 	struct kvm *kvm;
@@ -11857,6 +11981,8 @@ void kvm_arch_resume(int usage_count)
 	if (!usage_count)
 		return;
 
+	if (kvm_arch_check_processor_compat())
+		return;
 	if (kvm_arch_hardware_enable())
 		return;
 
@@ -12115,11 +12241,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 	return ret;
 }
 
-int kvm_arch_post_init_vm(struct kvm *kvm)
-{
-	return kvm_mmu_post_init_vm(kvm);
-}
-
 static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
 {
 	vcpu_load(vcpu);
-- 
2.25.1


  parent reply	other threads:[~2022-09-02  2:19 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
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 ` isaku.yamahata [this message]
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=903be9503d38e1bfbc4023ef24753f4eba76bc87.1662084396.git.isaku.yamahata@intel.com \
    --to=isaku.yamahata@intel.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@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=tglx@linutronix.de \
    --cc=will@kernel.org \
    --cc=ying.huang@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).