Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/21/2017 6:12 PM, Paolo Bonzini wrote:

On 21/08/2017 09:27, Yu Zhang wrote:


On 8/18/2017 8:50 PM, Paolo Bonzini wrote:

On 18/08/2017 10:28, Yu Zhang wrote:

On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
 switch (mode) {
 case X86EMUL_MODE_PROT64:
 *linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
 goto bad;
   *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this
reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Sorry, Paolo. I still do not quite get it.
Do you mean the
   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la +
*max_size still falls in
the canonical address space.

And if above understanding is correct, I think it should be something
like below:
*max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.

But what if value of "la" falls in between 0x and
0x? (1ull << 48) - la may result in something between
0x10001 and> 0x2, and the *max_size would be 4G - 1
in this scenario.  For instance, when "la" is 0xFFF0 (unlikely
in practice though), the *max_size we are expecting should be 15, instead
of 4G - 1.

No, it is possible to wrap a memory access from the top half of the
address space to the bottom half, so there's no limit at 0xFFF0.


Oh? So you mean it is allowed for one instruction to reside both in the 
top half of

the address space and in the bottom half?

If this is possible, I guess the code should be

*max_size = min_t(u64, ~0u, (1ull << va_bits) - la);

But I wonder, why should such scenario be allowed? :-)

Thanks
Yu






Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/21/2017 6:12 PM, Paolo Bonzini wrote:

On 21/08/2017 09:27, Yu Zhang wrote:


On 8/18/2017 8:50 PM, Paolo Bonzini wrote:

On 18/08/2017 10:28, Yu Zhang wrote:

On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
 switch (mode) {
 case X86EMUL_MODE_PROT64:
 *linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
 goto bad;
   *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this
reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Sorry, Paolo. I still do not quite get it.
Do you mean the
   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la +
*max_size still falls in
the canonical address space.

And if above understanding is correct, I think it should be something
like below:
*max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.

But what if value of "la" falls in between 0x and
0x? (1ull << 48) - la may result in something between
0x10001 and> 0x2, and the *max_size would be 4G - 1
in this scenario.  For instance, when "la" is 0xFFF0 (unlikely
in practice though), the *max_size we are expecting should be 15, instead
of 4G - 1.

No, it is possible to wrap a memory access from the top half of the
address space to the bottom half, so there's no limit at 0xFFF0.


Oh? So you mean it is allowed for one instruction to reside both in the 
top half of

the address space and in the bottom half?

If this is possible, I guess the code should be

*max_size = min_t(u64, ~0u, (1ull << va_bits) - la);

But I wonder, why should such scenario be allowed? :-)

Thanks
Yu






Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 21/08/2017 09:27, Yu Zhang wrote:
> 
> 
> On 8/18/2017 8:50 PM, Paolo Bonzini wrote:
>> On 18/08/2017 10:28, Yu Zhang wrote:
>>>
>>> On 8/17/2017 10:29 PM, Paolo Bonzini wrote:
 On 17/08/2017 13:53, Yu Zhang wrote:
> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
>> On 12/08/2017 15:35, Yu Zhang wrote:
>>> index a98b88a..50107ae 100644
>>> --- a/arch/x86/kvm/emulate.c
>>> +++ b/arch/x86/kvm/emulate.c
>>> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
>>> x86_emulate_ctxt *ctxt,
>>> switch (mode) {
>>> case X86EMUL_MODE_PROT64:
>>> *linear = la;
>>> -if (is_noncanonical_address(la))
>>> +if (emul_is_noncanonical_address(la, ctxt))
>>> goto bad;
>>>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>> Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
>> and
>> then "inline" emul_is_noncanonical_address as "get_canonical(la,
>> va_bits) != la".
> Sorry, I just sent out the v2 patch set without noticing this
> reply. :-)
>
> The emul_is_noncanonical() is defined in x86.h so that no
> ctxt_virt_addr_bits needed in emulate.c, are you
> suggesting to use ctx_virt_addr_bits in this file each time before
> emul_is_noncanonical_address() is called?
 No, only in this instance which uses "48" after the call to
 emul_is_noncanonical_address.
