On 10.08.2017 15:35, David Hildenbrand wrote:
> Don't use shifts, tag them correctly as EPTP and use better matching
> names (PWL vs. GAW).
>
> Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
> ---
> arch/x86/include/asm/vmx.h | 11 ++++++-----
> arch/x86/kvm/vmx.c | 25 +++++++++++--------------
> 2 files changed, 17 insertions(+), 19 deletions(-)
>
> diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
> index 5f63a2e..929b3fc 100644
> --- a/arch/x86/include/asm/vmx.h
> +++ b/arch/x86/include/asm/vmx.h
> @@ -468,12 +468,13 @@ enum vmcs_field {
> #define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT (1ull << 10) /* (42 - 32) */
> #define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT (1ull << 11) /* (43 - 32) */
>
> -#define VMX_EPT_DEFAULT_GAW 3
> -#define VMX_EPT_MAX_GAW 0x4
> #define VMX_EPT_MT_EPTE_SHIFT 3
> -#define VMX_EPT_GAW_EPTP_SHIFT 3
> -#define VMX_EPT_AD_ENABLE_BIT (1ull << 6)
> -#define VMX_EPT_DEFAULT_MT 0x6ull
> +#define VMX_EPTP_PWL_MASK 0x38ull
> +#define VMX_EPTP_PWL_4 0x38ull
stupid typo, this should be 0x18ull (otherwise you'll get a kernel panic
...)
--
Thanks,
David
