From patchwork Fri Jun 17 17:16:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 70362 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp388596qgy; Fri, 17 Jun 2016 10:16:47 -0700 (PDT) X-Received: by 10.98.73.69 with SMTP id w66mr3501830pfa.104.1466183807167; Fri, 17 Jun 2016 10:16:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id oz4si16139383pac.91.2016.06.17.10.16.46; Fri, 17 Jun 2016 10:16:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933580AbcFQRQk (ORCPT + 30 others); Fri, 17 Jun 2016 13:16:40 -0400 Received: from mail-wm0-f49.google.com ([74.125.82.49]:38168 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755687AbcFQRQi (ORCPT ); Fri, 17 Jun 2016 13:16:38 -0400 Received: by mail-wm0-f49.google.com with SMTP id m124so8165343wme.1 for ; Fri, 17 Jun 2016 10:16:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hP2WYhu0Pqef8NhN5Wws38g/oZ8GbcELpFuLLvd8mzw=; b=L1OwsX+KarF1B8KOgLWZv6sPW312Wte1d8//xifjxV+5c/TBWoFjb6xvzwzMHuPvsm xzk4xfAW7kEskwHcZMDbWloD3TtsJHNmmTFmpsgHAGzN0c1saNyz55IKDjx+NHc/QBCe mPn2wapR1Q6QEo/CPsH1ZVfhS1+LA+rae2K5c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hP2WYhu0Pqef8NhN5Wws38g/oZ8GbcELpFuLLvd8mzw=; b=Zx0x68sV0bMrBp+9LTlK4kp5dwfroy96bD8gV/1AawnzVSc7t+6vopC5JA4HnsW4M9 HPav9nhf0xJvatqgukDmXMdukMwm+0PAXrpnf9bnt/v4ETKoZihMHPQWkZWpWDqhH7W7 sTz2HPuyqpfXL75q8FBRyi3IJxMrgTyxg5xPFWr8XIdGcRKMxJJwpMQ5R1/8S449K/lh p7P2xJhExCE+37nC3C9kSGzdyFCjgtU6xZDWpqFvDiCbqf3GMHIhVsSS7lXBs/D/TNr9 /l4kUUcNI9A8jINZiDl6xKgrBnlRMOpBLObj0UBKomt88hZvA09T5WonNPPLpcQjNe9y 313g== X-Gm-Message-State: ALyK8tIyoNAJ3SF9PBPO1vsO4kaaaUIsKpeBX5hx6gY1m0ihbW8DgZ4hrTmj8G98bKLj8R4F X-Received: by 10.28.31.140 with SMTP id f134mr655167wmf.69.1466183791667; Fri, 17 Jun 2016 10:16:31 -0700 (PDT) Received: from localhost.localdomain (sju31-1-78-210-255-2.fbx.proxad.net. [78.210.255.2]) by smtp.gmail.com with ESMTPSA id v200sm595206wmv.4.2016.06.17.10.16.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Jun 2016 10:16:30 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: daniel.lezcano@linaro.org, nicolas.pitre@linaro.org, shreyas@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, peterz@infradead.org, rafael@kernel.org, vincent.guittot@linaro.org Subject: [PATCH V7] irq: Track the interrupt timings Date: Fri, 17 Jun 2016 19:16:16 +0200 Message-Id: <1466183776-5296-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The interrupt framework gives a lot of information about each interrupt. It does not keep track of when those interrupts occur though. This patch provides a mean to record the elapsed time between successive interrupt occurrences in a per-IRQ per-CPU circular buffer to help with the prediction of the next occurrence using a statistical model. A new function is added to browse the different interrupts and retrieve the timing information stored in it. A static key is introduced so when the irq prediction is switched off at runtime, we can reduce the overhead near to zero. The irq timings is supposed to be potentially used by different sub-systems and for this reason the static key is a ref counter, so when the last use releases the irq timings that will result on the effective deactivation of the irq measurement. Signed-off-by: Daniel Lezcano Acked-by: Nicolas Pitre --- V7: - Mentionned in the irq_timings_get_next() function description, the function must be called inside a rcu read locked section V6: - Renamed handle_irq_timings to record_irq_time - Stored the event time instead of the interval time - Removed the 'timestamp' field from the timings structure - Moved _handle_irq_timings content inside record_irq_time V5: - Changed comment about 'deterministic' as the comment is confusing - Added license comment in the header - Replaced irq_timings_get/put by irq_timings_enable/disable - Moved IRQS_TIMINGS check in the handle_timings inline function - Dropped 'if !prev' as it is pointless - Stored time interval in nsec basis with u64 instead of u32 - Removed redundant store - Removed the math V4: - Added a static key - Added more comments for irq_timings_get_next() - Unified some function names to be prefixed by 'irq_timings_...' - Fixed a rebase error V3: - Replaced ktime_get() by local_clock() - Shared irq are not handled - Simplified code by adding the timing in the irqdesc struct - Added a function to browse the irq timings V2: - Fixed kerneldoc comment - Removed data field from the struct irq timing - Changed the lock section comment - Removed semi-colon style with empty stub - Replaced macro by static inline - Fixed static functions declaration RFC: - initial posting --- include/linux/interrupt.h | 16 ++++++++++ include/linux/irqdesc.h | 4 +++ kernel/irq/Kconfig | 3 ++ kernel/irq/Makefile | 1 + kernel/irq/handle.c | 2 ++ kernel/irq/internals.h | 62 +++++++++++++++++++++++++++++++++++++++ kernel/irq/irqdesc.c | 6 ++++ kernel/irq/manage.c | 3 ++ kernel/irq/timings.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 172 insertions(+) create mode 100644 kernel/irq/timings.c -- 1.9.1 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 9fcabeb..5ff1d3a 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -675,6 +675,22 @@ static inline void init_irq_proc(void) } #endif +#ifdef CONFIG_IRQ_TIMINGS + +#define IRQ_TIMINGS_SHIFT 3 +#define IRQ_TIMINGS_SIZE (1 << IRQ_TIMINGS_SHIFT) +#define IRQ_TIMINGS_MASK (IRQ_TIMINGS_SIZE - 1) + +struct irq_timings { + u64 values[IRQ_TIMINGS_SIZE]; /* our circular buffer */ + unsigned int w_index; /* current buffer index */ +}; + +struct irq_timings *irq_timings_get_next(int *irq); +void irq_timings_enable(void); +void irq_timings_disable(void); +#endif + struct seq_file; int show_interrupts(struct seq_file *p, void *v); int arch_show_interrupts(struct seq_file *p, int prec); diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h index b51beeb..a21ddbbe 100644 --- a/include/linux/irqdesc.h +++ b/include/linux/irqdesc.h @@ -12,6 +12,7 @@ struct proc_dir_entry; struct module; struct irq_desc; struct irq_domain; +struct irq_timings; struct pt_regs; /** @@ -51,6 +52,9 @@ struct irq_desc { struct irq_data irq_data; unsigned int __percpu *kstat_irqs; irq_flow_handler_t handle_irq; +#ifdef CONFIG_IRQ_TIMINGS + struct irq_timings __percpu *timings; +#endif #ifdef CONFIG_IRQ_PREFLOW_FASTEOI irq_preflow_handler_t preflow_handler; #endif diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index 3bbfd6a..38e551d 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -81,6 +81,9 @@ config GENERIC_MSI_IRQ_DOMAIN config HANDLE_DOMAIN_IRQ bool +config IRQ_TIMINGS + bool + config IRQ_DOMAIN_DEBUG bool "Expose hardware/virtual IRQ mapping via debugfs" depends on IRQ_DOMAIN && DEBUG_FS diff --git a/kernel/irq/Makefile b/kernel/irq/Makefile index 2ee42e9..e1debaa9 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_GENERIC_IRQ_MIGRATION) += cpuhotplug.o obj-$(CONFIG_PM_SLEEP) += pm.o obj-$(CONFIG_GENERIC_MSI_IRQ) += msi.o obj-$(CONFIG_GENERIC_IRQ_IPI) += ipi.o +obj-$(CONFIG_IRQ_TIMINGS) += timings.o diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index a15b548..335847e 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -138,6 +138,8 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) unsigned int flags = 0, irq = desc->irq_data.irq; struct irqaction *action; + record_irq_time(desc); + for_each_action_of_desc(desc, action) { irqreturn_t res; diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index d5edcdc..734fe38 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -57,6 +57,7 @@ enum { IRQS_WAITING = 0x00000080, IRQS_PENDING = 0x00000200, IRQS_SUSPENDED = 0x00000800, + IRQS_TIMINGS = 0x00001000, }; #include "debug.h" @@ -223,3 +224,64 @@ irq_pm_install_action(struct irq_desc *desc, struct irqaction *action) { } static inline void irq_pm_remove_action(struct irq_desc *desc, struct irqaction *action) { } #endif + +#ifdef CONFIG_IRQ_TIMINGS +static inline int alloc_timings(struct irq_desc *desc) +{ + desc->timings = alloc_percpu(struct irq_timings); + if (!desc->timings) + return -ENOMEM; + + return 0; +} + +static inline void free_timings(struct irq_desc *desc) +{ + free_percpu(desc->timings); +} + +static inline void remove_timings(struct irq_desc *desc) +{ + desc->istate &= ~IRQS_TIMINGS; +} + +static inline void setup_timings(struct irq_desc *desc, struct irqaction *act) +{ + /* + * We don't need the measurement because the idle code already + * knows the next expiry event. + */ + if (act->flags & __IRQF_TIMER) + return; + + desc->istate |= IRQS_TIMINGS; +} + +extern struct static_key_false irq_timing_enabled; + +/* + * The function record_irq_time is only called in one place in the + * interrupts handler. We want this function always inline so the code + * inside is embedded in the function and the static key branching + * code can act at the higher level. Without the explicit + * __always_inline we can end up with a function call and a small + * overhead in the hotpath for nothing. + */ +static __always_inline void record_irq_time(struct irq_desc *desc) +{ + if (static_key_enabled(&irq_timing_enabled)) { + if (desc->istate & IRQS_TIMINGS) { + struct irq_timings *timings = this_cpu_ptr(desc->timings); + timings->w_index = (timings->w_index + 1) & IRQ_TIMINGS_MASK; + timings->values[timings->w_index] = local_clock(); + } + } +} +#else +static inline int alloc_timings(struct irq_desc *desc) { return 0; } +static inline void free_timings(struct irq_desc *desc) {} +static inline void remove_timings(struct irq_desc *desc) {} +static inline void setup_timings(struct irq_desc *desc, + struct irqaction *act) {}; +static inline void record_irq_time(struct irq_desc *desc) {} +#endif diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 8731e1c..2c3ce74 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -174,6 +174,9 @@ static struct irq_desc *alloc_desc(int irq, int node, struct module *owner) if (alloc_masks(desc, gfp, node)) goto err_kstat; + if (alloc_timings(desc)) + goto err_mask; + raw_spin_lock_init(&desc->lock); lockdep_set_class(&desc->lock, &irq_desc_lock_class); init_rcu_head(&desc->rcu); @@ -182,6 +185,8 @@ static struct irq_desc *alloc_desc(int irq, int node, struct module *owner) return desc; +err_mask: + free_masks(desc); err_kstat: free_percpu(desc->kstat_irqs); err_desc: @@ -193,6 +198,7 @@ static void delayed_free_desc(struct rcu_head *rhp) { struct irq_desc *desc = container_of(rhp, struct irq_desc, rcu); + free_timings(desc); free_masks(desc); free_percpu(desc->kstat_irqs); kfree(desc); diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 00cfc85..7a9f460 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1350,6 +1350,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) __enable_irq(desc); } + setup_timings(desc, new); + raw_spin_unlock_irqrestore(&desc->lock, flags); /* @@ -1480,6 +1482,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) irq_settings_clr_disable_unlazy(desc); irq_shutdown(desc); irq_release_resources(desc); + remove_timings(desc); } #ifdef CONFIG_SMP diff --git a/kernel/irq/timings.c b/kernel/irq/timings.c new file mode 100644 index 0000000..e6f1d61 --- /dev/null +++ b/kernel/irq/timings.c @@ -0,0 +1,75 @@ +/* + * linux/kernel/irq/timings.c + * + * Copyright (C) 2016, Linaro Ltd - Daniel Lezcano + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ +#include +#include +#include +#include +#include + +#include "internals.h" + +DEFINE_STATIC_KEY_FALSE(irq_timing_enabled); + +void irq_timings_enable(void) +{ + static_branch_inc(&irq_timing_enabled); +} + +void irq_timings_disable(void) +{ + static_branch_dec(&irq_timing_enabled); +} + +/** + * irqtiming_get_next - return the next irq timing + * + * @irq: a pointer to an integer representing the interrupt number + * + * Must be called under rcu_read_lock(). + * + * This function allows to browse safely the interrupt descriptors in order + * to retrieve the interrupts timings. The parameter gives the interrupt + * number to begin with and will return the interrupt timings for the next + * allocated irq. This approach gives us the possibility to go through the + * different interrupts without having to handle the sparse irq. + * + * The function changes @irq to the next allocated irq + 1, it should be + * passed back again and again until NULL is returned. Usually this function + * is called the first time with @irq = 0. + * + * Returns a struct irq_timings, NULL if we reach the end of the interrupts + * list. + */ +struct irq_timings *irq_timings_get_next(int *irq) +{ + struct irq_desc *desc; + int next; + +again: + /* Do a racy lookup of the next allocated irq */ + next = irq_get_next_irq(*irq); + if (next >= nr_irqs) + return NULL; + + *irq = next + 1; + + /* + * Now lookup the descriptor. It's RCU protected. This + * descriptor might belong to an uninteresting interrupt or + * one that is not measured. Look for the next interrupt in + * that case. + */ + desc = irq_to_desc(next); + if (!desc || !(desc->istate & IRQS_TIMINGS)) + goto again; + + return this_cpu_ptr(desc->timings); +}