>>> Sorry, Paolo. I still do not quite get it.
>>> Do you mean the
>>>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>>> also need to be changed?
>>>
>>> But I do not understand why this statement is used like this. My
>>> understanding is that
>>> for 64 bit scenario, the *max_size is calculated to guarantee la +
>>> *max_size still falls in
>>> the canonical address space.
>>>
>>> And if above understanding is correct, I think it should be something
>>> like below:
>>>*max_size = min_t(u64, ~0u - la, (1ull << 48) - la);
>> The "~0u" part is simply because max_size has 32-bit size (it's an
>> unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
>> protects from the overflow.
> 
> But what if value of "la" falls in between 0x and
> 0x? (1ull << 48) - la may result in something between
> 0x10001 and> 0x2, and the *max_size would be 4G - 1
> in this scenario.  For instance, when "la" is 0xFFF0 (unlikely
> in practice though), the *max_size we are expecting should be 15, instead
> of 4G - 1.

No, it is possible to wrap a memory access from the top half of the
address space to the bottom half, so there's no limit at 0xFFF0.

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 21/08/2017 09:27, Yu Zhang wrote:
> 
> 
> On 8/18/2017 8:50 PM, Paolo Bonzini wrote:
>> On 18/08/2017 10:28, Yu Zhang wrote:
>>>
>>> On 8/17/2017 10:29 PM, Paolo Bonzini wrote:
 On 17/08/2017 13:53, Yu Zhang wrote:
> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
>> On 12/08/2017 15:35, Yu Zhang wrote:
>>> index a98b88a..50107ae 100644
>>> --- a/arch/x86/kvm/emulate.c
>>> +++ b/arch/x86/kvm/emulate.c
>>> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
>>> x86_emulate_ctxt *ctxt,
>>> switch (mode) {
>>> case X86EMUL_MODE_PROT64:
>>> *linear = la;
>>> -if (is_noncanonical_address(la))
>>> +if (emul_is_noncanonical_address(la, ctxt))
>>> goto bad;
>>>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>> Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
>> and
>> then "inline" emul_is_noncanonical_address as "get_canonical(la,
>> va_bits) != la".
> Sorry, I just sent out the v2 patch set without noticing this
> reply. :-)
>
> The emul_is_noncanonical() is defined in x86.h so that no
> ctxt_virt_addr_bits needed in emulate.c, are you
> suggesting to use ctx_virt_addr_bits in this file each time before
> emul_is_noncanonical_address() is called?
 No, only in this instance which uses "48" after the call to
 emul_is_noncanonical_address.
>>> Sorry, Paolo. I still do not quite get it.
>>> Do you mean the
>>>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>>> also need to be changed?
>>>
>>> But I do not understand why this statement is used like this. My
>>> understanding is that
>>> for 64 bit scenario, the *max_size is calculated to guarantee la +
>>> *max_size still falls in
>>> the canonical address space.
>>>
>>> And if above understanding is correct, I think it should be something
>>> like below:
>>>*max_size = min_t(u64, ~0u - la, (1ull << 48) - la);
>> The "~0u" part is simply because max_size has 32-bit size (it's an
>> unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
>> protects from the overflow.
> 
> But what if value of "la" falls in between 0x and
> 0x? (1ull << 48) - la may result in something between
> 0x10001 and> 0x2, and the *max_size would be 4G - 1
> in this scenario.  For instance, when "la" is 0xFFF0 (unlikely
> in practice though), the *max_size we are expecting should be 15, instead
> of 4G - 1.

No, it is possible to wrap a memory access from the top half of the
address space to the bottom half, so there's no limit at 0xFFF0.

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/18/2017 8:50 PM, Paolo Bonzini wrote:

On 18/08/2017 10:28, Yu Zhang wrote:


On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
goto bad;
  *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Sorry, Paolo. I still do not quite get it.
Do you mean the
  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la +
*max_size still falls in
the canonical address space.

And if above understanding is correct, I think it should be something
like below:
   *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.


Oh, right. "~0u" is only an unsigned int. Thanks for your clarification. :-)

