Messages in this thread | | | Date | Tue, 26 Oct 2021 18:16:56 +0200 | Subject | Re: [PATCH MANUALSEL 5.14 4/5] KVM: SEV-ES: Set guest_state_protected after VMSA update | From | Paolo Bonzini <> |
| |
On 25/10/21 22:38, Sasha Levin wrote: > From: Peter Gonda <pgonda@google.com> > > [ Upstream commit baa1e5ca172ce7bf9554070139482dd7ea919528 ] > > The refactoring in commit bb18a6777465 ("KVM: SEV: Acquire > vcpu mutex when updating VMSA") left behind the assignment to > svm->vcpu.arch.guest_state_protected; add it back. > > Signed-off-by: Peter Gonda <pgonda@google.com> > [Delta between v2 and v3 of Peter's patch, which had already been > committed; the commit message is my own. - Paolo] > Fixes: bb18a6777465 ("KVM: SEV: Acquire vcpu mutex when updating VMSA") > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > arch/x86/kvm/svm/sev.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index cb166bde449b..50dabccd664e 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -619,7 +619,12 @@ static int __sev_launch_update_vmsa(struct kvm *kvm, struct kvm_vcpu *vcpu, > vmsa.handle = to_kvm_svm(kvm)->sev_info.handle; > vmsa.address = __sme_pa(svm->vmsa); > vmsa.len = PAGE_SIZE; > - return sev_issue_cmd(kvm, SEV_CMD_LAUNCH_UPDATE_VMSA, &vmsa, error); > + ret = sev_issue_cmd(kvm, SEV_CMD_LAUNCH_UPDATE_VMSA, &vmsa, error); > + if (ret) > + return ret; > + > + vcpu->arch.guest_state_protected = true; > + return 0; > } > > static int sev_launch_update_vmsa(struct kvm *kvm, struct kvm_sev_cmd *argp) >
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
I missed that bb18a677746543e7f5eeb478129c92cedb0f9658 was Cc'd to stable. Good bot. :)
Paolo
| |