From patchwork Tue Jan 5 14:12:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 71036 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o05EHlcJ012069 for ; Tue, 5 Jan 2010 14:17:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754599Ab0AEORK (ORCPT ); Tue, 5 Jan 2010 09:17:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754271Ab0AEORB (ORCPT ); Tue, 5 Jan 2010 09:17:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62009 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754227Ab0AEONZ (ORCPT ); Tue, 5 Jan 2010 09:13:25 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o05ECwSQ004304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 5 Jan 2010 09:12:58 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o05ECvHI025822; Tue, 5 Jan 2010 09:12:58 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 5F8821336D9; Tue, 5 Jan 2010 16:12:55 +0200 (IST) From: Gleb Natapov To: kvm@vger.kernel.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, avi@redhat.com, mingo@elte.hu, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com, riel@redhat.com, cl@linux-foundation.org Subject: [PATCH v3 12/12] Send async PF when guest is not in userspace too. Date: Tue, 5 Jan 2010 16:12:54 +0200 Message-Id: <1262700774-1808-13-git-send-email-gleb@redhat.com> In-Reply-To: <1262700774-1808-1-git-send-email-gleb@redhat.com> References: <1262700774-1808-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 9fd29cb..7945abf 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -2204,7 +2204,13 @@ static bool can_do_async_pf(struct kvm_vcpu *vcpu) if (!vcpu->arch.apf_data || kvm_event_needs_reinjection(vcpu)) return false; - return !!kvm_x86_ops->get_cpl(vcpu); + if (vcpu->arch.apf_send_user_only) + return !!kvm_x86_ops->get_cpl(vcpu); + + if (!kvm_x86_ops->interrupt_allowed(vcpu)) + return false; + + return true; } static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,