But what if value of "la" falls in between 0x and 
0x?
(1ull << 48) - la may result in something between 0x10001 and 
0x2,

and the *max_size would be 4G - 1 in this scenario.
For instance, when "la" is 0xFFF0(unlikely in practice 
though), the *max_size

we are expecting should be 15, instead of 4G - 1.

If above understanding is correct, maybe we should change this code as 
below:
@@ -690,16 +690,21 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,

    ulong la;
    u32 lim;
    u16 sel;
+   u64 canonical_limit;
+   u8 va_bits;

    la = seg_base(ctxt, addr.seg) + addr.ea;
    *max_size = 0;
    switch (mode) {
    case X86EMUL_MODE_PROT64:
    *linear = la;
-   if (emul_is_noncanonical_address(la, ctxt))
+   va_bits = ctxt_virt_addr_bits(ctxt);
+   if (get_canonical(la, va_bits) != la)
    goto bad;

-   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
+   canonical_limit = (la & (1 << va_bits)) ?
+ ~0ull : ((1 << va_bits) -1);
+   *max_size = min_t(u64, ~0u, canonical_limit - la + 1);

Does this sound reasonable?
BTW, I did not use min_t(u64, ~0ull - la + 1, (1 << va_bits) - la) here, 
because I still would like to
keep *max_size as an unsigned int, and my previous suggestion may cause 
the return value of

min_t be truncated.

Yu


And with LA57, may better be changed to:
   *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) -
la);

And for the above
   if (emul_is_noncanonical_address(la, ctxt))
we may just leave it as it is.

Yes, exactly.  But since emul_is_noncanonical_address is already using
ctxt_virt_addr_bits(ctxt), it may make sense to compute
ctxt_virt_addr_bits(ctxt) once and then reuse it twice, once in
get_canonical(la, va_bits) != la and once in (1ull << va_bits) - la.

Paolo


Is this understanding correct? Or did I misunderstand your comments? :-)

Thanks
Yu

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/18/2017 8:50 PM, Paolo Bonzini wrote:

On 18/08/2017 10:28, Yu Zhang wrote:


On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
goto bad;
  *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Sorry, Paolo. I still do not quite get it.
Do you mean the
  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la +
*max_size still falls in
the canonical address space.

And if above understanding is correct, I think it should be something
like below:
   *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.


Oh, right. "~0u" is only an unsigned int. Thanks for your clarification. :-)

But what if value of "la" falls in between 0x and 
0x?
(1ull << 48) - la may result in something between 0x10001 and 
0x2,

and the *max_size would be 4G - 1 in this scenario.
For instance, when "la" is 0xFFF0(unlikely in practice 
though), the *max_size

we are expecting should be 15, instead of 4G - 1.

If above understanding is correct, maybe we should change this code as 
below:
@@ -690,16 +690,21 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,

    ulong la;
    u32 lim;
    u16 sel;
+   u64 canonical_limit;
+   u8 va_bits;

    la = seg_base(ctxt, addr.seg) + addr.ea;
    *max_size = 0;
    switch (mode) {
    case X86EMUL_MODE_PROT64:
    *linear = la;
-   if (emul_is_noncanonical_address(la, ctxt))
+   va_bits = ctxt_virt_addr_bits(ctxt);
+   if (get_canonical(la, va_bits) != la)
    goto bad;

-   *max_size = min_t(u64, ~0u, (1ull << 48) - la);
+   canonical_limit = (la & (1 << va_bits)) ?
+ ~0ull : ((1 << va_bits) -1);
+   *max_size = min_t(u64, ~0u, canonical_limit - la + 1);

Does this sound reasonable?
BTW, I did not use min_t(u64, ~0ull - la + 1, (1 << va_bits) - la) here, 
because I still would like to
keep *max_size as an unsigned int, and my previous suggestion may cause 
the return value of

min_t be truncated.

Yu


And with LA57, may better be changed to:
   *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) -
la);

And for the above
   if (emul_is_noncanonical_address(la, ctxt))
we may just leave it as it is.

