lkml.org 
[lkml]   [2021]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 108/169] KVM: SEV-ES: keep INS functions together
    Date
    From: Paolo Bonzini <pbonzini@redhat.com>

    commit 4fa4b38dae6fc6a3695695add8c18fa8b6a05a1a upstream.

    Make the diff a little nicer when we actually get to fixing
    the bug. 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/kvm/x86.c | 18 +++++++++---------
    1 file changed, 9 insertions(+), 9 deletions(-)

    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -12320,15 +12320,6 @@ int kvm_sev_es_mmio_read(struct kvm_vcpu
    }
    EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);

    -static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
    -{
    - memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
    - vcpu->arch.pio.count * vcpu->arch.pio.size);
    - vcpu->arch.pio.count = 0;
    -
    - return 1;
    -}
    -
    static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
    unsigned int port, unsigned int count)
    {
    @@ -12344,6 +12335,15 @@ static int kvm_sev_es_outs(struct kvm_vc
    return 0;
    }

    +static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
    +{
    + memcpy(vcpu->arch.sev_pio_data, vcpu->arch.pio_data,
    + vcpu->arch.pio.count * vcpu->arch.pio.size);
    + vcpu->arch.pio.count = 0;
    +
    + return 1;
    +}
    +
    static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
    unsigned int port, unsigned int count)
    {

    \
     
     \ /
      Last update: 2021-10-25 21:56    [W:2.751 / U:0.772 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site