lkml.org 
[lkml]   [2015]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:irq/urgent] genirq: Move field 'node' from irq_data into irq_common_data
    Commit-ID:  449e9cae58b06be1293858ec8e5d8cb728238baa
    Gitweb: http://git.kernel.org/tip/449e9cae58b06be1293858ec8e5d8cb728238baa
    Author: Jiang Liu <jiang.liu@linux.intel.com>
    AuthorDate: Mon, 1 Jun 2015 16:05:16 +0800
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitDate: Wed, 16 Sep 2015 15:46:49 +0200

    genirq: Move field 'node' from irq_data into irq_common_data

    NUMA 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.

    Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
    Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Randy Dunlap <rdunlap@infradead.org>
    Cc: Yinghai Lu <yinghai@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Jason Cooper <jason@lakedaemon.net>
    Cc: Kevin Cernekee <cernekee@gmail.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Link: http://lkml.kernel.org/r/1433145945-789-8-git-send-email-jiang.liu@linux.intel.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    ---
    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(-)

    diff --git a/include/linux/irq.h b/include/linux/irq.h
    index e54ae82..ebcc5c6 100644
    --- a/include/linux/irq.h
    +++ b/include/linux/irq.h
    @@ -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
    @@ -156,7 +159,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;
    @@ -664,9 +666,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);
    }

    static inline struct cpumask *irq_get_affinity_mask(int irq)
    diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
    index eee4b38..5ef0c2d 100644
    --- a/kernel/irq/internals.h
    +++ b/kernel/irq/internals.h
    @@ -194,7 +194,7 @@ static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)

    static 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
    diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
    index 0a2a4b6..7f3e9fa 100644
    --- a/kernel/irq/irqdesc.c
    +++ b/kernel/irq/irqdesc.c
    @@ -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
    diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
    index 79baaf8..dc9d27c 100644
    --- a/kernel/irq/irqdomain.c
    +++ b/kernel/irq/irqdomain.c
    @@ -844,7 +844,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;
    }


    \
     
     \ /
      Last update: 2015-09-16 23:21    [W:4.116 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site