Message ID | 1468361932-16580-5-git-send-email-bsd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index c364dcb..566eea5 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3923,9 +3923,10 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu, * clearer. */ smap = cr4_smap && u && !uf && !ff; - } else - /* Not really needed: no U/S accesses on ept */ - u = 1; + } else { + if (shadow_present_mask) + u = 1; + } fault = (ff && !x) || (uf && !u) || (wf && !w) || (smapf && smap);
For the nested EPT case, we assume that the read bit (u) is always set since we used to unconditionally set it in set_spte(). Modify it to only be set when host ept execute only support isn't present. Signed-off-by: Bandan Das <bsd@redhat.com> --- arch/x86/kvm/mmu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)