From: Grant Likely <grant.likely@secretlab.ca>
To: Milton Miller <miltonm@bga.com>
Cc: Thomas Gleixner <tglx@linutronix.de>, linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH 23/37] powerpc: radix trees are available before init_IRQ
Date: Wed, 11 May 2011 21:00:02 +0200 [thread overview]
Message-ID: <BANLkTimAHAOEovwD9NDesSLkNyy7WQe--w@mail.gmail.com> (raw)
In-Reply-To: <69f5978c647fad7a57b39de2a3c10f2f2bccb642.1305092637.git.miltonm@bga.com>
On Wed, May 11, 2011 at 7:29 AM, Milton Miller <miltonm@bga.com> wrote:
> Since the generic irq code uses a radix tree for sparse interrupts,
> the initcall ordering has been changed to initialize radix trees before
> irqs. =A0 We no longer need to defer creating revmap radix trees to the
> arch_initcall irq_late_init.
>
> Also, the kmem caches are allocated so we don't need to use
> zalloc_maybe_bootmem.
>
> Signed-off-by: Milton Miller <miltonm@bga.com>
w00t. Looks right to me.
Reviewed-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> =A0arch/powerpc/kernel/irq.c | =A0 78 ++---------------------------------=
---------
> =A01 files changed, 4 insertions(+), 74 deletions(-)
>
> diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
> index 826552c..f42e869 100644
> --- a/arch/powerpc/kernel/irq.c
> +++ b/arch/powerpc/kernel/irq.c
> @@ -493,7 +493,6 @@ struct irq_map_entry {
>
> =A0static LIST_HEAD(irq_hosts);
> =A0static DEFINE_RAW_SPINLOCK(irq_big_lock);
> -static unsigned int revmap_trees_allocated;
> =A0static DEFINE_MUTEX(revmap_trees_mutex);
> =A0static struct irq_map_entry irq_map[NR_IRQS];
> =A0static unsigned int irq_virq_count =3D NR_IRQS;
> @@ -537,7 +536,7 @@ struct irq_host *irq_alloc_host(struct device_node *o=
f_node,
> =A0 =A0 =A0 =A0/* Allocate structure and revmap table if using linear map=
ping */
> =A0 =A0 =A0 =A0if (revmap_type =3D=3D IRQ_HOST_MAP_LINEAR)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0size +=3D revmap_arg * sizeof(unsigned int=
);
> - =A0 =A0 =A0 host =3D zalloc_maybe_bootmem(size, GFP_KERNEL);
> + =A0 =A0 =A0 host =3D kzalloc(size, GFP_KERNEL);
> =A0 =A0 =A0 =A0if (host =3D=3D NULL)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return NULL;
>
> @@ -605,6 +604,9 @@ struct irq_host *irq_alloc_host(struct device_node *o=
f_node,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0smp_wmb();
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0host->revmap_data.linear.revmap =3D rmap;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
> + =A0 =A0 =A0 case IRQ_HOST_MAP_TREE:
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 INIT_RADIX_TREE(&host->revmap_data.tree, GF=
P_KERNEL);
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
> =A0 =A0 =A0 =A0default:
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
> =A0 =A0 =A0 =A0}
> @@ -839,13 +841,6 @@ void irq_dispose_mapping(unsigned int virq)
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0host->revmap_data.linear.r=
evmap[hwirq] =3D NO_IRQ;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break;
> =A0 =A0 =A0 =A0case IRQ_HOST_MAP_TREE:
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* Check if radix tree allocated yet, if =
not then nothing to
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0* remove.
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 smp_rmb();
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (revmap_trees_allocated < 1)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 break;
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mutex_lock(&revmap_trees_mutex);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0radix_tree_delete(&host->revmap_data.tree,=
hwirq);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mutex_unlock(&revmap_trees_mutex);
> @@ -906,14 +901,6 @@ unsigned int irq_radix_revmap_lookup(struct irq_host=
*host,
> =A0 =A0 =A0 =A0WARN_ON(host->revmap_type !=3D IRQ_HOST_MAP_TREE);
>
> =A0 =A0 =A0 =A0/*
> - =A0 =A0 =A0 =A0* Check if the radix tree exists and has bee initialized=
.
> - =A0 =A0 =A0 =A0* If not, we fallback to slow mode
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 if (revmap_trees_allocated < 2)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return irq_find_mapping(host, hwirq);
> -
> - =A0 =A0 =A0 /* Now try to resolve */
> - =A0 =A0 =A0 /*
> =A0 =A0 =A0 =A0 * No rcu_read_lock(ing) needed, the ptr returned can't go=
under us
> =A0 =A0 =A0 =A0 * as it's referencing an entry in the static irq_map tabl=
e.
> =A0 =A0 =A0 =A0 */
> @@ -935,18 +922,8 @@ unsigned int irq_radix_revmap_lookup(struct irq_host=
*host,
> =A0void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 irq_hw_number_t h=
wirq)
> =A0{
> -
> =A0 =A0 =A0 =A0WARN_ON(host->revmap_type !=3D IRQ_HOST_MAP_TREE);
>
> - =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0* Check if the radix tree exists yet.
> - =A0 =A0 =A0 =A0* If not, then the irq will be inserted into the tree wh=
en it gets
> - =A0 =A0 =A0 =A0* initialized.
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 smp_rmb();
> - =A0 =A0 =A0 if (revmap_trees_allocated < 1)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 return;
> -
> =A0 =A0 =A0 =A0if (virq !=3D NO_IRQ) {
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0mutex_lock(&revmap_trees_mutex);
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0radix_tree_insert(&host->revmap_data.tree,=
hwirq,
> @@ -1054,53 +1031,6 @@ int arch_early_irq_init(void)
> =A0 =A0 =A0 =A0return 0;
> =A0}
>
> -/* We need to create the radix trees late */
> -static int irq_late_init(void)
> -{
> - =A0 =A0 =A0 struct irq_host *h;
> - =A0 =A0 =A0 unsigned int i;
> -
> - =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0* No mutual exclusion with respect to accessors of the t=
ree is needed
> - =A0 =A0 =A0 =A0* here as the synchronization is done via the state vari=
able
> - =A0 =A0 =A0 =A0* revmap_trees_allocated.
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 list_for_each_entry(h, &irq_hosts, link) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (h->revmap_type =3D=3D IRQ_HOST_MAP_TREE=
)
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 INIT_RADIX_TREE(&h->revmap_=
data.tree, GFP_KERNEL);
> - =A0 =A0 =A0 }
> -
> - =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0* Make sure the radix trees inits are visible before set=
ting
> - =A0 =A0 =A0 =A0* the flag
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 smp_wmb();
> - =A0 =A0 =A0 revmap_trees_allocated =3D 1;
> -
> - =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0* Insert the reverse mapping for those interrupts alread=
y present
> - =A0 =A0 =A0 =A0* in irq_map[].
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 mutex_lock(&revmap_trees_mutex);
> - =A0 =A0 =A0 for (i =3D 0; i < irq_virq_count; i++) {
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (irq_map[i].host &&
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 (irq_map[i].host->revmap_type =3D=
=3D IRQ_HOST_MAP_TREE))
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 radix_tree_insert(&irq_map[=
i].host->revmap_data.tree,
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0=
=A0 =A0 irq_map[i].hwirq, &irq_map[i]);
> - =A0 =A0 =A0 }
> - =A0 =A0 =A0 mutex_unlock(&revmap_trees_mutex);
> -
> - =A0 =A0 =A0 /*
> - =A0 =A0 =A0 =A0* Make sure the radix trees insertions are visible befor=
e setting
> - =A0 =A0 =A0 =A0* the flag
> - =A0 =A0 =A0 =A0*/
> - =A0 =A0 =A0 smp_wmb();
> - =A0 =A0 =A0 revmap_trees_allocated =3D 2;
> -
> - =A0 =A0 =A0 return 0;
> -}
> -arch_initcall(irq_late_init);
> -
> =A0#ifdef CONFIG_VIRQ_DEBUG
> =A0static int virq_debug_show(struct seq_file *m, void *private)
> =A0{
> --
> 1.7.0.4
>
>
--=20
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
next prev parent reply other threads:[~2011-05-11 19:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 5:43 [PATCH 00/37] fix paca memory usage and NR_CPU loops, factor ipi and simplify irq code Milton Miller
2011-05-11 5:28 ` [PATCH 01/37] powerpc: fix memory corruption from unallocated slaves Milton Miller
2011-05-11 5:28 ` [PATCH 02/37] powerpc: don't search for paca in freed memory Milton Miller
2011-05-11 5:28 ` [PATCH 03/37] powerpc/kdump64: Don't reference freed memory as pacas Milton Miller
2011-05-11 5:28 ` [PATCH 04/37] powerpc/iseries: cleanup and fix secondary startup Milton Miller
2011-05-11 5:28 ` [PATCH 05/37] powerpc: Respect nr_cpu_ids when calling set_cpu_possible and set_cpu_present Milton Miller
2011-05-11 5:28 ` [PATCH 06/37] powerpc: use nr_cpu_ids in initial paca allocation Milton Miller
2011-05-11 5:28 ` [PATCH 07/37] powerpc: call no-longer static setup_nr_cpu_ids instead of replicating it Milton Miller
2011-05-11 5:28 ` [PATCH 08/37] powerpc: mpic: limit NR_CPUS loop to 32 bit Milton Miller
2011-05-11 5:29 ` [PATCH 09/37] powerpc: mpic: break cpumask abstraction earlier Milton Miller
2011-05-11 5:29 ` [PATCH 10/37] powerpc: remove call sites of MSG_ALL_BUT_SELF Milton Miller
2011-05-11 5:29 ` [PATCH 11/37] powerpc: remove checks for MSG_ALL and MSG_ALL_BUT_SELF Milton Miller
2011-05-11 5:29 ` [PATCH 12/37] linux/smp.h: remove unused MSG_ flags Milton Miller
2011-05-11 5:29 ` [PATCH 13/37] powerpc/mpic: simplify ipi cpu mask handling Milton Miller
2011-05-11 5:29 ` [PATCH 14/37] powerpc: remove powermac/pic.h Milton Miller
2011-05-11 5:29 ` [PATCH 15/37] powerpc: remove alloc_maybe_bootmem for zalloc version Milton Miller
2011-05-11 5:29 ` [PATCH 16/37] powerpc: remove stubbed beat smp support Milton Miller
2011-05-11 5:29 ` [PATCH 17/37] powerpc cell: use smp_request_message_ipi Milton Miller
2011-05-11 5:29 ` [PATCH 18/37] powerpc: move smp_ops_t from machdep.h to smp.h Milton Miller
2011-05-11 5:29 ` [PATCH 19/37] powerpc: consolidate ipi message mux and demux Milton Miller
2011-05-19 6:57 ` Benjamin Herrenschmidt
2011-05-19 6:58 ` Benjamin Herrenschmidt
2011-05-11 5:29 ` [PATCH 20/37] powerpc: add kconfig for muxed smp ipi support Milton Miller
2011-05-11 5:29 ` [PATCH 21/37] powerpc: use bytes instead of bitops in smp ipi multiplexing Milton Miller
2011-05-11 5:29 ` [PATCH 22/37] powerpc: xics: cleanup xics_host_map and ipi Milton Miller
2011-05-11 5:29 ` [PATCH 23/37] powerpc: radix trees are available before init_IRQ Milton Miller
2011-05-11 19:00 ` Grant Likely [this message]
2011-05-11 5:29 ` [PATCH 24/37] powerpc: return early if irq_host lookup type is wrong Milton Miller
2011-05-11 19:03 ` Grant Likely
2011-05-11 5:30 ` [PATCH 25/37] powerpc: remove trival irq_host_ops.unmap Milton Miller
2011-05-11 5:30 ` [PATCH 26/37] powerpc: remove i8259 irq_host_ops->unmap Milton Miller
2011-05-11 5:30 ` [PATCH 27/37] powerpc fsl_msi: don't abuse platform_data for driver_data Milton Miller
2011-05-11 19:05 ` Grant Likely
2011-05-11 5:30 ` [PATCH 28/37] powerpc: fsl_msi: use chip_data not handler_data Milton Miller
2011-05-11 5:30 ` [PATCH 29/37] powerpc: mpc5121_ads_cpld: remove use of NO_IRQ_IGNORE Milton Miller
2011-05-11 19:07 ` Grant Likely
2011-05-11 5:30 ` [PATCH 30/37] powerpc: mpc62xx_pic: fix get_irq handling of NO_IRQ Milton Miller
2011-05-11 19:08 ` Grant Likely
2011-05-11 5:30 ` [PATCH 31/37] powerpc: psurge: create a irq_host for secondary cpus Milton Miller
2011-05-11 5:30 ` [PATCH 32/37] powerpc: remove irq_host_ops->remap hook Milton Miller
2011-05-11 5:30 ` [PATCH 33/37] powerpc: spider-pic: get pic from chip_data instead of irq_map Milton Miller
2011-05-11 19:13 ` Grant Likely
2011-05-11 5:30 ` [PATCH 34/37] powerpc: axon_msi: validate msi irq via chip_data Milton Miller
2011-05-11 5:30 ` [PATCH 35/37] powerpc: add virq_is_host to reduce virq_to_host usage Milton Miller
2011-05-11 19:16 ` Grant Likely
2011-05-11 5:30 ` [PATCH 36/37] powerpc: remove virq_to_host Milton Miller
2011-05-11 19:17 ` Grant Likely
2011-05-11 5:30 ` [PATCH 37/37] powerpc: make IRQ_NOREQUEST last to clear, first to set Milton Miller
2011-05-11 19:18 ` Grant Likely
2011-05-12 8:31 ` Milton Miller
2011-05-11 19:40 ` [PATCH 00/37] fix paca memory usage and NR_CPU loops, factor ipi and simplify irq code Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTimAHAOEovwD9NDesSLkNyy7WQe--w@mail.gmail.com \
--to=grant.likely@secretlab.ca \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=miltonm@bga.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).