From patchwork Tue Jun 20 21:28:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 106030 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1607871qgd; Tue, 20 Jun 2017 14:30:37 -0700 (PDT) X-Received: by 10.84.131.6 with SMTP id 6mr6384391pld.33.1497994237525; Tue, 20 Jun 2017 14:30:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497994237; cv=none; d=google.com; s=arc-20160816; b=A57nCztLcPkK8xGFDMgu0IyARGSGGpDpth+Kd0JxJOKGPKaVnYnhljzUxJnGIPf7LP ZQpJ9fp45vCIp3UH/isUTIu0n9DzI3ytRI7sDt6wyeymKvL+1pp8PZfPe4rp2r5tHfOf l09+SVp9vE+YGuPpmvUEOMqD6NHW8IeAwpRfKB+ORIdGQY+Z49KBOhWK9mDzwzLaYVpW rfrCIn9dRcfvEPcL853k44NHQ493doT+J/bgMBx+v0DSvJVQRub6TQpQt/FNyz14VDAG RRpaLHlr5UgWAbaMa2mk/+QbWrs4FeE9HtWv7hTjuaHrCGsQcaTSa3/OMwMmftrpei85 +TQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=eKGBgjggCrlURhqBYo6yiaYRZ1zt68EJ4TEm757MmjE=; b=0A1hUGR8kCKtB7cBLWGCqdTfr3R4b3XGk/9J9TmWWTqaQBF6VH7eBGMulMB++6IgKw th5Javb302WBdKi/sl2j2ztnkBS4rViDtPL2xgsBmAAkypuAnCLKhqQZLaVCnGqrwy8X UWpMo0/wIKR2mbZbkZh75WGTj9UX5xJAOPF4dRXBVeMt1DiJ5wNCv0Pl92UC/En8tj8w h4vWtdCDjsQeea9BXkwwiLljjBUc4T071sbrzoatVkYYX9z16ImYuSyDBrFUOhW0O9OI LSXNtWPrsQQjaKh46JJ9CTFmIL5Z1/R/CtbszojS0jLMrubt741Wh4Z3+p4dpr55ryiK +HrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=bmsGI2Ap; 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 31si12395690plk.261.2017.06.20.14.30.37; Tue, 20 Jun 2017 14:30:37 -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=bmsGI2Ap; 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 S1752697AbdFTVae (ORCPT + 25 others); Tue, 20 Jun 2017 17:30:34 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:34701 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752479AbdFTVac (ORCPT ); Tue, 20 Jun 2017 17:30:32 -0400 Received: by mail-wr0-f181.google.com with SMTP id 77so108477074wrb.1 for ; Tue, 20 Jun 2017 14:30: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:in-reply-to:references; bh=eKGBgjggCrlURhqBYo6yiaYRZ1zt68EJ4TEm757MmjE=; b=bmsGI2ApxkPIjnRML+FmHk29cdASQT6XMBl+Ky0LHTMWniR4F0lv3jGzKbKvdETf2Y G5U9A23UKWnd7bh+f/t3dwb+FpXj0WU/Vkpr1lQ1+7gpj8UUhsmStYKhWY0LbxvMPhfw fiPeeV90YbhxHt63kAFkte7cfrRsyeq8/1mjI= 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:in-reply-to :references; bh=eKGBgjggCrlURhqBYo6yiaYRZ1zt68EJ4TEm757MmjE=; b=T5zNu71wZXLwyZhW7dbG2ZAs8gvcAWTD3rsa1pGr20aOTnUZliIWETlfpnW2p/ohsR IPohQbp7BEgBl0zHO8146DUhvUOyLTMcuOsJLT4GIr2zuVT2hqsZzAlNAORlPfsKnIqb FaHazy+NU/2PVBXum5xy9jPZf1HUImrEw21P25J9twuzUUcJznHqrobPiRqVsr4vpLaQ mf6R1ivmaonmE+Zcsdp1MtNj6ben6qtznxBHVZxaal0htTu7xvGWViXjQ4QJ8vfclLlG IVIaF/aGbZL5nlmN4oD27lxPFxJ4z5a178IukmxFlMaB2Cy87bMOkX+b5ieAIkkdhVA5 AumA== X-Gm-Message-State: AKS2vOxPFgL+yrGXFB147ZHR3bioTxGhsE6iyCO38mfGOLphc2DA2+39 QNi6Dia+l4ehtt/6 X-Received: by 10.223.135.237 with SMTP id c42mr24103818wrc.10.1497994231145; Tue, 20 Jun 2017 14:30:31 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:ccbe:9633:e651:d298]) by smtp.gmail.com with ESMTPSA id o7sm13044234wmd.0.2017.06.20.14.30.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Jun 2017 14:30: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 , Hannes Reinecke , Jens Axboe , Bjorn Helgaas Subject: [PATCH 2/3] irq: Track the interrupt timings Date: Tue, 20 Jun 2017 23:28:56 +0200 Message-Id: <1497994139-19816-2-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497994139-19816-1-git-send-email-daniel.lezcano@linaro.org> References: <20170620212657.GB1812@mai> <1497994139-19816-1-git-send-email-daniel.lezcano@linaro.org> 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: 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 | 84 +++++++++++++++++++++++++++++++++++++++++++++++ kernel/irq/manage.c | 3 ++ kernel/irq/timings.c | 30 +++++++++++++++++ 7 files changed, 128 insertions(+) create mode 100644 kernel/irq/timings.c -- 2.7.4 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index d4ae50e..5f98aa7 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -712,6 +712,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..df51b5e0 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,85 @@ 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 { + u64 values[IRQ_TIMINGS_SIZE]; /* our circular buffer */ + unsigned int count; /* Number of interruptions since last inspection */ +}; + +DECLARE_PER_CPU(struct irq_timings, irq_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 void irq_timings_enable(void); +extern void irq_timings_disable(void); + +extern struct 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 void irq_timing_decode(u64 value, u64 *timestamp, int *irq) +{ + *timestamp = value >> 16; + *irq = 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 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 /* CONFIG_IRQ_TIMINGS */ diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 5424cfb..d3f63f1 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); + 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); + 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); +}