As I said in 2/2:
Move the initialization of irq_default_affinity to early_irq_init
as core_initcall is too late.
irq_default_affinity can be used in init_IRQ and potentially timer
and SMP init as well. All of these happen before core_initcall.
Moving the initialization to early_irq_init ensures that it is
initialized before it is used.
Mike Travis pointed out that irq_default_affinity depends on
CONFIG_GENERIC_HARDIRQS in addition to CONFIG_SMP. So to make things
consistent, I added 1/2 so that the irq_*_affinity functions and
irq_default_affinity are defined for the same conditions that they are
declared.
I Took Linus' suggestion to move init_irq_default_affinity over to
kernel/irq/handle.c, however due to the way that cpumask_*() are
defined, it is still necessary to have the ugly ifdefs, but now they
are localized to init_irq_default_affinity.
Mike Travis also suggested that alloc_bootmem_cpumask_var() be used in
preference to alloc_cpumask_var, so I incorporated that suggestion as
well.
I tested both with and without CONFIG_SMP, on mips/cavium_octeon, Mike
tested a similar(but not identical patch) on x86_64.
I will reply with the two patches.
David Daney (2):
Make irq_*_affinity depend on CONFIG_GENERIC_HARDIRQS too.
cpumask fallout: Initialize irq_default_affinity earlier (v2).
kernel/irq/handle.c | 12 ++++++++++++
kernel/irq/manage.c | 10 +---------
2 files changed, 13 insertions(+), 9 deletions(-)
In interrupt.h these functions are declared only if
CONFIG_GENERIC_HARDIRQS is set. We should define them under identical
conditions.
Signed-off-by: David Daney <[email protected]>
---
kernel/irq/manage.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index cd0cd8d..618a64f 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -15,7 +15,7 @@
#include "internals.h"
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
cpumask_var_t irq_default_affinity;
static int init_irq_default_affinity(void)
--
1.5.6.6
Move the initialization of irq_default_affinity to early_irq_init as
core_initcall is too late.
irq_default_affinity can be used in init_IRQ and potentially timer and
SMP init as well. All of these happen before core_initcall. Moving
the initialization to early_irq_init ensures that it is initialized
before it is used.
Signed-off-by: David Daney <[email protected]>
---
kernel/irq/handle.c | 12 ++++++++++++
kernel/irq/manage.c | 8 --------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index c20db0b..a9fbb01 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -39,6 +39,14 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
ack_bad_irq(irq);
}
+static inline void __init init_irq_default_affinity(void)
+{
+#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
+ alloc_bootmem_cpumask_var(&irq_default_affinity);
+ cpumask_setall(irq_default_affinity);
+#endif
+}
+
/*
* Linux has a controller-independent interrupt architecture.
* Every controller has a 'controller-template', that is used
@@ -134,6 +142,8 @@ int __init early_irq_init(void)
int legacy_count;
int i;
+ init_irq_default_affinity();
+
desc = irq_desc_legacy;
legacy_count = ARRAY_SIZE(irq_desc_legacy);
@@ -219,6 +229,8 @@ int __init early_irq_init(void)
int count;
int i;
+ init_irq_default_affinity();
+
desc = irq_desc;
count = ARRAY_SIZE(irq_desc);
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 618a64f..291f036 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -18,14 +18,6 @@
#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
cpumask_var_t irq_default_affinity;
-static int init_irq_default_affinity(void)
-{
- alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL);
- cpumask_setall(irq_default_affinity);
- return 0;
-}
-core_initcall(init_irq_default_affinity);
-
/**
* synchronize_irq - wait for pending IRQ handlers (on other CPUs)
* @irq: interrupt number to wait for
--
1.5.6.6
#ifdef X
void func(args)
{
operation();
}
#else
void func(args)
{
}
#endif
is better than:
void func(args)
{
#ifdef X
operation();
#endif
}
IMHO.
On Fri, Jan 9, 2009 at 12:55 AM, David Daney <[email protected]> wrote:
> Move the initialization of irq_default_affinity to early_irq_init as
> core_initcall is too late.
>
> irq_default_affinity can be used in init_IRQ and potentially timer and
> SMP init as well. All of these happen before core_initcall. Moving
> the initialization to early_irq_init ensures that it is initialized
> before it is used.
>
> Signed-off-by: David Daney <[email protected]>
> ---
> kernel/irq/handle.c | 12 ++++++++++++
> kernel/irq/manage.c | 8 --------
> 2 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
> index c20db0b..a9fbb01 100644
> --- a/kernel/irq/handle.c
> +++ b/kernel/irq/handle.c
> @@ -39,6 +39,14 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
> ack_bad_irq(irq);
> }
>
> +static inline void __init init_irq_default_affinity(void)
> +{
> +#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> + alloc_bootmem_cpumask_var(&irq_default_affinity);
> + cpumask_setall(irq_default_affinity);
> +#endif
> +}
> +
> /*
> * Linux has a controller-independent interrupt architecture.
> * Every controller has a 'controller-template', that is used
> @@ -134,6 +142,8 @@ int __init early_irq_init(void)
> int legacy_count;
> int i;
>
> + init_irq_default_affinity();
> +
> desc = irq_desc_legacy;
> legacy_count = ARRAY_SIZE(irq_desc_legacy);
>
> @@ -219,6 +229,8 @@ int __init early_irq_init(void)
> int count;
> int i;
>
> + init_irq_default_affinity();
> +
> desc = irq_desc;
> count = ARRAY_SIZE(irq_desc);
>
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index 618a64f..291f036 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -18,14 +18,6 @@
> #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> cpumask_var_t irq_default_affinity;
>
> -static int init_irq_default_affinity(void)
> -{
> - alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL);
> - cpumask_setall(irq_default_affinity);
> - return 0;
> -}
> -core_initcall(init_irq_default_affinity);
> -
> /**
> * synchronize_irq - wait for pending IRQ handlers (on other CPUs)
> * @irq: interrupt number to wait for
> --
> 1.5.6.6
>
>
>
It's essentially the same as I tested on x86_64 so you can add my
Acked-by: Mike Travis <[email protected]>
Thanks!
Mike
David Daney wrote:
> Move the initialization of irq_default_affinity to early_irq_init as
> core_initcall is too late.
>
> irq_default_affinity can be used in init_IRQ and potentially timer and
> SMP init as well. All of these happen before core_initcall. Moving
> the initialization to early_irq_init ensures that it is initialized
> before it is used.
>
> Signed-off-by: David Daney <[email protected]>
> ---
> kernel/irq/handle.c | 12 ++++++++++++
> kernel/irq/manage.c | 8 --------
> 2 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
> index c20db0b..a9fbb01 100644
> --- a/kernel/irq/handle.c
> +++ b/kernel/irq/handle.c
> @@ -39,6 +39,14 @@ void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
> ack_bad_irq(irq);
> }
>
> +static inline void __init init_irq_default_affinity(void)
> +{
> +#if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> + alloc_bootmem_cpumask_var(&irq_default_affinity);
> + cpumask_setall(irq_default_affinity);
> +#endif
> +}
> +
> /*
> * Linux has a controller-independent interrupt architecture.
> * Every controller has a 'controller-template', that is used
> @@ -134,6 +142,8 @@ int __init early_irq_init(void)
> int legacy_count;
> int i;
>
> + init_irq_default_affinity();
> +
> desc = irq_desc_legacy;
> legacy_count = ARRAY_SIZE(irq_desc_legacy);
>
> @@ -219,6 +229,8 @@ int __init early_irq_init(void)
> int count;
> int i;
>
> + init_irq_default_affinity();
> +
> desc = irq_desc;
> count = ARRAY_SIZE(irq_desc);
>
> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
> index 618a64f..291f036 100644
> --- a/kernel/irq/manage.c
> +++ b/kernel/irq/manage.c
> @@ -18,14 +18,6 @@
> #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
> cpumask_var_t irq_default_affinity;
>
> -static int init_irq_default_affinity(void)
> -{
> - alloc_cpumask_var(&irq_default_affinity, GFP_KERNEL);
> - cpumask_setall(irq_default_affinity);
> - return 0;
> -}
> -core_initcall(init_irq_default_affinity);
> -
> /**
> * synchronize_irq - wait for pending IRQ handlers (on other CPUs)
> * @irq: interrupt number to wait for