From patchwork Wed Jan 25 17:33:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joao Martins X-Patchwork-Id: 9537613 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B58166042C for ; Wed, 25 Jan 2017 17:33:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6AD52832B for ; Wed, 25 Jan 2017 17:33:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B2AE28334; Wed, 25 Jan 2017 17:33:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3ED8C2832B for ; Wed, 25 Jan 2017 17:33:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWRPX-0007Vi-GX; Wed, 25 Jan 2017 17:31:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWRPW-0007Ul-7H for xen-devel@lists.xenproject.org; Wed, 25 Jan 2017 17:31:06 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id F7/70-14551-9D0E8885; Wed, 25 Jan 2017 17:31:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeJIrShJLcpLzFFi42LpnVTnqnvzQUe EwZV2XovvWyYzOTB6HP5whSWAMYo1My8pvyKBNWPfigWMBdtkKs5dc2lg/CfRxcjFISQwkUli 6bd1LBDOb0aJg5tPsEM4Gxkl9vxZyQzhNDJKHLr8g7GLkZODTUBPovX8Z2YQW0TAVOLghHusI EXMAs+ZJKafewqWEBbwkPh8+RCYzSKgKvHjSRMTiM0r4Cnx9cg3NhBbQkBO4vzxn2A1nAJeEn e3N7OA2EJANUfm9bJD1BhKnH64jXECI98CRoZVjBrFqUVlqUW6RsZ6SUWZ6RkluYmZObqGBsZ 6uanFxYnpqTmJScV6yfm5mxiBwVLPwMC4g7Fvr98hRkkOJiVR3lOnOiKE+JLyUyozEosz4otK c1KLDzHKcHAoSfDq3AfKCRalpqdWpGXmAMMWJi3BwaMkwqsOkuYtLkjMLc5Mh0idYtTlOHXj9 EsmIZa8/LxUKXHenyBFAiBFGaV5cCNgMXSJUVZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjBvH8 gUnsy8ErhNr4COYAI64gJzO8gRJYkIKakGxm03lsdOM+IwFjX74bLbKcrjuPi32itOeVMirbk 1eQMVmkU47ulvmlOXGFTMIPlWQFJun4IMy3UGDu5KpqI0gaYl+WKRtxepiBQ28KyU1XzJe9Lv PF+QZ9jEsGm/C6o8Lm1jv3arWTlJ6qOC86XKQ40Ln8icyma84SsxvWYTa+A0i7Mn/j1UYinOS DTUYi4qTgQAwovwKpwCAAA= X-Env-Sender: joao.m.martins@oracle.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1485365463!79146605!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11699 invoked from network); 25 Jan 2017 17:31:04 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-5.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Jan 2017 17:31:04 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v0PHUqsv013537 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jan 2017 17:30:53 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v0PHUqSY027590 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jan 2017 17:30:52 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id v0PHUpNt016443; Wed, 25 Jan 2017 17:30:51 GMT Received: from paddy.lan (/89.114.92.174) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Jan 2017 09:30:50 -0800 From: Joao Martins To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Date: Wed, 25 Jan 2017 17:33:04 +0000 Message-Id: <1485365586-21653-2-git-send-email-joao.m.martins@oracle.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1485365586-21653-1-git-send-email-joao.m.martins@oracle.com> References: <1485365586-21653-1-git-send-email-joao.m.martins@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: xen-devel , Radim Krcmar , x86@kernel.org, Andy Lutomirski , Ingo Molnar , "H. Peter Anvin" , Paolo Bonzini , Joao Martins , Thomas Gleixner Subject: [Xen-devel] [PATCH v1 1/3] x86/pvclock: add setter for pvclock_pvti_cpu0_va X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Right now there is only a pvclock_pvti_cpu0_va() which is defined on kvmclock since: commit dac16fba6fc5 ("x86/vdso: Get pvclock data from the vvar VMA instead of the fixmap") The only user of this interface was kvm. This commit moves pvclock_pvti_cpu0_va to pvclock which is a more generic place to have it and adds the correspondent setter routine for it. This allows other pvclock-based clocksources to use it, such as Xen. Signed-off-by: Joao Martins Acked-by: Andy Lutomirski --- Changes since RFC: (Comments from Andy Lutomirski) * Add WARN_ON(vclock_was_used(VCLOCK_PVCLOCK)) to pvclock_set_pvti_cpu0_va --- arch/x86/include/asm/pvclock.h | 22 +++++++++++++--------- arch/x86/kernel/kvmclock.c | 6 +----- arch/x86/kernel/pvclock.c | 13 +++++++++++++ 3 files changed, 27 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h index 448cfe1..58399e1 100644 --- a/arch/x86/include/asm/pvclock.h +++ b/arch/x86/include/asm/pvclock.h @@ -4,15 +4,6 @@ #include #include -#ifdef CONFIG_KVM_GUEST -extern struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void); -#else -static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void) -{ - return NULL; -} -#endif - /* some helper functions for xen and kvm pv clock sources */ u64 pvclock_clocksource_read(struct pvclock_vcpu_time_info *src); u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src); @@ -101,4 +92,17 @@ struct pvclock_vsyscall_time_info { #define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info) +#ifdef CONFIG_PARAVIRT_CLOCK +void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti); +struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void); +#else +static inline void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti) +{ +} +static inline struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void) +{ + return NULL; +} +#endif + #endif /* _ASM_X86_PVCLOCK_H */ diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index 2a5cafd..9dfbb79 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c @@ -45,11 +45,6 @@ early_param("no-kvmclock", parse_no_kvmclock); static struct pvclock_vsyscall_time_info *hv_clock; static struct pvclock_wall_clock wall_clock; -struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void) -{ - return hv_clock; -} - /* * The wallclock is the time of day when we booted. Since then, some time may * have elapsed since the hypervisor wrote the data. So we try to account for @@ -330,6 +325,7 @@ int __init kvm_setup_vsyscall_timeinfo(void) return 1; } + pvclock_set_pvti_cpu0_va(hv_clock); put_cpu(); kvm_clock.archdata.vclock_mode = VCLOCK_PVCLOCK; diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c index 9e93fe5..b281060 100644 --- a/arch/x86/kernel/pvclock.c +++ b/arch/x86/kernel/pvclock.c @@ -23,8 +23,10 @@ #include #include #include +#include static u8 valid_flags __read_mostly = 0; +static struct pvclock_vsyscall_time_info *pvti_cpu0_va __read_mostly = NULL; void pvclock_set_flags(u8 flags) { @@ -142,3 +144,14 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock, set_normalized_timespec(ts, now.tv_sec, now.tv_nsec); } + +void pvclock_set_pvti_cpu0_va(struct pvclock_vsyscall_time_info *pvti) +{ + WARN_ON(vclock_was_used(VCLOCK_PVCLOCK)); + pvti_cpu0_va = pvti; +} + +struct pvclock_vsyscall_time_info *pvclock_pvti_cpu0_va(void) +{ + return pvti_cpu0_va; +}