Yes, exactly.  But since emul_is_noncanonical_address is already using
ctxt_virt_addr_bits(ctxt), it may make sense to compute
ctxt_virt_addr_bits(ctxt) once and then reuse it twice, once in
get_canonical(la, va_bits) != la and once in (1ull << va_bits) - la.

Paolo


Is this understanding correct? Or did I misunderstand your comments? :-)

Thanks
Yu

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 18/08/2017 10:28, Yu Zhang wrote:
> 
> 
> On 8/17/2017 10:29 PM, Paolo Bonzini wrote:
>> On 17/08/2017 13:53, Yu Zhang wrote:
>>>
>>> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
 On 12/08/2017 15:35, Yu Zhang wrote:
> index a98b88a..50107ae 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
> x86_emulate_ctxt *ctxt,
>switch (mode) {
>case X86EMUL_MODE_PROT64:
>*linear = la;
> -if (is_noncanonical_address(la))
> +if (emul_is_noncanonical_address(la, ctxt))
>goto bad;
>  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
 Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
 and
 then "inline" emul_is_noncanonical_address as "get_canonical(la,
 va_bits) != la".
>>> Sorry, I just sent out the v2 patch set without noticing this reply. :-)
>>>
>>> The emul_is_noncanonical() is defined in x86.h so that no
>>> ctxt_virt_addr_bits needed in emulate.c, are you
>>> suggesting to use ctx_virt_addr_bits in this file each time before
>>> emul_is_noncanonical_address() is called?
>> No, only in this instance which uses "48" after the call to
>> emul_is_noncanonical_address.
> 
> Sorry, Paolo. I still do not quite get it.
> Do you mean the
>  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
> also need to be changed?
> 
> But I do not understand why this statement is used like this. My
> understanding is that
> for 64 bit scenario, the *max_size is calculated to guarantee la +
> *max_size still falls in
> the canonical address space.
> 
> And if above understanding is correct, I think it should be something
> like below:
>   *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.

> And with LA57, may better be changed to:
>   *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) -
> la);
> 
> And for the above
>   if (emul_is_noncanonical_address(la, ctxt))
> we may just leave it as it is.

Yes, exactly.  But since emul_is_noncanonical_address is already using
ctxt_virt_addr_bits(ctxt), it may make sense to compute
ctxt_virt_addr_bits(ctxt) once and then reuse it twice, once in
get_canonical(la, va_bits) != la and once in (1ull << va_bits) - la.

Paolo

> Is this understanding correct? Or did I misunderstand your comments? :-)
> 
> Thanks
> Yu
>> Paolo
>>
> 

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 18/08/2017 10:28, Yu Zhang wrote:
> 
> 
> On 8/17/2017 10:29 PM, Paolo Bonzini wrote:
>> On 17/08/2017 13:53, Yu Zhang wrote:
>>>
>>> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
 On 12/08/2017 15:35, Yu Zhang wrote:
> index a98b88a..50107ae 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
> x86_emulate_ctxt *ctxt,
>switch (mode) {
>case X86EMUL_MODE_PROT64:
>*linear = la;
> -if (is_noncanonical_address(la))
> +if (emul_is_noncanonical_address(la, ctxt))
>goto bad;
>  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
 Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits
 and
 then "inline" emul_is_noncanonical_address as "get_canonical(la,
 va_bits) != la".
>>> Sorry, I just sent out the v2 patch set without noticing this reply. :-)
>>>
>>> The emul_is_noncanonical() is defined in x86.h so that no
>>> ctxt_virt_addr_bits needed in emulate.c, are you
>>> suggesting to use ctx_virt_addr_bits in this file each time before
>>> emul_is_noncanonical_address() is called?
>> No, only in this instance which uses "48" after the call to
>> emul_is_noncanonical_address.
> 
> Sorry, Paolo. I still do not quite get it.
> Do you mean the
>  *max_size = min_t(u64, ~0u, (1ull << 48) - la);
> also need to be changed?
> 
> But I do not understand why this statement is used like this. My
> understanding is that
> for 64 bit scenario, the *max_size is calculated to guarantee la +
> *max_size still falls in
> the canonical address space.
> 
> And if above understanding is correct, I think it should be something
> like below:
>   *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

