Commit b7b29338 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Sanitize dynamic irq handling 



Use the cleanup functions of the dynamic allocator. No need to have
separate implementations.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent b7d0d825

include/linux/irq.h

+8 −4
Original line number Diff line number Diff line
@@ -326,11 +326,15 @@ extern unsigned int create_irq_nr(unsigned int irq_want, int node); 
extern int create_irq(void);

extern void destroy_irq(unsigned int irq);



/* 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);

kernel/irq/chip.c

+0 −102
Original line number Diff line number Diff line
@@ -18,108 +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->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->irq_data.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)->irq_data.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->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)->irq_data.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

kernel/irq/internals.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ extern void __enable_irq(struct irq_desc *desc, unsigned int irq, bool resume); 


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;



/* Resending of interrupts :*/

kernel/irq/irqdesc.c

+23 −18
Original line number Diff line number Diff line
@@ -53,12 +53,21 @@ static void desc_smp_init(struct irq_desc *desc, int node) 
{

	desc->irq_data.node = node;

	cpumask_copy(desc->irq_data.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->irq_data.node;

}



#else

static inline int

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) { }

static inline int desc_node(struct irq_desc *desc) { return 0; }

#endif



static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node)
@@ -71,6 +80,8 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node) 
	desc->status = IRQ_DEFAULT_INIT_FLAGS;

	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);
@@ -286,23 +297,9 @@ struct irq_desc *irq_to_desc_alloc_node(unsigned int irq, int node) 
	return irq_to_desc(irq);

}



#ifdef CONFIG_SMP

static inline int desc_node(struct irq_desc *desc)

{

	return desc->irq_data.node;

}

#else

static inline int desc_node(struct irq_desc *desc) { return 0; }

#endif



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);

	desc_set_defaults(irq, desc, desc_node(desc));

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	dynamic_irq_cleanup(irq);

}



static inline int alloc_descs(unsigned int start, unsigned int cnt, int node)
@@ -409,10 +406,18 @@ unsigned int irq_get_next_irq(unsigned int offset) 
	return find_next_bit(allocated_irqs, nr_irqs, offset);

}



/* Statistics access */

void clear_kstat_irqs(struct irq_desc *desc)

/**

 * dynamic_irq_cleanup - cleanup a dynamically allocated irq

 * @irq:	irq number to initialize

 */

void dynamic_irq_cleanup(unsigned int irq)

{

	memset(desc->kstat_irqs, 0, nr_cpu_ids * sizeof(*(desc->kstat_irqs)));

	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)