[PATCH] auxiliary vector cleanups

The size of auxiliary vector is fixed at 42 in linux/sched.h. But it isn't very obvious when looking at linux/elf.h. This patch adds AT_VECTOR_SIZE so that we can change it if necessary when a new vector is added. Because of include file ordering problems, doing this necessitated the extraction of the AT_* symbols into a standalone header file. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>

[PATCH] auxiliary vector cleanups
The size of auxiliary vector is fixed at 42 in linux/sched.h. But it isn't very obvious when looking at linux/elf.h. This patch adds AT_VECTOR_SIZE so that we can change it if necessary when a new vector is added. Because of include file ordering problems, doing this necessitated the extraction of the AT_* symbols into a standalone header file. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
H. J. Lu · Linus Torvalds
1 parent 32605a1815
Showing 32 changed files with 196 additions and 83 deletions Side-by-side Diff
include/asm-alpha/auxvec.h
include/asm-alpha/elf.h
include/asm-arm/auxvec.h
include/asm-arm26/auxvec.h
include/asm-cris/auxvec.h
include/asm-frv/auxvec.h
include/asm-h8300/auxvec.h
include/asm-i386/auxvec.h
include/asm-i386/elf.h
include/asm-ia64/auxvec.h
include/asm-ia64/elf.h
include/asm-m32r/auxvec.h
include/asm-m68k/auxvec.h
include/asm-m68knommu/auxvec.h
include/asm-mips/auxvec.h
include/asm-parisc/auxvec.h
include/asm-ppc/auxvec.h
include/asm-ppc/elf.h
include/asm-ppc64/auxvec.h
include/asm-ppc64/elf.h
+#ifndef __ASM_ALPHA_AUXVEC_H
+#define __ASM_ALPHA_AUXVEC_H
+
+/* Reserve these numbers for any future use of a VDSO.  */
+#if 0
+#define AT_SYSINFO		32
+#define AT_SYSINFO_EHDR		33
+#endif
+
+/* More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
+   value is -1, then the cache doesn't exist.  Otherwise:
+
+      bit 0-3:	  Cache set-associativity; 0 means fully associative.
+      bit 4-7:	  Log2 of cacheline size.
+      bit 8-31:	  Size of the entire cache >> 8.
+      bit 32-63:  Reserved.
+*/
+
+#define AT_L1I_CACHESHAPE	34
+#define AT_L1D_CACHESHAPE	35
+#define AT_L2_CACHESHAPE	36
+#define AT_L3_CACHESHAPE	37
+
+#endif /* __ASM_ALPHA_AUXVEC_H */
 #ifndef __ASM_ALPHA_ELF_H
 #define __ASM_ALPHA_ELF_H
  
+#include <asm/auxvec.h>
+
 /* Special values for the st_other field in the symbol table.  */
  
 #define STO_ALPHA_NOPV		0x80
@@ -141,26 +143,6 @@
 	  ? (amask(AMASK_BWX) ? "ev5" : "ev56")	\
 	: amask (AMASK_CIX) ? "ev6" : "ev67");	\
 })
-
-/* Reserve these numbers for any future use of a VDSO.  */
-#if 0
-#define AT_SYSINFO		32
-#define AT_SYSINFO_EHDR		33
-#endif
-
-/* More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
-   value is -1, then the cache doesn't exist.  Otherwise:
-
-      bit 0-3:	  Cache set-associativity; 0 means fully associative.
-      bit 4-7:	  Log2 of cacheline size.
-      bit 8-31:	  Size of the entire cache >> 8.
-      bit 32-63:  Reserved.
-*/
-
-#define AT_L1I_CACHESHAPE	34
-#define AT_L1D_CACHESHAPE	35
-#define AT_L2_CACHESHAPE	36
-#define AT_L3_CACHESHAPE	37
  
 #ifdef __KERNEL__
  
