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>,
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 v5 23/30] KVM: Eliminate kvm_arch_post_init_vm()
Date: Thu, 22 Sep 2022 11:20:52 -0700 [thread overview]
Message-ID: <7ea322131782fdeb8df0122c5f4a3b75fcb360b2.1663869838.git.isaku.yamahata@intel.com> (raw)
In-Reply-To: <cover.1663869838.git.isaku.yamahata@intel.com>
From: Isaku Yamahata <isaku.yamahata@intel.com>
Now kvm_arch_post_init_vm() is used only by x86 kvm_arch_add_vm(). Other
arch doesn't define it. Merge x86 kvm_arch_post_init_vm() into x86
kvm_arch_add_vm() and eliminate kvm_arch_post_init_vm().
Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
arch/x86/kvm/x86.c | 7 +------
include/linux/kvm_host.h | 1 -
virt/kvm/kvm_arch.c | 16 +---------------
3 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d49396bb6c2e..bf8d3b901725 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -11969,11 +11969,6 @@ void kvm_arch_hardware_disable(void)
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)
{
int cpu = raw_smp_processor_id();
@@ -12032,7 +12027,7 @@ int kvm_arch_add_vm(struct kvm *kvm, int usage_count)
goto err;
}
- r = kvm_arch_post_init_vm(kvm);
+ r = kvm_mmu_post_init_vm(kvm);
err:
if (r)
on_each_cpu(hardware_disable, NULL, 1);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 2c5ca8741ca5..8dfa212b4543 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1451,7 +1451,6 @@ bool kvm_arch_vcpu_in_kernel(struct kvm_vcpu *vcpu);
int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu);
bool kvm_arch_dy_runnable(struct kvm_vcpu *vcpu);
bool kvm_arch_dy_has_pending_interrupt(struct kvm_vcpu *vcpu);
-int kvm_arch_post_init_vm(struct kvm *kvm);
int kvm_arch_add_vm(struct kvm *kvm, int usage_count);
int kvm_arch_del_vm(int usage_count);
void kvm_arch_pre_destroy_vm(struct kvm *kvm);
diff --git a/virt/kvm/kvm_arch.c b/virt/kvm/kvm_arch.c
index 87ee84c09634..2509c2777a49 100644
--- a/virt/kvm/kvm_arch.c
+++ b/virt/kvm/kvm_arch.c
@@ -14,15 +14,6 @@
static cpumask_t cpus_hardware_enabled = CPU_MASK_NONE;
-/*
- * Called after the VM is otherwise initialized, but just before adding it to
- * the vm_list.
- */
-int __weak kvm_arch_post_init_vm(struct kvm *kvm)
-{
- return 0;
-}
-
static int __hardware_enable(void)
{
int cpu = raw_smp_processor_id();
@@ -77,13 +68,8 @@ int __weak kvm_arch_add_vm(struct kvm *kvm, int usage_count)
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;
}
--
2.25.1
next prev parent reply other threads:[~2022-09-22 18:24 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-22 18:20 [PATCH v5 00/30] KVM: hardware enable/disable reorganize isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 01/30] KVM: x86: Drop kvm_user_return_msr_cpu_online() isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 02/30] KVM: x86: Use this_cpu_ptr() instead of per_cpu_ptr(smp_processor_id()) isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 03/30] KVM: x86: Move check_processor_compatibility from init ops to runtime ops isaku.yamahata
2022-10-11 19:53 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 04/30] Partially revert "KVM: Pass kvm_init()'s opaque param to additional arch funcs" isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 05/30] KVM: Provide more information in kernel log if hardware enabling fails isaku.yamahata
2022-10-12 19:45 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 06/30] KVM: arm64: Simplify the CPUHP logic isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 07/30] KVM: Rename and move CPUHP_AP_KVM_STARTING to ONLINE section isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 08/30] KVM: Do compatibility checks on hotplugged CPUs isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 09/30] KVM: Drop kvm_count_lock and instead protect kvm_usage_count with kvm_lock isaku.yamahata
2022-10-12 20:14 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 10/30] KVM: Add arch hooks when VM is added/deleted isaku.yamahata
2022-10-04 0:16 ` Isaku Yamahata
2022-10-12 20:43 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 11/30] KVM: Add arch hook for reboot event isaku.yamahata
2022-10-12 20:47 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 12/30] KVM: Add arch hook for suspend isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 13/30] KVM: Add arch hook for resume event isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 14/30] KVM: Add arch hook for cpu online event isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 15/30] KVM: Add arch hook for cpu offline event isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 16/30] KVM: Remove on_each_cpu(hardware_disable_nolock) in kvm_exit() isaku.yamahata
2022-10-12 20:50 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 17/30] KVM: Move out KVM arch PM hooks and hardware enable/disable logic isaku.yamahata
2022-10-12 21:10 ` Sean Christopherson
2022-09-22 18:20 ` [PATCH v5 18/30] KVM: kvm_arch.c: Remove _nolock post fix isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 19/30] KVM: kvm_arch.c: Remove a global variable, hardware_enable_failed isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 20/30] KVM: Introduce an arch wrapper to check all processor compatibility isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 21/30] KVM: x86: Duplicate arch callbacks related to pm events and compat check isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 22/30] KVM: x86: Move TSC fixup logic to KVM arch resume callback isaku.yamahata
2022-09-22 18:20 ` isaku.yamahata [this message]
2022-09-22 18:20 ` [PATCH v5 24/30] KVM: Add config to not compile kvm_arch.c isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 25/30] KVM: x86: Delete kvm_arch_hardware_enable/disable() isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 26/30] KVM: x86: Make x86 processor compat check callback empty isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 27/30] RFC: KVM: powerpc: Move processor compatibility check to hardware setup isaku.yamahata
2022-09-23 6:58 ` Michael Ellerman
2022-09-27 0:40 ` Isaku Yamahata
2022-09-22 18:20 ` [PATCH v5 28/30] KVM: Eliminate kvm_arch_check_processor_compat() isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 29/30] RFC: KVM: x86: Remove cpus_hardware_enabled and related sanity check isaku.yamahata
2022-09-22 18:20 ` [PATCH v5 30/30] RFC: KVM: " isaku.yamahata
2022-10-13 0:25 ` [PATCH v5 00/30] KVM: hardware enable/disable reorganize Sean Christopherson
2022-10-14 4:04 ` Sean Christopherson
2022-11-02 18:02 ` Paolo Bonzini
2022-11-02 18:59 ` Sean Christopherson
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=7ea322131782fdeb8df0122c5f4a3b75fcb360b2.1663869838.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=kai.huang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--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).