linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0
@ 2014-12-06 15:02 Bandan Das
  2014-12-07 10:22 ` Jan Kiszka
  2014-12-10 12:06 ` Paolo Bonzini
  0 siblings, 2 replies; 3+ messages in thread
From: Bandan Das @ 2014-12-06 15:02 UTC (permalink / raw)
  To: kvm; +Cc: jan.kiszka, pbonzini, linux-kernel


If L0 has disabled EPT, don't advertise unrestricted
mode at all since it depends on EPT to run real mode code.

Signed-off-by: Bandan Das <bsd@redhat.com>
---
 arch/x86/kvm/vmx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3e556c6..ed70394 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2377,12 +2377,12 @@ static __init void nested_vmx_setup_ctls_msrs(void)
 	nested_vmx_secondary_ctls_low = 0;
 	nested_vmx_secondary_ctls_high &=
 		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
-		SECONDARY_EXEC_UNRESTRICTED_GUEST |
 		SECONDARY_EXEC_WBINVD_EXITING;
 
 	if (enable_ept) {
 		/* nested EPT: emulate EPT also to L1 */
-		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
+		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT |
+			SECONDARY_EXEC_UNRESTRICTED_GUEST;
 		nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
 			 VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
 			 VMX_EPT_INVEPT_BIT;
-- 
1.9.3


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0
  2014-12-06 15:02 [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0 Bandan Das
@ 2014-12-07 10:22 ` Jan Kiszka
  2014-12-10 12:06 ` Paolo Bonzini
  1 sibling, 0 replies; 3+ messages in thread
From: Jan Kiszka @ 2014-12-07 10:22 UTC (permalink / raw)
  To: Bandan Das, kvm; +Cc: pbonzini, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1187 bytes --]

On 2014-12-06 16:02, Bandan Das wrote:
> 
> If L0 has disabled EPT, don't advertise unrestricted
> mode at all since it depends on EPT to run real mode code.
> 
> Signed-off-by: Bandan Das <bsd@redhat.com>
> ---
>  arch/x86/kvm/vmx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 3e556c6..ed70394 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -2377,12 +2377,12 @@ static __init void nested_vmx_setup_ctls_msrs(void)
>  	nested_vmx_secondary_ctls_low = 0;
>  	nested_vmx_secondary_ctls_high &=
>  		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
> -		SECONDARY_EXEC_UNRESTRICTED_GUEST |
>  		SECONDARY_EXEC_WBINVD_EXITING;
>  
>  	if (enable_ept) {
>  		/* nested EPT: emulate EPT also to L1 */
> -		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
> +		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT |
> +			SECONDARY_EXEC_UNRESTRICTED_GUEST;
>  		nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
>  			 VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
>  			 VMX_EPT_INVEPT_BIT;
> 

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0
  2014-12-06 15:02 [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0 Bandan Das
  2014-12-07 10:22 ` Jan Kiszka
@ 2014-12-10 12:06 ` Paolo Bonzini
  1 sibling, 0 replies; 3+ messages in thread
From: Paolo Bonzini @ 2014-12-10 12:06 UTC (permalink / raw)
  To: Bandan Das, kvm; +Cc: jan.kiszka, linux-kernel



On 06/12/2014 16:02, Bandan Das wrote:
> 
> If L0 has disabled EPT, don't advertise unrestricted
> mode at all since it depends on EPT to run real mode code.
> 
> Signed-off-by: Bandan Das <bsd@redhat.com>
> ---
>  arch/x86/kvm/vmx.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index 3e556c6..ed70394 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -2377,12 +2377,12 @@ static __init void nested_vmx_setup_ctls_msrs(void)
>  	nested_vmx_secondary_ctls_low = 0;
>  	nested_vmx_secondary_ctls_high &=
>  		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
> -		SECONDARY_EXEC_UNRESTRICTED_GUEST |
>  		SECONDARY_EXEC_WBINVD_EXITING;
>  
>  	if (enable_ept) {
>  		/* nested EPT: emulate EPT also to L1 */
> -		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
> +		nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT |
> +			SECONDARY_EXEC_UNRESTRICTED_GUEST;
>  		nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
>  			 VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
>  			 VMX_EPT_INVEPT_BIT;
> 

Thanks, applied with

Fixes: 92fbc7b195b824e201d9f06f2b93105f72384d65
Cc: stable@vger.kernel.org

Paolo

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-12-10 12:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-06 15:02 [PATCH] KVM: nVMX: Disable unrestricted mode if ept=0 Bandan Das
2014-12-07 10:22 ` Jan Kiszka
2014-12-10 12:06 ` Paolo Bonzini

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).