From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752465AbdKHRUY (ORCPT ); Wed, 8 Nov 2017 12:20:24 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:27838 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751931AbdKHRUU (ORCPT ); Wed, 8 Nov 2017 12:20:20 -0500 From: Joao Martins To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Joao Martins , Paolo Bonzini , Radim Krcmar , Richard Cochran , Marcelo Tosatti , Boris Ostrovsky , Juergen Gross , Andy Lutomirski , xen-devel@lists.xenproject.org Subject: [PATCH v8 1/5] ptp_kvm: probe for kvm guest availability Date: Wed, 8 Nov 2017 17:19:54 +0000 Message-Id: <20171108171958.23921-2-joao.m.martins@oracle.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171108171958.23921-1-joao.m.martins@oracle.com> References: <20171108171958.23921-1-joao.m.martins@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In the event of moving pvclock_pvti_cpu0_va() definition to common pvclock code, this function would return a value on non KVM guests. Later on this would fail with a GPF on ptp_kvm_init when running on a Xen guest. Therefore, ptp_kvm_init() should check whether it is running in a KVM guest. Signed-off-by: Joao Martins Acked-by: Radim Krčmář --- Changes since v7: * Add Radim's Acked-by --- drivers/ptp/ptp_kvm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/ptp/ptp_kvm.c b/drivers/ptp/ptp_kvm.c index 2b1b212c219e..e04d7b2ecb3a 100644 --- a/drivers/ptp/ptp_kvm.c +++ b/drivers/ptp/ptp_kvm.c @@ -178,6 +178,9 @@ static int __init ptp_kvm_init(void) { long ret; + if (!kvm_para_available()) + return -ENODEV; + clock_pair_gpa = slow_virt_to_phys(&clock_pair); hv_clock = pvclock_pvti_cpu0_va(); -- 2.11.0