The "~0u" part is simply because max_size has 32-bit size (it's an
unsigned int variable), while (1ull << 48) - la has 64-bit size.  It
protects from the overflow.

> And with LA57, may better be changed to:
>   *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) -
> la);
> 
> And for the above
>   if (emul_is_noncanonical_address(la, ctxt))
> we may just leave it as it is.

Yes, exactly.  But since emul_is_noncanonical_address is already using
ctxt_virt_addr_bits(ctxt), it may make sense to compute
ctxt_virt_addr_bits(ctxt) once and then reuse it twice, once in
get_canonical(la, va_bits) != la and once in (1ull << va_bits) - la.

Paolo

> Is this understanding correct? Or did I misunderstand your comments? :-)
> 
> Thanks
> Yu
>> Paolo
>>
> 

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:


On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
   switch (mode) {
   case X86EMUL_MODE_PROT64:
   *linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
   goto bad;
 *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.


Sorry, Paolo. I still do not quite get it.
Do you mean the
 *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My 
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la + 
*max_size still falls in

the canonical address space.

And if above understanding is correct, I think it should be something 
like below:

  *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

And with LA57, may better be changed to:
  *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) 
- la);


And for the above
  if (emul_is_noncanonical_address(la, ctxt))
we may just leave it as it is.

Is this understanding correct? Or did I misunderstand your comments? :-)

Thanks
Yu

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/17/2017 10:29 PM, Paolo Bonzini wrote:

On 17/08/2017 13:53, Yu Zhang wrote:


On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
x86_emulate_ctxt *ctxt,
   switch (mode) {
   case X86EMUL_MODE_PROT64:
   *linear = la;
-if (is_noncanonical_address(la))
+if (emul_is_noncanonical_address(la, ctxt))
   goto bad;
 *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before
emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.


Sorry, Paolo. I still do not quite get it.
Do you mean the
 *max_size = min_t(u64, ~0u, (1ull << 48) - la);
also need to be changed?

But I do not understand why this statement is used like this. My 
understanding is that
for 64 bit scenario, the *max_size is calculated to guarantee la + 
*max_size still falls in

the canonical address space.

And if above understanding is correct, I think it should be something 
like below:

  *max_size = min_t(u64, ~0u - la, (1ull << 48) - la);

And with LA57, may better be changed to:
  *max_size = min_t(u64, ~0u - la, (1ull << ctxt_virt_addr_bits(ctxt)) 
- la);


And for the above
  if (emul_is_noncanonical_address(la, ctxt))
we may just leave it as it is.

Is this understanding correct? Or did I misunderstand your comments? :-)

Thanks
Yu

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 17/08/2017 13:53, Yu Zhang wrote:
> 
> 
> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
>> On 12/08/2017 15:35, Yu Zhang wrote:
>>> index a98b88a..50107ae 100644
>>> --- a/arch/x86/kvm/emulate.c
>>> +++ b/arch/x86/kvm/emulate.c
>>> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
>>> x86_emulate_ctxt *ctxt,
>>>   switch (mode) {
>>>   case X86EMUL_MODE_PROT64:
>>>   *linear = la;
>>> -if (is_noncanonical_address(la))
>>> +if (emul_is_noncanonical_address(la, ctxt))
>>>   goto bad;
>>> *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>> Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
>> then "inline" emul_is_noncanonical_address as "get_canonical(la,
>> va_bits) != la".
> 
> Sorry, I just sent out the v2 patch set without noticing this reply. :-)
> 
> The emul_is_noncanonical() is defined in x86.h so that no
> ctxt_virt_addr_bits needed in emulate.c, are you
> suggesting to use ctx_virt_addr_bits in this file each time before
> emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 17/08/2017 13:53, Yu Zhang wrote:
> 
> 
> On 8/17/2017 7:57 PM, Paolo Bonzini wrote:
>> On 12/08/2017 15:35, Yu Zhang wrote:
>>> index a98b88a..50107ae 100644
>>> --- a/arch/x86/kvm/emulate.c
>>> +++ b/arch/x86/kvm/emulate.c
>>> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct
>>> x86_emulate_ctxt *ctxt,
>>>   switch (mode) {
>>>   case X86EMUL_MODE_PROT64:
>>>   *linear = la;
>>> -if (is_noncanonical_address(la))
>>> +if (emul_is_noncanonical_address(la, ctxt))
>>>   goto bad;
>>> *max_size = min_t(u64, ~0u, (1ull << 48) - la);
>> Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
>> then "inline" emul_is_noncanonical_address as "get_canonical(la,
>> va_bits) != la".
> 
> Sorry, I just sent out the v2 patch set without noticing this reply. :-)
> 
> The emul_is_noncanonical() is defined in x86.h so that no
> ctxt_virt_addr_bits needed in emulate.c, are you
> suggesting to use ctx_virt_addr_bits in this file each time before
> emul_is_noncanonical_address() is called?

No, only in this instance which uses "48" after the call to
emul_is_noncanonical_address.

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-   if (is_noncanonical_address(la))
+   if (emul_is_noncanonical_address(la, ctxt))
goto bad;
  
  		*max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".


Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no 
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before 
emul_is_noncanonical_address() is called?


Yu


Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

On 8/17/2017 7:57 PM, Paolo Bonzini wrote:

On 12/08/2017 15:35, Yu Zhang wrote:

index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-   if (is_noncanonical_address(la))
+   if (emul_is_noncanonical_address(la, ctxt))
goto bad;
  
  		*max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".


Sorry, I just sent out the v2 patch set without noticing this reply. :-)

The emul_is_noncanonical() is defined in x86.h so that no 
ctxt_virt_addr_bits needed in emulate.c, are you
suggesting to use ctx_virt_addr_bits in this file each time before 
emul_is_noncanonical_address() is called?


Yu


Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 12/08/2017 15:35, Yu Zhang wrote:
> index a98b88a..50107ae 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
> x86_emulate_ctxt *ctxt,
>   switch (mode) {
>   case X86EMUL_MODE_PROT64:
>   *linear = la;
> - if (is_noncanonical_address(la))
> + if (emul_is_noncanonical_address(la, ctxt))
>   goto bad;
>  
>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Paolo

Re: [PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Paolo Bonzini]

On 12/08/2017 15:35, Yu Zhang wrote:
> index a98b88a..50107ae 100644
> --- a/arch/x86/kvm/emulate.c
> +++ b/arch/x86/kvm/emulate.c
> @@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
> x86_emulate_ctxt *ctxt,
>   switch (mode) {
>   case X86EMUL_MODE_PROT64:
>   *linear = la;
> - if (is_noncanonical_address(la))
> + if (emul_is_noncanonical_address(la, ctxt))
>   goto bad;
>  
>   *max_size = min_t(u64, ~0u, (1ull << 48) - la);

Oops, you missed one here.  Probably best to use ctxt_virt_addr_bits and
then "inline" emul_is_noncanonical_address as "get_canonical(la,
va_bits) != la".

Paolo

[PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

This patch exposes 5 level page table feature to the VM,
at the same time, the canonical virtual address checking is
extended to support both 48-bits and 57-bits address width.

Signed-off-by: Yu Zhang 
---
 arch/x86/include/asm/kvm_host.h | 18 ++
 arch/x86/kvm/cpuid.c| 16 ++--
 arch/x86/kvm/emulate.c  | 12 ++--
 arch/x86/kvm/kvm_cache_regs.h   |  2 +-
 arch/x86/kvm/vmx.c  |  8 
 arch/x86/kvm/x86.c  |  7 +--
 arch/x86/kvm/x86.h  | 34 ++
 7 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 7e98a75..4bc7f11 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -85,8 +85,8 @@
  | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
  | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | 
X86_CR4_PCIDE \
  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \
- | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE | X86_CR4_SMAP \
- | X86_CR4_PKE))
+ | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \
+ | X86_CR4_SMAP | X86_CR4_PKE))
 
 #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
 
@@ -1297,20 +1297,6 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu, 
u32 error_code)
kvm_queue_exception_e(vcpu, GP_VECTOR, error_code);
 }
 
-static inline u64 get_canonical(u64 la)
-{
-   return ((int64_t)la << 16) >> 16;
-}
-
-static inline bool is_noncanonical_address(u64 la)
-{
-#ifdef CONFIG_X86_64
-   return get_canonical(la) != la;
-#else
-   return false;
-#endif
-}
-
 #define TSS_IOPB_BASE_OFFSET 0x66
 #define TSS_BASE_SIZE 0x68
 #define TSS_IOPB_SIZE (65536 / 8)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index aceacf8..2161b33 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -126,13 +126,16 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)
best->ebx = xstate_required_size(vcpu->arch.xcr0, true);
 
/*
-* The existing code assumes virtual address is 48-bit in the canonical
-* address checks; exit if it is ever changed.
+* The existing code assumes virtual address is 48-bit or 57-bit in the
+* canonical address checks; exit if it is ever changed.
 */
best = kvm_find_cpuid_entry(vcpu, 0x8008, 0);
-   if (best && ((best->eax & 0xff00) >> 8) != 48 &&
-   ((best->eax & 0xff00) >> 8) != 0)
-   return -EINVAL;
+   if (best) {
+   int vaddr_bits = (best->eax & 0xff00) >> 8;
+
+   if (vaddr_bits != 48 && vaddr_bits != 57 && vaddr_bits != 0)
+   return -EINVAL;
+   }
 
/* Update physical-address width */
vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
@@ -388,7 +391,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 
*entry, u32 function,
 
/* cpuid 7.0.ecx*/
const u32 kvm_cpuid_7_0_ecx_x86_features =
-   F(AVX512VBMI) | F(PKU) | 0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);
+   F(AVX512VBMI) | F(LA57) | F(PKU) |
+   0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);
 
/* cpuid 7.0.edx*/
const u32 kvm_cpuid_7_0_edx_x86_features =
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-   if (is_noncanonical_address(la))
+   if (emul_is_noncanonical_address(la, ctxt))
goto bad;
 
*max_size = min_t(u64, ~0u, (1ull << 48) - la);
@@ -1748,8 +1748,8 @@ static int __load_segment_descriptor(struct 
x86_emulate_ctxt *ctxt,
sizeof(base3), >exception);
if (ret != X86EMUL_CONTINUE)
return ret;
-   if (is_noncanonical_address(get_desc_base(_desc) |
-((u64)base3 << 32)))
+   if (emul_is_noncanonical_address(get_desc_base(_desc) |
+   ((u64)base3 << 32), ctxt))
return emulate_gp(ctxt, 0);
}
 load:
@@ -2840,8 +2840,8 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt)
ss_sel = cs_sel + 8;
cs.d = 0;
cs.l = 1;
-   if (is_noncanonical_address(rcx) ||
-   is_noncanonical_address(rdx))
+   if (emul_is_noncanonical_address(rcx, ctxt) ||
+   emul_is_noncanonical_address(rdx, ctxt))
return 

[PATCH v1 4/4] KVM: MMU: Expose the LA57 feature to VM.

[Yu Zhang]

This patch exposes 5 level page table feature to the VM,
at the same time, the canonical virtual address checking is
extended to support both 48-bits and 57-bits address width.

Signed-off-by: Yu Zhang 
---
 arch/x86/include/asm/kvm_host.h | 18 ++
 arch/x86/kvm/cpuid.c| 16 ++--
 arch/x86/kvm/emulate.c  | 12 ++--
 arch/x86/kvm/kvm_cache_regs.h   |  2 +-
 arch/x86/kvm/vmx.c  |  8 
 arch/x86/kvm/x86.c  |  7 +--
 arch/x86/kvm/x86.h  | 34 ++
 7 files changed, 62 insertions(+), 35 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 7e98a75..4bc7f11 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -85,8 +85,8 @@
  | X86_CR4_PSE | X86_CR4_PAE | X86_CR4_MCE \
  | X86_CR4_PGE | X86_CR4_PCE | X86_CR4_OSFXSR | 
X86_CR4_PCIDE \
  | X86_CR4_OSXSAVE | X86_CR4_SMEP | X86_CR4_FSGSBASE \
