From patchwork Fri Jun 23 14:11:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 106264 Delivered-To: patch@linaro.org Received: by 10.182.135.102 with SMTP id pr6csp57980obb; Fri, 23 Jun 2017 07:12:42 -0700 (PDT) X-Received: by 10.98.93.154 with SMTP id n26mr8192914pfj.82.1498227162074; Fri, 23 Jun 2017 07:12:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498227162; cv=none; d=google.com; s=arc-20160816; b=0uoJNemHFl1LAGn6l8ZSSSTDJF6rfRuq/j4qIA+Aqw0IYn5w2Nkx6GnIwfoccxxGKO ub5aJWEhpPZ3QfGMmj0xeXUGVvdPkw2wny7SYXXg0J/QVqkdQ9/ATEoUeblki4o5CPJF SOZQqht/xkjNPXVX/QaWBm3xgdz+rVW2L7aNEAaQLmWrhejsyY6LIMORfOCffzWQhGAQ P1wFfpekvnz9bgO5OJ7LTalmTB1dWAOLEpOUiIiPaR4iUvHdwmCpsoUMThTQN2+U8plP /wRlaKhwEz85c+RIjpvOPZAU6Jcp1QekhsP2Pg+Zv43F2CnSpDC+4xL5knSw63ZA8r+y Wfvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=tOK20Fl/e46Hg9wkh12glDlTzcVTb8f3kKtYDKnoA7c=; b=a/5/2Bupwu1sqYFNyZLydtaL58tCzqX7JfoweOagtJPxLF4QN+HurUiNRGQW8ynFwo 5ZYtM/Uv67orGc8OACWlKU8Rp5OoKZKOGINXqsFs/ivCIwRKOCZMj2KGnKYVeyz2GrUm jlbn9ck2Ou8Q094mNYobhaHLaUIHSKBlxmfZR3ov2ltQ/I2EoEnuO8xrhbTpsKzJzx9F GhSK00MxZ9ivCbDdPVUKrDK/7Bjgq1S5nUI/jtJjCnXCtK0zMQ7DpU4IxHVpL1tnJrCP 5lLqR/e/NaAxGY0LiFeX8X5+zfV5uHMR6MCAL8lxVJurRRE8DFqjjwVWb9dgB24l/U7k NRjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=LDW/XkR4; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h4si3732587plk.467.2017.06.23.07.12.41; Fri, 23 Jun 2017 07:12:42 -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 header.b=LDW/XkR4; 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 sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753598AbdFWOMe (ORCPT + 25 others); Fri, 23 Jun 2017 10:12:34 -0400 Received: from mail-wr0-f179.google.com ([209.85.128.179]:33353 "EHLO mail-wr0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751217AbdFWOMc (ORCPT ); Fri, 23 Jun 2017 10:12:32 -0400 Received: by mail-wr0-f179.google.com with SMTP id r103so67690675wrb.0 for ; Fri, 23 Jun 2017 07:12:32 -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; bh=tOK20Fl/e46Hg9wkh12glDlTzcVTb8f3kKtYDKnoA7c=; b=LDW/XkR4Xj+OFtZJDrXeXoV3FXiHAvI71TSpLMLtyKHhDq1Alp1VZSwokZmHv6N4YS 6aud56q8EbszcN95xVW0OEtLtvyM6fOudLo79t5iM/rr/lda/Q6Aw6eeqi9pSIATlQz9 uIuECbE3MhwoTW0mcCZSM8fr3K0recwcadUGg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=tOK20Fl/e46Hg9wkh12glDlTzcVTb8f3kKtYDKnoA7c=; b=BWf8yF+61zEZ8hiLauNeoLpZ0Ytw4LfKc1K25ftMQLVnqqy4kOFZCMH9q75j/dq1gn c+JxwcsuevFbLFtcp6KdJjkltropUncjBwZUE5RDxlQa4Ky0eLRUqA1e5Bw+AmGTU6Ra SUPI7WuBJMnGPEr12EB/n/KouM3LyDXvr3zguTHVmYDmnnjM6G5MjFNxKj+IPlzMX3OD tHt5iEj4DUgnyM5t4njVwuDAjvG3OzJk5RKNjXk1Yr61eLu6D09hSJju5AA4A8/y0Fyt 5m8aLpGLX+p9ZlcysS7oWxWfejxB5/bj6CZABVHO66sTiDgEf++gRNumdcEGTqVK1Byj 43pA== X-Gm-Message-State: AKS2vOwzeh2MkV90ZgRpeNXYZHkWG00+io8t1f93Vgiy0cq6ljAUEeae LkKFMxdPHh6FrhUJ X-Received: by 10.28.72.212 with SMTP id v203mr5579488wma.90.1498227151085; Fri, 23 Jun 2017 07:12:31 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:487d:9a3b:823e:400a]) by smtp.gmail.com with ESMTPSA id b131sm4850605wma.11.2017.06.23.07.12.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Jun 2017 07:12:30 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , "Rafael J . Wysocki" , Vincent Guittot , Nicolas Pitre , Jens Axboe , Hannes Reinecke , Bjorn Helgaas Subject: [PATCH V12 1/2] irq: Track the interrupt timings Date: Fri, 23 Jun 2017 16:11:07 +0200 Message-Id: <1498227072-5980-1-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 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 timestamp for each interrupt occurrences in a per-CPU circular buffer to help with the prediction of the next occurrence using a statistical model. Each CPU can store IRQ_TIMINGS_SIZE events , the current value of IRQ_TIMINGS_SIZE is 32. Each event is encoded into a single u64, where the 48 bits are used for the timestamp and the next 16 bits are for the irq number. A static key is introduced so when the irq prediction is switched off at runtime, we can reduce the overhead near to zero. It results in most of the code in internals.h for inline reason and a very few in the new file timings.c. The latter will contain more in the next patch which will provide the statistical model for the next event prediction. Note this code is by default *not* compiled in the kernel. Signed-off-by: Daniel Lezcano Acked-by: Nicolas Pitre Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Vincent Guittot --- Changelog: V12: - Changed struct irq_timings comments to kerneldoc format - Changed struct irq_timings name to be tabular aligned - Renamed remove_timings to irq_remove_timings - Renamed setup_timings to irq_setup_timings - Used macro DECLARE_STATIC_KEY_FALSE instead of raw declaration - Made irq_timing_decode() to return the irq number V11: - No changes V10: - No changes V9: - Changed indentation level by inverting the static key condition - Encoded interrupt and timestamp into a u64 variable - Boolean enable instead of refcount for the static key V8: - Replaced percpu field in the irqdesc by a percpu array containing the timings and the associated irq. The function irq_timings_get_next()is no longer needed, so it is removed - Removed all unused code resulting from the conversion irqdesc->percpu timings storage 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 Signed-off-by: Daniel Lezcano --- include/linux/interrupt.h | 5 +++ kernel/irq/Kconfig | 3 ++ kernel/irq/Makefile | 1 + kernel/irq/handle.c | 2 ++ kernel/irq/internals.h | 89 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/irq/manage.c | 3 ++ kernel/irq/timings.c | 30 ++++++++++++++++ 7 files changed, 133 insertions(+) create mode 100644 kernel/irq/timings.c -- 2.7.4 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index a6fba48..9f61723 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -703,6 +703,11 @@ static inline void init_irq_proc(void) } #endif +#ifdef CONFIG_IRQ_TIMINGS +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/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 1d3ee31..efb5f14 100644 --- a/kernel/irq/Makefile +++ b/kernel/irq/Makefile @@ -10,3 +10,4 @@ obj-$(CONFIG_PM_SLEEP) += pm.o obj-$(CONFIG_GENERIC_MSI_IRQ) += msi.o obj-$(CONFIG_GENERIC_IRQ_IPI) += ipi.o obj-$(CONFIG_SMP) += affinity.o +obj-$(CONFIG_IRQ_TIMINGS) += timings.o diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index d3f2490..eb4d3e8 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 unsigned int 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 bc226e7..ec86e0e 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -8,6 +8,7 @@ #include #include #include +#include #ifdef CONFIG_SPARSE_IRQ # define IRQ_BITMAP_BITS (NR_IRQS + 8196) @@ -57,6 +58,7 @@ enum { IRQS_WAITING = 0x00000080, IRQS_PENDING = 0x00000200, IRQS_SUSPENDED = 0x00000800, + IRQS_TIMINGS = 0x00001000, }; #include "debug.h" @@ -226,3 +228,90 @@ 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 + +#define IRQ_TIMINGS_SHIFT 5 +#define IRQ_TIMINGS_SIZE (1 << IRQ_TIMINGS_SHIFT) +#define IRQ_TIMINGS_MASK (IRQ_TIMINGS_SIZE - 1) + +/** + * struct irq_timings - irq timings storing structure + * @values: a circular buffer of u64 encoded values + * @count: the number of elements in the array + */ +struct irq_timings { + u64 values[IRQ_TIMINGS_SIZE]; + int count; +}; + +DECLARE_PER_CPU(struct irq_timings, irq_timings); + +static inline void irq_remove_timings(struct irq_desc *desc) +{ + desc->istate &= ~IRQS_TIMINGS; +} + +static inline void irq_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 void irq_timings_enable(void); +extern void irq_timings_disable(void); + +DECLARE_STATIC_KEY_FALSE(irq_timing_enabled); + +/* + * The interrupt number and the timestamp are encoded into a single + * u64 variable to optimize the size. + * 48 bit time stamp and 16 bit IRQ number is way sufficient. + * Who cares an IRQ after 78 hours of idle time? + */ +static inline u64 irq_timing_encode(u64 timestamp, int irq) +{ + return (timestamp << 16) | irq; +} + +static inline int irq_timing_decode(u64 value, u64 *timestamp) +{ + *timestamp = value >> 16; + return value & U16_MAX; +} + +/* + * 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_branch_likely(&irq_timing_enabled)) + return; + + if (desc->istate & IRQS_TIMINGS) { + struct irq_timings *timings = this_cpu_ptr(&irq_timings); + + timings->values[timings->count & IRQ_TIMINGS_MASK] = + irq_timing_encode(local_clock(), + irq_desc_get_irq(desc)); + + timings->count++; + } +} +#else +static inline void irq_remove_timings(struct irq_desc *desc) {} +static inline void irq_setup_timings(struct irq_desc *desc, + struct irqaction *act) {}; +static inline void record_irq_time(struct irq_desc *desc) {} +#endif /* CONFIG_IRQ_TIMINGS */ diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 4c34696..45ad6ee 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -1388,6 +1388,8 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) raw_spin_unlock_irqrestore(&desc->lock, flags); + irq_setup_timings(desc, new); + /* * Strictly no need to wake it up, but hung_task complains * when no hard interrupt wakes the thread up. @@ -1516,6 +1518,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); + irq_remove_timings(desc); } #ifdef CONFIG_SMP diff --git a/kernel/irq/timings.c b/kernel/irq/timings.c new file mode 100644 index 0000000..56cf687 --- /dev/null +++ b/kernel/irq/timings.c @@ -0,0 +1,30 @@ +/* + * 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 "internals.h" + +DEFINE_STATIC_KEY_FALSE(irq_timing_enabled); + +DEFINE_PER_CPU(struct irq_timings, irq_timings); + +void irq_timings_enable(void) +{ + static_branch_enable(&irq_timing_enabled); +} + +void irq_timings_disable(void) +{ + static_branch_disable(&irq_timing_enabled); +}