+#ifndef __ASMARM_AUXVEC_H
+#define __ASMARM_AUXVEC_H
+
+#endif
+#ifndef __ASMARM_AUXVEC_H
+#define __ASMARM_AUXVEC_H
+
+#endif
+#ifndef __ASMCRIS_AUXVEC_H
+#define __ASMCRIS_AUXVEC_H
+
+#endif
+#ifndef __FRV_AUXVEC_H
+#define __FRV_AUXVEC_H
+
+#endif
+#ifndef __ASMH8300_AUXVEC_H
+#define __ASMH8300_AUXVEC_H
+
+#endif
+#ifndef __ASMi386_AUXVEC_H
+#define __ASMi386_AUXVEC_H
+
+/*
+ * Architecture-neutral AT_ values in 0-17, leave some room
+ * for more of them, start the x86-specific ones at 32.
+ */
+#define AT_SYSINFO		32
+#define AT_SYSINFO_EHDR		33
+
+#endif
@@ -9,6 +9,7 @@
 #include <asm/user.h>
 #include <asm/processor.h>
 #include <asm/system.h>		/* for savesegment */
+#include <asm/auxvec.h>
  
 #include <linux/utsname.h>
  
@@ -108,13 +109,6 @@
    but that could change... */
  
 #define ELF_PLATFORM  (system_utsname.machine)
-
-/*
- * Architecture-neutral AT_ values in 0-17, leave some room
- * for more of them, start the x86-specific ones at 32.
- */
-#define AT_SYSINFO		32
-#define AT_SYSINFO_EHDR		33
  
 #ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2) do { } while (0)
+#ifndef _ASM_IA64_AUXVEC_H
+#define _ASM_IA64_AUXVEC_H
+
+/*
+ * Architecture-neutral AT_ values are in the range 0-17.  Leave some room for more of
+ * them, start the architecture-specific ones at 32.
+ */
+#define AT_SYSINFO	32
+#define AT_SYSINFO_EHDR	33
+
+#endif /* _ASM_IA64_AUXVEC_H */
@@ -12,6 +12,7 @@
  
 #include <asm/fpu.h>
 #include <asm/page.h>
+#include <asm/auxvec.h>
  
 /*
  * This is used to ensure we don't load something for the wrong architecture.
@@ -176,13 +177,6 @@
    implementation specific libraries for optimization.  Not terribly
    relevant until we have real hardware to play with... */
 #define ELF_PLATFORM	NULL
-
-/*
- * Architecture-neutral AT_ values are in the range 0-17.  Leave some room for more of
- * them, start the architecture-specific ones at 32.
- */
-#define AT_SYSINFO	32
-#define AT_SYSINFO_EHDR	33
  
 #ifdef __KERNEL__
 #define SET_PERSONALITY(ex, ibcs2)	set_personality(PER_LINUX)
+#ifndef _ASM_M32R__AUXVEC_H
+#define _ASM_M32R__AUXVEC_H
+
+#endif  /* _ASM_M32R__AUXVEC_H */
+#ifndef __ASMm68k_AUXVEC_H
+#define __ASMm68k_AUXVEC_H
+
+#endif
+#ifndef __ASMm68k_AUXVEC_H
+#define __ASMm68k_AUXVEC_H
+
+#endif
+#ifndef _ASM_AUXVEC_H
+#define _ASM_AUXVEC_H
+
+#endif /* _ASM_AUXVEC_H */
+#ifndef __ASMPARISC_AUXVEC_H
+#define __ASMPARISC_AUXVEC_H
+
+#endif
+#ifndef __PPC_AUXVEC_H
+#define __PPC_AUXVEC_H
+
+/*
+ * We need to put in some extra aux table entries to tell glibc what
+ * the cache block size is, so it can use the dcbz instruction safely.
+ */
+#define AT_DCACHEBSIZE		19
+#define AT_ICACHEBSIZE		20
+#define AT_UCACHEBSIZE		21
+/* A special ignored type value for PPC, for glibc compatibility.  */
+#define AT_IGNOREPPC		22
+
+#endif
@@ -7,6 +7,7 @@
 #include <asm/types.h>
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
+#include <asm/auxvec.h>
  
 /* PowerPC relocations defined by the ABIs */
 #define R_PPC_NONE		0
@@ -121,16 +122,6 @@
 #define ELF_PLATFORM	(NULL)
  
 #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
-
-/*
- * We need to put in some extra aux table entries to tell glibc what
- * the cache block size is, so it can use the dcbz instruction safely.
- */
-#define AT_DCACHEBSIZE		19
-#define AT_ICACHEBSIZE		20
-#define AT_UCACHEBSIZE		21
-/* A special ignored type value for PPC, for glibc compatibility.  */
-#define AT_IGNOREPPC		22
  
 extern int dcache_bsize;
 extern int icache_bsize;
