| From b5998402e3de429b5e5f9bdea08ddf77c5fd661e Mon Sep 17 00:00:00 2001 |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| Date: Tue, 12 Oct 2021 10:22:34 -0400 |
| Subject: KVM: SEV-ES: rename guest_ins_data to sev_pio_data |
| |
| From: Paolo Bonzini <pbonzini@redhat.com> |
| |
| commit b5998402e3de429b5e5f9bdea08ddf77c5fd661e upstream. |
| |
| We will be using this field for OUTS emulation as well, in case the |
| data that is pushed via OUTS spans more than one page. In that case, |
| there will be a need to save the data pointer across exits to userspace. |
| |
| So, change the name to something that refers to any kind of PIO. |
| Also spell out what it is used for, namely SEV-ES. |
| |
| No functional change intended. |
| |
| Cc: stable@vger.kernel.org |
| Fixes: 7ed9abfe8e9f ("KVM: SVM: Support string IO operations for an SEV-ES guest") |
| Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/include/asm/kvm_host.h | 2 +- |
| arch/x86/kvm/x86.c | 4 ++-- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/x86/include/asm/kvm_host.h |
| +++ b/arch/x86/include/asm/kvm_host.h |
| @@ -695,7 +695,7 @@ struct kvm_vcpu_arch { |
| |
| struct kvm_pio_request pio; |
| void *pio_data; |
| - void *guest_ins_data; |
| + void *sev_pio_data; |
| |
| u8 event_exit_inst_len; |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -12322,7 +12322,7 @@ EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read); |
| |
| static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu) |
| { |
| - memcpy(vcpu->arch.guest_ins_data, vcpu->arch.pio_data, |
| + memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data, |
| vcpu->arch.pio.count * vcpu->arch.pio.size); |
| vcpu->arch.pio.count = 0; |
| |
| @@ -12354,7 +12354,7 @@ static int kvm_sev_es_ins(struct kvm_vcp |
| if (ret) { |
| vcpu->arch.pio.count = 0; |
| } else { |
| - vcpu->arch.guest_ins_data = data; |
| + vcpu->arch.sev_pio_data = data; |
| vcpu->arch.complete_userspace_io = complete_sev_es_emulated_ins; |
| } |
| |