From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
linux-arch@vger.kernel.org, Linus Torvalds <torvalds@osdl.org>,
Andrew Morton <akpm@linux-foundation.org>,
x86@kernel.org, Peter Zijlstra <peterz@infradead.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Paul Mundt <lethal@linux-sh.org>,
Russell King <linux@arm.linux.org.uk>,
David Woodhouse <dwmw2@infradead.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
Grant Likely <grant.likely@secretlab.ca>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: Re: [patch 40/47] genirq: Sanitize dynamic irq handling
Date: Thu, 30 Sep 2010 22:47:58 -0700 [thread overview]
Message-ID: <4CA5760E.1030303@kernel.org> (raw)
In-Reply-To: <20100930221742.416816916@linutronix.de>
On 09/30/2010 04:17 PM, Thomas Gleixner wrote:
> Use the cleanup functions of the dynamic allocator. No need to have
> separate implementations.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
> include/linux/irq.h | 12 +++--
> kernel/irq/chip.c | 104 -------------------------------------------------
> kernel/irq/internals.h | 1
> kernel/irq/irqdesc.c | 37 +++++++++++------
> 4 files changed, 33 insertions(+), 121 deletions(-)
>
> Index: linux-2.6-tip/include/linux/irq.h
> ===================================================================
> --- linux-2.6-tip.orig/include/linux/irq.h
> +++ linux-2.6-tip/include/linux/irq.h
> @@ -497,11 +497,15 @@ static inline int irq_has_action(unsigne
> return desc->action != NULL;
> }
>
> -/* Dynamic irq helper functions */
> -extern void dynamic_irq_init(unsigned int irq);
> -void dynamic_irq_init_keep_chip_data(unsigned int irq);
> +/*
> + * Dynamic irq helper functions. Obsolete. Use irq_alloc_desc* and
> + * irq_free_desc instead.
> + */
> extern void dynamic_irq_cleanup(unsigned int irq);
> -void dynamic_irq_cleanup_keep_chip_data(unsigned int irq);
> +static inline void dynamic_irq_init(unsigned int irq)
> +{
> + dynamic_irq_cleanup(irq);
> +}
>
> /* Set/get chip/data for an IRQ: */
> extern int set_irq_chip(unsigned int irq, struct irq_chip *chip);
> Index: linux-2.6-tip/kernel/irq/chip.c
> ===================================================================
> --- linux-2.6-tip.orig/kernel/irq/chip.c
> +++ linux-2.6-tip/kernel/irq/chip.c
> @@ -18,110 +18,6 @@
>
> #include "internals.h"
>
> -static void dynamic_irq_init_x(unsigned int irq, bool keep_chip_data)
> -{
> - struct irq_desc *desc;
> - unsigned long flags;
> -
> - desc = irq_to_desc(irq);
> - if (!desc) {
> - WARN(1, KERN_ERR "Trying to initialize invalid IRQ%d\n", irq);
> - return;
> - }
> -
> - /* Ensure we don't have left over values from a previous use of this irq */
> - raw_spin_lock_irqsave(&desc->lock, flags);
> - desc->status = IRQ_DEFAULT_INIT_FLAGS;
> - desc->chip = &no_irq_chip;
> - desc->irq_data.chip = &no_irq_chip;
> - desc->handle_irq = handle_bad_irq;
> - desc->depth = 1;
> - desc->irq_data.msi_desc = NULL;
> - desc->irq_data.handler_data = NULL;
> - if (!keep_chip_data)
> - desc->irq_data.chip_data = NULL;
> - desc->action = NULL;
> - desc->irq_count = 0;
> - desc->irqs_unhandled = 0;
> -#ifdef CONFIG_SMP
> - cpumask_setall(desc->affinity);
> -#ifdef CONFIG_GENERIC_PENDING_IRQ
> - cpumask_clear(desc->pending_mask);
> -#endif
> -#endif
> - raw_spin_unlock_irqrestore(&desc->lock, flags);
> -}
> -
> -/**
> - * dynamic_irq_init - initialize a dynamically allocated irq
> - * @irq: irq number to initialize
> - */
> -void dynamic_irq_init(unsigned int irq)
> -{
> - dynamic_irq_init_x(irq, false);
> -}
> -
> -/**
> - * dynamic_irq_init_keep_chip_data - initialize a dynamically allocated irq
> - * @irq: irq number to initialize
> - *
> - * does not set irq_to_desc(irq)->chip_data to NULL
> - */
> -void dynamic_irq_init_keep_chip_data(unsigned int irq)
> -{
> - dynamic_irq_init_x(irq, true);
> -}
> -
> -static void dynamic_irq_cleanup_x(unsigned int irq, bool keep_chip_data)
> -{
> - struct irq_desc *desc = irq_to_desc(irq);
> - unsigned long flags;
> -
> - if (!desc) {
> - WARN(1, KERN_ERR "Trying to cleanup invalid IRQ%d\n", irq);
> - return;
> - }
> -
> - raw_spin_lock_irqsave(&desc->lock, flags);
> - if (desc->action) {
> - raw_spin_unlock_irqrestore(&desc->lock, flags);
> - WARN(1, KERN_ERR "Destroying IRQ%d without calling free_irq\n",
> - irq);
> - return;
> - }
> - desc->irq_data.msi_desc = NULL;
> - desc->irq_data.handler_data = NULL;
> - if (!keep_chip_data)
> - desc->irq_data.chip_data = NULL;
> - desc->handle_irq = handle_bad_irq;
> - desc->chip = &no_irq_chip;
> - desc->irq_data.chip = &no_irq_chip;
> - desc->name = NULL;
> - clear_kstat_irqs(desc);
> - raw_spin_unlock_irqrestore(&desc->lock, flags);
> -}
> -
> -/**
> - * dynamic_irq_cleanup - cleanup a dynamically allocated irq
> - * @irq: irq number to initialize
> - */
> -void dynamic_irq_cleanup(unsigned int irq)
> -{
> - dynamic_irq_cleanup_x(irq, false);
> -}
> -
> -/**
> - * dynamic_irq_cleanup_keep_chip_data - cleanup a dynamically allocated irq
> - * @irq: irq number to initialize
> - *
> - * does not set irq_to_desc(irq)->chip_data to NULL
> - */
> -void dynamic_irq_cleanup_keep_chip_data(unsigned int irq)
> -{
> - dynamic_irq_cleanup_x(irq, true);
> -}
> -
> -
> /**
> * set_irq_chip - set the irq chip for an irq
> * @irq: irq number
> Index: linux-2.6-tip/kernel/irq/internals.h
> ===================================================================
> --- linux-2.6-tip.orig/kernel/irq/internals.h
> +++ linux-2.6-tip/kernel/irq/internals.h
> @@ -17,7 +17,6 @@ extern void __enable_irq(struct irq_desc
>
> extern struct lock_class_key irq_desc_lock_class;
> extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr);
> -extern void clear_kstat_irqs(struct irq_desc *desc);
> extern raw_spinlock_t sparse_irq_lock;
>
> #ifdef CONFIG_SPARSE_IRQ
> Index: linux-2.6-tip/kernel/irq/irqdesc.c
> ===================================================================
> --- linux-2.6-tip.orig/kernel/irq/irqdesc.c
> +++ linux-2.6-tip/kernel/irq/irqdesc.c
> @@ -54,10 +54,13 @@ static void desc_smp_init(struct irq_des
> desc->node = node;
> desc->irq_data.affinity = &desc->affinity;
> cpumask_copy(desc->affinity, irq_default_affinity);
> +#ifdef CONFIG_GENERIC_PENDING_IRQ
> + cpumask_clear(desc->pending_mask);
> +#endif
> }
> -
> +static inline int desc_node(struct irq_desc *desc) { return desc->node; }
> #else
> -static inline int
> +static inline int desc_node(struct irq_desc *desc) { return 0; }
> alloc_masks(struct irq_desc *desc, gfp_t gfp, int node) { return 0; }
> static inline void desc_smp_init(struct irq_desc *desc, int node) { }
> #endif
> @@ -72,6 +75,8 @@ static void desc_set_defaults(unsigned i
> desc->irq_data.chip = &no_irq_chip;
> desc->handle_irq = handle_bad_irq;
> desc->depth = 1;
> + desc->irq_count = 0;
> + desc->irqs_unhandled = 0;
> desc->name = NULL;
> memset(desc->kstat_irqs, 0, nr_cpu_ids * sizeof(*(desc->kstat_irqs)));
> desc_smp_init(desc, node);
> @@ -136,6 +141,7 @@ static void free_masks(struct irq_desc *
> #endif
> free_cpumask_var(desc->affinity);
> }
> +static int node
?
> #else
> static inline void free_masks(struct irq_desc *desc) { }
> #endif
> @@ -290,16 +296,7 @@ struct irq_desc *irq_to_desc_alloc_node(
>
> static void free_desc(unsigned int irq)
> {
> - struct irq_desc *desc = irq_to_desc(irq);
> - unsigned long flags;
> -
> - raw_spin_lock_irqsave(&desc->lock, flags);
> -#ifdef CONFIG_SMP
> - desc_set_defaults(irq, desc, desc->node);
> -#else
> - desc_set_defaults(irq, desc, 0);
> -#endif
> - raw_spin_unlock_irqrestore(&desc->lock, flags);
> + dynamic_irq_cleanup(irq);
> }
>
> static inline int alloc_descs(unsigned int start, unsigned int cnt, int node)
> @@ -386,6 +383,22 @@ unsigned int irq_get_next_irq(unsigned i
> return res;
> }
>
> +/**
> + * dynamic_irq_cleanup - cleanup a dynamically allocated irq
> + * @irq: irq number to initialize
> + */
> +void dynamic_irq_cleanup(unsigned int irq)
> +{
> + struct irq_desc *desc = irq_to_desc(irq);
> + unsigned long flags;
> +
> + raw_spin_lock_irqsave(&desc->lock, flags);
> + desc_set_defaults(irq, desc, desc_node(desc));
> + raw_spin_unlock_irqrestore(&desc->lock, flags);
> +}
> +
> + unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
> +
> /* Statistics access */
> void clear_kstat_irqs(struct irq_desc *desc)
> {
>
next prev parent reply other threads:[~2010-10-01 5:49 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 23:14 [patch 00/47] Sparse irq rework Thomas Gleixner
2010-09-30 23:14 ` [patch 01/47] x86: Plug memory leak in sparse irq Thomas Gleixner
2010-09-30 23:14 ` [patch 02/47] x86: Hpet: Fix bogus error check in hpet_assign_irq() Thomas Gleixner
2010-09-30 23:14 ` [patch 03/47] genirq: Provide status modifier Thomas Gleixner
2010-09-30 23:14 ` [patch 04/47] arm: Use irq " Thomas Gleixner
2010-09-30 23:14 ` [patch 05/47] genirq-sanitize-irq-data-accessors.patch Thomas Gleixner
2010-09-30 23:15 ` [patch 06/47] genirq: Distangle kernel/irq/handle.c Thomas Gleixner
2010-09-30 23:15 ` [patch 07/47] genirq: Remove early_init_irq_lock_class() Thomas Gleixner
2010-09-30 23:15 ` [patch 08/47] genirq: Move core only inlines to kernel/irq Thomas Gleixner
2010-09-30 23:15 ` [patch 09/47] isdn: hisax: Replace the bogus access to irq stats Thomas Gleixner
2010-09-30 23:15 ` [patch 10/47] genirq: Remove export of kstat_irqs_cpu Thomas Gleixner
2010-09-30 23:15 ` [patch 11/47] genirq: Provide default irq init flags Thomas Gleixner
2010-09-30 23:15 ` [patch 12/47] arm: Use ARCH_IRQ_INIT_FLAGS Thomas Gleixner
2010-09-30 23:15 ` [patch 13/47] powerpc: " Thomas Gleixner
2010-09-30 23:15 ` [patch 14/47] genirq: Implement a sane sparse_irq allocator Thomas Gleixner
2010-10-01 5:28 ` Yinghai Lu
2010-10-01 20:36 ` Thomas Gleixner
2010-09-30 23:15 ` [patch 15/47] genirq: Prepare proc for real sparse irq support Thomas Gleixner
2010-09-30 23:15 ` [patch 16/47] genirq: Implement sane enumeration Thomas Gleixner
2010-10-03 10:55 ` Grant Likely
2010-09-30 23:15 ` [patch 17/47] genirq-update-kerneldoc.patch Thomas Gleixner
2010-09-30 23:16 ` [patch 18/47] genirq: Use sane sparse allocator Thomas Gleixner
2010-09-30 23:16 ` [patch 19/47] genirq: Query arch for number of early descriptors Thomas Gleixner
2010-09-30 23:16 ` [patch 20/47] x86: Remove useless reinitialization of irq descriptors Thomas Gleixner
2010-10-03 15:21 ` Eric W. Biederman
2010-10-03 18:26 ` Thomas Gleixner
2010-09-30 23:16 ` [patch 21/47] x86: Sanitize apb timer interrupt handling Thomas Gleixner
2010-09-30 23:16 ` [patch 22/47] x86: lguest: Convert to new irq chip functions Thomas Gleixner
2010-09-30 23:16 ` [patch 23/47] x86: Cleanup visws interrupt handling Thomas Gleixner
2010-09-30 23:16 ` [patch 24/47] x86: i8259: Convert to new irq_chip functions Thomas Gleixner
2010-09-30 23:16 ` [patch 25/47] x86: Cleanup io_apic Thomas Gleixner
2010-09-30 23:16 ` [patch 26/47] x86: io_apic: Convert startup to new irq_chip function Thomas Gleixner
2010-09-30 23:16 ` [patch 27/47] x86: ioapic: Convert mask " Thomas Gleixner
2010-09-30 23:16 ` [patch 28/47] x86: ioapic/hpet: Convert to new chip functions Thomas Gleixner
2010-09-30 23:16 ` [patch 29/47] pci: Convert msi to new irq_chip functions Thomas Gleixner
2010-10-11 17:09 ` Jesse Barnes
2010-09-30 23:16 ` [patch 30/47] dmar: Convert to new irq chip functions Thomas Gleixner
2010-09-30 23:17 ` [patch 31/47] ht: Convert to new irq_chip functions Thomas Gleixner
2010-09-30 23:17 ` [patch 32/47] x86: ioapic: Clean up the direct access to irq_desc Thomas Gleixner
2010-09-30 23:17 ` [patch 33/47] pci: Cleanup the irq_desc mess in msi Thomas Gleixner
2010-10-11 17:08 ` Jesse Barnes
2010-09-30 23:17 ` [patch 34/47] x86: ioapic: Convert irq affinity to new chip functions Thomas Gleixner
2010-09-30 23:17 ` [patch 35/47] x86: ioapic: Cleanup some more Thomas Gleixner
2010-09-30 23:17 ` [patch 36/47] x86: ioapic: Cleanup sparse irq code Thomas Gleixner
2010-09-30 23:17 ` [patch 37/47] x86: uv: Clean up the direct access to irq_desc Thomas Gleixner
2010-09-30 23:17 ` [patch 38/47] x86: Use sane enumeration Thomas Gleixner
2010-09-30 23:17 ` [patch 39/47] genirq: Remove arch_init_chip_data() Thomas Gleixner
2010-09-30 23:17 ` [patch 40/47] genirq: Sanitize dynamic irq handling Thomas Gleixner
2010-10-01 5:47 ` Yinghai Lu [this message]
2010-09-30 23:18 ` [patch 41/47] arm: davinci: Cleanup irq_desc access Thomas Gleixner
2010-09-30 23:18 ` [patch 42/47] genirq: Remove the now unused sparse irq leftovers Thomas Gleixner
2010-09-30 23:18 ` [patch 43/47] x86: xen: Sanitise sparse_irq handling Thomas Gleixner
2010-09-30 23:18 ` [patch 44/47] sh: Sanitize sparse irq Thomas Gleixner
2010-09-30 23:18 ` [patch 45/47] x86: lguest: Use new irq allocator Thomas Gleixner
2010-09-30 23:18 ` [patch 46/47] powerpc: " Thomas Gleixner
2010-10-01 0:42 ` Benjamin Herrenschmidt
2010-10-01 13:07 ` Thomas Gleixner
2010-10-01 20:46 ` Benjamin Herrenschmidt
2010-10-01 21:11 ` Grant Likely
2010-10-01 21:17 ` Benjamin Herrenschmidt
2010-10-03 16:53 ` Eric W. Biederman
2010-10-03 18:34 ` Thomas Gleixner
2010-10-03 20:04 ` Thomas Gleixner
2010-10-03 22:54 ` Benjamin Herrenschmidt
2010-10-04 0:15 ` Eric W. Biederman
2010-10-04 0:37 ` Benjamin Herrenschmidt
2010-10-04 16:46 ` Grant Likely
2010-09-30 23:18 ` [patch 47/47] genirq: Remove the old sparse irq allocator function Thomas Gleixner
2010-10-01 3:32 ` [patch 00/47] Sparse irq rework Linus Torvalds
2010-10-01 5:54 ` Yinghai Lu
2010-10-01 20:35 ` Thomas Gleixner
2010-10-03 11:23 ` Grant Likely
2010-10-03 11:29 ` Russell King - ARM Linux
2010-10-03 11:57 ` Grant Likely
2010-10-03 13:48 ` Thomas Gleixner
2010-10-05 10:22 ` Thomas Gleixner
2010-10-06 22:45 ` Yinghai Lu
2010-10-06 22:52 ` Thomas Gleixner
2010-10-06 23:37 ` Yinghai Lu
2010-10-07 0:16 ` Yinghai Lu
2010-10-07 4:01 ` Thomas Gleixner
2010-10-07 4:38 ` Yinghai Lu
2010-10-08 21:50 ` Thomas Gleixner
2010-10-08 21:54 ` Thomas Gleixner
2010-10-09 4:26 ` Yinghai Lu
2010-10-09 5:44 ` Yinghai Lu
2010-10-09 6:34 ` Thomas Gleixner
2010-10-09 7:08 ` Yinghai Lu
2010-10-09 7:08 ` Yinghai Lu
2010-10-09 12:08 ` Thomas Gleixner
2010-10-10 9:32 ` Thomas Gleixner
2010-10-10 13:30 ` Anca Emanuel
2010-10-11 2:20 ` Yinghai Lu
2010-10-11 2:20 ` Yinghai Lu
2010-10-11 3:50 ` Yinghai Lu
2010-10-11 3:50 ` Yinghai Lu
2010-10-11 8:16 ` Thomas Gleixner
2010-10-11 11:34 ` Benjamin Herrenschmidt
2010-10-11 16:19 ` Yinghai Lu
2010-10-11 16:19 ` Yinghai Lu
2010-10-12 20:23 ` [tip:irq/core] x86: Don't setup ioapic irq for sci twice tip-bot for Yinghai Lu
2010-10-09 6:10 ` [patch 00/47] Sparse irq rework Thomas Gleixner
2010-10-09 7:03 ` Yinghai Lu
2010-10-09 12:12 ` Thomas Gleixner
2010-10-10 2:32 ` Yinghai Lu
2010-10-10 2:32 ` Yinghai Lu
2010-10-10 5:11 ` Yinghai Lu
2010-10-10 5:11 ` Yinghai Lu
2010-10-10 8:20 ` Thomas Gleixner
2010-10-03 16:41 ` Eric W. Biederman
2010-10-03 16:41 ` Eric W. Biederman
2010-10-03 19:16 ` Thomas Gleixner
2010-10-03 22:57 ` Benjamin Herrenschmidt
2010-10-04 16:31 ` Grant Likely
2010-10-04 0:49 ` Eric W. Biederman
2010-10-04 8:05 ` Thomas Gleixner
2010-10-04 1:13 ` Eric W. Biederman
2010-10-04 6:36 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA5760E.1030303@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=dwmw2@infradead.org \
--cc=ebiederm@xmission.com \
--cc=grant.likely@secretlab.ca \
--cc=jbarnes@virtuousgeek.org \
--cc=lethal@linux-sh.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@osdl.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.