KVM: SVM: Rename SEV implemenations to conform to kvm_x86_ops hooks

Rename svm_vm_copy_asid_from() and svm_vm_migrate_from() to conform to
the names used by kvm_x86_ops, and opportunistically use "sev" instead of
"svm" to more precisely identify the role of the hooks.

svm_vm_copy_asid_from() in particular was poorly named as the function
does much more than simply copy the ASID.

No functional change intended.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20220128005208.4008533-21-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 7f346dd..4662e5f 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1681,7 +1681,7 @@ static int sev_es_migrate_from(struct kvm *dst, struct kvm *src)
        return 0;
 }
 
-int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd)
+int sev_vm_move_enc_context_from(struct kvm *kvm, unsigned int source_fd)
 {
        struct kvm_sev_info *dst_sev = &to_kvm_svm(kvm)->sev_info;
        struct kvm_sev_info *src_sev, *cg_cleanup_sev;
@@ -1761,7 +1761,7 @@ out_fput:
        return ret;
 }
 
-int svm_mem_enc_ioctl(struct kvm *kvm, void __user *argp)
+int sev_mem_enc_ioctl(struct kvm *kvm, void __user *argp)
 {
        struct kvm_sev_cmd sev_cmd;
        int r;
@@ -1858,8 +1858,8 @@ out:
        return r;
 }
 
-int svm_register_enc_region(struct kvm *kvm,
-                           struct kvm_enc_region *range)
+int sev_mem_enc_register_region(struct kvm *kvm,
+                               struct kvm_enc_region *range)
 {
        struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info;
        struct enc_region *region;
@@ -1932,8 +1932,8 @@ static void __unregister_enc_region_locked(struct kvm *kvm,
        kfree(region);
 }
 
-int svm_unregister_enc_region(struct kvm *kvm,
-                             struct kvm_enc_region *range)
+int sev_mem_enc_unregister_region(struct kvm *kvm,
+                                 struct kvm_enc_region *range)
 {
        struct enc_region *region;
        int ret;
@@ -1972,7 +1972,7 @@ failed:
        return ret;
 }
 
-int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd)
+int sev_vm_copy_enc_context_from(struct kvm *kvm, unsigned int source_fd)
 {
        struct file *source_kvm_file;
        struct kvm *source_kvm;

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 19b6a60..10e38bb 100644 (file)
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -1574,7 +1574,7 @@ static void svm_set_gdt(struct kvm_vcpu *vcpu, struct desc_ptr *dt)
        vmcb_mark_dirty(svm->vmcb, VMCB_DT);
 }
 
-static void svm_post_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
+static void sev_post_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
 {
        struct vcpu_svm *svm = to_svm(vcpu);
 
@@ -4521,7 +4521,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
        .get_cpl = svm_get_cpl,
        .get_cs_db_l_bits = svm_get_cs_db_l_bits,
        .set_cr0 = svm_set_cr0,
-       .post_set_cr3 = svm_post_set_cr3,
+       .post_set_cr3 = sev_post_set_cr3,
        .is_valid_cr4 = svm_is_valid_cr4,
        .set_cr4 = svm_set_cr4,
        .set_efer = svm_set_efer,
@@ -4605,12 +4605,12 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {
        .leave_smm = svm_leave_smm,
        .enable_smi_window = svm_enable_smi_window,
 
-       .mem_enc_ioctl = svm_mem_enc_ioctl,
-       .mem_enc_register_region = svm_register_enc_region,
-       .mem_enc_unregister_region = svm_unregister_enc_region,
+       .mem_enc_ioctl = sev_mem_enc_ioctl,
+       .mem_enc_register_region = sev_mem_enc_register_region,
+       .mem_enc_unregister_region = sev_mem_enc_unregister_region,
 
-       .vm_copy_enc_context_from = svm_vm_copy_asid_from,
-       .vm_move_enc_context_from = svm_vm_migrate_from,
+       .vm_copy_enc_context_from = sev_vm_copy_enc_context_from,
+       .vm_move_enc_context_from = sev_vm_move_enc_context_from,
 
        .can_emulate_instruction = svm_can_emulate_instruction,
 

diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index d6a415a..cb6b45b 100644 (file)
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -587,13 +587,13 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu);
 extern unsigned int max_sev_asid;
 
 void sev_vm_destroy(struct kvm *kvm);
-int svm_mem_enc_ioctl(struct kvm *kvm, void __user *argp);
-int svm_register_enc_region(struct kvm *kvm,
-                           struct kvm_enc_region *range);
-int svm_unregister_enc_region(struct kvm *kvm,
-                             struct kvm_enc_region *range);
-int svm_vm_copy_asid_from(struct kvm *kvm, unsigned int source_fd);
-int svm_vm_migrate_from(struct kvm *kvm, unsigned int source_fd);
+int sev_mem_enc_ioctl(struct kvm *kvm, void __user *argp);
+int sev_mem_enc_register_region(struct kvm *kvm,
+                               struct kvm_enc_region *range);
+int sev_mem_enc_unregister_region(struct kvm *kvm,
+                                 struct kvm_enc_region *range);
+int sev_vm_copy_enc_context_from(struct kvm *kvm, unsigned int source_fd);
+int sev_vm_move_enc_context_from(struct kvm *kvm, unsigned int source_fd);
 void pre_sev_run(struct vcpu_svm *svm, int cpu);
 void __init sev_set_cpu_caps(void);
 void __init sev_hardware_setup(void);