iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: PPC: Move processor compatibility check to module init

Browse Source 
Move KVM PPC's compatibility checks to their respective module_init()
hooks, there's no need to wait until KVM's common compat check, nor is
there a need to perform the check on every CPU (provided by common KVM's
hook), as the compatibility checks operate on global data.

  arch/powerpc/include/asm/cputable.h: extern struct cpu_spec *cur_cpu_spec;
  arch/powerpc/kvm/book3s.c: return 0
  arch/powerpc/kvm/e500.c: strcmp(cur_cpu_spec->cpu_name, "e500v2")
  arch/powerpc/kvm/e500mc.c: strcmp(cur_cpu_spec->cpu_name, "e500mc")
                             strcmp(cur_cpu_spec->cpu_name, "e5500")
                             strcmp(cur_cpu_spec->cpu_name, "e6500")

Cc: Fabiano Rosas <farosas@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Message-Id: <20221130230934.1014142-27-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2022-11-30 23:09:10 +00:00
committed by Paolo Bonzini
parent 45b66dc139
commit ae19b15d91
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/kvm_ppc.h
View File

@ -118,7 +118,6 @@ extern int kvmppc_xlate(struct kvm_vcpu *vcpu, ulong eaddr,
extern int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu); extern int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu);
extern void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu); extern void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu);
extern int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu); extern int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu);
extern int kvmppc_core_check_processor_compat(void);
extern int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu, extern int kvmppc_core_vcpu_translate(struct kvm_vcpu *vcpu,
struct kvm_translation *tr); struct kvm_translation *tr);

10
arch/powerpc/kvm/book3s.c
View File

@ -999,16 +999,6 @@ int kvmppc_h_logical_ci_store(struct kvm_vcpu *vcpu)
} }
EXPORT_SYMBOL_GPL(kvmppc_h_logical_ci_store); EXPORT_SYMBOL_GPL(kvmppc_h_logical_ci_store);
int kvmppc_core_check_processor_compat(void)
{
/*
* We always return 0 for book3s. We check
* for compatibility while loading the HV
* or PR module
*/
return 0;
}
int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hcall) int kvmppc_book3s_hcall_implemented(struct kvm *kvm, unsigned long hcall)
{ {
return kvm->arch.kvm_ops->hcall_implemented(hcall); return kvm->arch.kvm_ops->hcall_implemented(hcall);

4
arch/powerpc/kvm/e500.c
View File

@ -314,7 +314,7 @@ static void kvmppc_core_vcpu_put_e500(struct kvm_vcpu *vcpu)
kvmppc_booke_vcpu_put(vcpu); kvmppc_booke_vcpu_put(vcpu);
} }
int kvmppc_core_check_processor_compat(void) static int kvmppc_e500_check_processor_compat(void)
{ {
int r; int r;
@ -507,7 +507,7 @@ static int __init kvmppc_e500_init(void)
unsigned long handler_len; unsigned long handler_len;
unsigned long max_ivor = 0; unsigned long max_ivor = 0;
r = kvmppc_core_check_processor_compat(); r = kvmppc_e500_check_processor_compat();
if (r) if (r)
goto err_out; goto err_out;

4
arch/powerpc/kvm/e500mc.c
View File

@ -388,6 +388,10 @@ static int __init kvmppc_e500mc_init(void)
{ {
int r; int r;
r = kvmppc_e500mc_check_processor_compat();
if (r)
return kvmppc_e500mc;
r = kvmppc_booke_init(); r = kvmppc_booke_init();
if (r) if (r)
goto err_out; goto err_out;

2
arch/powerpc/kvm/powerpc.c
View File

@ -442,7 +442,7 @@ int kvm_arch_hardware_enable(void)
int kvm_arch_check_processor_compat(void *opaque) int kvm_arch_check_processor_compat(void *opaque)
{ {
return kvmppc_core_check_processor_compat(); return 0;
} }
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)