+#ifndef __PPC64_AUXVEC_H
+#define __PPC64_AUXVEC_H
+
+/*
+ * We need to put in some extra aux table entries to tell glibc what
+ * the cache block size is, so it can use the dcbz instruction safely.
+ */
+#define AT_DCACHEBSIZE		19
+#define AT_ICACHEBSIZE		20
+#define AT_UCACHEBSIZE		21
+/* A special ignored type value for PPC, for glibc compatibility.  */
+#define AT_IGNOREPPC		22
+
+/* The vDSO location. We have to use the same value as x86 for glibc's
+ * sake :-)
+ */
+#define AT_SYSINFO_EHDR		33
+
+#endif /* __PPC64_AUXVEC_H */
@@ -4,6 +4,7 @@
 #include <asm/types.h>
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
+#include <asm/auxvec.h>
  
 /* PowerPC relocations defined by the ABIs */
 #define R_PPC_NONE		0
@@ -236,21 +237,6 @@
 		(exec_stk != EXSTACK_DISABLE_X) : 0)
  
 #endif
-
-/*
- * We need to put in some extra aux table entries to tell glibc what
- * the cache block size is, so it can use the dcbz instruction safely.
- */
-#define AT_DCACHEBSIZE		19
-#define AT_ICACHEBSIZE		20
-#define AT_UCACHEBSIZE		21
-/* A special ignored type value for PPC, for glibc compatibility.  */
-#define AT_IGNOREPPC		22
-
-/* The vDSO location. We have to use the same value as x86 for glibc's
- * sake :-)
- */
-#define AT_SYSINFO_EHDR		33
  
 extern int dcache_bsize;
 extern int icache_bsize;
+#ifndef __ASMS390_AUXVEC_H
+#define __ASMS390_AUXVEC_H
+
+#endif
+#ifndef __ASM_SH_AUXVEC_H
+#define __ASM_SH_AUXVEC_H
+
+#endif /* __ASM_SH_AUXVEC_H */
+#ifndef __ASM_SH64_AUXVEC_H
+#define __ASM_SH64_AUXVEC_H
+
+#endif /* __ASM_SH64_AUXVEC_H */
+#ifndef __ASMSPARC_AUXVEC_H
+#define __ASMSPARC_AUXVEC_H
+
+#endif /* !(__ASMSPARC_AUXVEC_H) */
+#ifndef __ASM_SPARC64_AUXVEC_H
+#define __ASM_SPARC64_AUXVEC_H
+
+#endif /* !(__ASM_SPARC64_AUXVEC_H) */
+#ifndef __UM_AUXVEC_H
+#define __UM_AUXVEC_H
+
+#endif
+#ifndef __V850_AUXVEC_H__
+#define __V850_AUXVEC_H__
+
+#endif /* __V850_AUXVEC_H__ */
+#ifndef __ASM_X86_64_AUXVEC_H
+#define __ASM_X86_64_AUXVEC_H
+
+#endif
+#ifndef __XTENSA_AUXVEC_H
+#define __XTENSA_AUXVEC_H
+
+#endif
+#ifndef _LINUX_AUXVEC_H
+#define _LINUX_AUXVEC_H
+
+#include <asm/auxvec.h>
+
+/* Symbolic values for the entries in the auxiliary table
+   put on the initial stack */
+#define AT_NULL   0	/* end of vector */
+#define AT_IGNORE 1	/* entry should be ignored */
+#define AT_EXECFD 2	/* file descriptor of program */
+#define AT_PHDR   3	/* program headers for program */
+#define AT_PHENT  4	/* size of program header entry */
+#define AT_PHNUM  5	/* number of program headers */
+#define AT_PAGESZ 6	/* system page size */
+#define AT_BASE   7	/* base address of interpreter */
+#define AT_FLAGS  8	/* flags */
+#define AT_ENTRY  9	/* entry point of program */
+#define AT_NOTELF 10	/* program is not ELF */
+#define AT_UID    11	/* real uid */
+#define AT_EUID   12	/* effective uid */
+#define AT_GID    13	/* real gid */
+#define AT_EGID   14	/* effective gid */
+#define AT_PLATFORM 15  /* string identifying CPU for optimizations */
+#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
+#define AT_CLKTCK 17	/* frequency at which times() increments */
+
+#define AT_SECURE 23   /* secure mode boolean */
+
+#define AT_VECTOR_SIZE  42 /* Size of auxiliary table.  */
+
+#endif /* _LINUX_AUXVEC_H */
@@ -2,6 +2,7 @@
 #define _LINUX_ELF_H
  
 #include <linux/types.h>
+#include <linux/auxvec.h>
 #include <asm/elf.h>
  
 #ifndef elf_read_implies_exec
@@ -157,29 +158,6 @@
 #define ELF32_ST_TYPE(x)	ELF_ST_TYPE(x)
 #define ELF64_ST_BIND(x)	ELF_ST_BIND(x)
 #define ELF64_ST_TYPE(x)	ELF_ST_TYPE(x)
-
-/* Symbolic values for the entries in the auxiliary table
-   put on the initial stack */
-#define AT_NULL   0	/* end of vector */
-#define AT_IGNORE 1	/* entry should be ignored */
-#define AT_EXECFD 2	/* file descriptor of program */
-#define AT_PHDR   3	/* program headers for program */
-#define AT_PHENT  4	/* size of program header entry */
-#define AT_PHNUM  5	/* number of program headers */
-#define AT_PAGESZ 6	/* system page size */
-#define AT_BASE   7	/* base address of interpreter */
-#define AT_FLAGS  8	/* flags */
-#define AT_ENTRY  9	/* entry point of program */
-#define AT_NOTELF 10	/* program is not ELF */
-#define AT_UID    11	/* real uid */
-#define AT_EUID   12	/* effective uid */
-#define AT_GID    13	/* real gid */
-#define AT_EGID   14	/* effective gid */
-#define AT_PLATFORM 15  /* string identifying CPU for optimizations */
-#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
-#define AT_CLKTCK 17	/* frequency at which times() increments */
-
-#define AT_SECURE 23   /* secure mode boolean */
  
 typedef struct dynamic{
   Elf32_Sword d_tag;
@@ -35,6 +35,8 @@
 #include <linux/topology.h>
 #include <linux/seccomp.h>
  
+#include <linux/auxvec.h>	/* For AT_VECTOR_SIZE */
+
 struct exec_domain;
  
 /*
@@ -261,7 +263,7 @@
 	mm_counter_t _rss;
 	mm_counter_t _anon_rss;
  
-	unsigned long saved_auxv[42]; /* for /proc/PID/auxv */
+	unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
  
 	unsigned dumpable:2;
 	cpumask_t cpu_vm_mask;
	1	+#ifndef __ASM_ALPHA_AUXVEC_H
	2	+#define __ASM_ALPHA_AUXVEC_H
	3	+
	4	+/* Reserve these numbers for any future use of a VDSO. */
	5	+#if 0
	6	+#define AT_SYSINFO 32
	7	+#define AT_SYSINFO_EHDR 33
	8	+#endif
	9	+
	10	+/* More complete cache descriptions than AT_[DIU]CACHEBSIZE. If the
	11	+ value is -1, then the cache doesn't exist. Otherwise:
	12	+
	13	+ bit 0-3: Cache set-associativity; 0 means fully associative.
	14	+ bit 4-7: Log2 of cacheline size.
	15	+ bit 8-31: Size of the entire cache >> 8.
	16	+ bit 32-63: Reserved.
	17	+*/
	18	+
	19	+#define AT_L1I_CACHESHAPE 34
	20	+#define AT_L1D_CACHESHAPE 35
	21	+#define AT_L2_CACHESHAPE 36
	22	+#define AT_L3_CACHESHAPE 37
	23	+
	24	+#endif /* __ASM_ALPHA_AUXVEC_H */
1	1	#ifndef __ASM_ALPHA_ELF_H
2	2	#define __ASM_ALPHA_ELF_H
3	3
	4	+#include <asm/auxvec.h>
	5	+
4	6	/* Special values for the st_other field in the symbol table. */
5	7
6	8	#define STO_ALPHA_NOPV 0x80
...	...	@@ -141,26 +143,6 @@
141	143	? (amask(AMASK_BWX) ? "ev5" : "ev56") \
142	144	: amask (AMASK_CIX) ? "ev6" : "ev67"); \
143	145	})
144		-
145		-/* Reserve these numbers for any future use of a VDSO. */
146		-#if 0
147		-#define AT_SYSINFO 32
148		-#define AT_SYSINFO_EHDR 33
149		-#endif
150		-
151		-/* More complete cache descriptions than AT_[DIU]CACHEBSIZE. If the
152		- value is -1, then the cache doesn't exist. Otherwise:
153		-
154		- bit 0-3: Cache set-associativity; 0 means fully associative.
155		- bit 4-7: Log2 of cacheline size.
156		- bit 8-31: Size of the entire cache >> 8.
157		- bit 32-63: Reserved.
158		-*/
159		-
160		-#define AT_L1I_CACHESHAPE 34
161		-#define AT_L1D_CACHESHAPE 35
162		-#define AT_L2_CACHESHAPE 36
163		-#define AT_L3_CACHESHAPE 37
164	146
165	147	#ifdef __KERNEL__
166	148
	1	+#ifndef __ASMARM_AUXVEC_H
	2	+#define __ASMARM_AUXVEC_H
	3	+
	4	+#endif
	1	+#ifndef __ASMCRIS_AUXVEC_H
	2	+#define __ASMCRIS_AUXVEC_H
	3	+
	4	+#endif
	1	+#ifndef __ASMH8300_AUXVEC_H
	2	+#define __ASMH8300_AUXVEC_H
	3	+
	4	+#endif
	1	+#ifndef __ASMi386_AUXVEC_H
	2	+#define __ASMi386_AUXVEC_H
	3	+
	4	+/*
	5	+ * Architecture-neutral AT_ values in 0-17, leave some room
	6	+ * for more of them, start the x86-specific ones at 32.
	7	+ */
	8	+#define AT_SYSINFO 32
	9	+#define AT_SYSINFO_EHDR 33
	10	+
	11	+#endif
