powerpc: Add HWCAP2 aux entry
Subsystems (3)
PATCH 1/1 powerpc: Add HWCAP2 aux entry
From: Michael Neuling <[email protected]>
We are currently out of free bits in AT_HWCAP. With POWER8, we have several hardware features that we need to advertise. Tested on POWER and x86.
arch/powerpc/include/asm/cputable.h +1 -0
@@ -52,6 +52,7 @@ struct cpu_spec {char *cpu_name;unsigned long cpu_features;/* Kernel features */ unsigned int cpu_user_features;/* Userland features */ +unsigned int cpu_user_features2;/* Userland features v2 */ unsigned int mmu_features;/* MMU features */ /* cache line sizes */
arch/powerpc/include/asm/elf.h +1 -0
@@ -61,6 +61,7 @@ typedef elf_vrregset_t elf_fpxregset_t;instruction set this cpu supports. This could be done in userspace, but it's not easy, and we've already done it here. */ # define ELF_HWCAP (cur_cpu_spec->cpu_user_features) +# define ELF_HWCAP2 (cur_cpu_spec->cpu_user_features2)/* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in
fs/binfmt_elf.c +8 -0
@@ -140,6 +140,13 @@ static int padzero(unsigned long elf_bss)#define ELF_BASE_PLATFORM NULL#endif +/* +* Most archs don't need this +*/ +#ifndef ELF_HWCAP2 +#define ELF_HWCAP2 (0) +#endif +static int create_elf_tables (struct linux_binprm *bprm,struct elfhdr *exec,unsigned long load_addr,unsigned long interp_load_addr)
@@ -240,6 +247,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,NEW_AUX_ENT (AT_EGID ,from_kgid_munged (cred->user_ns, cred->egid));NEW_AUX_ENT (AT_SECURE ,security_bprm_secureexec (bprm));NEW_AUX_ENT (AT_RANDOM , (elf_addr_t )(unsigned long )u_rand_bytes); +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 );NEW_AUX_ENT (AT_EXECFN , bprm->exec);if (k_platform) { NEW_AUX_ENT(AT_PLATFORM,
fs/binfmt_elf_fdpic.c +9 -4
@@ -469,6 +469,13 @@ error_kill:#endif /* +* Most archs don't need this +*/ +#ifndef ELF_HWCAP2 +#define ELF_HWCAP2 (0) +#endif + +/* * present useful information to the program by shovelling it onto the new * process's stack */
@@ -483,7 +490,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,size_t platform_len =0 , len;char *k_platform, *k_base_platform;char __user *u_platform, *u_base_platform, *p; -long hwcap;int loop;int nr;/* reset for each csp adjustment */
@@ -502,8 +508,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,return -EFAULT ;#endif - hwcap =ELF_HWCAP ; -/* * If this architecture has a platform capability string, copy it * to userspace. In some cases (Sparc), this info is impossible
@@ -617,7 +621,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, nr =0 ; csp -=DLINFO_ITEMS *2 *sizeof (unsigned long ); -NEW_AUX_ENT (AT_HWCAP , hwcap); +NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP ); +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 );NEW_AUX_ENT (AT_PAGESZ ,PAGE_SIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC );NEW_AUX_ENT (AT_PHDR , exec_params->ph_addr);
include/uapi/linux/auxvec.h +1 -0
@@ -28,6 +28,7 @@#define AT_BASE_PLATFORM 24/* string identifying real platform, may * differ from AT_PLATFORM. */ #define AT_RANDOM 25/* address of 16 random bytes */ +#define AT_HWCAP2 26/* extension of AT_HWCAP */ #define AT_EXECFN 31/* filename of program */
Hi guys,
Added some folks to CC, blame scripts/get_maintainer.pl.
Comment below ..
Quoted 52 lines · Nishanth Aravamudan
From: Michael Neuling <[email protected]>
We are currently out of free bits in
AT_HWCAP. With POWER8, we have several hardware features that we need to advertise. Tested on POWER and x86.Signed-off-by Michael Neuling <[email protected]>Signed-off-by Nishanth Aravamudan <[email protected]>arch/powerpc/include/asm/cputable.h +1
-0@@ -52,6 +52,7 @@ struct cpu_spec {char *cpu_name;unsigned long cpu_features;/* Kernel features */ unsigned int cpu_user_features;/* Userland features */ +unsigned int cpu_user_features2;/* Userland features v2 */ unsigned int mmu_features;/* MMU features */ /* cache line sizes */ arch/powerpc/include/asm/elf.h +1
-0@@ -61,6 +61,7 @@ typedef elf_vrregset_t elf_fpxregset_t;instruction set this cpu supports. This could be done in userspace, but it's not easy, and we've already done it here. */ # define ELF_HWCAP (cur_cpu_spec->cpu_user_features) +# define ELF_HWCAP2 (cur_cpu_spec->cpu_user_features2)/* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in fs/binfmt_elf.c +7
-0@@ -140,6 +140,13 @@ static int padzero(unsigned long elf_bss)#define ELF_BASE_PLATFORM NULL#endif +/* +* Most archs don't need this +*/ +#ifndef ELF_HWCAP2 +#define ELF_HWCAP2 (0) +#endif +static int create_elf_tables (struct linux_binprm *bprm,struct elfhdr *exec,unsigned long load_addr,unsigned long interp_load_addr)
fs/binfmt_elf.c create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec, · line 250
Quoted 4 lines
fs/binfmt_elf.c +1
-0@@ -240,6 +247,7 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,NEW_AUX_ENT (AT_EGID ,from_kgid_munged (cred->user_ns, cred->egid));NEW_AUX_ENT (AT_SECURE ,security_bprm_secureexec (bprm));NEW_AUX_ENT (AT_RANDOM , (elf_addr_t )(unsigned long )u_rand_bytes); +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 );
Wouldn't it be safer to not emit AT_HWCAP2 unless it is defined by the arch?
That way the change would only impact powerpc.
cheers
Quoted 63 lines
fs/binfmt_elf_fdpic.c +9
-4@@ -469,6 +469,13 @@ error_kill:#endif /* +* Most archs don't need this +*/ +#ifndef ELF_HWCAP2 +#define ELF_HWCAP2 (0) +#endif + +/* * present useful information to the program by shovelling it onto the new * process's stack */ @@ -483,7 +490,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,size_t platform_len =0 , len;char *k_platform, *k_base_platform;char __user *u_platform, *u_base_platform, *p; -long hwcap;int loop;int nr;/* reset for each csp adjustment */ @@ -502,8 +508,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,return -EFAULT ;#endif - hwcap =ELF_HWCAP ; -/* * If this architecture has a platform capability string, copy it * to userspace. In some cases (Sparc), this info is impossible @@ -617,7 +621,8 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, nr =0 ; csp -=DLINFO_ITEMS *2 *sizeof (unsigned long ); -NEW_AUX_ENT (AT_HWCAP , hwcap); +NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP ); +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 );NEW_AUX_ENT (AT_PAGESZ ,PAGE_SIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC );NEW_AUX_ENT (AT_PHDR , exec_params->ph_addr);include/uapi/linux/auxvec.h +1
-0@@ -28,6 +28,7 @@#define AT_BASE_PLATFORM 24/* string identifying real platform, may * differ from AT_PLATFORM. */ #define AT_RANDOM 25/* address of 16 random bytes */ +#define AT_HWCAP2 26/* extension of AT_HWCAP */ #define AT_EXECFN 31/* filename of program */ _______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
PATCH 1/1 powerpc: Add HWCAP2 aux entry
In reply to a message not in the archiveWe are currently out of free bits in AT_HWCAP. With POWER8, we have several hardware features that we need to advertise.
Tested on POWER and x86.
---
Quoted 3 lines
Wouldn't it be safer to not emit
AT_HWCAP2unless it is defined by the arch?That way the change would only impact powerpc.
Should be addressed with this version.
Mikey
arch/powerpc/include/asm/cputable.h +1 -0
@@ -52,6 +52,7 @@ struct cpu_spec {char *cpu_name;unsigned long cpu_features;/* Kernel features */ unsigned int cpu_user_features;/* Userland features */ +unsigned int cpu_user_features2;/* Userland features v2 */ unsigned int mmu_features;/* MMU features */ /* cache line sizes */
arch/powerpc/include/asm/elf.h +1 -0
@@ -61,6 +61,7 @@ typedef elf_vrregset_t elf_fpxregset_t;instruction set this cpu supports. This could be done in userspace, but it's not easy, and we've already done it here. */ # define ELF_HWCAP (cur_cpu_spec->cpu_user_features) +# define ELF_HWCAP2 (cur_cpu_spec->cpu_user_features2)/* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in
fs/binfmt_elf.c +3 -0
@@ -240,6 +240,9 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,NEW_AUX_ENT (AT_EGID ,from_kgid_munged (cred->user_ns, cred->egid));NEW_AUX_ENT (AT_SECURE ,security_bprm_secureexec (bprm));NEW_AUX_ENT (AT_RANDOM , (elf_addr_t )(unsigned long )u_rand_bytes); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_EXECFN , bprm->exec);if (k_platform) { NEW_AUX_ENT(AT_PLATFORM,
fs/binfmt_elf_fdpic.c +4 -4
@@ -483,7 +483,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,size_t platform_len =0 , len;char *k_platform, *k_base_platform;char __user *u_platform, *u_base_platform, *p; -long hwcap;int loop;int nr;/* reset for each csp adjustment */
@@ -502,8 +501,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,return -EFAULT ;#endif - hwcap =ELF_HWCAP ; -/* * If this architecture has a platform capability string, copy it * to userspace. In some cases (Sparc), this info is impossible
@@ -617,7 +614,10 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, nr =0 ; csp -=DLINFO_ITEMS *2 *sizeof (unsigned long ); -NEW_AUX_ENT (AT_HWCAP , hwcap); +NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP ); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_PAGESZ ,PAGE_SIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC );NEW_AUX_ENT (AT_PHDR , exec_params->ph_addr);
include/uapi/linux/auxvec.h +1 -0
@@ -28,6 +28,7 @@#define AT_BASE_PLATFORM 24/* string identifying real platform, may * differ from AT_PLATFORM. */ #define AT_RANDOM 25/* address of 16 random bytes */ +#define AT_HWCAP2 26/* extension of AT_HWCAP */ #define AT_EXECFN 31/* filename of program */
akpm,
If you're happy with this, is it something you can take in your tree?
Mikey
Quoted 105 lines · Michael Neuling
We are currently out of free bits in
AT_HWCAP. With POWER8, we have several hardware features that we need to advertise.Tested on POWER and x86.
Signed-off-by Michael Neuling <[email protected]>Signed-off-by Nishanth Aravamudan <[email protected]>---
Quoted 3 lines
Wouldn't it be safer to not emit
AT_HWCAP2unless it is defined by the arch?That way the change would only impact powerpc.
Should be addressed with this version.
Mikey
arch/powerpc/include/asm/cputable.h +1
-0@@ -52,6 +52,7 @@ struct cpu_spec {char *cpu_name;unsigned long cpu_features;/* Kernel features */ unsigned int cpu_user_features;/* Userland features */ +unsigned int cpu_user_features2;/* Userland features v2 */ unsigned int mmu_features;/* MMU features */ /* cache line sizes */ arch/powerpc/include/asm/elf.h +1
-0@@ -61,6 +61,7 @@ typedef elf_vrregset_t elf_fpxregset_t;instruction set this cpu supports. This could be done in userspace, but it's not easy, and we've already done it here. */ # define ELF_HWCAP (cur_cpu_spec->cpu_user_features) +# define ELF_HWCAP2 (cur_cpu_spec->cpu_user_features2)/* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in fs/binfmt_elf.c +3
-0@@ -240,6 +240,9 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,NEW_AUX_ENT (AT_EGID ,from_kgid_munged (cred->user_ns, cred->egid));NEW_AUX_ENT (AT_SECURE ,security_bprm_secureexec (bprm));NEW_AUX_ENT (AT_RANDOM , (elf_addr_t )(unsigned long )u_rand_bytes); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_EXECFN , bprm->exec);if (k_platform) { NEW_AUX_ENT(AT_PLATFORM,fs/binfmt_elf_fdpic.c +4
-4@@ -483,7 +483,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,size_t platform_len =0 , len;char *k_platform, *k_base_platform;char __user *u_platform, *u_base_platform, *p; -long hwcap;int loop;int nr;/* reset for each csp adjustment */ @@ -502,8 +501,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,return -EFAULT ;#endif - hwcap =ELF_HWCAP ; -/* * If this architecture has a platform capability string, copy it * to userspace. In some cases (Sparc), this info is impossible @@ -617,7 +614,10 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, nr =0 ; csp -=DLINFO_ITEMS *2 *sizeof (unsigned long ); -NEW_AUX_ENT (AT_HWCAP , hwcap); +NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP ); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_PAGESZ ,PAGE_SIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC );NEW_AUX_ENT (AT_PHDR , exec_params->ph_addr);include/uapi/linux/auxvec.h +1
-0@@ -28,6 +28,7 @@#define AT_BASE_PLATFORM 24/* string identifying real platform, may * differ from AT_PLATFORM. */ #define AT_RANDOM 25/* address of 16 random bytes */ +#define AT_HWCAP2 26/* extension of AT_HWCAP */ #define AT_EXECFN 31/* filename of program */ _______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 3 lines · Michael Neuling
akpm,
If you're happy with this, is it something you can take in your tree?
Andrew ? Or give me an ack ? :-) I'm happy to carry this, we need that rather urgently and we have the glibc folks on board.
Cheers,
Ben.
Quoted 112 lines
Mikey
Quoted 100 lines · Michael Neuling
We are currently out of free bits in
AT_HWCAP. With POWER8, we have several hardware features that we need to advertise.Tested on POWER and x86.
Signed-off-by Michael Neuling <[email protected]>Signed-off-by Nishanth Aravamudan <[email protected]>---
Quoted 3 lines
Wouldn't it be safer to not emit
AT_HWCAP2unless it is defined by the arch?That way the change would only impact powerpc.
Should be addressed with this version.
Mikey
arch/powerpc/include/asm/cputable.h +1
-0@@ -52,6 +52,7 @@ struct cpu_spec {char *cpu_name;unsigned long cpu_features;/* Kernel features */ unsigned int cpu_user_features;/* Userland features */ +unsigned int cpu_user_features2;/* Userland features v2 */ unsigned int mmu_features;/* MMU features */ /* cache line sizes */ arch/powerpc/include/asm/elf.h +1
-0@@ -61,6 +61,7 @@ typedef elf_vrregset_t elf_fpxregset_t;instruction set this cpu supports. This could be done in userspace, but it's not easy, and we've already done it here. */ # define ELF_HWCAP (cur_cpu_spec->cpu_user_features) +# define ELF_HWCAP2 (cur_cpu_spec->cpu_user_features2)/* This yields a string that ld.so will use to load implementation specific libraries for optimization. This is more specific in fs/binfmt_elf.c +3
-0@@ -240,6 +240,9 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,NEW_AUX_ENT (AT_EGID ,from_kgid_munged (cred->user_ns, cred->egid));NEW_AUX_ENT (AT_SECURE ,security_bprm_secureexec (bprm));NEW_AUX_ENT (AT_RANDOM , (elf_addr_t )(unsigned long )u_rand_bytes); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_EXECFN , bprm->exec);if (k_platform) { NEW_AUX_ENT(AT_PLATFORM,fs/binfmt_elf_fdpic.c +4
-4@@ -483,7 +483,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,size_t platform_len =0 , len;char *k_platform, *k_base_platform;char __user *u_platform, *u_base_platform, *p; -long hwcap;int loop;int nr;/* reset for each csp adjustment */ @@ -502,8 +501,6 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm,return -EFAULT ;#endif - hwcap =ELF_HWCAP ; -/* * If this architecture has a platform capability string, copy it * to userspace. In some cases (Sparc), this info is impossible @@ -617,7 +614,10 @@ static int create_elf_fdpic_tables(struct linux_binprm *bprm, nr =0 ; csp -=DLINFO_ITEMS *2 *sizeof (unsigned long ); -NEW_AUX_ENT (AT_HWCAP , hwcap); +NEW_AUX_ENT (AT_HWCAP ,ELF_HWCAP ); +#ifdef ELF_HWCAP2 +NEW_AUX_ENT (AT_HWCAP2 ,ELF_HWCAP2 ); +#endif NEW_AUX_ENT (AT_PAGESZ ,PAGE_SIZE );NEW_AUX_ENT (AT_CLKTCK ,CLOCKS_PER_SEC );NEW_AUX_ENT (AT_PHDR , exec_params->ph_addr);include/uapi/linux/auxvec.h +1
-0@@ -28,6 +28,7 @@#define AT_BASE_PLATFORM 24/* string identifying real platform, may * differ from AT_PLATFORM. */ #define AT_RANDOM 25/* address of 16 random bytes */ +#define AT_HWCAP2 26/* extension of AT_HWCAP */ #define AT_EXECFN 31/* filename of program */ Quoted 5 lines
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev
Quoted 7 lines · On Tue, 23 Apr 2013 10:41:42 +1000 Benjamin Herrenschmidt…
Quoted 3 lines · Michael Neuling
akpm,
If you're happy with this, is it something you can take in your tree?
Andrew ? Or give me an ack ? :-) I'm happy to carry this, we need that rather urgently and we have the glibc folks on board.
Looks good to me - please proceed with the patch.