Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932310AbbFQNe1 (ORCPT ); Wed, 17 Jun 2015 09:34:27 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:34509 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754519AbbFQNeO (ORCPT ); Wed, 17 Jun 2015 09:34:14 -0400 Message-ID: <55817752.7070200@redhat.com> Date: Wed, 17 Jun 2015 15:34:10 +0200 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Andy Lutomirski , x86@kernel.org CC: Borislav Petkov , Peter Zijlstra , John Stultz , linux-kernel@vger.kernel.org, Len Brown , Huang Rui , Denys Vlasenko , kvm@vger.kernel.org, Ralf Baechle Subject: Re: [PATCH v3 02/18] x86/msr/kvm: Remove vget_cycles() References: <20615df14ae2eb713ea7a5f5123c1dc4c7ca993d.1434501121.git.luto@kernel.org> In-Reply-To: <20615df14ae2eb713ea7a5f5123c1dc4c7ca993d.1434501121.git.luto@kernel.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2090 Lines: 65 On 17/06/2015 02:35, Andy Lutomirski wrote: > The only caller was kvm's read_tsc. The only difference between > vget_cycles and native_read_tsc was that vget_cycles returned zero > instead of crashing on TSC-less systems. KVM's already checks > vclock_mode before calling that function, so the extra check is > unnecessary. Or more simply, KVM (host-side) requires the TSC to exist. Acked-by: Paolo Bonzini > (Off-topic, but the whole KVM clock host implementation is gross. > IMO it should be rewritten.) > > Signed-off-by: Andy Lutomirski > --- > arch/x86/include/asm/tsc.h | 13 ------------- > arch/x86/kvm/x86.c | 2 +- > 2 files changed, 1 insertion(+), 14 deletions(-) > > diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h > index fd11128faf25..3da1cc1218ac 100644 > --- a/arch/x86/include/asm/tsc.h > +++ b/arch/x86/include/asm/tsc.h > @@ -32,19 +32,6 @@ static inline cycles_t get_cycles(void) > return ret; > } > > -static __always_inline cycles_t vget_cycles(void) > -{ > - /* > - * We only do VDSOs on TSC capable CPUs, so this shouldn't > - * access boot_cpu_data (which is not VDSO-safe): > - */ > -#ifndef CONFIG_X86_TSC > - if (!cpu_has_tsc) > - return 0; > -#endif > - return (cycles_t)native_read_tsc(); > -} > - > extern void tsc_init(void); > extern void mark_tsc_unstable(char *reason); > extern int unsynchronized_tsc(void); > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index 26eaeb522cab..c26faf408bce 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -1430,7 +1430,7 @@ static cycle_t read_tsc(void) > * but no one has ever seen it happen. > */ > rdtsc_barrier(); > - ret = (cycle_t)vget_cycles(); > + ret = (cycle_t)native_read_tsc(); > > last = pvclock_gtod_data.clock.cycle_last; > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/