On 22/04/21 19:09, Vipin Sharma wrote:
On Thu, Apr 22, 2021 at 12:47 AM Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
You can check the current state of the merge in the queue branch of the
KVM tree. This is what I plan to merge if Tejun agrees. That would be
helpful indeed!
Merge looks fine from my patch perspective. However, one thing is missing:
In sev_guest_init() after sev_asid_free() call we should also write
set sev->es_false = false.
Without this the main intent of Sean's patch will be missing in the merge.
So this:
diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index 3539201278bd..2632852be856 100644
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -224,7 +224,7 @@ static int sev_guest_init(struct kvm *kvm, struct
kvm_sev_cmd *argp)
sev->es_active = es_active;
asid = sev_asid_new(sev);
if (asid < 0)
- return ret;
+ goto e_no_asid;
sev->asid = asid;
ret = sev_platform_init(&argp->error);
@@ -240,6 +240,8 @@ static int sev_guest_init(struct kvm *kvm, struct
kvm_sev_cmd *argp)
e_free:
sev_asid_free(sev);
sev->asid = 0;
+e_no_asid:
+ sev->es_active = false;
return ret;
}
Sounds good, I'll squash it and push to kvm.git.
Paolo
