From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1756206AbdGXO2P (ORCPT <rfc822;w@1wt.eu>);
        Mon, 24 Jul 2017 10:28:15 -0400
Received: from mx1.redhat.com ([209.132.183.28]:39974 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1751827AbdGXO2G (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 24 Jul 2017 10:28:06 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A3641356DB
Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com
Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com
DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A3641356DB
Subject: Re: [PATCH] KVM: nVMX: consult PFER_MASK and PFER_MATCH before nested
 vmexit if inject #PF
To: Wanpeng Li <kernellwp@gmail.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        kvm <kvm@vger.kernel.org>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        Wanpeng Li <wanpeng.li@hotmail.com>
References: <1500771954-3979-1-git-send-email-wanpeng.li@hotmail.com>
 <8515ff0e-a9f3-f6f2-47db-d475b0de5c45@redhat.com>
 <CANRm+CxYAkt_OoiwQq9rG+bSTHEir_ocEkawUX5Ak3_ibPVdrQ@mail.gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <a3e54db0-eb8d-9316-e8d1-9cf097aef506@redhat.com>
Date: Mon, 24 Jul 2017 16:28:03 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.2.1
MIME-Version: 1.0
In-Reply-To: <CANRm+CxYAkt_OoiwQq9rG+bSTHEir_ocEkawUX5Ak3_ibPVdrQ@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 24 Jul 2017 14:28:06 +0000 (UTC)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 24/07/2017 15:57, Wanpeng Li wrote:
> 
>      if (!((vmcs12->exception_bitmap & (1u << nr)) ||
> -        (nr == PF_VECTOR && vcpu->arch.exception.nested_apf)))
> +        (nr == PF_VECTOR && (vcpu->arch.exception.nested_apf ||
> +            nested_vmx_is_page_fault_vmexit(vmcs12,
> vcpu->arch.exception.error_code)))))
>          return 0;

No, it would be more like

	if (nr == PF_VECTOR
	    ? (vcpu->arch.exception.nested_apf ||
               nested_vmx_is_page_fault_vmexit(vmcs12, vcpu->arch.exception.error_code))
            : (vmcs12->exception_bitmap & (1u << nr)))

but I've sent an RFC patch that also fixes the exit qualification.

Paolo