From: Maxim Levitsky <mlevitsk@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: seanjc@google.com
Subject: Re: [PATCH 13/13] KVM: SEV-ES: reuse advance_sev_es_emulated_ins for OUT too
Date: Tue, 26 Oct 2021 16:57:12 +0300 [thread overview]
Message-ID: <ed81ce712b8c75bea619ba06bb35c9d21d327a9e.camel@redhat.com> (raw)
In-Reply-To: <20211022153616.1722429-14-pbonzini@redhat.com>
On Fri, 2021-10-22 at 11:36 -0400, Paolo Bonzini wrote:
> complete_emulator_pio_in only has to be called by
> complete_sev_es_emulated_ins now; therefore, all that the function does
> now is adjust sev_pio_count and sev_pio_data. Which is the same for
> both IN and OUT.
>
> No functional change intended.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> arch/x86/kvm/x86.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index c3a2f479604d..b9ce4cfec121 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -12365,6 +12365,12 @@ int kvm_sev_es_mmio_read(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned int bytes,
> }
> EXPORT_SYMBOL_GPL(kvm_sev_es_mmio_read);
>
> +static void advance_sev_es_emulated_pio(struct kvm_vcpu *vcpu, unsigned count, int size)
> +{
> + vcpu->arch.sev_pio_count -= count;
> + vcpu->arch.sev_pio_data += count * size;
> +}
> +
> static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
> unsigned int port);
>
> @@ -12388,8 +12394,7 @@ static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
> int ret = emulator_pio_out(vcpu, size, port, vcpu->arch.sev_pio_data, count);
>
> /* memcpy done already by emulator_pio_out. */
> - vcpu->arch.sev_pio_count -= count;
> - vcpu->arch.sev_pio_data += count * vcpu->arch.pio.size;
> + advance_sev_es_emulated_pio(vcpu, count, size);
> if (!ret)
> break;
>
> @@ -12405,12 +12410,6 @@ static int kvm_sev_es_outs(struct kvm_vcpu *vcpu, unsigned int size,
> static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
> unsigned int port);
>
> -static void advance_sev_es_emulated_ins(struct kvm_vcpu *vcpu, unsigned count, int size)
> -{
> - vcpu->arch.sev_pio_count -= count;
> - vcpu->arch.sev_pio_data += count * size;
> -}
> -
> static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
> {
> unsigned count = vcpu->arch.pio.count;
> @@ -12418,7 +12417,7 @@ static int complete_sev_es_emulated_ins(struct kvm_vcpu *vcpu)
> int port = vcpu->arch.pio.port;
>
> complete_emulator_pio_in(vcpu, vcpu->arch.sev_pio_data);
> - advance_sev_es_emulated_ins(vcpu, count, size);
> + advance_sev_es_emulated_pio(vcpu, count, size);
> if (vcpu->arch.sev_pio_count)
> return kvm_sev_es_ins(vcpu, size, port);
> return 1;
> @@ -12434,7 +12433,7 @@ static int kvm_sev_es_ins(struct kvm_vcpu *vcpu, unsigned int size,
> break;
>
> /* Emulation done by the kernel. */
> - advance_sev_es_emulated_ins(vcpu, count, size);
> + advance_sev_es_emulated_pio(vcpu, count, size);
> if (!vcpu->arch.sev_pio_count)
> return 1;
> }
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
prev parent reply other threads:[~2021-10-26 13:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-22 15:36 [PATCH v2 00/13] fixes and cleanups for string I/O emulation Paolo Bonzini
2021-10-22 15:36 ` [PATCH 01/13] KVM: SEV-ES: rename guest_ins_data to sev_pio_data Paolo Bonzini
2021-10-22 15:36 ` [PATCH 02/13] KVM: x86: leave vcpu->arch.pio.count alone in emulator_pio_in_out Paolo Bonzini
2021-10-22 15:36 ` [PATCH 03/13] KVM: SEV-ES: clean up kvm_sev_es_ins/outs Paolo Bonzini
2021-10-22 15:36 ` [PATCH 04/13] KVM: x86: split the two parts of emulator_pio_in Paolo Bonzini
2021-10-22 15:36 ` [PATCH 05/13] KVM: x86: remove unnecessary arguments from complete_emulator_pio_in Paolo Bonzini
2021-10-22 15:36 ` [PATCH 06/13] KVM: SEV-ES: keep INS functions together Paolo Bonzini
2021-10-22 15:36 ` [PATCH 07/13] KVM: SEV-ES: go over the sev_pio_data buffer in multiple passes if needed Paolo Bonzini
2021-10-22 15:36 ` [PATCH 08/13] KVM: x86: inline kernel_pio into its sole caller Paolo Bonzini
2021-10-26 13:55 ` Maxim Levitsky
2021-10-22 15:36 ` [PATCH 09/13] KVM: x86: move all vcpu->arch.pio* setup in emulator_pio_in_out Paolo Bonzini
2021-10-26 13:56 ` Maxim Levitsky
2021-10-22 15:36 ` [PATCH 10/13] KVM: x86: wean in-kernel PIO from vcpu->arch.pio* Paolo Bonzini
2021-10-26 13:56 ` Maxim Levitsky
2021-10-22 15:36 ` [PATCH 11/13] KVM: x86: wean fast IN from emulator_pio_in Paolo Bonzini
2021-10-26 13:56 ` Maxim Levitsky
2021-10-22 15:36 ` [PATCH 12/13] KVM: x86: de-underscorify __emulator_pio_in Paolo Bonzini
2021-10-26 13:56 ` Maxim Levitsky
2021-10-22 15:36 ` [PATCH 13/13] KVM: SEV-ES: reuse advance_sev_es_emulated_ins for OUT too Paolo Bonzini
2021-10-26 13:57 ` Maxim Levitsky [this message]
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=ed81ce712b8c75bea619ba06bb35c9d21d327a9e.camel@redhat.com \
--to=mlevitsk@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.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).