* [PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits
@ 2014-09-23 7:01 Nadav Amit
2014-09-23 8:02 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Nadav Amit @ 2014-09-23 7:01 UTC (permalink / raw)
To: pbonzini; +Cc: kvm, Nadav Amit
Commit 346874c9507a ("KVM: x86: Fix CR3 reserved bits") removed non-PAE
reserved bits which were not according to Intel SDM. However, residue was left
in a debug assertion (CR3_NONPAE_RESERVED_BITS). Remove it.
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
---
arch/x86/kvm/paging_tmpl.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 0ab6c65..806d58e 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -298,8 +298,7 @@ retry_walk:
}
#endif
walker->max_level = walker->level;
- ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
- (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
+ ASSERT(!is_long_mode(vcpu) && is_pae(vcpu));
accessed_dirty = PT_GUEST_ACCESSED_MASK;
pt_access = pte_access = ACC_ALL;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits
2014-09-23 7:01 [PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits Nadav Amit
@ 2014-09-23 8:02 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2014-09-23 8:02 UTC (permalink / raw)
To: Nadav Amit; +Cc: kvm
Il 23/09/2014 09:01, Nadav Amit ha scritto:
> Commit 346874c9507a ("KVM: x86: Fix CR3 reserved bits") removed non-PAE
> reserved bits which were not according to Intel SDM. However, residue was left
> in a debug assertion (CR3_NONPAE_RESERVED_BITS). Remove it.
>
> Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
> ---
> arch/x86/kvm/paging_tmpl.h | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
> index 0ab6c65..806d58e 100644
> --- a/arch/x86/kvm/paging_tmpl.h
> +++ b/arch/x86/kvm/paging_tmpl.h
> @@ -298,8 +298,7 @@ retry_walk:
> }
> #endif
> walker->max_level = walker->level;
> - ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
> - (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
> + ASSERT(!is_long_mode(vcpu) && is_pae(vcpu));
>
> accessed_dirty = PT_GUEST_ACCESSED_MASK;
> pt_access = pte_access = ACC_ALL;
>
Thanks, applied.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-23 8:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-23 7:01 [PATCH] KVM: x86: Remove debug assertion of non-PAE reserved bits Nadav Amit
2014-09-23 8:02 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox