From: Paolo Bonzini <pbonzini@redhat.com>
To: Sean Christopherson <sean.j.christopherson@intel.com>,
Krish Sadhukhan <krish.sadhukhan@oracle.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] KVM: x86: Perform non-canonical checks in 32-bit KVM
Date: Sat, 18 Jan 2020 22:38:59 +0100 [thread overview]
Message-ID: <c88c77f4-83c8-2d6d-6c78-c004f7917efd@redhat.com> (raw)
In-Reply-To: <20200116155057.GB20561@linux.intel.com>
On 16/01/20 16:50, Sean Christopherson wrote:
> On Wed, Jan 15, 2020 at 05:37:16PM -0800, Krish Sadhukhan wrote:
>>
>> On 01/15/2020 10:36 AM, Sean Christopherson wrote:
>>> arch/x86/kvm/x86.h | 8 --------
>>> 1 file changed, 8 deletions(-)
>>>
>>> diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
>>> index cab5e71f0f0f..3ff590ec0238 100644
>>> --- a/arch/x86/kvm/x86.h
>>> +++ b/arch/x86/kvm/x86.h
>>> @@ -166,21 +166,13 @@ static inline u64 get_canonical(u64 la, u8 vaddr_bits)
>>> static inline bool is_noncanonical_address(u64 la, struct kvm_vcpu *vcpu)
>>> {
>>> -#ifdef CONFIG_X86_64
>>> return get_canonical(la, vcpu_virt_addr_bits(vcpu)) != la;
>>> -#else
>>> - return false;
>>> -#endif
>>> }
>>> static inline bool emul_is_noncanonical_address(u64 la,
>>> struct x86_emulate_ctxt *ctxt)
>>> {
>>> -#ifdef CONFIG_X86_64
>>> return get_canonical(la, ctxt_virt_addr_bits(ctxt)) != la;
>>> -#else
>>> - return false;
>>> -#endif
>>> }
>>> static inline void vcpu_cache_mmio_info(struct kvm_vcpu *vcpu,
>>
>> nested_vmx_check_host_state() still won't call it on 32-bit because it has
>> the CONFIG_X86_64 guard around the callee:
>>
>> #ifdef CONFIG_X86_64
>> if (CC(is_noncanonical_address(vmcs12->host_fs_base, vcpu)) ||
>> CC(is_noncanonical_address(vmcs12->host_gs_base, vcpu)) ||
>> ...
>
> Doh, I was looking at an older version of nested.c. Nice catch!
>
>> Don't we need to remove these guards in the callers as well ?
>
> Ya, that would be my preference.
>
Fixed and queued, thanks.
Paolo
prev parent reply other threads:[~2020-01-18 21:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 18:36 [PATCH] KVM: x86: Perform non-canonical checks in 32-bit KVM Sean Christopherson
2020-01-16 1:37 ` Krish Sadhukhan
2020-01-16 15:50 ` Sean Christopherson
2020-01-18 21:38 ` Paolo Bonzini [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c88c77f4-83c8-2d6d-6c78-c004f7917efd@redhat.com \
--to=pbonzini@redhat.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=krish.sadhukhan@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).