[Xen-devel] Ping: [PATCH] x86emul/fuzz: extend canonicalization to 57-bit linear address width case

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 01.04.19 at 09:42,  wrote:
> Don't enforce any other dependencies for now, just like we don't enforce
> e.g. PAE enabled as a prereq for long mode.
> 
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
> 
> --- a/tools/fuzz/x86_instruction_emulator/fuzz-emul.c
> +++ b/tools/fuzz/x86_instruction_emulator/fuzz-emul.c
> @@ -662,21 +662,21 @@ static void set_sizes(struct x86_emulate
>      }
>  }
>  
> -#define CANONICALIZE(x)                                   \
> +#define CANONICALIZE(x, bits)                             \
>      do {                                                  \
>          uint64_t _y = (x);                                \
> -        if ( _y & (1ULL << 47) )                          \
> -            _y |= (~0ULL) << 48;                          \
> +        if ( _y & (1ULL << ((bits) - 1)) )                \
> +            _y |= (~0ULL) << (bits);                      \
>          else                                              \
> -            _y &= (1ULL << 48)-1;                         \
> +            _y &= (1ULL << (bits)) - 1;                   \
>          printf("Canonicalized %" PRIx64 " to %" PRIx64 "\n", x, _y);    \
>          (x) = _y;                                       \
>      } while( 0 )
>  
> -/* Expects bitmap and regs to be defined */
> +/* Expects bitmap, regs, and c to be defined */
>  #define CANONICALIZE_MAYBE(reg)                       \
>      if ( !(bitmap & (1 << CANONICALIZE_##reg)) )      \
> -        CANONICALIZE(regs->reg);                      \
> +        CANONICALIZE(regs->reg, c->cr[4] & X86_CR4_LA57 ? 57 : 48); \
>  
>  enum {
>      HOOK_read,
> --- a/xen/include/asm-x86/x86-defns.h
> +++ b/xen/include/asm-x86/x86-defns.h
> @@ -64,6 +64,7 @@
>  #define X86_CR4_OSFXSR     0x00000200 /* enable fast FPU save and restore 
> */
>  #define X86_CR4_OSXMMEXCPT 0x00000400 /* enable unmasked SSE exceptions */
>  #define X86_CR4_UMIP       0x00000800 /* enable UMIP */
> +#define X86_CR4_LA57       0x00001000 /* enable 5-level paging */
>  #define X86_CR4_VMXE       0x00002000 /* enable VMX */
>  #define X86_CR4_SMXE       0x00004000 /* enable SMX */
>  #define X86_CR4_FSGSBASE   0x00010000 /* enable {rd,wr}{fs,gs}base */
> 
> 
> 
> 





_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel