[PATCH 03/25] add dyn_array support

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>, H. Peter Anvin <hpa@...>, Eric W. Biederman <ebiederm@...>, Dhaval Giani <dhaval@...>, Mike Travis <travis@...>, Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, Yinghai Lu <yhlu.kernel@...>
Date: Saturday, August 2, 2008 - 10:59 pm

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]

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..54864c0 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_nopanic(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

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sat Aug 2, 10:59 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 7:01 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 7:15 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 7:26 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 7:53 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sun Aug 3, 1:51 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 2:04 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sun Aug 3, 2:39 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Mike Travis, (Mon Aug 4, 10:31 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 4:25 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sun Aug 3, 5:15 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 1:54 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 3:20 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 9:59 pm)
[PATCH 02/25] x86: remove irq_vectors_limits, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:59 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sun Aug 3, 12:03 am)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sun Aug 3, 12:21 am)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sun Aug 3, 12:55 am)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sun Aug 3, 1:04 am)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sun Aug 3, 1:31 am)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sun Aug 3, 1:39 am)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sun Aug 3, 1:47 am)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sun Aug 3, 1:48 am)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sun Aug 3, 1:40 am)
[PATCH 04/25] add per_cpu_dyn_array support, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 05/25] x86: alloc dyn_array all alltogether, Yinghai Lu, (Sat Aug 2, 10:59 pm)
Re: [PATCH 05/25] x86: alloc dyn_array all alltogether, Johannes Weiner, (Sun Aug 3, 12:16 am)
[PATCH 06/25] x86: enable dyn_array support, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 07/25] introduce nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 08/25] x86: using nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 09/25] drivers/char to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 10/25] drivers/net to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 11/25] drivers intr remapping to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 12/25] drivers/pcmcia to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 13/25] drivers/rtc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 14/25] drivers/scsi to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Alan Cox, (Sun Aug 3, 9:02 am)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sun Aug 3, 1:43 pm)
[PATCH 16/25] drivers proc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 17/25] drivers xen events to use nr_irqs, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 18/25] make irq_timer_state to use dyn_array, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 19/25] make irq2_iommu to use dyn_array, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 20/25] make irq_desc to use dyn_array, Yinghai Lu, (Sat Aug 2, 10:59 pm)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Sun Aug 3, 3:57 pm)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Mon Aug 4, 2:51 pm)
[PATCH] serial: Remove NR_IRQS usage, Alan Cox, (Wed Aug 6, 9:09 am)
Re: [PATCH] serial: Remove NR_IRQS usage, Eric W. Biederman, (Wed Aug 6, 12:10 pm)
[PATCH 23/25] x86: use dyn_array in io_apic_xx.c, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 24/25] x86: get mp_irqs from madt, Yinghai Lu, (Sat Aug 2, 10:59 pm)
[PATCH 25/25] x86: remove nr_irq_vectors, Yinghai Lu, (Sat Aug 2, 10:59 pm)