From: Christoffer Dall <christoffer.dall@linaro.org> To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Marc Zyngier <marc.zyngier@arm.com>, Christoffer Dall <christoffer.dall@linaro.org> Subject: [RFC PATCH 1/7] arm64: Use physical counter for in-kernel reads Date: Sat, 10 Dec 2016 21:47:06 +0100 [thread overview] Message-ID: <20161210204712.21830-2-christoffer.dall@linaro.org> (raw) In-Reply-To: <20161210204712.21830-1-christoffer.dall@linaro.org> Using the physical counter allows KVM to retain the offset between the virtual and physical counter as long as it is actively running a VCPU. As soon as a VCPU is released, another thread is scheduled or we start running userspace applications, we reset the offset to 0, so that VDSO operations can still read the virtual counter and get the same view of time as the kernel. This opens up potential improvements for KVM performance. VHE kernels or kernels using the virtual timer are unaffected by this. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/include/asm/arch_timer.h | 6 ++++-- drivers/clocksource/arm_arch_timer.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index eaa5bbe..cec2549 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -139,11 +139,13 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) static inline u64 arch_counter_get_cntpct(void) { + u64 cval; /* * AArch64 kernel and user space mandate the use of CNTVCT. */ - BUG(); - return 0; + isb(); + asm volatile("mrs %0, cntpct_el0" : "=r" (cval)); + return cval; } static inline u64 arch_counter_get_cntvct(void) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 73c487d..a5b0789 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -597,7 +597,7 @@ static void __init arch_counter_register(unsigned type) /* Register the CP15 based counter if we have one */ if (type & ARCH_CP15_TIMER) { - if (IS_ENABLED(CONFIG_ARM64) || arch_timer_uses_ppi == VIRT_PPI) + if (arch_timer_uses_ppi == VIRT_PPI || is_kernel_in_hyp_mode()) arch_timer_read_counter = arch_counter_get_cntvct; else arch_timer_read_counter = arch_counter_get_cntpct; -- 2.9.0
WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 1/7] arm64: Use physical counter for in-kernel reads Date: Sat, 10 Dec 2016 21:47:06 +0100 [thread overview] Message-ID: <20161210204712.21830-2-christoffer.dall@linaro.org> (raw) In-Reply-To: <20161210204712.21830-1-christoffer.dall@linaro.org> Using the physical counter allows KVM to retain the offset between the virtual and physical counter as long as it is actively running a VCPU. As soon as a VCPU is released, another thread is scheduled or we start running userspace applications, we reset the offset to 0, so that VDSO operations can still read the virtual counter and get the same view of time as the kernel. This opens up potential improvements for KVM performance. VHE kernels or kernels using the virtual timer are unaffected by this. Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> --- arch/arm64/include/asm/arch_timer.h | 6 ++++-- drivers/clocksource/arm_arch_timer.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h index eaa5bbe..cec2549 100644 --- a/arch/arm64/include/asm/arch_timer.h +++ b/arch/arm64/include/asm/arch_timer.h @@ -139,11 +139,13 @@ static inline void arch_timer_set_cntkctl(u32 cntkctl) static inline u64 arch_counter_get_cntpct(void) { + u64 cval; /* * AArch64 kernel and user space mandate the use of CNTVCT. */ - BUG(); - return 0; + isb(); + asm volatile("mrs %0, cntpct_el0" : "=r" (cval)); + return cval; } static inline u64 arch_counter_get_cntvct(void) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 73c487d..a5b0789 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -597,7 +597,7 @@ static void __init arch_counter_register(unsigned type) /* Register the CP15 based counter if we have one */ if (type & ARCH_CP15_TIMER) { - if (IS_ENABLED(CONFIG_ARM64) || arch_timer_uses_ppi == VIRT_PPI) + if (arch_timer_uses_ppi == VIRT_PPI || is_kernel_in_hyp_mode()) arch_timer_read_counter = arch_counter_get_cntvct; else arch_timer_read_counter = arch_counter_get_cntpct; -- 2.9.0
next prev parent reply other threads:[~2016-12-10 20:47 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-12-10 20:47 [RFC PATCH 0/7] KVM: arm/arm64: Optimize arch timer register handling Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall [this message] 2016-12-10 20:47 ` [RFC PATCH 1/7] arm64: Use physical counter for in-kernel reads Christoffer Dall 2017-01-05 18:11 ` Marc Zyngier 2017-01-05 18:11 ` Marc Zyngier 2017-01-06 10:00 ` Christoffer Dall 2017-01-06 10:00 ` Christoffer Dall 2017-01-06 10:38 ` Marc Zyngier 2017-01-06 10:38 ` Marc Zyngier 2017-01-06 10:53 ` Christoffer Dall 2017-01-06 10:53 ` Christoffer Dall 2017-01-06 15:16 ` Marc Zyngier 2017-01-06 15:16 ` Marc Zyngier 2017-01-09 11:29 ` Christoffer Dall 2017-01-09 11:29 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 2/7] KVM: arm/arm64: Move kvm_vgic_flush_hwstate under disabled irq Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 3/7] KVM: arm/arm64: Support calling vgic_update_irq_pending from irq context Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 4/7] KVM: arm/arm64: Check that system supports split eoi/deactivate Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2017-01-05 17:40 ` Marc Zyngier 2017-01-05 17:40 ` Marc Zyngier 2017-01-06 10:02 ` Christoffer Dall 2017-01-06 10:02 ` Christoffer Dall 2017-01-06 10:24 ` Marc Zyngier 2017-01-06 10:24 ` Marc Zyngier 2017-01-06 10:53 ` Christoffer Dall 2017-01-06 10:53 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 5/7] KVM: arm/arm64: Move timer save/restore out of hyp code where possible Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 6/7] KVM: arm/arm64: Remove unnecessary timer BUG_ON operations Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2016-12-10 20:47 ` [RFC PATCH 7/7] KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized Christoffer Dall 2016-12-10 20:47 ` Christoffer Dall 2017-01-06 10:01 ` [RFC PATCH 0/7] KVM: arm/arm64: Optimize arch timer register handling Christoffer Dall 2017-01-06 10:01 ` Christoffer Dall
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20161210204712.21830-2-christoffer.dall@linaro.org \ --to=christoffer.dall@linaro.org \ --cc=kvm@vger.kernel.org \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.