From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0767E305675 for ; Sun, 17 May 2026 20:02:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779048148; cv=none; b=kilMCMxhIePHoy3pNEyVfvPZRFV+u+uMR6quYAC0UkQtjUXrNKy213FL/38tnOcxgcQOh4oiXqdJfoldWS5Rh6Mc9qnJi/clIhdSA9B9vDyl3d/aEbqRgb7igQ5tp/O5kI5sZON12/+TkEb9kF5THGX+qJCjv2dIv2V/7STmReU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779048148; c=relaxed/simple; bh=Y72kEIfueY7MgiWMjmiBjhC00BQKllTIdgmsrWKtYLA=; h=Date:Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=jHTfh0trFP4DmifknjY5xcget6YRvEFsSV86vawypuwZHWmZ4qzcLDsQFbZK2ry11+Sl1LTlQWJ12slq8onLPl9vyyrpybTUa8svi1IkbjwDGnG9uaeYd8Nx+XbA1WCrYTng+65NLoiyqRDSwojox9KSe2iYZujrfmXGufh4/Vs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nL7jI9fX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nL7jI9fX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1426AC2BCB0; Sun, 17 May 2026 20:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1779048147; bh=Y72kEIfueY7MgiWMjmiBjhC00BQKllTIdgmsrWKtYLA=; h=Date:From:To:Cc:Subject:References:From; b=nL7jI9fXV3rSqVZ3CU8HZREY4dWPOgl3tqttKN8nTl3zCwMPhZ4VakG0AL5ka7i6/ T+4xPF/Le261JMmk8U1MedpOG+HNf9HYnwN+VpnqSlbYeIle11+uI/4T6tpRrXZ+6I fnZxnCCoEOvuNRCyhDibrIJQmHlwabbwMjL4RYmCTKx4Bgh/AnJF/TkjZ/AJEgKMkx T9SeJSYranvsNTYZ7ckj9t/A61a3Yyd+FHtyoA638NXWI6DQ6YjesOhXLt3NYJpHxc k6c2hk3+LUY12vWJOVB8+6OMp2YuAj2rAS8n3roLGAXy2CRi056RlJ1wB0ozCTNwYg S0tMxiBNdtZWw== Date: Sun, 17 May 2026 22:02:24 +0200 Message-ID: <20260517194931.760664517@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Michael Kelley , Dmitry Ilvokhin , Radu Rendec , Jan Kiszka , Kieran Bingham , Florian Fainelli , Marc Zyngier Subject: [patch V6 11/16] genirq: Calculate precision only when required References: <20260517194421.705253664@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Thomas Gleixner Calculating the precision of the interrupt number column on every initial show_interrupt() invocation is a pointless exercise as the underlying maximum number of interrupts rarely changes. Calculate it only when that number is modified and let show_interrupts() use the cached value. Signed-off-by: Thomas Gleixner Tested-by: Michael Kelley Reviewed-by: Dmitry Ilvokhin Reviewed-by: Radu Rendec --- kernel/irq/internals.h | 6 ++++++ kernel/irq/irqdesc.c | 10 ++++++---- kernel/irq/proc.c | 33 +++++++++++++++++++++++---------- 3 files changed, 35 insertions(+), 14 deletions(-) --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -134,6 +134,12 @@ static inline void unregister_handler_pr static inline void irq_proc_update_valid(struct irq_desc *desc) { } #endif +#if defined(CONFIG_PROC_FS) && defined(CONFIG_GENERIC_IRQ_SHOW) +void irq_proc_calc_prec(void); +#else +static inline void irq_proc_calc_prec(void) { } +#endif + extern bool irq_can_set_affinity_usr(unsigned int irq); extern int irq_do_set_affinity(struct irq_data *data, --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c @@ -157,13 +157,12 @@ EXPORT_SYMBOL_GPL(irq_get_nr_irqs); * * Return: @nr. */ -unsigned int irq_set_nr_irqs(unsigned int nr) +unsigned int __init irq_set_nr_irqs(unsigned int nr) { total_nr_irqs = nr; - + irq_proc_calc_prec(); return nr; } -EXPORT_SYMBOL_GPL(irq_set_nr_irqs); static DEFINE_MUTEX(sparse_irq_lock); static struct maple_tree sparse_irqs = MTREE_INIT_EXT(sparse_irqs, @@ -544,6 +543,7 @@ static bool irq_expand_nr_irqs(unsigned if (nr > MAX_SPARSE_IRQS) return false; total_nr_irqs = nr; + irq_proc_calc_prec(); return true; } @@ -572,6 +572,7 @@ int __init early_irq_init(void) desc = alloc_desc(i, node, 0, NULL, NULL); irq_insert_desc(i, desc); } + irq_proc_calc_prec(); return arch_early_irq_init(); } @@ -592,7 +593,7 @@ int __init early_irq_init(void) init_irq_default_affinity(); - printk(KERN_INFO "NR_IRQS: %d\n", NR_IRQS); + pr_info("NR_IRQS: %d\n", NR_IRQS); count = ARRAY_SIZE(irq_desc); @@ -602,6 +603,7 @@ int __init early_irq_init(void) goto __free_desc_res; } + irq_proc_calc_prec(); return arch_early_irq_init(); __free_desc_res: --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c @@ -456,10 +456,25 @@ int __weak arch_show_interrupts(struct s return 0; } +static struct irq_proc_constraints { + unsigned int num_prec; +} irq_proc_constraints __read_mostly = { + .num_prec = 3, +}; + #ifndef ACTUAL_NR_IRQS # define ACTUAL_NR_IRQS total_nr_irqs #endif +void irq_proc_calc_prec(void) +{ + unsigned int prec, n; + + for (prec = 3, n = 1000; prec < 10 && n <= total_nr_irqs; ++prec) + n *= 10; + WRITE_ONCE(irq_proc_constraints.num_prec, prec); +} + /* Same as seq_put_decimal_ull_width(p, " ", cnt, 10) */ #define ZSTR1 " 0" #define ZSTR1_LEN (sizeof(ZSTR1) - 1) @@ -499,9 +514,7 @@ void irq_proc_emit_counts(struct seq_fil int show_interrupts(struct seq_file *p, void *v) { - const unsigned int nr_irqs = total_nr_irqs; - static int prec; - + unsigned int prec = READ_ONCE(irq_proc_constraints.num_prec); int i = *(loff_t *) v, j; struct irqaction *action; struct irq_desc *desc; @@ -514,9 +527,6 @@ int show_interrupts(struct seq_file *p, /* print header and calculate the width of the first column */ if (i == 0) { - for (prec = 3, j = 1000; prec < 10 && j <= nr_irqs; ++prec) - j *= 10; - seq_printf(p, "%*s", prec + 8, ""); for_each_online_cpu(j) seq_printf(p, "CPU%-8d", j); @@ -552,13 +562,16 @@ int show_interrupts(struct seq_file *p, } else { seq_printf(p, "%8s", "None"); } + + seq_putc(p, ' '); if (desc->irq_data.domain) - seq_printf(p, " %*lu", prec, desc->irq_data.hwirq); + seq_put_decimal_ull_width(p, "", desc->irq_data.hwirq, prec); else seq_printf(p, " %*s", prec, ""); -#ifdef CONFIG_GENERIC_IRQ_SHOW_LEVEL - seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); -#endif + + if (IS_ENABLED(CONFIG_GENERIC_IRQ_SHOW_LEVEL)) + seq_printf(p, " %-8s", irqd_is_level_type(&desc->irq_data) ? "Level" : "Edge"); + if (desc->name) seq_printf(p, "-%-8s", desc->name);