Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH 5.10 048/104] KVM: x86: cleanup CR3 reserved bits checks
To:     Pavel Machek <pavel@ucw.cz>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     linux-kernel@vger.kernel.org, stable@vger.kernel.org,
        Sean Christopherson <seanjc@google.com>,
        Sasha Levin <sashal@kernel.org>
References: <20210215152719.459796636@linuxfoundation.org>
 <20210215152721.031370031@linuxfoundation.org> <20210215184644.GA8689@amd>
From:   Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <f5107037-63b2-a745-1c3e-ba1960bc507b@redhat.com>
Date:   Mon, 15 Feb 2021 20:04:27 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.0
MIME-Version: 1.0
In-Reply-To: <20210215184644.GA8689@amd>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 15/02/21 19:46, Pavel Machek wrote:
> Hi!
> 
>> [ Upstream commit c1c35cf78bfab31b8cb455259524395c9e4c7cd6 ]
>>
>> If not in long mode, the low bits of CR3 are reserved but not enforced to
>> be zero, so remove those checks.  If in long mode, however, the MBZ bits
>> extend down to the highest physical address bit of the guest, excluding
>> the encryption bit.
>>
>> Make the checks consistent with the above, and match them between
>> nested_vmcb_checks and KVM_SET_SREGS.
> 
>> +++ b/arch/x86/kvm/x86.c
>> @@ -9558,6 +9558,8 @@ static int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)
>>   		if (!(sregs->cr4 & X86_CR4_PAE)
>>   		    || !(sregs->efer & EFER_LMA))
>>   			return -EINVAL;
>> +		if (sregs->cr3 & vcpu->arch.cr3_lm_rsvd_bits)
>> +			return false;
>>   	} else {
> 
> Function has different return type between 5.10 and 5.11, so this
> needs fixing.

I'll check that c1c35cf78bfab31b8cb455259524395c9e4c7cd6 is enough and 
send either a backport of that one, or a fixed patch for <= 5.10. 
Thanks Pavel.

Paolo