- | X86_CR4_OSXMMEXCPT | X86_CR4_VMXE | X86_CR4_SMAP \
- | X86_CR4_PKE))
+ | X86_CR4_OSXMMEXCPT | X86_CR4_LA57 | X86_CR4_VMXE \
+ | X86_CR4_SMAP | X86_CR4_PKE))
 
 #define CR8_RESERVED_BITS (~(unsigned long)X86_CR8_TPR)
 
@@ -1297,20 +1297,6 @@ static inline void kvm_inject_gp(struct kvm_vcpu *vcpu, 
u32 error_code)
kvm_queue_exception_e(vcpu, GP_VECTOR, error_code);
 }
 
-static inline u64 get_canonical(u64 la)
-{
-   return ((int64_t)la << 16) >> 16;
-}
-
-static inline bool is_noncanonical_address(u64 la)
-{
-#ifdef CONFIG_X86_64
-   return get_canonical(la) != la;
-#else
-   return false;
-#endif
-}
-
 #define TSS_IOPB_BASE_OFFSET 0x66
 #define TSS_BASE_SIZE 0x68
 #define TSS_IOPB_SIZE (65536 / 8)
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index aceacf8..2161b33 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -126,13 +126,16 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu)
best->ebx = xstate_required_size(vcpu->arch.xcr0, true);
 
/*
-* The existing code assumes virtual address is 48-bit in the canonical
-* address checks; exit if it is ever changed.
+* The existing code assumes virtual address is 48-bit or 57-bit in the
+* canonical address checks; exit if it is ever changed.
 */
best = kvm_find_cpuid_entry(vcpu, 0x8008, 0);
-   if (best && ((best->eax & 0xff00) >> 8) != 48 &&
-   ((best->eax & 0xff00) >> 8) != 0)
-   return -EINVAL;
+   if (best) {
+   int vaddr_bits = (best->eax & 0xff00) >> 8;
+
+   if (vaddr_bits != 48 && vaddr_bits != 57 && vaddr_bits != 0)
+   return -EINVAL;
+   }
 
/* Update physical-address width */
vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);
@@ -388,7 +391,8 @@ static inline int __do_cpuid_ent(struct kvm_cpuid_entry2 
*entry, u32 function,
 
/* cpuid 7.0.ecx*/
const u32 kvm_cpuid_7_0_ecx_x86_features =
-   F(AVX512VBMI) | F(PKU) | 0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);
+   F(AVX512VBMI) | F(LA57) | F(PKU) |
+   0 /*OSPKE*/ | F(AVX512_VPOPCNTDQ);
 
/* cpuid 7.0.edx*/
const u32 kvm_cpuid_7_0_edx_x86_features =
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index a98b88a..50107ae 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -694,7 +694,7 @@ static __always_inline int __linearize(struct 
x86_emulate_ctxt *ctxt,
switch (mode) {
case X86EMUL_MODE_PROT64:
*linear = la;
-   if (is_noncanonical_address(la))
+   if (emul_is_noncanonical_address(la, ctxt))
goto bad;
 
*max_size = min_t(u64, ~0u, (1ull << 48) - la);
@@ -1748,8 +1748,8 @@ static int __load_segment_descriptor(struct 
x86_emulate_ctxt *ctxt,
sizeof(base3), >exception);
if (ret != X86EMUL_CONTINUE)
return ret;
-   if (is_noncanonical_address(get_desc_base(_desc) |
-((u64)base3 << 32)))
+   if (emul_is_noncanonical_address(get_desc_base(_desc) |
+   ((u64)base3 << 32), ctxt))
return emulate_gp(ctxt, 0);
}
 load:
@@ -2840,8 +2840,8 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt)
ss_sel = cs_sel + 8;
cs.d = 0;
cs.l = 1;
-   if (is_noncanonical_address(rcx) ||
-   is_noncanonical_address(rdx))
+   if (emul_is_noncanonical_address(rcx, ctxt) ||
+   emul_is_noncanonical_address(rdx, ctxt))
return emulate_gp(ctxt, 0);