Split struct irq_data into common part and per-chip part
Subsystems (27)
v2 cover Split struct irq_data into common part and per-chip part
Hi all,
Now the irq core supports hierarchy irq and stacked irqchips,
so there may be multiple irq_datas associated with the same irq. But some fields in struct irq_data are per-irq instance and duplicating those fields into multiple irq_data may cause troubles.
So this patch introduces a new data structure 'structirq_common_data' to host per-irq instance data fields, and struct irq_data will only host per-chip data fields after the conversion.
It's based on tip/x86/apic.
And it passes Fengguang's zeroday test suite.
V1->V2:
1) Patch "net/mlx4: Cache irq_desc->affinity instead of irq_desc" is still kept to avoid build failure. It may be dropped if Amir Vadai changed related code.
2) Reorganize patches according to Thomas's suggestion.
3) Rename irq_data_get_msi() as irq_data_get_msi_desc().
Thanks!
Gerry
Jiang Liu (14):
genirq: Introduce struct irq_common_data to host shared irq data
genirq: Introduce helper function irq_data_get_node() x86, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
sh, irq: Use accessor irq_data_get_node() to hide struct irq_data
detail
genirq: Move field 'node' from struct irq_data into struct
irq_common_data
genirq: Move field 'handler_data' from struct irq_data into struct
irq_common_data
mn10300: Fix incorrect use of data->affinity
genirq: Introduce helper function irq_data_get_affinity_mask() net/mlx4: Cache irq_desc->affinity instead of irq_desc
genirq: Move field 'affinity' from struct irq_data into struct
irq_common_data
genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
genirq: Use helper function to access irq_data->msi_desc
genirq: Move field 'msi_desc' from struct irq_data into struct
irq_common_data
genirq: Pass irq_data to helper function
__irq_set_chip_handler_name_locked()
arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 4 +- arch/arm64/kernel/irq.c | 4 +- arch/blackfin/mach-common/ints-priority.c | 3 +- arch/ia64/kernel/iosapic.c | 8 +- arch/ia64/kernel/irq.c | 6 +- arch/ia64/kernel/msi_ia64.c | 6 +- arch/ia64/sn/kernel/msi_sn.c | 4 +- arch/metag/kernel/irq.c | 10 ++- arch/mips/alchemy/common/irq.c | 4 +- arch/mips/bcm63xx/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 14 ++-- arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 +- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +-- arch/parisc/kernel/irq.c | 12 +-- arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 4 +- arch/powerpc/sysdev/xics/ics-rtas.c | 4 +- arch/sh/kernel/irq.c | 9 ++- arch/sparc/kernel/irq_64.c | 27 ++++--- arch/sparc/kernel/leon_kernel.c | 6 +- arch/sparc/kernel/sun4d_irq.c | 4 +- arch/sparc/kernel/sun4m_irq.c | 6 +- arch/tile/kernel/pci_gx.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/msi.c | 2 +- arch/x86/kernel/apic/vector.c | 13 ++- arch/x86/kernel/hpet.c | 4 +- arch/x86/kernel/irq.c | 5 +- arch/x86/platform/uv/uv_irq.c | 2 +- arch/xtensa/kernel/irq.c | 10 ++- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpio/gpio-zynq.c | 9 +-- drivers/irqchip/irq-metag-ext.c | 5 +- drivers/irqchip/irq-mips-gic.c | 13 ++- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 6 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- drivers/parisc/iosapic.c | 2 +- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/msi.c | 4 +- drivers/sh/intc/chip.c | 6 +- drivers/sh/intc/virq.c | 4 +- drivers/xen/events/events_base.c | 4 +- include/linux/irq.h | 111 +++++++++++++++++--------- include/linux/irqdesc.h | 19 +++-- kernel/irq/chip.c | 4 +- kernel/irq/internals.h | 15 ++-- kernel/irq/irqdesc.c | 27 +++---- kernel/irq/irqdomain.c | 5 +- kernel/irq/manage.c | 14 ++-- kernel/irq/proc.c | 4 +- 53 files changed, 259 insertions(+), 203 deletions(-)
Signature · 1 line
1.7.10.4
PATCH v2 1/14 genirq: Introduce struct irq_common_data to host shared irq data
With introduction of hierarchy irqdomain, struct irq_data becomes per-chip instead of per-irq and there may be multiple irq_datas associated with the same irq. Some per-irq data stored in struct irq_data now may get duplicated into multiple irq_datas, and causes inconsistent view.
So introduce struct irq_common_data to host per-irq common data and to achieve consistent view among irq_chips.
Other patches in this patch set will move common fields from struct irq_data into struct irq_common_data one by one.
--- include/linux/irq.h | 54 ++++++++++++++++++++++++++++------------------- include/linux/irqdesc.h | 3 ++- kernel/irq/internals.h | 10 ++++----- kernel/irq/irqdesc.c | 1 + kernel/irq/irqdomain.c | 1 + 5 files changed, 41 insertions(+), 28 deletions(-)
include/linux/irq.h +32 -22
@@ -126,13 +126,21 @@ struct msi_desc;struct irq_domain ;/** -* struct irq_data - per irq and irq chip data passed down to chip functions +* struct irq_common_data - per irq data shared by all irqchips +* @state_use_accessors: status information for irq chip functions. +* Use accessor functions to deal with it +*/ +struct irq_common_data { +unsigned int state_use_accessors; +}; + +/** +* struct irq_data - per irq chip data passed down to chip functions * @mask: precomputed bitmask for accessing the chip registers * @irq: interrupt number * @hwirq: hardware interrupt number, local to the interrupt domain * @node: node index useful for balancing -* @state_use_accessors: status information for irq chip functions. -* Use accessor functions to deal with it +* @common: point to data shared by all irqchips * @chip: low level interrupt hardware access * @domain: Interrupt translation domain; responsible for mapping * between hwirq number and linux irq number.
@@ -153,7 +161,7 @@ struct irq_data {unsigned int irq;unsigned long hwirq;unsigned int node; -unsigned int state_use_accessors; +struct irq_common_data *common;struct irq_chip *chip;struct irq_domain *domain;#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY
@@ -166,7 +174,7 @@ struct irq_data { };/* -* Bit masks for irq_data.state +* Bit masks for irq_common_data.state_use_accessors * * IRQD_TRIGGER_MASK - Mask for the trigger type bits * IRQD_SETAFFINITY_PENDING - Affinity setting is pending
@@ -198,34 +206,36 @@ enum { IRQD_WAKEUP_ARMED = (1 << 19), }; +#define __irqd_to_state (d) ((d)->common->state_use_accessors) +static inline bool irqd_is_setaffinity_pending (struct irq_data *d) { -return d->state_use_accessors &IRQD_SETAFFINITY_PENDING ; +return __irqd_to_state (d) &IRQD_SETAFFINITY_PENDING ; }static inline bool irqd_is_per_cpu (struct irq_data *d) { -return d->state_use_accessors &IRQD_PER_CPU ; +return __irqd_to_state (d) &IRQD_PER_CPU ; }static inline bool irqd_can_balance (struct irq_data *d) { -return !(d->state_use_accessors & (IRQD_PER_CPU |IRQD_NO_BALANCING )); +return !(__irqd_to_state (d) & (IRQD_PER_CPU |IRQD_NO_BALANCING )); }static inline bool irqd_affinity_was_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_AFFINITY_SET ; +return __irqd_to_state (d) &IRQD_AFFINITY_SET ; }static inline void irqd_mark_affinity_was_set (struct irq_data *d) { - d->state_use_accessors |=IRQD_AFFINITY_SET ; +__irqd_to_state (d) |=IRQD_AFFINITY_SET ; }static inline u32 irqd_get_trigger_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_TRIGGER_MASK ; +return __irqd_to_state (d) &IRQD_TRIGGER_MASK ; }/*
@@ -233,43 +243,43 @@ static inline u32 irqd_get_trigger_type(struct irq_data *d)*/ static inline void irqd_set_trigger_type (struct irq_data *d,u32 type) { - d->state_use_accessors &= ~IRQD_TRIGGER_MASK ; - d->state_use_accessors |= type &IRQD_TRIGGER_MASK ; +__irqd_to_state (d) &= ~IRQD_TRIGGER_MASK ; +__irqd_to_state (d) |= type &IRQD_TRIGGER_MASK ; }static inline bool irqd_is_level_type (struct irq_data *d) { -return d->state_use_accessors &IRQD_LEVEL ; +return __irqd_to_state (d) &IRQD_LEVEL ; }static inline bool irqd_is_wakeup_set (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_STATE ; +return __irqd_to_state (d) &IRQD_WAKEUP_STATE ; }static inline bool irqd_can_move_in_process_context (struct irq_data *d) { -return d->state_use_accessors &IRQD_MOVE_PCNTXT ; +return __irqd_to_state (d) &IRQD_MOVE_PCNTXT ; }static inline bool irqd_irq_disabled (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_DISABLED ; +return __irqd_to_state (d) &IRQD_IRQ_DISABLED ; }static inline bool irqd_irq_masked (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_MASKED ; +return __irqd_to_state (d) &IRQD_IRQ_MASKED ; }static inline bool irqd_irq_inprogress (struct irq_data *d) { -return d->state_use_accessors &IRQD_IRQ_INPROGRESS ; +return __irqd_to_state (d) &IRQD_IRQ_INPROGRESS ; }static inline bool irqd_is_wakeup_armed (struct irq_data *d) { -return d->state_use_accessors &IRQD_WAKEUP_ARMED ; +return __irqd_to_state (d) &IRQD_WAKEUP_ARMED ; }
@@ -280,12 +290,12 @@ static inline bool irqd_is_wakeup_armed(struct irq_data *d)*/ static inline void irqd_set_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors |=IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) |=IRQD_IRQ_INPROGRESS ; }static inline void irqd_clr_chained_irq_inprogress (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_IRQ_INPROGRESS ; +__irqd_to_state (d) &= ~IRQD_IRQ_INPROGRESS ; }static inline irq_hw_number_t irqd_to_hwirq (struct irq_data *d)
include/linux/irqdesc.h +2 -1
@@ -17,7 +17,7 @@ struct pt_regs;/** * struct irq_desc - interrupt descriptor -* @irq_data: per irq and chip data passed down to chip functions +* @irq_common_data: per irq and chip data passed down to chip functions * @kstat_irqs: irq stats per cpu * @handle_irq: highlevel irq-events handler * @preflow_handler: handler called before the flow handler (currently used by sparc)
@@ -47,6 +47,7 @@ struct pt_regs;* @name: flow handler name for /proc/interrupts output */ struct irq_desc { +struct irq_common_data irq_common_data;struct irq_data irq_data;unsigned int __percpu *kstat_irqs;irq_flow_handler_t handle_irq;
kernel/irq/internals.h +5 -5
@@ -170,27 +170,27 @@ irq_put_desc_unlock(struct irq_desc *desc, unsigned long flags)*/ static inline void irqd_set_move_pending (struct irq_data *d) { - d->state_use_accessors |=IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) |=IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clr_move_pending (struct irq_data *d) { - d->state_use_accessors &= ~IRQD_SETAFFINITY_PENDING ; +__irqd_to_state (d) &= ~IRQD_SETAFFINITY_PENDING ; }static inline void irqd_clear (struct irq_data *d,unsigned int mask) { - d->state_use_accessors &= ~mask; +__irqd_to_state (d) &= ~mask; }static inline void irqd_set (struct irq_data *d,unsigned int mask) { - d->state_use_accessors |= mask; +__irqd_to_state (d) |= mask; }static inline bool irqd_has_set (struct irq_data *d,unsigned int mask) { -return d->state_use_accessors & mask; +return __irqd_to_state (d) & mask; }static inline void kstat_incr_irqs_this_cpu (unsigned int irq,struct irq_desc *desc)
kernel/irq/irqdesc.c +1 -0
@@ -76,6 +76,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ;
kernel/irq/irqdomain.c +1 -0
@@ -834,6 +834,7 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain,if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq; + irq_data->common = child->common; irq_data->node = child->node; irq_data->domain = domain; }
Signature · 1 line
1.7.10.4
PATCH v2 2/14 genirq: Introduce helper function irq_data_get_node()
In reply to Jiang LiuIntroduce helper function irq_data_get_node() and friends to hide struct irq_data implementation details.
--- include/linux/irq.h | 5 +++++ kernel/irq/internals.h | 5 +++++ kernel/irq/irqdesc.c | 8 +------- kernel/irq/irqdomain.c | 3 ++- kernel/irq/manage.c | 2 +- kernel/irq/proc.c | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-)
include/linux/irq.h +5 -0
@@ -634,6 +634,11 @@ static inline u32 irq_get_trigger_type(unsigned int irq)return d ?irqd_get_trigger_type (d) :0 ; } +static inline int irq_data_get_node (struct irq_data *d) +{ +return d->node; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
kernel/irq/internals.h +5 -0
@@ -199,6 +199,11 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *d__this_cpu_inc (kstat.irqs_sum); } +static inline int irq_desc_get_node (struct irq_desc *desc) +{ +return irq_data_get_node (&desc->irq_data); +} +#ifdef CONFIG_PM_SLEEP bool irq_pm_check_wakeup (struct irq_desc *desc);void irq_pm_install_action (struct irq_desc *desc,struct irqaction *action);
kernel/irq/irqdesc.c +1 -7
@@ -59,16 +59,10 @@ static void desc_smp_init(struct irq_desc *desc, int node)#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,
@@ -300,7 +294,7 @@ static void free_desc(unsigned int irq)unsigned long flags;raw_spin_lock_irqsave (&desc->lock, flags); -desc_set_defaults (irq, desc,desc_node (desc),NULL ); +desc_set_defaults (irq, desc,irq_desc_get_node (desc),NULL );raw_spin_unlock_irqrestore (&desc->lock, flags); }
kernel/irq/irqdomain.c +2 -1
@@ -830,7 +830,8 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain, {struct irq_data *irq_data; - irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , child->node); + irq_data =kzalloc_node (sizeof (*irq_data),GFP_KERNEL , +irq_data_get_node (child));if (irq_data) { child->parent_data = irq_data; irq_data->irq = child->irq;
kernel/irq/manage.c +1 -1
@@ -332,7 +332,7 @@ static int setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask) { struct cpumask *set = irq_default_affinity; -int node = desc->irq_data.node; +int node =irq_desc_get_node (desc);/* Excludes PER_CPU and NO_BALANCE interrupts */ if (!irq_can_set_affinity (irq))
kernel/irq/proc.c +1 -1
@@ -241,7 +241,7 @@ static int irq_node_proc_show(struct seq_file *m, void *v) {struct irq_desc *desc =irq_to_desc ((long ) m->private); -seq_printf (m,"%d\n" , desc->irq_data.node); +seq_printf (m,"%d\n" ,irq_desc_get_node (desc));return 0 ; }
Signature · 1 line
1.7.10.4
PATCH v2 3/14 x86, irq: Use accessor irq_data_get_node() to hide struct irq_data detail
In reply to Jiang LiuUse accessor irq_data_get_node() to hide struct irq_data implementation detail, so we could easily reconstruct struct irq_data later.
--- arch/x86/kernel/apic/vector.c | 8 ++++---- arch/x86/platform/uv/uv_irq.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/x86/kernel/apic/vector.c +4 -4
@@ -296,7 +296,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,struct irq_alloc_info *info = arg;struct apic_chip_data *data;struct irq_data *irq_data; -int i, err; +int i, err, node;if (disable_apic)return -ENXIO ;
@@ -308,12 +308,13 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq,for (i =0 ; i < nr_irqs; i++) { irq_data =irq_domain_get_irq_data (domain, virq + i);BUG_ON (!irq_data); + node =irq_data_get_node (irq_data);#ifdef CONFIG_X86_IO_APIC if (virq + i <nr_legacy_irqs () && legacy_irq_data[virq + i]) data = legacy_irq_data[virq + i]; else#endif - data =alloc_apic_chip_data (irq_data->node); + data =alloc_apic_chip_data (node);if (!data) { err = -ENOMEM ; goto error;
@@ -322,8 +323,7 @@ static int x86_vector_alloc_irqs(struct irq_domain *domain, unsigned int virq, irq_data->chip = &lapic_controller; irq_data->chip_data = data; irq_data->hwirq = virq + i; - err =assign_irq_vector_policy (virq, irq_data->node, data, - info); + err =assign_irq_vector_policy (virq, node, data, info);if (err) goto error; }
arch/x86/platform/uv/uv_irq.c +1 -1
@@ -89,7 +89,7 @@ static int uv_domain_alloc(struct irq_domain *domain, unsigned int virq,return -EINVAL ; chip_data =kmalloc_node (sizeof (*chip_data),GFP_KERNEL , - irq_data->node); +irq_data_get_node (irq_data));if (!chip_data)return -ENOMEM ;
Signature · 1 line
1.7.10.4
PATCH v2 4/14 sh, irq: Use accessor irq_data_get_node() to hide struct irq_data detail
In reply to Jiang LiuUse accessor irq_data_get_node() to hide struct irq_data implementation detail, so we could easily reconstruct struct irq_data later.
--- arch/sh/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/sh/kernel/irq.c +1 -1
@@ -227,7 +227,7 @@ void migrate_irqs(void)for_each_active_irq (irq) {struct irq_data *data =irq_get_irq_data (irq); -if (data->node == cpu) { +if (irq_data_get_node (data) == cpu) {unsigned int newcpu =cpumask_any_and (data->affinity, cpu_online_mask);if (newcpu >= nr_cpu_ids) {
Signature · 1 line
1.7.10.4
PATCH v2 5/14 genirq: Move field 'node' from struct irq_data into struct irq_common_data
In reply to Jiang LiuNUMA node information is per-irq instead of per-irqchip, so move it into struct irq_common_data. Also use CONFIG_NUMA to guard irq_common_data.node.
--- include/linux/irq.h | 17 ++++++++++++++--- kernel/irq/internals.h | 2 +- kernel/irq/irqdesc.c | 4 +++- kernel/irq/irqdomain.c | 1 - 4 files changed, 18 insertions(+), 6 deletions(-)
include/linux/irq.h +14 -3
@@ -129,9 +129,13 @@ struct irq_domain;* struct irq_common_data - per irq data shared by all irqchips * @state_use_accessors: status information for irq chip functions. * Use accessor functions to deal with it +* @node: node index useful for balancing */ struct irq_common_data {unsigned int state_use_accessors; +#ifdef CONFIG_NUMA +unsigned int node; +#endif };/**
@@ -139,7 +143,6 @@ struct irq_common_data {* @mask: precomputed bitmask for accessing the chip registers * @irq: interrupt number * @hwirq: hardware interrupt number, local to the interrupt domain -* @node: node index useful for balancing * @common: point to data shared by all irqchips * @chip: low level interrupt hardware access * @domain: Interrupt translation domain; responsible for mapping
@@ -160,7 +163,6 @@ struct irq_data {u32 mask;unsigned int irq;unsigned long hwirq; -unsigned int node;struct irq_common_data *common;struct irq_chip *chip;struct irq_domain *domain;
@@ -634,9 +636,18 @@ static inline u32 irq_get_trigger_type(unsigned int irq)return d ?irqd_get_trigger_type (d) :0 ; } -static inline int irq_data_get_node (struct irq_data *d) +static inline int irq_common_data_get_node (struct irq_common_data *d) { +#ifdef CONFIG_NUMA return d->node; +#else +return 0 ; +#endif +} + +static inline int irq_data_get_node (struct irq_data *d) +{ +return irq_common_data_get_node (d->common); }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/internals.h +1 -1
@@ -201,7 +201,7 @@ static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *dstatic inline int irq_desc_get_node (struct irq_desc *desc) { -return irq_data_get_node (&desc->irq_data); +return irq_common_data_get_node (&desc->irq_common_data); }#ifdef CONFIG_PM_SLEEP
kernel/irq/irqdesc.c +3 -1
@@ -52,11 +52,13 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)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 +#ifdef CONFIG_NUMA + desc->irq_common_data.node = node; +#endif }#else
kernel/irq/irqdomain.c +0 -1
@@ -836,7 +836,6 @@ static struct irq_data *irq_domain_insert_irq_data(struct irq_domain *domain, child->parent_data = irq_data; irq_data->irq = child->irq; irq_data->common = child->common; - irq_data->node = child->node; irq_data->domain = domain; }
Signature · 1 line
1.7.10.4
PATCH v2 6/14 genirq: Move field 'handler_data' from struct irq_data into struct irq_common_data
In reply to Jiang LiuHandler data (handler_data) is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- arch/sparc/kernel/irq_64.c | 15 +++++++++------ arch/sparc/kernel/sun4d_irq.c | 4 ++-- arch/sparc/kernel/sun4m_irq.c | 6 ++++-- arch/x86/kernel/apic/msi.c | 2 +- arch/x86/kernel/hpet.c | 4 ++-- drivers/gpio/gpio-davinci.c | 2 +- drivers/sh/intc/virq.c | 4 ++-- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 3 ++- 11 files changed, 29 insertions(+), 23 deletions(-)
arch/sparc/kernel/irq_64.c +9 -6
@@ -210,21 +210,21 @@ struct irq_handler_data {static inline unsigned int irq_data_to_handle (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_handle; }static inline unsigned int irq_data_to_ino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->dev_ino; }static inline unsigned long irq_data_to_sysino (struct irq_data *data) { -struct irq_handler_data *ihd = data->handler_data; +struct irq_handler_data *ihd =irq_data_get_irq_handler_data (data);return ihd->sysino; }
@@ -370,8 +370,9 @@ static int irq_choose_cpu(unsigned int irq, const struct cpumask *affinity)static void sun4u_irq_enable (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -393,8 +394,9 @@ static void sun4u_irq_enable(struct irq_data *data)static int sun4u_set_affinity (struct irq_data *data,const struct cpumask *mask,bool force) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data)) {unsigned long cpuid, imap, val;unsigned int tid;
@@ -438,8 +440,9 @@ static void sun4u_irq_disable(struct irq_data *data)static void sun4u_irq_eoi (struct irq_data *data) { -struct irq_handler_data *handler_data = data->handler_data; +struct irq_handler_data *handler_data; + handler_data =irq_data_get_irq_handler_data (data);if (likely (handler_data))upa_writeq (ICLR_IDLE , handler_data->iclr); }
arch/sparc/kernel/sun4d_irq.c +2 -2
@@ -188,7 +188,7 @@ void sun4d_handler_irq(unsigned int pil, struct pt_regs *regs)static void sun4d_mask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
@@ -206,7 +206,7 @@ static void sun4d_mask_irq(struct irq_data *data)static void sun4d_unmask_irq (struct irq_data *data) { -struct sun4d_handler_data *handler_data = data->handler_data; +struct sun4d_handler_data *handler_data =irq_data_get_irq_handler_data (data);unsigned int real_irq;#ifdef CONFIG_SMP int cpuid = handler_data->cpuid;
arch/sparc/kernel/sun4m_irq.c +4 -2
@@ -188,9 +188,10 @@ static unsigned long sun4m_imask[0x50] = {static void sun4m_mask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
@@ -206,9 +207,10 @@ static void sun4m_mask_irq(struct irq_data *data)static void sun4m_unmask_irq (struct irq_data *data) { -struct sun4m_handler_data *handler_data = data->handler_data; +struct sun4m_handler_data *handler_data;int cpu =smp_processor_id (); + handler_data =irq_data_get_irq_handler_data (data);if (handler_data->mask) {unsigned long flags;
arch/x86/kernel/apic/msi.c +1 -1
@@ -263,7 +263,7 @@ static inline int hpet_dev_id(struct irq_domain *domain)static void hpet_msi_write_msg (struct irq_data *data,struct msi_msg *msg) { -hpet_msi_write (data->handler_data, msg); +hpet_msi_write (irq_data_get_irq_handler_data (data), msg); }static struct irq_chip hpet_msi_controller = {
arch/x86/kernel/hpet.c +2 -2
@@ -426,7 +426,7 @@ static struct irq_domain *hpet_domain;void hpet_msi_unmask (struct irq_data *data) { -struct hpet_dev *hdev = data->handler_data; +struct hpet_dev *hdev =irq_data_get_irq_handler_data (data);unsigned int cfg;/* unmask it */
@@ -437,7 +437,7 @@ void hpet_msi_unmask(struct irq_data *data)void hpet_msi_mask (struct irq_data *data) { -struct hpet_dev *hdev = data->handler_data; +struct hpet_dev *hdev =irq_data_get_irq_handler_data (data);unsigned int cfg;/* mask it */
drivers/gpio/gpio-davinci.c +1 -1
@@ -396,7 +396,7 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger)struct davinci_gpio_regs __iomem *g;u32 mask; - d = (struct davinci_gpio_controller *)data->handler_data; + d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data (data); g = (struct davinci_gpio_regs __iomem *)d->regs; mask =__gpio_mask (data->irq - d->gpio_irq);
drivers/sh/intc/virq.c +2 -2
@@ -87,8 +87,8 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)struct irq_data *data =irq_get_irq_data (irq);/* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; -for_each_virq (entry, data->handler_data) { + last = (struct intc_virq_list **)&data->common->handler_data; +for_each_virq (entry,irq_data_get_irq_handler_data (data)) {if (entry->irq == virq)return 0 ; last = &entry->next;
include/linux/irq.h +4 -4
@@ -130,12 +130,14 @@ struct irq_domain;* @state_use_accessors: status information for irq chip functions. * Use accessor functions to deal with it * @node: node index useful for balancing +* @handler_data: per-IRQ data for the irq_chip methods */ struct irq_common_data {unsigned int state_use_accessors;#ifdef CONFIG_NUMA unsigned int node;#endif +void *handler_data; };/**
@@ -149,7 +151,6 @@ struct irq_common_data {* between hwirq number and linux irq number. * @parent_data: pointer to parent struct irq_data to support hierarchy * irq_domain -* @handler_data: per-IRQ data for the irq_chip methods * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor
@@ -169,7 +170,6 @@ struct irq_data {#ifdef CONFIG_IRQ_DOMAIN_HIERARCHY struct irq_data *parent_data;#endif -void *handler_data;void *chip_data;struct msi_desc *msi_desc;cpumask_var_t affinity;
@@ -611,12 +611,12 @@ static inline void *irq_data_get_irq_chip_data(struct irq_data *d)static inline void *irq_get_handler_data (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->handler_data :NULL ; +return d ? d->common->handler_data :NULL ; }static inline void *irq_data_get_irq_handler_data (struct irq_data *d) { -return d->handler_data; +return d->common->handler_data; }static inline struct msi_desc *irq_get_msi_desc (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -111,7 +111,7 @@ static inline void *irq_desc_get_chip_data(struct irq_desc *desc)static inline void *irq_desc_get_handler_data (struct irq_desc *desc) { -return desc->irq_data.handler_data; +return desc->irq_common_data.handler_data; }static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc)
kernel/irq/chip.c +1 -1
@@ -83,7 +83,7 @@ int irq_set_handler_data(unsigned int irq, void *data)if (!desc)return -EINVAL ; - desc->irq_data.handler_data = data; + desc->irq_common_data.handler_data = data;irq_put_desc_unlock (desc, flags);return 0 ; }
kernel/irq/irqdesc.c +2 -1
@@ -72,11 +72,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, {int cpu; + desc->irq_common_data.handler_data =NULL ; + desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.handler_data =NULL ; desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED );
Signature · 1 line
1.7.10.4
Re: [Patch v2 06/14] genirq: Move field 'handler_data' from struct irq_data into struct irq_common_data
Quoted 2 lines · Jiang Liu
Handler data (
handler_data) is per-irq instead of per irqchip, so move it into structirq_common_data.
For review and debugging sake, please do the same split as you did with node. Convert first and then move. 5 patches this time:
Sparc:
Quoted 3 lines
arch/sparc/kernel/irq_64.c | 15 +++++++++------ arch/sparc/kernel/sun4d_irq.c | 4 ++-- arch/sparc/kernel/sun4m_irq.c | 6 ++++--
x86:
Quoted 2 lines
arch/x86/kernel/apic/msi.c | 2 +- arch/x86/kernel/hpet.c | 4 ++--
gpio:
Quoted 1 line
drivers/gpio/gpio-davinci.c | 2 +-
sh:
Quoted 1 line
drivers/sh/intc/virq.c | 4 ++--
Move:
Quoted 10 lines
include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 3 ++-drivers/gpio/gpio-davinci.c +0
-0
drivers/gpio/gpio-davinci.c static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger) · line 399
Quoted 5 lines
drivers/gpio/gpio-davinci.c +1
-1@@ -396,7 +396,7 @@ static int gpio_irq_type_unbanked(struct irq_data *data, unsigned trigger)struct davinci_gpio_regs __iomem *g;u32 mask; - d = (struct davinci_gpio_controller *)data->handler_data; + d = (struct davinci_gpio_controller *)irq_data_get_irq_handler_data (data);
This type cast is silly, handler_data is (void *)
Quoted 8 lines
drivers/gpio/gpio-davinci.c +0
-0g = (struct davinci_gpio_regs __iomem *)d->regs; mask =__gpio_mask (data->irq - d->gpio_irq);drivers/sh/intc/virq.c +0
-0
drivers/sh/intc/virq.c static int add_virq_to_pirq(unsigned int irq, unsigned int virq) · line 90
Quoted 6 lines
drivers/sh/intc/virq.c +1
-2@@ -87,8 +87,8 @@ static int add_virq_to_pirq(unsigned int irq, unsigned int virq)struct irq_data *data =irq_get_irq_data (irq);/* scan for duplicates */ - last = (struct intc_virq_list **)&data->handler_data; -for_each_virq (entry, data->handler_data) { + last = (struct intc_virq_list **)&data->common->handler_data;
That does not make sense. You convert the one below, but not that one to the accessor function.
handler_data is a pointer to a struct intc_virq_list. So
struct intc_virq_list **last, *entry, *head;
head = irq_data_get_irq_handler_data(data);
last = &head;
for_each_virq(entry, head) {
....
}Would be clean code and lets you convert all usage sites of data->handler_data before actually doing the move to common data.
Thanks,
tglx
PATCH v2 7/14 mn10300: Fix incorrect use of data->affinity
In reply to Jiang LiuThe field affinity in struct irq_data is type of cpumask_var_t, so we should pass in data->affinity instead of &data->affinity when calling cpumask_xxxx().
--- arch/mn10300/kernel/irq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/mn10300/kernel/irq.c +3 -3
@@ -320,11 +320,11 @@ void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, &data->affinity) && +if (cpumask_test_cpu (self, data->affinity) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, &data->affinity); +cpumask_set_cpu (cpu_id, data->affinity); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,7 +335,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (&data->affinity, + new =cpumask_any_and (data->affinity, cpu_online_mask); irq_affinity_online[irq] = new;
Signature · 1 line
1.7.10.4
PATCH v2 8/14 genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuIntroduce helper function irq_data_get_affinity_mask() and irq_get_affinity_mask() to hide implementation details, so we could move field 'affinity' from struct irq_data into struct irq_common_data later.
--- arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 4 ++-- arch/arm64/kernel/irq.c | 4 ++-- arch/blackfin/mach-common/ints-priority.c | 3 ++- arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 6 +++--- arch/ia64/kernel/msi_ia64.c | 4 ++-- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/metag/kernel/irq.c | 10 ++++++---- arch/mips/bcm63xx/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 14 ++++++++------ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 ++- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +++++++------ arch/parisc/kernel/irq.c | 12 ++++++------ arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- arch/sh/kernel/irq.c | 7 ++++--- arch/sparc/kernel/irq_64.c | 12 +++++++----- arch/sparc/kernel/leon_kernel.c | 6 +++--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 5 ++--- arch/x86/kernel/irq.c | 5 +++-- arch/xtensa/kernel/irq.c | 10 ++++++---- drivers/irqchip/irq-mips-gic.c | 2 +- drivers/parisc/iosapic.c | 2 +- drivers/sh/intc/chip.c | 6 +++--- drivers/xen/events/events_base.c | 4 ++-- include/linux/irq.h | 12 ++++++++++++ 30 files changed, 93 insertions(+), 69 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -60,7 +60,7 @@ int irq_select_affinity(unsigned int irq) cpu = (cpu < (NR_CPUS -1 ) ? cpu +1 :0 ); last_cpu = cpu; -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); chip->irq_set_affinity (data,cpumask_of (cpu), false);return 0 ; }
arch/arm/kernel/irq.c +2 -2
@@ -140,7 +140,7 @@ int __init arch_probe_nr_irqs(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -160,7 +160,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
arch/arm64/kernel/irq.c +2 -2
@@ -61,7 +61,7 @@ void __init init_IRQ(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -81,7 +81,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
arch/blackfin/mach-common/ints-priority.c +2 -1
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned int irq)#ifdef CONFIG_SMP static void bfin_internal_unmask_irq_chip (struct irq_data *d) { -bfin_internal_unmask_irq_affinity (d->irq, d->affinity); +bfin_internal_unmask_irq_affinity (d->irq, +irq_data_get_affinity_mask (d)); } static int bfin_internal_set_affinity(struct irq_data *d,
arch/ia64/kernel/iosapic.c +1 -1
@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi)if (iosapic_intr_info[irq].count ==0 ) {#ifdef CONFIG_SMP /* Clear affinity */ -cpumask_setall (irq_get_irq_data (irq)->affinity); +cpumask_setall (irq_get_affinity_mask (irq));#endif /* Clear the interrupt information */ iosapic_intr_info[irq].dest =0 ;
arch/ia64/kernel/irq.c +3 -3
@@ -67,7 +67,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };void set_irq_affinity_info (unsigned int irq,int hwid,int redir) {if (irq <NR_IRQS ) { -cpumask_copy (irq_get_irq_data (irq)->affinity, +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu_logical_id (hwid))); irq_redir[irq] = (char ) (redir &0xff ); }
@@ -119,8 +119,8 @@ static void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_any_and (data->affinity, cpu_online_mask) - >= nr_cpu_ids) { +if (cpumask_any_and (irq_data_get_affinity_mask (data), + cpu_online_mask) >= nr_cpu_ids) {/* * Save it for phase 2 processing */
arch/ia64/kernel/msi_ia64.c +2 -2
@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, msg.data = data;pci_write_msi_msg (irq, &msg); -cpumask_copy (idata->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (idata),cpumask_of (cpu));return 0 ; }
@@ -148,7 +148,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, msg.address_lo |=MSI_ADDR_DEST_ID_CPU (cpu_physical_id (cpu));dmar_msi_write (irq, &msg); -cpumask_copy (data->affinity, mask); +cpumask_copy (irq_data_get_affinity_mask (data), mask);return 0 ; }
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, msg.address_lo = (u32)(bus_addr &0x00000000ffffffff );pci_write_msi_msg (irq, &msg); -cpumask_copy (data->affinity, cpu_mask); +cpumask_copy (irq_data_get_affinity_mask (data), cpu_mask);return 0 ; }
arch/metag/kernel/irq.c +6 -4
@@ -270,23 +270,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
arch/mips/bcm63xx/irq.c +1 -1
@@ -60,7 +60,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,if (m) enable &=cpumask_test_cpu (cpu, m);else if (irqd_affinity_was_set (d)) - enable &=cpumask_test_cpu (cpu, d->affinity); + enable &=cpumask_test_cpu (cpu,irq_data_get_affinity_mask (d));#endif return enable; }
arch/mips/cavium-octeon/octeon-irq.c +8 -6
@@ -225,13 +225,14 @@ static int next_cpu_for_irq(struct irq_data *data)#ifdef CONFIG_SMP int cpu; -int weight =cpumask_weight (data->affinity); +struct cpumask *mask =irq_data_get_affinity_mask (data); +int weight =cpumask_weight (mask);struct octeon_ciu_chip_data *cd =irq_data_get_irq_chip_data (data);if (weight >1 ) { cpu = cd->current_cpu;for (;;) { - cpu =cpumask_next (cpu, data->affinity); + cpu =cpumask_next (cpu, mask);if (cpu >= nr_cpu_ids) { cpu =-1 ;continue ;
@@ -240,7 +241,7 @@ static int next_cpu_for_irq(struct irq_data *data) } } }else if (weight ==1 ) { - cpu =cpumask_first (data->affinity); + cpu =cpumask_first (mask); }else { cpu =smp_processor_id (); }
@@ -710,16 +711,17 @@ static void octeon_irq_cpu_offline_ciu(struct irq_data *data) {int cpu =smp_processor_id ();cpumask_t new_affinity; +struct cpumask *mask =irq_data_get_affinity_mask (data); -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu, mask))return ; -if (cpumask_weight (data->affinity) >1 ) { +if (cpumask_weight (mask) >1 ) {/* * It has multi CPU affinity, just remove this CPU * from the affinity set. */ -cpumask_copy (&new_affinity, data->affinity); +cpumask_copy (&new_affinity, mask);cpumask_clear_cpu (cpu, &new_affinity); }else {/* Otherwise, put it on lowest numbered online CPU. */
arch/mips/pmcs-msp71xx/msp_irq_cic.c +2 -1
@@ -88,7 +88,8 @@ static void unmask_cic_irq(struct irq_data *d)* Make sure we have IRQ affinity. It may have changed while * we were processing the IRQ. */ -if (!cpumask_test_cpu (smp_processor_id (), d->affinity)) +if (!cpumask_test_cpu (smp_processor_id (), +irq_data_get_affinity_mask (d)))return ;#endif
arch/mn10300/kernel/cevt-mn10300.c +1 -1
@@ -123,7 +123,7 @@ int __init init_clockevents(void) {struct irq_data *data; data =irq_get_irq_data (cd->irq); -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); iact->flags |=IRQF_NOBALANCING ; }#endif
arch/mn10300/kernel/irq.c +7 -6
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d) tmp2 =GxICR (irq); irq_affinity_online[irq] = -cpumask_any_and (d->affinity, cpu_online_mask); +cpumask_any_and (irq_data_get_affinity_mask (d), + cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d) }else { tmp =GxICR (irq); - irq_affinity_online[irq] =cpumask_any_and (d->affinity, + irq_affinity_online[irq] =cpumask_any_and (irq_data_get_affinity_mask (d), cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void) self =smp_processor_id ();for (irq =0 ; irq <NR_IRQS ; irq++) {struct irq_data *data =irq_get_irq_data (irq); +struct cpumask *mask =irq_data_get_affinity_mask (data);if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, data->affinity) && +if (cpumask_test_cpu (self, mask) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, data->affinity); +cpumask_set_cpu (cpu_id, mask); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (data->affinity, - cpu_online_mask); + new =cpumask_any_and (mask, cpu_online_mask); irq_affinity_online[irq] = new; CROSS_GxICR(irq, new) =
arch/parisc/kernel/irq.c +6 -6
@@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,if (cpu_dest <0 )return -1 ; -cpumask_copy (d->affinity, dest); +cpumask_copy (irq_data_get_affinity_mask (d), dest);return 0 ; }
@@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu) {#ifdef CONFIG_SMP struct irq_data *d =irq_get_irq_data (irq); -cpumask_copy (d->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (cpu));#endif return per_cpu (cpu_data, cpu).txn_addr;
@@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)unsigned long eirr_val;int irq, cpu =smp_processor_id ();#ifdef CONFIG_SMP -struct irq_desc *desc; +struct irq_data *irq_data;cpumask_t dest;#endif
@@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq =eirr_to_irq (eirr_val);#ifdef CONFIG_SMP - desc =irq_to_desc (irq); -cpumask_copy (&dest, desc->irq_data.affinity); -if (irqd_is_per_cpu (&desc->irq_data) && + irq_data =irq_get_irq_data (irq); +cpumask_copy (&dest,irq_data_get_affinity_mask (irq_data)); +if (irqd_is_per_cpu (irq_data) && !cpumask_test_cpu (smp_processor_id (), &dest)) {int cpu =cpumask_first (&dest);
arch/powerpc/kernel/irq.c +1 -1
@@ -441,7 +441,7 @@ void migrate_irqs(void) chip =irq_data_get_irq_chip (data); -cpumask_and (mask, data->affinity, map); +cpumask_and (mask,irq_data_get_affinity_mask (data), map);if (cpumask_any (mask) >= nr_cpu_ids) {pr_warn ("Breaking affinity for irq %i\n" , irq);cpumask_copy (mask, map);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); server =ics_opal_mangle_server (server); rc =opal_set_xive (hw_irq, server,DEFAULT_PRIORITY );
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, server,DEFAULT_PRIORITY );
arch/sh/kernel/irq.c +4 -3
@@ -228,15 +228,16 @@ void migrate_irqs(void)struct irq_data *data =irq_get_irq_data (irq);if (irq_data_get_node (data) == cpu) { -unsigned int newcpu =cpumask_any_and (data->affinity, +struct cpumask *mask =irq_data_get_affinity_mask (data); +unsigned int newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , irq, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (irq, data->affinity); +irq_set_affinity (irq, mask); } } }
arch/sparc/kernel/irq_64.c +7 -5
@@ -377,7 +377,8 @@ static void sun4u_irq_enable(struct irq_data *data)unsigned long cpuid, imap, val;unsigned int tid; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data)); imap = handler_data->imap; tid =sun4u_compute_tid (imap, cpuid);
@@ -449,7 +450,8 @@ static void sun4u_irq_eoi(struct irq_data *data)static void sun4v_irq_enable (struct irq_data *data) { -unsigned long cpuid =irq_choose_cpu (data->irq, data->affinity); +unsigned long cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data));unsigned int ino =irq_data_to_sysino (data);int err;
@@ -511,7 +513,7 @@ static void sun4v_virq_enable(struct irq_data *data)unsigned long cpuid;int err; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq,irq_data_get_affinity_mask (data)); err =sun4v_vintr_set_target (dev_handle, dev_ino, cpuid);if (err !=HV_EOK )
@@ -884,8 +886,8 @@ void fixup_irqs(void)if (desc->action && !irqd_is_per_cpu (data)) {if (data->chip->irq_set_affinity) data->chip->irq_set_affinity (data, - data->affinity, - false); +irq_data_get_affinity_mask (data), + false); }raw_spin_unlock_irqrestore (&desc->lock, flags); }
arch/sparc/kernel/leon_kernel.c +3 -3
@@ -126,7 +126,7 @@ static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest,int oldcpu, newcpu; mask = (unsigned long )data->chip_data; - oldcpu =irq_choose_cpu (data->affinity); + oldcpu =irq_choose_cpu (irq_data_get_affinity_mask (data)); newcpu =irq_choose_cpu (dest);if (oldcpu == newcpu)
@@ -149,7 +149,7 @@ static void leon_unmask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask | mask));
@@ -162,7 +162,7 @@ static void leon_mask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask & ~mask));
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -3
@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -304,7 +304,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -382,7 +383,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
arch/xtensa/kernel/irq.c +6 -4
@@ -166,23 +166,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -403,7 +403,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,clear_bit (irq, pcpu_masks[i].pcpu_mask);set_bit (irq, pcpu_masks[cpumask_first (&tmp)].pcpu_mask); -cpumask_copy (d->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (d), cpumask);spin_unlock_irqrestore (&gic_lock, flags);return IRQ_SET_MASK_OK_NOCOPY ;
drivers/parisc/iosapic.c +1 -1
@@ -691,7 +691,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d,if (dest_cpu <0 )return -1 ; -cpumask_copy (d->affinity,cpumask_of (dest_cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (dest_cpu)); vi->txn_addr =txn_affinity_addr (d->irq, dest_cpu);spin_lock_irqsave (&iosapic_lock, flags);
drivers/sh/intc/chip.c +3 -3
@@ -22,7 +22,7 @@ void _intc_enable(struct irq_data *data, unsigned long handle)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_E (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_E (handle), cpu);
@@ -50,7 +50,7 @@ static void intc_disable(struct irq_data *data)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_D (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_D (handle), cpu);
@@ -72,7 +72,7 @@ static int intc_set_affinity(struct irq_data *data,if (!cpumask_intersects (cpumask, cpu_online_mask))return -1 ; -cpumask_copy (data->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (data), cpumask);return IRQ_SET_MASK_OK_NOCOPY ; }
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
include/linux/irq.h +12 -0
@@ -650,6 +650,18 @@ static inline int irq_data_get_node(struct irq_data *d)return irq_common_data_get_node (d->common); } +static inline struct cpumask *irq_get_affinity_mask (int irq) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ; +} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
Signature · 1 line
1.7.10.4
Re: [Patch v2 08/14] genirq: Introduce helper function irq_data_get_affinity_mask()
Quoted 2 lines · Jiang Liu
Introduce helper function
irq_data_get_affinity_mask()andirq_get_affinity_mask()to hide implementation details,
That patch does way more than introducing the functions. Again:
Patch 1: Introduce helpers
Patch 2-n: Convert users subsystem wise
Thanks,
tglx
Re: [Patch v2 08/14] genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuQuoted 2 lines · Jiang Liu
Introduce helper function
irq_data_get_affinity_mask()andirq_get_affinity_mask()to hide implementation details,
That patch does way more than introducing the functions. Again:
Patch 1: Introduce helpers
Patch 2-n: Convert users subsystem wise
Thanks,
tglx
Re: [Patch v2 08/14] genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuQuoted 36 lines · Jiang Liu
arch/arm/kernel/irq.c +2
-2@@ -140,7 +140,7 @@ int __init arch_probe_nr_irqs(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;@@ -160,7 +160,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }include/linux/irq.h +5
-0@@ -650,6 +650,18 @@ static inline int irq_data_get_node(struct irq_data *d)return irq_common_data_get_node (d->common); } +static inline struct cpumask *irq_get_affinity_mask (int irq) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ;
include/linux/irq.h static inline int irq_data_get_node(struct irq_data *d) · line 667
Quoted 10 lines
include/linux/irq.h +7
-0+} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
For the above only,
Thanks.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
Re: [Patch v2 08/14] genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuQuoted 36 lines · Jiang Liu
arch/arm/kernel/irq.c +2
-2@@ -140,7 +140,7 @@ int __init arch_probe_nr_irqs(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;@@ -160,7 +160,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }include/linux/irq.h +5
-0@@ -650,6 +650,18 @@ static inline int irq_data_get_node(struct irq_data *d)return irq_common_data_get_node (d->common); } +static inline struct cpumask *irq_get_affinity_mask (int irq) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ;
include/linux/irq.h static inline int irq_data_get_node(struct irq_data *d) · line 667
Quoted 10 lines
include/linux/irq.h +7
-0+} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
For the above only,
Thanks.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up according to speedtest.net.
PATCH v2 8/14 genirq: Introduce helper function irq_data_get_affinity_mask()
In reply to Jiang LiuIntroduce helper function irq_data_get_affinity_mask() and irq_get_affinity_mask() to hide implementation details, so we could move field 'affinity' from struct irq_data into struct irq_common_data later.
--- arch/alpha/kernel/irq.c | 2 +- arch/arm/kernel/irq.c | 4 ++-- arch/arm64/kernel/irq.c | 4 ++-- arch/blackfin/mach-common/ints-priority.c | 3 ++- arch/ia64/kernel/iosapic.c | 2 +- arch/ia64/kernel/irq.c | 6 +++--- arch/ia64/kernel/msi_ia64.c | 4 ++-- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/metag/kernel/irq.c | 10 ++++++---- arch/mips/bcm63xx/irq.c | 2 +- arch/mips/cavium-octeon/octeon-irq.c | 14 ++++++++------ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 ++- arch/mn10300/kernel/cevt-mn10300.c | 2 +- arch/mn10300/kernel/irq.c | 13 +++++++------ arch/parisc/kernel/irq.c | 12 ++++++------ arch/powerpc/kernel/irq.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- arch/sh/kernel/irq.c | 7 ++++--- arch/sparc/kernel/irq_64.c | 12 +++++++----- arch/sparc/kernel/leon_kernel.c | 6 +++--- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/vector.c | 5 ++--- arch/x86/kernel/irq.c | 5 +++-- arch/xtensa/kernel/irq.c | 10 ++++++---- drivers/irqchip/irq-mips-gic.c | 2 +- drivers/parisc/iosapic.c | 2 +- drivers/sh/intc/chip.c | 6 +++--- drivers/xen/events/events_base.c | 4 ++-- include/linux/irq.h | 12 ++++++++++++ 30 files changed, 93 insertions(+), 69 deletions(-)
arch/alpha/kernel/irq.c +1 -1
@@ -60,7 +60,7 @@ int irq_select_affinity(unsigned int irq) cpu = (cpu < (NR_CPUS -1 ) ? cpu +1 :0 ); last_cpu = cpu; -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); chip->irq_set_affinity (data,cpumask_of (cpu), false);return 0 ; }
arch/arm/kernel/irq.c +2 -2
@@ -140,7 +140,7 @@ int __init arch_probe_nr_irqs(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -160,7 +160,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
arch/arm64/kernel/irq.c +2 -2
@@ -61,7 +61,7 @@ void __init init_IRQ(void)static bool migrate_one_irq (struct irq_desc *desc) {struct irq_data *d =irq_desc_get_irq_data (desc); -const struct cpumask *affinity = d->affinity; +const struct cpumask *affinity =irq_data_get_affinity_mask (d);struct irq_chip *c;bool ret = false;
@@ -81,7 +81,7 @@ static bool migrate_one_irq(struct irq_desc *desc)if (!c->irq_set_affinity)pr_debug ("IRQ%u: unable to set affinity\n" , d->irq);else if (c->irq_set_affinity (d, affinity, false) ==IRQ_SET_MASK_OK && ret) -cpumask_copy (d->affinity, affinity); +cpumask_copy (irq_data_get_affinity_mask (d), affinity);return ret; }
arch/blackfin/mach-common/ints-priority.c +2 -1
@@ -194,7 +194,8 @@ void bfin_internal_unmask_irq(unsigned int irq)#ifdef CONFIG_SMP static void bfin_internal_unmask_irq_chip (struct irq_data *d) { -bfin_internal_unmask_irq_affinity (d->irq, d->affinity); +bfin_internal_unmask_irq_affinity (d->irq, +irq_data_get_affinity_mask (d)); } static int bfin_internal_set_affinity(struct irq_data *d,
arch/ia64/kernel/iosapic.c +1 -1
@@ -838,7 +838,7 @@ iosapic_unregister_intr (unsigned int gsi)if (iosapic_intr_info[irq].count ==0 ) {#ifdef CONFIG_SMP /* Clear affinity */ -cpumask_setall (irq_get_irq_data (irq)->affinity); +cpumask_setall (irq_get_affinity_mask (irq));#endif /* Clear the interrupt information */ iosapic_intr_info[irq].dest =0 ;
arch/ia64/kernel/irq.c +3 -3
@@ -67,7 +67,7 @@ static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };void set_irq_affinity_info (unsigned int irq,int hwid,int redir) {if (irq <NR_IRQS ) { -cpumask_copy (irq_get_irq_data (irq)->affinity, +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu_logical_id (hwid))); irq_redir[irq] = (char ) (redir &0xff ); }
@@ -119,8 +119,8 @@ static void migrate_irqs(void)if (irqd_is_per_cpu (data))continue ; -if (cpumask_any_and (data->affinity, cpu_online_mask) - >= nr_cpu_ids) { +if (cpumask_any_and (irq_data_get_affinity_mask (data), + cpu_online_mask) >= nr_cpu_ids) {/* * Save it for phase 2 processing */
arch/ia64/kernel/msi_ia64.c +2 -2
@@ -36,7 +36,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata, msg.data = data;pci_write_msi_msg (irq, &msg); -cpumask_copy (idata->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (idata),cpumask_of (cpu));return 0 ; }
@@ -148,7 +148,7 @@ static int dmar_msi_set_affinity(struct irq_data *data, msg.address_lo |=MSI_ADDR_DEST_ID_CPU (cpu_physical_id (cpu));dmar_msi_write (irq, &msg); -cpumask_copy (data->affinity, mask); +cpumask_copy (irq_data_get_affinity_mask (data), mask);return 0 ; }
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -206,7 +206,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data, msg.address_lo = (u32)(bus_addr &0x00000000ffffffff );pci_write_msi_msg (irq, &msg); -cpumask_copy (data->affinity, cpu_mask); +cpumask_copy (irq_data_get_affinity_mask (data), cpu_mask);return 0 ; }
arch/metag/kernel/irq.c +6 -4
@@ -270,23 +270,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
arch/mips/bcm63xx/irq.c +1 -1
@@ -60,7 +60,7 @@ static inline int enable_irq_for_cpu(int cpu, struct irq_data *d,if (m) enable &=cpumask_test_cpu (cpu, m);else if (irqd_affinity_was_set (d)) - enable &=cpumask_test_cpu (cpu, d->affinity); + enable &=cpumask_test_cpu (cpu,irq_data_get_affinity_mask (d));#endif return enable; }
arch/mips/cavium-octeon/octeon-irq.c +8 -6
@@ -225,13 +225,14 @@ static int next_cpu_for_irq(struct irq_data *data)#ifdef CONFIG_SMP int cpu; -int weight =cpumask_weight (data->affinity); +struct cpumask *mask =irq_data_get_affinity_mask (data); +int weight =cpumask_weight (mask);struct octeon_ciu_chip_data *cd =irq_data_get_irq_chip_data (data);if (weight >1 ) { cpu = cd->current_cpu;for (;;) { - cpu =cpumask_next (cpu, data->affinity); + cpu =cpumask_next (cpu, mask);if (cpu >= nr_cpu_ids) { cpu =-1 ;continue ;
@@ -240,7 +241,7 @@ static int next_cpu_for_irq(struct irq_data *data) } } }else if (weight ==1 ) { - cpu =cpumask_first (data->affinity); + cpu =cpumask_first (mask); }else { cpu =smp_processor_id (); }
@@ -710,16 +711,17 @@ static void octeon_irq_cpu_offline_ciu(struct irq_data *data) {int cpu =smp_processor_id ();cpumask_t new_affinity; +struct cpumask *mask =irq_data_get_affinity_mask (data); -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu, mask))return ; -if (cpumask_weight (data->affinity) >1 ) { +if (cpumask_weight (mask) >1 ) {/* * It has multi CPU affinity, just remove this CPU * from the affinity set. */ -cpumask_copy (&new_affinity, data->affinity); +cpumask_copy (&new_affinity, mask);cpumask_clear_cpu (cpu, &new_affinity); }else {/* Otherwise, put it on lowest numbered online CPU. */
arch/mips/pmcs-msp71xx/msp_irq_cic.c +2 -1
@@ -88,7 +88,8 @@ static void unmask_cic_irq(struct irq_data *d)* Make sure we have IRQ affinity. It may have changed while * we were processing the IRQ. */ -if (!cpumask_test_cpu (smp_processor_id (), d->affinity)) +if (!cpumask_test_cpu (smp_processor_id (), +irq_data_get_affinity_mask (d)))return ;#endif
arch/mn10300/kernel/cevt-mn10300.c +1 -1
@@ -123,7 +123,7 @@ int __init init_clockevents(void) {struct irq_data *data; data =irq_get_irq_data (cd->irq); -cpumask_copy (data->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (data),cpumask_of (cpu)); iact->flags |=IRQF_NOBALANCING ; }#endif
arch/mn10300/kernel/irq.c +7 -6
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d) tmp2 =GxICR (irq); irq_affinity_online[irq] = -cpumask_any_and (d->affinity, cpu_online_mask); +cpumask_any_and (irq_data_get_affinity_mask (d), + cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d) }else { tmp =GxICR (irq); - irq_affinity_online[irq] =cpumask_any_and (d->affinity, + irq_affinity_online[irq] =cpumask_any_and (irq_data_get_affinity_mask (d), cpu_online_mask);CROSS_GxICR (irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT; tmp =CROSS_GxICR (irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void) self =smp_processor_id ();for (irq =0 ; irq <NR_IRQS ; irq++) {struct irq_data *data =irq_get_irq_data (irq); +struct cpumask *mask =irq_data_get_affinity_mask (data);if (irqd_is_per_cpu (data))continue ; -if (cpumask_test_cpu (self, data->affinity) && +if (cpumask_test_cpu (self, mask) && !cpumask_intersects (&irq_affinity[irq], cpu_online_mask)) {int cpu_id; cpu_id =cpumask_first (cpu_online_mask); -cpumask_set_cpu (cpu_id, data->affinity); +cpumask_set_cpu (cpu_id, mask); }/* We need to operate irq_affinity_online atomically. */ arch_local_cli_save (flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void)GxICR (irq) = x & GxICR_LEVEL; tmp =GxICR (irq); - new =cpumask_any_and (data->affinity, - cpu_online_mask); + new =cpumask_any_and (mask, cpu_online_mask); irq_affinity_online[irq] = new; CROSS_GxICR(irq, new) =
arch/parisc/kernel/irq.c +6 -6
@@ -131,7 +131,7 @@ static int cpu_set_affinity_irq(struct irq_data *d, const struct cpumask *dest,if (cpu_dest <0 )return -1 ; -cpumask_copy (d->affinity, dest); +cpumask_copy (irq_data_get_affinity_mask (d), dest);return 0 ; }
@@ -339,7 +339,7 @@ unsigned long txn_affinity_addr(unsigned int irq, int cpu) {#ifdef CONFIG_SMP struct irq_data *d =irq_get_irq_data (irq); -cpumask_copy (d->affinity,cpumask_of (cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (cpu));#endif return per_cpu (cpu_data, cpu).txn_addr;
@@ -508,7 +508,7 @@ void do_cpu_irq_mask(struct pt_regs *regs)unsigned long eirr_val;int irq, cpu =smp_processor_id ();#ifdef CONFIG_SMP -struct irq_desc *desc; +struct irq_data *irq_data;cpumask_t dest;#endif
@@ -522,9 +522,9 @@ void do_cpu_irq_mask(struct pt_regs *regs) irq =eirr_to_irq (eirr_val);#ifdef CONFIG_SMP - desc =irq_to_desc (irq); -cpumask_copy (&dest, desc->irq_data.affinity); -if (irqd_is_per_cpu (&desc->irq_data) && + irq_data =irq_get_irq_data (irq); +cpumask_copy (&dest,irq_data_get_affinity_mask (irq_data)); +if (irqd_is_per_cpu (irq_data) && !cpumask_test_cpu (smp_processor_id (), &dest)) {int cpu =cpumask_first (&dest);
arch/powerpc/kernel/irq.c +1 -1
@@ -441,7 +441,7 @@ void migrate_irqs(void) chip =irq_data_get_irq_chip (data); -cpumask_and (mask, data->affinity, map); +cpumask_and (mask,irq_data_get_affinity_mask (data), map);if (cpumask_any (mask) >= nr_cpu_ids) {pr_warn ("Breaking affinity for irq %i\n" , irq);cpumask_copy (mask, map);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -54,7 +54,7 @@ static void ics_opal_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); server =ics_opal_mangle_server (server); rc =opal_set_xive (hw_irq, server,DEFAULT_PRIORITY );
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -47,7 +47,7 @@ static void ics_rtas_unmask_irq(struct irq_data *d)if (hw_irq ==XICS_IPI || hw_irq ==XICS_IRQ_SPURIOUS )return ; - server =xics_get_irq_server (d->irq, d->affinity,0 ); + server =xics_get_irq_server (d->irq,irq_data_get_affinity_mask (d),0 ); call_status =rtas_call (ibm_set_xive,3 ,1 ,NULL , hw_irq, server,DEFAULT_PRIORITY );
arch/sh/kernel/irq.c +4 -3
@@ -228,15 +228,16 @@ void migrate_irqs(void)struct irq_data *data =irq_get_irq_data (irq);if (irq_data_get_node (data) == cpu) { -unsigned int newcpu =cpumask_any_and (data->affinity, +struct cpumask *mask =irq_data_get_affinity_mask (data); +unsigned int newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , irq, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (irq, data->affinity); +irq_set_affinity (irq, mask); } } }
arch/sparc/kernel/irq_64.c +7 -5
@@ -377,7 +377,8 @@ static void sun4u_irq_enable(struct irq_data *data)unsigned long cpuid, imap, val;unsigned int tid; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data)); imap = handler_data->imap; tid =sun4u_compute_tid (imap, cpuid);
@@ -449,7 +450,8 @@ static void sun4u_irq_eoi(struct irq_data *data)static void sun4v_irq_enable (struct irq_data *data) { -unsigned long cpuid =irq_choose_cpu (data->irq, data->affinity); +unsigned long cpuid =irq_choose_cpu (data->irq, +irq_data_get_affinity_mask (data));unsigned int ino =irq_data_to_sysino (data);int err;
@@ -511,7 +513,7 @@ static void sun4v_virq_enable(struct irq_data *data)unsigned long cpuid;int err; - cpuid =irq_choose_cpu (data->irq, data->affinity); + cpuid =irq_choose_cpu (data->irq,irq_data_get_affinity_mask (data)); err =sun4v_vintr_set_target (dev_handle, dev_ino, cpuid);if (err !=HV_EOK )
@@ -884,8 +886,8 @@ void fixup_irqs(void)if (desc->action && !irqd_is_per_cpu (data)) {if (data->chip->irq_set_affinity) data->chip->irq_set_affinity (data, - data->affinity, - false); +irq_data_get_affinity_mask (data), + false); }raw_spin_unlock_irqrestore (&desc->lock, flags); }
arch/sparc/kernel/leon_kernel.c +3 -3
@@ -126,7 +126,7 @@ static int leon_set_affinity(struct irq_data *data, const struct cpumask *dest,int oldcpu, newcpu; mask = (unsigned long )data->chip_data; - oldcpu =irq_choose_cpu (data->affinity); + oldcpu =irq_choose_cpu (irq_data_get_affinity_mask (data)); newcpu =irq_choose_cpu (dest);if (oldcpu == newcpu)
@@ -149,7 +149,7 @@ static void leon_unmask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask | mask));
@@ -162,7 +162,7 @@ static void leon_mask_irq(struct irq_data *data)int cpu; mask = (unsigned long )data->chip_data; - cpu =irq_choose_cpu (data->affinity); + cpu =irq_choose_cpu (irq_data_get_affinity_mask (data));spin_lock_irqsave (&leon_irq_lock, flags); oldmask =LEON3_BYPASS_LOAD_PA (LEON_IMASK (cpu));LEON3_BYPASS_STORE_PA (LEON_IMASK (cpu), (oldmask & ~mask));
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2541,7 +2541,7 @@ void __init setup_ioapic_dest(void)* Honour affinities which have been set in early boot */ if (!irqd_can_balance (idata) ||irqd_affinity_was_set (idata)) - mask = idata->affinity; + mask =irq_data_get_affinity_mask (idata);else mask = apic->target_cpus ();
arch/x86/kernel/apic/vector.c +2 -3
@@ -494,9 +494,8 @@ static int apic_set_affinity(struct irq_data *irq_data, err =assign_irq_vector (irq, data, dest);if (err) { -struct irq_data *top =irq_get_irq_data (irq); - -if (assign_irq_vector (irq, data, top->affinity)) +if (assign_irq_vector (irq, data, +irq_data_get_affinity_mask (irq_data)))pr_err ("Failed to recover vector for irq %d\n" , irq);return err; }
arch/x86/kernel/irq.c +3 -2
@@ -304,7 +304,8 @@ int check_irq_vectors_for_cpu_disable(void)continue ; data =irq_desc_get_irq_data (desc); -cpumask_copy (&affinity_new, data->affinity); +cpumask_copy (&affinity_new, +irq_data_get_affinity_mask (data));cpumask_clear_cpu (this_cpu, &affinity_new);/* Do not count inactive or per-cpu irqs. */
@@ -382,7 +383,7 @@ void fixup_irqs(void)raw_spin_lock (&desc->lock); data =irq_desc_get_irq_data (desc); - affinity = data->affinity; + affinity =irq_data_get_affinity_mask (data);if (!irq_has_action (irq) ||irqd_is_per_cpu (data) ||cpumask_subset (affinity, cpu_online_mask)) {raw_spin_unlock (&desc->lock);
arch/xtensa/kernel/irq.c +6 -4
@@ -166,23 +166,25 @@ void migrate_irqs(void)for_each_active_irq (i) {struct irq_data *data =irq_get_irq_data (i); +struct cpumask *mask;unsigned int newcpu;if (irqd_is_per_cpu (data))continue ; -if (!cpumask_test_cpu (cpu, data->affinity)) + mask =irq_data_get_affinity_mask (data); +if (!cpumask_test_cpu (cpu, mask))continue ; - newcpu =cpumask_any_and (data->affinity, cpu_online_mask); + newcpu =cpumask_any_and (mask, cpu_online_mask);if (newcpu >= nr_cpu_ids) {pr_info_ratelimited ("IRQ%u no longer affine to CPU%u\n" , i, cpu); -cpumask_setall (data->affinity); +cpumask_setall (mask); } -irq_set_affinity (i, data->affinity); +irq_set_affinity (i, mask); } }#endif /* CONFIG_HOTPLUG_CPU */
drivers/irqchip/irq-mips-gic.c +1 -1
@@ -403,7 +403,7 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *cpumask,clear_bit (irq, pcpu_masks[i].pcpu_mask);set_bit (irq, pcpu_masks[cpumask_first (&tmp)].pcpu_mask); -cpumask_copy (d->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (d), cpumask);spin_unlock_irqrestore (&gic_lock, flags);return IRQ_SET_MASK_OK_NOCOPY ;
drivers/parisc/iosapic.c +1 -1
@@ -691,7 +691,7 @@ static int iosapic_set_affinity_irq(struct irq_data *d,if (dest_cpu <0 )return -1 ; -cpumask_copy (d->affinity,cpumask_of (dest_cpu)); +cpumask_copy (irq_data_get_affinity_mask (d),cpumask_of (dest_cpu)); vi->txn_addr =txn_affinity_addr (d->irq, dest_cpu);spin_lock_irqsave (&iosapic_lock, flags);
drivers/sh/intc/chip.c +3 -3
@@ -22,7 +22,7 @@ void _intc_enable(struct irq_data *data, unsigned long handle)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_E (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_E (handle), cpu);
@@ -50,7 +50,7 @@ static void intc_disable(struct irq_data *data)for (cpu =0 ; cpu <SMP_NR (d,_INTC_ADDR_D (handle)); cpu++) {#ifdef CONFIG_SMP -if (!cpumask_test_cpu (cpu, data->affinity)) +if (!cpumask_test_cpu (cpu,irq_data_get_affinity_mask (data)))continue ;#endif addr =INTC_REG (d,_INTC_ADDR_D (handle), cpu);
@@ -72,7 +72,7 @@ static int intc_set_affinity(struct irq_data *data,if (!cpumask_intersects (cpumask, cpu_online_mask))return -1 ; -cpumask_copy (data->affinity, cpumask); +cpumask_copy (irq_data_get_affinity_mask (data), cpumask);return IRQ_SET_MASK_OK_NOCOPY ; }
drivers/xen/events/events_base.c +2 -2
@@ -336,7 +336,7 @@ static void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu)BUG_ON (irq ==-1 );#ifdef CONFIG_SMP -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (cpu)); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (cpu));#endif xen_evtchn_port_bind_to_cpu (info, cpu);
@@ -373,7 +373,7 @@ static void xen_irq_init(unsigned irq)struct irq_info *info;#ifdef CONFIG_SMP /* By default all event channels notify CPU#0. */ -cpumask_copy (irq_get_irq_data (irq)->affinity,cpumask_of (0 )); +cpumask_copy (irq_get_affinity_mask (irq),cpumask_of (0 ));#endif info =kzalloc (sizeof (*info),GFP_KERNEL );
include/linux/irq.h +12 -0
@@ -650,6 +650,18 @@ static inline int irq_data_get_node(struct irq_data *d)return irq_common_data_get_node (d->common); } +static inline struct cpumask *irq_get_affinity_mask (int irq) +{ +struct irq_data *d =irq_get_irq_data (irq); + +return d ? d->affinity :NULL ; +} + +static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) +{ +return d->affinity; +} +unsigned int arch_dynirq_lower_bound (unsigned int from); int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
Signature · 1 line
1.7.10.4
PATCH v2 9/14 net/mlx4: Cache irq_desc->affinity instead of irq_desc
In reply to Jiang LiuThe field 'affinity' in irq_desc won't change once the irq_desc data structure is created. So cache irq_desc->affinity instead of irq_desc. This also helps to hide struct irq_desc from device drivers.
--- drivers/net/ethernet/mellanox/mlx4/en_cq.c | 6 +++--- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 5 +---- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx4/en_cq.c +3 -3
@@ -31,6 +31,7 @@* */ +#include <linux/irq.h> #include <linux/mlx4/cq.h> #include <linux/mlx4/qp.h> #include <linux/mlx4/cmd.h>
@@ -135,9 +136,8 @@ int mlx4_en_activate_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq, mdev->dev->caps.num_comp_vectors; } - cq->irq_desc = -irq_to_desc (mlx4_eq_get_irq (mdev->dev, - cq->vector)); + cq->irq_affinity =irq_get_affinity_mask ( +mlx4_eq_get_irq (mdev->dev, cq->vector)); }else {/* For TX we use the same irq per ring we assigned for the RX */
drivers/net/ethernet/mellanox/mlx4/en_rx.c +1 -4
@@ -1044,14 +1044,11 @@ int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget)/* If we used up all the quota - we're probably not done yet... */ if (done == budget) {int cpu_curr; -const struct cpumask *aff;INC_PERF_COUNTER (priv->pstats.napi_quota); cpu_curr =smp_processor_id (); - aff =irq_desc_get_irq_data (cq->irq_desc)->affinity; - -if (likely (cpumask_test_cpu (cpu_curr, aff))) +if (likely (cpumask_test_cpu (cpu_curr, cq->irq_affinity)))return budget;/* Current cpu is not according to smp_irq_affinity -
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h +1 -1
@@ -357,7 +357,7 @@ struct mlx4_en_cq {#define CQ_USER_PEND (MLX4_EN_CQ_STATE_POLL | MLX4_EN_CQ_STATE_POLL_YIELD)spinlock_t poll_lock;/* protects from LLS/napi conflicts */ #endif /* CONFIG_NET_RX_BUSY_POLL */ -struct irq_desc *irq_desc; +struct cpumask *irq_affinity; };struct mlx4_en_port_profile {
Signature · 1 line
1.7.10.4
PATCH v2 10/14 genirq: Move field 'affinity' from struct irq_data into struct irq_common_data
In reply to Jiang LiuIrq affinity mask is per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 12 ++++++------ kernel/irq/irqdesc.c | 9 +++++---- kernel/irq/manage.c | 12 ++++++------ kernel/irq/proc.c | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-)
include/linux/irq.h +6 -6
@@ -110,8 +110,8 @@ enum {/* * Return value for chip->irq_set_affinity() * -* IRQ_SET_MASK_OK - OK, core updates irq_data.affinity -* IRQ_SET_MASK_NOCPY - OK, chip did update irq_data.affinity +* IRQ_SET_MASK_OK - OK, core updates irq_common_data.affinity +* IRQ_SET_MASK_NOCPY - OK, chip did update irq_common_data.affinity * IRQ_SET_MASK_OK_DONE - Same as IRQ_SET_MASK_OK for core. Special code to * support stacked irqchips, which indicates skipping * all descendent irqchips.
@@ -131,6 +131,7 @@ struct irq_domain;* Use accessor functions to deal with it * @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods +* @affinity: IRQ affinity on SMP */ struct irq_common_data {unsigned int state_use_accessors;
@@ -138,6 +139,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +cpumask_var_t affinity; };/**
@@ -154,7 +156,6 @@ struct irq_common_data {* @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations * @msi_desc: MSI descriptor -* @affinity: IRQ affinity on SMP * * The fields here need to overlay the ones in irq_desc until we * cleaned up the direct references and switched everything over to
@@ -172,7 +173,6 @@ struct irq_data {#endif void *chip_data;struct msi_desc *msi_desc; -cpumask_var_t affinity; };/*
@@ -654,12 +654,12 @@ static inline struct cpumask *irq_get_affinity_mask(int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->affinity :NULL ; +return d ? d->common->affinity :NULL ; }static inline struct cpumask *irq_data_get_affinity_mask (struct irq_data *d) { -return d->affinity; +return d->common->affinity; }unsigned int arch_dynirq_lower_bound (unsigned int from);
kernel/irq/irqdesc.c +5 -4
@@ -38,12 +38,13 @@ static void __init init_irq_default_affinity(void)#ifdef CONFIG_SMP static int alloc_masks (struct irq_desc *desc,gfp_t gfp,int node) { -if (!zalloc_cpumask_var_node (&desc->irq_data.affinity, gfp, node)) +if (!zalloc_cpumask_var_node (&desc->irq_common_data.affinity, + gfp, node))return -ENOMEM ;#ifdef CONFIG_GENERIC_PENDING_IRQ if (!zalloc_cpumask_var_node (&desc->pending_mask, gfp, node)) { -free_cpumask_var (desc->irq_data.affinity); +free_cpumask_var (desc->irq_common_data.affinity);return -ENOMEM ; }#endif
@@ -52,7 +53,7 @@ static int alloc_masks(struct irq_desc *desc, gfp_t gfp, int node)static void desc_smp_init (struct irq_desc *desc,int node) { -cpumask_copy (desc->irq_data.affinity, irq_default_affinity); +cpumask_copy (desc->irq_common_data.affinity, irq_default_affinity);#ifdef CONFIG_GENERIC_PENDING_IRQ cpumask_clear (desc->pending_mask);#endif
@@ -124,7 +125,7 @@ static void free_masks(struct irq_desc *desc)#ifdef CONFIG_GENERIC_PENDING_IRQ free_cpumask_var (desc->pending_mask);#endif - free_cpumask_var(desc->irq_data.affinity); + free_cpumask_var(desc->irq_common_data.affinity); }#else static inline void free_masks (struct irq_desc *desc) { }
kernel/irq/manage.c +6 -6
@@ -190,7 +190,7 @@ int irq_do_set_affinity(struct irq_data *data, const struct cpumask *mask,switch (ret) {case IRQ_SET_MASK_OK :case IRQ_SET_MASK_OK_DONE : -cpumask_copy (data->affinity, mask); +cpumask_copy (desc->irq_common_data.affinity, mask);case IRQ_SET_MASK_OK_NOCOPY :irq_set_thread_affinity (desc); ret =0 ;
@@ -271,7 +271,7 @@ static void irq_affinity_notify(struct work_struct *work)if (irq_move_pending (&desc->irq_data))irq_get_pending (cpumask, desc);else -cpumask_copy (cpumask, desc->irq_data.affinity); +cpumask_copy (cpumask, desc->irq_common_data.affinity);raw_spin_unlock_irqrestore (&desc->lock, flags); notify->notify (notify, cpumask);
@@ -343,9 +343,9 @@ setup_affinity(unsigned int irq, struct irq_desc *desc, struct cpumask *mask)* one of the targets is online. */ if (irqd_has_set (&desc->irq_data,IRQD_AFFINITY_SET )) { -if (cpumask_intersects (desc->irq_data.affinity, +if (cpumask_intersects (desc->irq_common_data.affinity, cpu_online_mask)) - set = desc->irq_data.affinity; + set = desc->irq_common_data.affinity;else irqd_clear (&desc->irq_data,IRQD_AFFINITY_SET ); }
@@ -796,8 +796,8 @@ irq_thread_check_affinity(struct irq_desc *desc, struct irqaction *action)* This code is triggered unconditionally. Check the affinity * mask pointer. For CPU_MASK_OFFSTACK=n this is optimized out. */ -if (desc->irq_data.affinity) -cpumask_copy (mask, desc->irq_data.affinity); +if (desc->irq_common_data.affinity) +cpumask_copy (mask, desc->irq_common_data.affinity);else valid = false;raw_spin_unlock_irq (&desc->lock);
kernel/irq/proc.c +1 -1
@@ -39,7 +39,7 @@ static struct proc_dir_entry *root_irq_dir;static int show_irq_affinity (int type,struct seq_file *m,void *v) {struct irq_desc *desc =irq_to_desc ((long )m->private); -const struct cpumask *mask = desc->irq_data.affinity; +const struct cpumask *mask = desc->irq_common_data.affinity;#ifdef CONFIG_GENERIC_PENDING_IRQ if (irqd_is_setaffinity_pending (&desc->irq_data))
Signature · 1 line
1.7.10.4
PATCH v2 11/14 genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
In reply to Jiang LiuRename irq_data_get_msi() as irq_data_get_msi_desc() to keep consistency with other irq_data access helpers.
--- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/msi.c | 2 +- include/linux/irq.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/pci/host/pcie-designware.c +1 -1
@@ -309,7 +309,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,static void dw_msi_teardown_irq (struct msi_controller *chip,unsigned int irq) {struct irq_data *data =irq_get_irq_data (irq); -struct msi_desc *msi =irq_data_get_msi (data); +struct msi_desc *msi =irq_data_get_msi_desc (data);struct pcie_port *pp =sys_to_pcie (msi->dev->bus->sysdata);clear_irq_range (pp, irq,1 , data->hwirq);
drivers/pci/msi.c +1 -1
@@ -270,7 +270,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)static void msi_set_mask_bit (struct irq_data *data,u32 flag) { -struct msi_desc *desc =irq_data_get_msi (data); +struct msi_desc *desc =irq_data_get_msi_desc (data);if (desc->msi_attrib.is_msix) {msix_mask_irq (desc, flag);
include/linux/irq.h +1 -1
@@ -625,7 +625,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)return d ? d->msi_desc :NULL ; } -static inline struct msi_desc *irq_data_get_msi (struct irq_data *d) +static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) {return d->msi_desc; }
Signature · 1 line
1.7.10.4
Re: [Patch v2 11/14] genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
Quoted 4 lines · Jiang Liu
Rename
irq_data_get_msi()asirq_data_get_msi_desc()to keep consistency with otherirq_dataaccess helpers.Signed-off-by Jiang Liu <[email protected]>
I assume Thomas will handle this whole series.
Quoted 48 lines
--- drivers/pci/host/pcie-designware.c | 2 +- drivers/pci/msi.c | 2 +- include/linux/irq.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)drivers/pci/host/pcie-designware.c +1
-1@@ -309,7 +309,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,static void dw_msi_teardown_irq (struct msi_controller *chip,unsigned int irq) {struct irq_data *data =irq_get_irq_data (irq); -struct msi_desc *msi =irq_data_get_msi (data); +struct msi_desc *msi =irq_data_get_msi_desc (data);struct pcie_port *pp =sys_to_pcie (msi->dev->bus->sysdata);clear_irq_range (pp, irq,1 , data->hwirq);drivers/pci/msi.c +1
-1@@ -270,7 +270,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)static void msi_set_mask_bit (struct irq_data *data,u32 flag) { -struct msi_desc *desc =irq_data_get_msi (data); +struct msi_desc *desc =irq_data_get_msi_desc (data);if (desc->msi_attrib.is_msix) {msix_mask_irq (desc, flag);include/linux/irq.h +1
-2@@ -625,7 +625,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)return d ? d->msi_desc :NULL ; } -static inline struct msi_desc *irq_data_get_msi (struct irq_data *d) +static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) {return d->msi_desc; } --1.7.10.4
PATCH v2 12/14 genirq: Use helper function to access irq_data->msi_desc
In reply to Jiang LiuUse irq_data access helper to access irq_data->msi_desc, so we could move msi_desc from struct irq_data into struct irq_common_data later.
--- arch/ia64/kernel/msi_ia64.c | 2 +- arch/ia64/sn/kernel/msi_sn.c | 2 +- arch/powerpc/sysdev/xics/ics-opal.c | 2 +- arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- arch/tile/kernel/pci_gx.c | 2 +- drivers/pci/msi.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
arch/ia64/kernel/msi_ia64.c +1 -1
@@ -23,7 +23,7 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,if (irq_prepare_move (irq, cpu))return -1 ; -__get_cached_msi_msg (idata->msi_desc, &msg); +__get_cached_msi_msg (irq_data_get_msi_desc (idata), &msg); addr = msg.address_lo; addr &=MSI_ADDR_DEST_ID_MASK ;
arch/ia64/sn/kernel/msi_sn.c +1 -1
@@ -175,7 +175,7 @@ static int sn_set_msi_irq_affinity(struct irq_data *data,* Release XIO resources for the old MSI PCI address */ -__get_cached_msi_msg (data->msi_desc, &msg); +__get_cached_msi_msg (irq_data_get_msi_desc (data), &msg); sn_pdev = (struct pcidev_info *)sn_irq_info->irq_pciioinfo; pdev = sn_pdev->pdi_linux_pcidev; provider =SN_PCIDEV_BUSPROVIDER (pdev);
arch/powerpc/sysdev/xics/ics-opal.c +1 -1
@@ -72,7 +72,7 @@ static unsigned int ics_opal_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif
arch/powerpc/sysdev/xics/ics-rtas.c +1 -1
@@ -75,7 +75,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)* card, using the MSI mask bits. Firmware doesn't appear to unmask * at that level, so we do it here by hand. */ -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);#endif /* unmask it */
arch/tile/kernel/pci_gx.c +1 -1
@@ -1442,7 +1442,7 @@ static struct pci_ops tile_cfg_ops = {/* MSI support starts here. */ static unsigned int tilegx_msi_startup (struct irq_data *d) { -if (d->msi_desc) +if (irq_data_get_msi_desc (d))pci_msi_unmask_irq (d);return 0 ;
drivers/pci/msi.c +1 -1
@@ -1178,7 +1178,7 @@ EXPORT_SYMBOL(pci_enable_msix_range);*/ void pci_msi_domain_write_msg (struct irq_data *irq_data,struct msi_msg *msg) { -struct msi_desc *desc = irq_data->msi_desc; +struct msi_desc *desc =irq_data_get_msi_desc (irq_data);/* * For MSI-X desc->irq is always equal to irq_data->irq. For
Signature · 1 line
1.7.10.4
PATCH v2 13/14 genirq: Move field 'msi_desc' from struct irq_data into struct irq_common_data
In reply to Jiang LiuMSI descriptors are per-irq instead of per irqchip, so move it into struct irq_common_data.
--- include/linux/irq.h | 8 ++++---- include/linux/irqdesc.h | 2 +- kernel/irq/chip.c | 2 +- kernel/irq/irqdesc.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
include/linux/irq.h +4 -4
@@ -132,6 +132,7 @@ struct irq_domain;* @node: node index useful for balancing * @handler_data: per-IRQ data for the irq_chip methods * @affinity: IRQ affinity on SMP +* @msi_desc: MSI descriptor */ struct irq_common_data {unsigned int state_use_accessors;
@@ -139,6 +140,7 @@ struct irq_common_data {unsigned int node;#endif void *handler_data; +struct msi_desc *msi_desc;cpumask_var_t affinity; };
@@ -155,7 +157,6 @@ struct irq_common_data {* irq_domain * @chip_data: platform-specific per-chip private data for the chip * methods, to allow shared chip implementations -* @msi_desc: MSI descriptor * * The fields here need to overlay the ones in irq_desc until we * cleaned up the direct references and switched everything over to
@@ -172,7 +173,6 @@ struct irq_data {struct irq_data *parent_data;#endif void *chip_data; -struct msi_desc *msi_desc; };/*
@@ -622,12 +622,12 @@ static inline void *irq_data_get_irq_handler_data(struct irq_data *d)static inline struct msi_desc *irq_get_msi_desc (unsigned int irq) {struct irq_data *d =irq_get_irq_data (irq); -return d ? d->msi_desc :NULL ; +return d ? d->common->msi_desc :NULL ; }static inline struct msi_desc *irq_data_get_msi_desc (struct irq_data *d) { -return d->msi_desc; +return d->common->msi_desc; }static inline u32 irq_get_trigger_type (unsigned int irq)
include/linux/irqdesc.h +1 -1
@@ -116,7 +116,7 @@ static inline void *irq_desc_get_handler_data(struct irq_desc *desc)static inline struct msi_desc *irq_desc_get_msi_desc (struct irq_desc *desc) { -return desc->irq_data.msi_desc; +return desc->irq_common_data.msi_desc; }/*
kernel/irq/chip.c +1 -1
@@ -105,7 +105,7 @@ int irq_set_msi_desc_off(unsigned int irq_base, unsigned int irq_offset,if (!desc)return -EINVAL ; - desc->irq_data.msi_desc = entry; + desc->irq_common_data.msi_desc = entry;if (entry && !irq_offset) entry->irq = irq_base;irq_put_desc_unlock (desc, flags);
kernel/irq/irqdesc.c +1 -1
@@ -74,12 +74,12 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node,int cpu; desc->irq_common_data.handler_data =NULL ; + desc->irq_common_data.msi_desc =NULL ; desc->irq_data.common = &desc->irq_common_data; desc->irq_data.irq = irq; desc->irq_data.chip = &no_irq_chip; desc->irq_data.chip_data =NULL ; - desc->irq_data.msi_desc =NULL ;irq_settings_clr_and_set (desc, ~0 , _IRQ_DEFAULT_INIT_FLAGS);irqd_set (&desc->irq_data,IRQD_IRQ_DISABLED ); desc->handle_irq = handle_bad_irq;
Signature · 1 line
1.7.10.4
PATCH v2 14/14 genirq: Pass irq_data to helper function __irq_set_chip_handler_name_locked()
In reply to Jiang LiuFor most cases, callers pass irq_data->irq to helper function __irq_set_chip_handler_name_locked() and __irq_set_chip_handler_name_locked() looks up irq_data again by calling irq_get_irq_data(irq_data->irq).
So pass irq_data directly instead of irq_data->irq to __irq_set_chip_handler_name_locked().
This also helps to better support hierarchy irqdomain in irq core.
--- arch/ia64/kernel/iosapic.c | 6 +++--- arch/mips/alchemy/common/irq.c | 4 ++-- drivers/gpio/gpio-zynq.c | 9 ++++----- drivers/irqchip/irq-metag-ext.c | 5 ++--- drivers/irqchip/irq-mips-gic.c | 11 ++++------- include/linux/irqdesc.h | 12 ++++++++---- 6 files changed, 23 insertions(+), 24 deletions(-)
arch/ia64/kernel/iosapic.c +3 -3
@@ -610,9 +610,9 @@ register_intr (unsigned int gsi, int irq, unsigned char delivery, chip->name, irq_type->name); chip = irq_type; } -__irq_set_chip_handler_name_locked (irq, chip, trigger ==IOSAPIC_EDGE ? - handle_edge_irq : handle_level_irq, -NULL ); +__irq_set_chip_handler_name_locked (irq_get_irq_data (irq), chip, + trigger ==IOSAPIC_EDGE ? handle_edge_irq : handle_level_irq, +NULL );return 0 ; }
arch/mips/alchemy/common/irq.c +2 -2
@@ -491,7 +491,7 @@ static int au1x_ic_settype(struct irq_data *d, unsigned int flow_type)default : ret = -EINVAL ; } -__irq_set_chip_handler_name_locked (d->irq, chip, handler, name); +__irq_set_chip_handler_name_locked (d, chip, handler, name);wmb ();
@@ -703,7 +703,7 @@ static int au1300_gpic_settype(struct irq_data *d, unsigned int type)return -EINVAL ; } -__irq_set_chip_handler_name_locked (d->irq, &au1300_gpic, hdl, name); +__irq_set_chip_handler_name_locked (d, &au1300_gpic, hdl, name);au1300_gpic_chgcfg (d->irq -ALCHEMY_GPIC_INT_BASE ,GPIC_CFG_IC_MASK , s);
drivers/gpio/gpio-zynq.c +4 -5
@@ -422,13 +422,12 @@ static int zynq_gpio_set_irq_type(struct irq_data *irq_data, unsigned int type)writel_relaxed (int_any, gpio->base_addr +ZYNQ_GPIO_INTANY_OFFSET (bank_num)); -if (type &IRQ_TYPE_LEVEL_MASK ) { -__irq_set_chip_handler_name_locked (irq_data->irq, +if (type &IRQ_TYPE_LEVEL_MASK ) +__irq_set_chip_handler_name_locked (irq_data, &zynq_gpio_level_irqchip, handle_fasteoi_irq,NULL ); - }else { -__irq_set_chip_handler_name_locked (irq_data->irq, +else +__irq_set_chip_handler_name_locked (irq_data, &zynq_gpio_edge_irqchip, handle_level_irq,NULL ); - }return 0 ; }
drivers/irqchip/irq-metag-ext.c +2 -3
@@ -404,7 +404,6 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)#ifdef CONFIG_METAG_SUSPEND_MEM struct meta_intc_priv *priv = &meta_intc_priv;#endif -unsigned int irq = data->irq;irq_hw_number_t hw = data->hwirq;unsigned int bit =1 <<meta_intc_offset (hw);void __iomem *level_addr =meta_intc_level_addr (hw);
@@ -413,10 +412,10 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)/* update the chip/handler */ if (flow_type &IRQ_TYPE_LEVEL_MASK ) -__irq_set_chip_handler_name_locked (irq, &meta_intc_level_chip, +__irq_set_chip_handler_name_locked (data, &meta_intc_level_chip, handle_level_irq,NULL );else -__irq_set_chip_handler_name_locked (irq, &meta_intc_edge_chip, +__irq_set_chip_handler_name_locked (data, &meta_intc_edge_chip, handle_edge_irq,NULL );/* and clear/set the bit in HWLEVELEXT */
drivers/irqchip/irq-mips-gic.c +4 -7
@@ -365,15 +365,12 @@ static int gic_set_type(struct irq_data *d, unsigned int type)break ; } -if (is_edge) { -__irq_set_chip_handler_name_locked (d->irq, - &gic_edge_irq_controller, +if (is_edge) +__irq_set_chip_handler_name_locked (d, &gic_edge_irq_controller, handle_edge_irq,NULL ); - }else { -__irq_set_chip_handler_name_locked (d->irq, - &gic_level_irq_controller, +else +__irq_set_chip_handler_name_locked (d, &gic_level_irq_controller, handle_level_irq,NULL ); - }spin_unlock_irqrestore (&gic_lock, flags);return 0 ;
include/linux/irqdesc.h +8 -4
@@ -94,6 +94,11 @@ struct irq_desc {extern struct irq_desc irq_desc[NR_IRQS ];#endif +static inline struct irq_desc *irq_data_to_desc (struct irq_data *data) +{ + return container_of(data->common, struct irq_desc, irq_common_data); +} +static inline struct irq_data *irq_desc_get_irq_data (struct irq_desc *desc) {return &desc->irq_data;
@@ -168,15 +173,14 @@ static inline void __irq_set_handler_locked(unsigned int irq,/* caller has locked the irq_desc and both params are valid */ static inline void -__irq_set_chip_handler_name_locked (unsigned int irq,struct irq_chip *chip, +__irq_set_chip_handler_name_locked (struct irq_data *data,struct irq_chip *chip,irq_flow_handler_t handler,const char *name) { -struct irq_desc *desc; +struct irq_desc *desc =irq_data_to_desc (data); - desc =irq_to_desc (irq); -irq_desc_get_irq_data (desc)->chip = chip; desc->handle_irq = handler; desc->name = name; + data->chip = chip; }static inline int irq_balancing_disabled (unsigned int irq)
Signature · 1 line
1.7.10.4