Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77421C282C0 for ; Wed, 23 Jan 2019 11:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EE8221019 for ; Wed, 23 Jan 2019 11:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726295AbfAWL4l (ORCPT ); Wed, 23 Jan 2019 06:56:41 -0500 Received: from mx2.suse.de ([195.135.220.15]:34002 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726057AbfAWL4l (ORCPT ); Wed, 23 Jan 2019 06:56:41 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 1BACFB0DF; Wed, 23 Jan 2019 11:56:40 +0000 (UTC) From: Juergen Gross To: stable@vger.kernel.org Cc: Juergen Gross , Joao Martins , Boris Ostrovsky Subject: [Patch-for-stable-4.14 1/6] ptp_kvm: probe for kvm guest availability Date: Wed, 23 Jan 2019 12:56:31 +0100 Message-Id: <20190123115636.19710-2-jgross@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190123115636.19710-1-jgross@suse.com> References: <20190123115636.19710-1-jgross@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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ář Signed-off-by: Boris Ostrovsky Signed-off-by: Juergen Gross --- This is upstream commit 001f60e1f662a6dee1630a2915401aaf5959d479. Needed for upstream commit 867cefb4cb1012f42cada1c7d1f35ac8dd276071. --- 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.16.4