From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934942AbcIFWaK (ORCPT ); Tue, 6 Sep 2016 18:30:10 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33479 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934049AbcIFWaG (ORCPT ); Tue, 6 Sep 2016 18:30:06 -0400 From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: rkrcmar@redhat.com, dmatlack@google.com, luto@kernel.org, peterhornyack@google.com, x86@kernel.org Subject: [PATCH 1/2] x86: paravirt: add local_apic_timer_interrupt to pv_ops Date: Wed, 7 Sep 2016 00:29:58 +0200 Message-Id: <1473200999-123004-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1473200999-123004-1-git-send-email-pbonzini@redhat.com> References: <1473200999-123004-1-git-send-email-pbonzini@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org local_apic_timer_interrupt refers to a static clockevent in apic.c. Paravirtualized implementations need to check a different clockevent, so allow customizing the guts of the APIC timer interrupt. Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/paravirt.h | 5 +++++ arch/x86/include/asm/paravirt_types.h | 1 + arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/paravirt.c | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 124357773ffa..f6e0bad1cde2 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -109,6 +109,7 @@ extern void native_apic_wait_icr_idle(void); extern u32 native_safe_apic_wait_icr_idle(void); extern void native_apic_icr_write(u32 low, u32 id); extern u64 native_apic_icr_read(void); +extern void native_local_apic_timer_interrupt(void); static inline bool apic_is_x2apic_enabled(void) { diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 2970d22d7766..71ec3a73745f 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -197,6 +197,11 @@ static inline u64 paravirt_steal_clock(int cpu) return PVOP_CALL1(u64, pv_time_ops.steal_clock, cpu); } +static inline void local_apic_timer_interrupt(void) +{ + PVOP_VCALL0(pv_time_ops.local_apic_timer_interrupt); +} + static inline unsigned long long paravirt_read_pmc(int counter) { return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter); diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index 7fa9e7740ba3..ea1f27400098 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -96,6 +96,7 @@ struct pv_lazy_ops { struct pv_time_ops { unsigned long long (*sched_clock)(void); unsigned long long (*steal_clock)(int cpu); + void (*local_apic_timer_interrupt)(void); }; struct pv_cpu_ops { diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index cea4fc19e844..5b63bec7d0af 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -902,7 +902,7 @@ void setup_secondary_APIC_clock(void) /* * The guts of the apic timer interrupt */ -static void local_apic_timer_interrupt(void) +void native_local_apic_timer_interrupt(void) { int cpu = smp_processor_id(); struct clock_event_device *evt = &per_cpu(lapic_events, cpu); diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index ad5bc9578a73..0e056271d714 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -310,6 +310,7 @@ struct pv_init_ops pv_init_ops = { struct pv_time_ops pv_time_ops = { .sched_clock = native_sched_clock, .steal_clock = native_steal_clock, + .local_apic_timer_interrupt = native_local_apic_timer_interrupt, }; __visible struct pv_irq_ops pv_irq_ops = { -- 1.8.3.1