From owner-svn-src-stable-10@freebsd.org Wed Nov 23 17:48:46 2016 Return-Path: Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 39E91C51008; Wed, 23 Nov 2016 17:48:46 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F0F56C41; Wed, 23 Nov 2016 17:48:45 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uANHmjHq059764; Wed, 23 Nov 2016 17:48:45 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uANHmhw2059745; Wed, 23 Nov 2016 17:48:43 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201611231748.uANHmhw2059745@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 23 Nov 2016 17:48:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r309061 - in stable/10/libexec/rtld-elf: . amd64 arm i386 ia64 mips powerpc powerpc64 sparc64 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2016 17:48:46 -0000 Author: kib Date: Wed Nov 23 17:48:43 2016 New Revision: 309061 URL: https://svnweb.freebsd.org/changeset/base/309061 Log: MFC r308689: Pass CPUID[1] %edx (cpu_feature), %ecx (cpu_feature2) and CPUID[7].%ebx (cpu_stdext_feature), %ecx (cpu_stdext_feature2) to the ifunc resolvers on x86. MFC r308925: Adjust r308689 to make rtld compilable with either in-tree or (hopefully) stock gcc 4.2.1 on i386 and other arches. Modified: stable/10/libexec/rtld-elf/amd64/reloc.c stable/10/libexec/rtld-elf/amd64/rtld_machdep.h stable/10/libexec/rtld-elf/arm/reloc.c stable/10/libexec/rtld-elf/arm/rtld_machdep.h stable/10/libexec/rtld-elf/i386/reloc.c stable/10/libexec/rtld-elf/i386/rtld_machdep.h stable/10/libexec/rtld-elf/ia64/reloc.c stable/10/libexec/rtld-elf/ia64/rtld_machdep.h stable/10/libexec/rtld-elf/mips/reloc.c stable/10/libexec/rtld-elf/mips/rtld_machdep.h stable/10/libexec/rtld-elf/powerpc/reloc.c stable/10/libexec/rtld-elf/powerpc/rtld_machdep.h stable/10/libexec/rtld-elf/powerpc64/reloc.c stable/10/libexec/rtld-elf/powerpc64/rtld_machdep.h stable/10/libexec/rtld-elf/rtld.c stable/10/libexec/rtld-elf/rtld.h stable/10/libexec/rtld-elf/sparc64/reloc.c stable/10/libexec/rtld-elf/sparc64/rtld_machdep.h Directory Properties: stable/10/ (props changed) Modified: stable/10/libexec/rtld-elf/amd64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/amd64/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/amd64/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -406,7 +407,7 @@ reloc_iresolve(Obj_Entry *obj, RtldLockS ptr = (Elf_Addr *)(obj->relocbase + rela->r_addend); where = (Elf_Addr *)(obj->relocbase + rela->r_offset); lock_release(rtld_bind_lock, lockstate); - target = ((Elf_Addr (*)(void))ptr)(); + target = call_ifunc_resolver(ptr); wlock_acquire(rtld_bind_lock, lockstate); *where = target; break; @@ -450,6 +451,25 @@ reloc_gnu_ifunc(Obj_Entry *obj, int flag return (0); } +uint32_t cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2; + +void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ + u_int p[4], cpu_high; + + do_cpuid(1, p); + cpu_feature = p[3]; + cpu_feature2 = p[2]; + do_cpuid(0, p); + cpu_high = p[0]; + if (cpu_high >= 7) { + cpuid_count(7, 0, p); + cpu_stdext_feature = p[1]; + cpu_stdext_feature2 = p[2]; + } +} + void allocate_initial_tls(Obj_Entry *objs) { Modified: stable/10/libexec/rtld-elf/amd64/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/amd64/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/amd64/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -61,6 +61,14 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +extern uint32_t cpu_feature; +extern uint32_t cpu_feature2; +extern uint32_t cpu_stdext_feature; +extern uint32_t cpu_stdext_feature2; +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(uint32_t, uint32_t, uint32_t, uint32_t))ptr)( \ + cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2)) + #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ Modified: stable/10/libexec/rtld-elf/arm/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/arm/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/arm/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -435,6 +435,11 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr } void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + +void allocate_initial_tls(Obj_Entry *objs) { #ifdef ARM_TP_ADDRESS Modified: stable/10/libexec/rtld-elf/arm/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/arm/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/arm/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -51,6 +51,9 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + #define TLS_TCB_SIZE 8 typedef struct { unsigned long ti_module; Modified: stable/10/libexec/rtld-elf/i386/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/i386/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/i386/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -359,7 +359,7 @@ reloc_iresolve(Obj_Entry *obj, RtldLockS case R_386_IRELATIVE: where = (Elf_Addr *)(obj->relocbase + rel->r_offset); lock_release(rtld_bind_lock, lockstate); - target = ((Elf_Addr (*)(void))(obj->relocbase + *where))(); + target = call_ifunc_resolver(obj->relocbase + *where); wlock_acquire(rtld_bind_lock, lockstate); *where = target; break; @@ -404,6 +404,58 @@ reloc_gnu_ifunc(Obj_Entry *obj, int flag return (0); } +uint32_t cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2; + +static void +rtld_cpuid_count(int idx, int cnt, u_int *p) +{ + + __asm __volatile( + " pushl %%ebx\n" + " cpuid\n" + " movl %%ebx,%1\n" + " popl %%ebx\n" + : "=a" (p[0]), "=r" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (idx), "2" (cnt)); +} + +void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ + u_int p[4], cpu_high; + int cpuid_supported; + + __asm __volatile( + " pushfl\n" + " popl %%eax\n" + " movl %%eax,%%ecx\n" + " xorl $0x200000,%%eax\n" + " pushl %%eax\n" + " popfl\n" + " pushfl\n" + " popl %%eax\n" + " xorl %%eax,%%ecx\n" + " je 1f\n" + " movl $1,%0\n" + " jmp 2f\n" + "1: movl $0,%0\n" + "2:\n" + : "=r" (cpuid_supported) : : "eax", "ecx"); + if (!cpuid_supported) + return; + + rtld_cpuid_count(1, 0, p); + cpu_feature = p[3]; + cpu_feature2 = p[2]; + rtld_cpuid_count(0, 0, p); + cpu_high = p[0]; + if (cpu_high >= 7) { + rtld_cpuid_count(7, 0, p); + cpu_stdext_feature = p[1]; + cpu_stdext_feature2 = p[2]; + } +} + void allocate_initial_tls(Obj_Entry *objs) { Modified: stable/10/libexec/rtld-elf/i386/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/i386/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/i386/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -61,6 +61,14 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +extern uint32_t cpu_feature; +extern uint32_t cpu_feature2; +extern uint32_t cpu_stdext_feature; +extern uint32_t cpu_stdext_feature2; +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(uint32_t, uint32_t, uint32_t, uint32_t))ptr)( \ + cpu_feature, cpu_feature2, cpu_stdext_feature, cpu_stdext_feature2)) + #define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ Modified: stable/10/libexec/rtld-elf/ia64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/ia64/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/ia64/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -603,6 +603,11 @@ call_init_pointer(const Obj_Entry *obj, ((InitArrFunc) &fptr)(main_argc, main_argv, environ); } +void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + /* Initialize the special PLT entries. */ void init_pltgot(Obj_Entry *obj) Modified: stable/10/libexec/rtld-elf/ia64/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/ia64/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/ia64/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -54,6 +54,9 @@ void *make_function_pointer(const Elf_Sy void call_initfini_pointer(const struct Struct_Obj_Entry *, Elf_Addr); void call_init_pointer(const struct Struct_Obj_Entry *, Elf_Addr); +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + #define TLS_TCB_SIZE 16 #define round(size, align) \ Modified: stable/10/libexec/rtld-elf/mips/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/mips/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/mips/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -618,6 +618,11 @@ reloc_jmpslot(Elf_Addr *where, Elf_Addr } void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + +void allocate_initial_tls(Obj_Entry *objs) { char *tls; Modified: stable/10/libexec/rtld-elf/mips/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/mips/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/mips/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -52,6 +52,9 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + typedef struct { unsigned long ti_module; unsigned long ti_offset; Modified: stable/10/libexec/rtld-elf/powerpc/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/powerpc/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -620,6 +620,11 @@ init_pltgot(Obj_Entry *obj) } void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + +void allocate_initial_tls(Obj_Entry *list) { register Elf_Addr **tp __asm__("r2"); Modified: stable/10/libexec/rtld-elf/powerpc/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/powerpc/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/powerpc/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -51,6 +51,9 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + /* * Lazy binding entry point, called via PLT. */ Modified: stable/10/libexec/rtld-elf/powerpc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/powerpc64/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/powerpc64/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -488,6 +488,11 @@ init_pltgot(Obj_Entry *obj) } void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + +void allocate_initial_tls(Obj_Entry *list) { Elf_Addr **tp; Modified: stable/10/libexec/rtld-elf/powerpc64/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/powerpc64/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/powerpc64/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -51,6 +51,9 @@ Elf_Addr reloc_jmpslot(Elf_Addr *where, #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + /* * Lazy binding entry point, called via PLT. */ Modified: stable/10/libexec/rtld-elf/rtld.c ============================================================================== --- stable/10/libexec/rtld-elf/rtld.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/rtld.c Wed Nov 23 17:48:43 2016 (r309061) @@ -635,6 +635,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_ r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */ map_stacks_exec(NULL); + ifunc_init(aux); dbg("resolving ifuncs"); if (resolve_objects_ifunc(obj_main, @@ -683,7 +684,7 @@ rtld_resolve_ifunc(const Obj_Entry *obj, Elf_Addr target; ptr = (void *)make_function_pointer(def, obj); - target = ((Elf_Addr (*)(void))ptr)(); + target = call_ifunc_resolver(ptr); return ((void *)target); } Modified: stable/10/libexec/rtld-elf/rtld.h ============================================================================== --- stable/10/libexec/rtld-elf/rtld.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/rtld.h Wed Nov 23 17:48:43 2016 (r309061) @@ -380,6 +380,7 @@ void dump_Elf_Rela(Obj_Entry *, const El unsigned long elf_hash(const char *); const Elf_Sym *find_symdef(unsigned long, const Obj_Entry *, const Obj_Entry **, int, SymCache *, struct Struct_RtldLockState *); +void ifunc_init(Elf_Auxinfo *); void init_pltgot(Obj_Entry *); void lockdflt_init(void); void digest_notes(Obj_Entry *, Elf_Addr, Elf_Addr); Modified: stable/10/libexec/rtld-elf/sparc64/reloc.c ============================================================================== --- stable/10/libexec/rtld-elf/sparc64/reloc.c Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/sparc64/reloc.c Wed Nov 23 17:48:43 2016 (r309061) @@ -786,6 +786,11 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr return (target); } +void +ifunc_init(Elf_Auxinfo aux_info[__min_size(AT_COUNT)] __unused) +{ +} + /* * Install rtld function call into this PLT slot. */ Modified: stable/10/libexec/rtld-elf/sparc64/rtld_machdep.h ============================================================================== --- stable/10/libexec/rtld-elf/sparc64/rtld_machdep.h Wed Nov 23 16:54:27 2016 (r309060) +++ stable/10/libexec/rtld-elf/sparc64/rtld_machdep.h Wed Nov 23 17:48:43 2016 (r309061) @@ -53,7 +53,10 @@ Elf_Addr reloc_jmpslot(Elf_Addr *, Elf_A #define call_init_pointer(obj, target) \ (((InitArrFunc)(target))(main_argc, main_argv, environ)) -#define round(size, align) \ +#define call_ifunc_resolver(ptr) \ + (((Elf_Addr (*)(void))ptr)()) + +#define round(size, align) \ (((size) + (align) - 1) & ~((align) - 1)) #define calculate_first_tls_offset(size, align) \ round(size, align)