...	...	@@ -9,6 +9,7 @@
9	9	#include <asm/user.h>
10	10	#include <asm/processor.h>
11	11	#include <asm/system.h> /* for savesegment */
	12	+#include <asm/auxvec.h>
12	13
13	14	#include <linux/utsname.h>
14	15
...	...	@@ -108,13 +109,6 @@
108	109	but that could change... */
109	110
110	111	#define ELF_PLATFORM (system_utsname.machine)
111		-
112		-/*
113		- * Architecture-neutral AT_ values in 0-17, leave some room
114		- * for more of them, start the x86-specific ones at 32.
115		- */
116		-#define AT_SYSINFO 32
117		-#define AT_SYSINFO_EHDR 33
118	112
119	113	#ifdef __KERNEL__
120	114	#define SET_PERSONALITY(ex, ibcs2) do { } while (0)
	1	+#ifndef _ASM_IA64_AUXVEC_H
	2	+#define _ASM_IA64_AUXVEC_H
	3	+
	4	+/*
	5	+ * Architecture-neutral AT_ values are in the range 0-17. Leave some room for more of
	6	+ * them, start the architecture-specific ones at 32.
	7	+ */
	8	+#define AT_SYSINFO 32
	9	+#define AT_SYSINFO_EHDR 33
	10	+
	11	+#endif /* _ASM_IA64_AUXVEC_H */
...	...	@@ -12,6 +12,7 @@
12	12
13	13	#include <asm/fpu.h>
14	14	#include <asm/page.h>
	15	+#include <asm/auxvec.h>
15	16
16	17	/*
17	18	* This is used to ensure we don't load something for the wrong architecture.
...	...	@@ -176,13 +177,6 @@
176	177	implementation specific libraries for optimization. Not terribly
177	178	relevant until we have real hardware to play with... */
178	179	#define ELF_PLATFORM NULL
179		-
180		-/*
181		- * Architecture-neutral AT_ values are in the range 0-17. Leave some room for more of
182		- * them, start the architecture-specific ones at 32.
183		- */
184		-#define AT_SYSINFO 32
185		-#define AT_SYSINFO_EHDR 33
186	180
187	181	#ifdef __KERNEL__
188	182	#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)
	1	+#ifndef _ASM_M32R__AUXVEC_H
	2	+#define _ASM_M32R__AUXVEC_H
	3	+
	4	+#endif /* _ASM_M32R__AUXVEC_H */