From: Yinghai Lu <yhlu.kernel@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Dhaval Giani <dhaval@linux.vnet.ibm.com>,
Mike Travis <travis@sgi.com>,
Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, Yinghai Lu <yhlu.kernel@gmail.com>
Subject: [PATCH 05/43] add dyn_array support
Date: Sun, 10 Aug 2008 00:35:54 -0700 [thread overview]
Message-ID: <1218353792-3355-6-git-send-email-yhlu.kernel@gmail.com> (raw)
In-Reply-To: <1218353792-3355-5-git-send-email-yhlu.kernel@gmail.com>
could have crazy big arrays and allocate them in bootmem at init stage.
also also to allocate array according to size we need to use to avoid wasting
memory
use CONFIG_HAVE_DYN_ARRAY to enable it or not
usage:
|static struct irq_desc irq_desc_init __initdata = {
| .status = IRQ_DISABLED,
| .chip = &no_irq_chip,
| .handle_irq = handle_bad_irq,
| .depth = 1,
| .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
|#ifdef CONFIG_SMP
| .affinity = CPU_MASK_ALL
|#endif
|};
|
|static void __init init_work(void *data)
|{
| struct dyn_array *da = data;
| struct irq_desc *desc;
| int i;
|
| desc = *da->name;
|
| for (i = 0; i < *da->nr; i++)
| memcpy(&desc[i], &irq_desc_init, sizeof(struct irq_desc));
|}
|
|struct irq_desc *irq_desc;
|DEFINE_DYN_ARRAY(irq_desc, sizeof(struct irq_desc), nr_irqs, PAGE_SIZE, init_work);
after pre_alloc_dyn_array() after setup_arch(), that array is ready to use
in this way could replace irq_desc[NR_IRQS] array with dyn_array irq_desc[nr_irqs]
v2: remove _nopanic in pre_alloc_dyn_array()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
include/asm-generic/vmlinux.lds.h | 7 +++++++
include/linux/init.h | 23 +++++++++++++++++++++++
init/main.c | 24 ++++++++++++++++++++++++
3 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index a44ec7a..1c3daac 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -214,6 +214,13 @@
* All archs are supposed to use RO_DATA() */
#define RODATA RO_DATA(4096)
+#define DYN_ARRAY_INIT(align) \
+ . = ALIGN((align)); \
+ .dyn_array.init : AT(ADDR(.dyn_array.init) - LOAD_OFFSET) { \
+ VMLINUX_SYMBOL(__dyn_array_start) = .; \
+ *(.dyn_array.init) \
+ VMLINUX_SYMBOL(__dyn_array_end) = .; \
+ }
#define SECURITY_INIT \
.security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__security_initcall_start) = .; \
diff --git a/include/linux/init.h b/include/linux/init.h
index 915c5b9..c31cd94 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -249,6 +249,29 @@ struct obs_kernel_param {
/* Relies on boot_command_line being set */
void __init parse_early_param(void);
+
+struct dyn_array {
+ void **name;
+ unsigned long size;
+ unsigned int *nr;
+ unsigned long align;
+ void (*init_work)(void *);
+};
+extern struct dyn_array *__dyn_array_start[], *__dyn_array_end[];
+
+#define DEFINE_DYN_ARRAY(nameX, sizeX, nrX, alignX, init_workX) \
+ static struct dyn_array __dyn_array_##nameX __initdata = \
+ { .name = (void **)&nameX,\
+ .size = sizeX,\
+ .nr = &nrX,\
+ .align = alignX,\
+ .init_work = init_workX,\
+ }; \
+ static struct dyn_array *__dyn_array_ptr_##nameX __used \
+ __attribute__((__section__(".dyn_array.init"))) = \
+ &__dyn_array_##nameX
+
+extern void pre_alloc_dyn_array(void);
#endif /* __ASSEMBLY__ */
/**
diff --git a/init/main.c b/init/main.c
index 3f8fa37..a53f1cf 100644
--- a/init/main.c
+++ b/init/main.c
@@ -539,6 +539,29 @@ void __init __weak thread_info_cache_init(void)
{
}
+void pre_alloc_dyn_array(void)
+{
+#ifdef CONFIG_HAVE_DYN_ARRAY
+ unsigned long size, phys = 0;
+ struct dyn_array **daa;
+
+ for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) {
+ struct dyn_array *da = *daa;
+
+ size = da->size * (*da->nr);
+ print_fn_descriptor_symbol("dyna_array %s ", da->name);
+ printk(KERN_CONT "size:%#lx nr:%d align:%#lx",
+ da->size, *da->nr, da->align);
+ *da->name = __alloc_bootmem(size, da->align, phys);
+ phys = virt_to_phys(*da->name);
+ printk(KERN_CONT " ==> [%#lx - %#lx]\n", phys, phys + size);
+
+ if (da->init_work)
+ da->init_work(da);
+ }
+#endif
+}
+
asmlinkage void __init start_kernel(void)
{
char * command_line;
@@ -576,6 +599,7 @@ asmlinkage void __init start_kernel(void)
printk(KERN_NOTICE);
printk(linux_banner);
setup_arch(&command_line);
+ pre_alloc_dyn_array();
mm_init_owner(&init_mm, &init_task);
setup_command_line(command_line);
unwind_setup();
--
1.5.4.5
next prev parent reply other threads:[~2008-08-10 7:39 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-10 7:35 [PATCH 00/43] dyn_array/nr_irqs/sparse_irq support v7 Yinghai Lu
2008-08-10 7:35 ` [PATCH 01/43] x86_64: Restore the proper NR_IRQS define so larger systems work Yinghai Lu
2008-08-10 7:35 ` [PATCH 02/43] 8250: Remove NR_IRQ usage Yinghai Lu
2008-08-10 7:35 ` [PATCH 03/43] x86: add after_bootmem for 32bit Yinghai Lu
2008-08-10 7:35 ` [PATCH 04/43] x86: remove irq_vectors_limits Yinghai Lu
2008-08-10 7:35 ` Yinghai Lu [this message]
2008-08-10 7:35 ` [PATCH 06/43] add per_cpu_dyn_array support Yinghai Lu
2008-08-10 7:35 ` [PATCH 07/43] x86: alloc dyn_array all alltogether Yinghai Lu
2008-08-10 7:35 ` [PATCH 08/43] x86: enable dyn_array support Yinghai Lu
2008-08-10 7:35 ` [PATCH 09/43] introduce nr_irqs Yinghai Lu
2008-08-10 7:35 ` [PATCH 10/43] x86: using nr_irqs Yinghai Lu
2008-08-10 7:36 ` [PATCH 11/43] drivers/char to use nr_irqs Yinghai Lu
2008-08-10 7:36 ` [PATCH 12/43] drivers/net " Yinghai Lu
2008-08-10 7:36 ` [PATCH 13/43] drivers intr remapping " Yinghai Lu
2008-08-10 7:36 ` [PATCH 14/43] drivers/pcmcia " Yinghai Lu
2008-08-10 7:36 ` [PATCH 15/43] drivers/rtc " Yinghai Lu
2008-08-10 7:36 ` [PATCH 16/43] drivers/scsi " Yinghai Lu
2008-08-10 7:36 ` [PATCH 17/43] drivers/serial " Yinghai Lu
2008-08-10 7:36 ` [PATCH 18/43] drivers proc " Yinghai Lu
2008-08-10 7:36 ` [PATCH 19/43] drivers xen events " Yinghai Lu
2008-08-10 7:36 ` [PATCH 20/43] make irq_timer_state to use dyn_array Yinghai Lu
2008-08-10 7:36 ` [PATCH 21/43] make irq2_iommu " Yinghai Lu
2008-08-10 7:36 ` [PATCH 22/43] make irq_desc " Yinghai Lu
2008-08-10 7:36 ` [PATCH 23/43] irq: make irqs in kernel stat use per_cpu_dyn_array Yinghai Lu
2008-08-10 7:36 ` [PATCH 24/43] x86: use dyn_array in io_apic_xx.c Yinghai Lu
2008-08-10 7:36 ` [PATCH 25/43] x86: get mp_irqs from madt Yinghai Lu
2008-08-10 7:36 ` [PATCH 26/43] x86: remove nr_irq_vectors Yinghai Lu
2008-08-10 7:36 ` [PATCH 27/43] x86_64: use irq_desc() together with dyn_array Yinghai Lu
2008-08-10 7:36 ` [PATCH 28/43] x86: add irq_cfg in io_apic_64.c Yinghai Lu
2008-08-10 7:36 ` [PATCH 29/43] x86: put irq_2_pin pointer into irq_cfg Yinghai Lu
2008-08-10 7:36 ` [PATCH 30/43] x86: put timer_rand_state pointer into irq_desc Yinghai Lu
2008-08-10 7:36 ` [PATCH 31/43] x86: move kstat_irqs from kstat to irq_desc Yinghai Lu
2008-08-10 7:36 ` [PATCH 32/43] add irq_desc_without_new Yinghai Lu
2008-08-10 7:36 ` [PATCH 33/43] replace loop with nr_irqs with for_each_irq_desc Yinghai Lu
2008-08-10 7:36 ` [PATCH 34/43] replace loop with nr_irqs for proc/stat Yinghai Lu
2008-08-10 7:36 ` [PATCH 35/43] replace loop with nr_irqs with for_each_irq_icfg Yinghai Lu
2008-08-10 7:36 ` [PATCH 36/43] remove >= nr_irqs checking with config_have_sparse_irq Yinghai Lu
2008-08-10 7:36 ` [PATCH 37/43] x86_64: add irq_desc in function in paramater Yinghai Lu
2008-08-10 7:36 ` [PATCH 38/43] x86: check with without_new in show_interrupts Yinghai Lu
2008-08-10 7:36 ` [PATCH 39/43] x86_64: rename irq_desc/irq_desc_with_new Yinghai Lu
2008-08-10 7:36 ` [PATCH 40/43] seperate irq_descX with irq_descX_free Yinghai Lu
2008-08-10 7:36 ` [PATCH 41/43] x86_64: sperate irq_cfgx with irq_cfgx_free Yinghai Lu
2008-08-10 7:36 ` [PATCH 42/43] x86_64: make /proc/interrupts works with dyn irq_desc Yinghai Lu
2008-08-10 7:36 ` [PATCH 43/43] x86: put irq_2_iommu pointer into irq_desc Yinghai Lu
2008-08-10 9:21 ` [PATCH 00/43] dyn_array/nr_irqs/sparse_irq support v7 Yinghai Lu
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=1218353792-3355-6-git-send-email-yhlu.kernel@gmail.com \
--to=yhlu.kernel@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=dhaval@linux.vnet.ibm.com \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=travis@sgi.com \
/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