Add support for more getauxval(3) parameters

Author: GrieferAtWork

kos/include/elf.h

@@ -1945,6 +1945,9 @@ typedef struct elf64_auxv_t /*[NAME(elf64_auxv)][PREFIX(a_)]*/ {
 /* Everything from here on seems to be non-portable (linux- (and KOS) specific?) */
 #define AT_PLATFORM          15         /* String identifying platform. */
 #define AT_HWCAP             16         /* Machine dependent hints about processor capabilities. */
+#define   HWCAP_X86_SSE2     0x0001    /* [i386] */
+#define   HWCAP_X86_64       0x0002    /* [x86_64] */
+#define   HWCAP_X86_AVX512_1 0x0004    /* [x86_64] */
 #define AT_CLKTCK            17         /* Frequency of times() */
 #define AT_FPUCW             18         /* Used FPU control word.
                                          * This entry gives some information about the
@@ -1959,10 +1962,10 @@ typedef struct elf64_auxv_t /*[NAME(elf64_auxv)][PREFIX(a_)]*/ {
 #define AT_BASE_PLATFORM     24         /* String identifying real platforms. */
 #define AT_RANDOM            25         /* Address of 16 random bytes. */
 #define AT_HWCAP2            26         /* More machine-dependent hints about processor capabilities. */
-/*efine AT_                  27          * ... */
-/*efine AT_                  28          * ... */
-/*efine AT_                  29          * ... */
-/*efine AT_                  30          * ... */
+#define AT_RSEQ_FEATURE_SIZE 27         /* rseq supported feature size.  */
+#define AT_RSEQ_ALIGN        28         /* rseq allocation alignment.  */
+#define AT_HWCAP3            29         /* extension of AT_HWCAP.  */
+#define AT_HWCAP4            30         /* extension of AT_HWCAP.  */
 #define AT_EXECFN            31         /* Filename of executable (absolute & normalized; s.a. `dlmodulename()') */
 #define AT_SYSINFO           32         /* Pointer to the global system page used for system calls and other nice things. */
 #define AT_SYSINFO_EHDR      33         /* *ditto* */

kos/src/kernel/core/memory/mman/driver.c

@@ -1694,51 +1694,51 @@ driver_dlsym_drv(struct driver *__restrict self,
                  struct driver_syminfo *__restrict info)
 		THROWS(E_SEGFAULT, ...) {
 	NCX char const *name = info->dsi_name + 4;
-	if (strcmp(name, "self") == 0) {
+	if (strcmp(name, "self") == 0) { /* extern struct driver drv_self; */
 		info->dsi_addr = self;
 		info->dsi_size = sizeof(*self);
 		goto ok;
 	}
 	if (name[0] == 'l' && name[1] == 'o' &&
 	    name[2] == 'a' && name[3] == 'd') {
 		NCX char const *load_name = name + 4;
-		if (strcmp(load_name, "addr") == 0) {
+		if (strcmp(load_name, "addr") == 0) { /* extern byte_t drv_loadaddr[]; */
 			info->dsi_addr = (void *)self->d_module.md_loadaddr;
 			goto ok_size0;
 		}
-		if (strcmp(load_name, "min") == 0) {
+		if (strcmp(load_name, "min") == 0) { /* extern byte_t drv_loadmin[]; */
 			info->dsi_addr = self->d_module.md_loadmin;
 			goto ok_size0;
 		}
-		if (strcmp(load_name, "max") == 0) {
+		if (strcmp(load_name, "max") == 0) { /* extern byte_t drv_loadmax[]; */
 			info->dsi_addr = self->d_module.md_loadmax;
 			goto ok_size0;
 		}
 	}
-	if (strcmp(name, "name") == 0) {
+	if (strcmp(name, "name") == 0) { /* extern char drv_name[]; */
 		info->dsi_addr = (void *)self->d_name;
 		info->dsi_size = (strlen(self->d_name) + 1) * sizeof(char);
 		goto ok;
 	}
-	if (strcmp(name, "file") == 0) {
+	if (strcmp(name, "file") == 0) { /* extern struct mfile *drv_file; */
 		COMPILER_UNUSED(driver_getfile(self)); /* Make sure it was initialized */
 		info->dsi_addr = &self->d_module.md_file;
 		info->dsi_size = sizeof(void *);
 		goto ok;
 	}
-	if (strcmp(name, "cmdline") == 0) {
+	if (strcmp(name, "cmdline") == 0) { /* extern char drv_cmdline[]; */
 		info->dsi_addr = (void *)self->d_cmdline;
 		info->dsi_size = (strlen(self->d_cmdline) + 1) * sizeof(char);
 		goto ok;
 	}
 	if (name[0] == 'a' && name[1] == 'r' && name[2] == 'g') {
 		NCX char const *arg_name = name + 3;
-		if (strcmp(arg_name, "c") == 0) {
+		if (strcmp(arg_name, "c") == 0) { /* extern size_t drv_argc; */
 			info->dsi_addr = &self->d_argc;
 			info->dsi_size = sizeof(self->d_argc);
 			goto ok;
 		}
-		if (strcmp(arg_name, "v") == 0) {
+		if (strcmp(arg_name, "v") == 0) { /* extern char *drv_argv[]; */
 			info->dsi_addr = self->d_argv;
 			info->dsi_size = self->d_argc * sizeof(char *);
 			goto ok;

kos/src/kernel/core/misc/except-syscall.c

@@ -85,9 +85,9 @@ PUBLIC ATTR_PERTASK ATTR_ALIGN(struct user_except_handler) this_user_except_hand
  * TID. */
 PUBLIC ATTR_PERTASK ATTR_ALIGN(NCX pid_t *) this_tid_address = NULL;
 
-DEFINE_PERMMAN_ONEXEC(reset_user_except_handler);
-PRIVATE ATTR_USED NOBLOCK void
-NOTHROW(KCALL reset_user_except_handler)(void) {
+DEFINE_PERMMAN_ONEXEC(onexec_reset_user_except_handler);
+INTDEF NOBLOCK void NOTHROW(KCALL onexec_reset_user_except_handler)(void);
+INTERN NOBLOCK void NOTHROW(KCALL onexec_reset_user_except_handler)(void) {
 	struct user_except_handler *hand;
 	hand            = &PERTASK(this_user_except_handler);
 	hand->ueh_mode  = EXCEPT_HANDLER_MODE_DISABLED;

kos/src/kernel/core/sched/sigaction.c

@@ -438,6 +438,7 @@ NOTHROW(FCALL sighand_has_nondefault_sig_ign)(struct sighand const *__restrict s
 
 /* During exec(), all signal handler dispositions of the calling thread are reset */
 DEFINE_PERMMAN_ONEXEC(onexec_posix_signals_reset_action);
+INTDEF void KCALL onexec_posix_signals_reset_action(void);
 INTERN void KCALL onexec_posix_signals_reset_action(void) {
 	REF struct sighand_ptr *handptr;
 	/* Posix says that signals set to SIG_IGN should remain SIG_IGN after exec(). */

kos/src/kernel/core/sched/task-clone.c

@@ -949,20 +949,20 @@ task_clone_kthread(int (*thread_main)(), size_t argc, ...)
 
 
 /* Per-task relocations */
-INTDEF uintptr_t __kernel_pertask_relocations_start[];
-INTDEF uintptr_t __kernel_pertask_relocations_end[];
+extern uintptr_t __kernel_pertask_relocations_start[];
+extern uintptr_t __kernel_pertask_relocations_end[];
 
 /* Initialize task relocations, as defined by `DEFINE_PERTASK_RELOCATION()' */
 INTERN NOBLOCK NONNULL((1)) void
 NOTHROW(FCALL _task_init_relocations)(struct task *__restrict self) {
 	uintptr_t *p_offset;
 	/* Apply relocations */
-	for (p_offset = __kernel_pertask_relocations_start;
-	     p_offset < __kernel_pertask_relocations_end; ++p_offset) {
+	p_offset = __kernel_pertask_relocations_start;
+	do {
 		uintptr_t *reladdr;
 		reladdr = (uintptr_t *)((byte_t *)self + *p_offset);
 		*reladdr += (uintptr_t)self;
-	}
+	} while (++p_offset < __kernel_pertask_relocations_end);
 
 	/* Assert that relocations were applied correctly. */
 	assert(self->t_self == self);

kos/src/libc/user/sys.auxv.c

@@ -50,6 +50,14 @@
 #include <string.h> /* preadall */
 #endif /* __i386__ && !__x86_64__ */
 
+#if defined(__x86_64__) || defined(__i386__)
+#include <asm/intrin-cpuid.h>
+#endif /* ... */
+
+#if __has_include(<fpu_control.h>)
+#include <fpu_control.h>
+#endif /* __has_include(<fpu_control.h>) */
+
 DECL_BEGIN
 
 PRIVATE ATTR_SECTION(".rodata.crt.system.getauxval") char const
@@ -135,10 +143,6 @@ NOTHROW_NCX(LIBCCALL libc_getauxval)(ulongptr_t type)
 	ulongptr_t result;
 	switch (type) {
 
-	case AT_IGNORE:
-		result = 0;
-		break;
-
 	case AT_EXECFD:
 		result = dlmodulefd(dlopen(NULL, 0));
 		break;
@@ -271,9 +275,67 @@ NOTHROW_NCX(LIBCCALL libc_getauxval)(ulongptr_t type)
 	case AT_MINSIGSTKSZ:
 		return SIGSTKSZ;
 
+#ifdef __x86_64__
+	case AT_HWCAP: {
+		/* This logic here matches what is done by GLibc */
+		uint32_t eax, ebx, ecx, edx;
+		result = HWCAP_X86_64;
+		__cpuid(0, &eax, &ecx, &edx, &ebx);
+		if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69 && eax >= 7) {
+			uint32_t b7 = __cpuid_ebx(0x7);
+			if ((b7 & (CPUID_7B_AVX512CD | CPUID_7B_AVX512ER | CPUID_7B_AVX512BW |
+			           CPUID_7B_AVX512DQ | CPUID_7B_AVX512VL)) ==
+			    /* */ (CPUID_7B_AVX512CD | CPUID_7B_AVX512BW | CPUID_7B_AVX512DQ | CPUID_7B_AVX512VL))
+				result |= HWCAP_X86_AVX512_1;
+		}
+	}	break;
+#elif defined(__i386__)
+	case AT_HWCAP: {
+		/* This logic here matches what is done by GLibc */
+		uint32_t eax, ebx, ecx, edx;
+		result = 0;
+		__cpuid(0, &eax, &ecx, &edx, &ebx);
+		if (eax >= 1) {
+			if (__cpuid_edx(0x1) & CPUID_1D_SSE2)
+				result |= HWCAP_X86_SSE2;
+		}
+	}	break;
+#endif /* ... */
+
+#ifdef _FPU_DEFAULT
+	case AT_FPUCW:
+		result = _FPU_DEFAULT;
+		break;
+#endif /* _FPU_DEFAULT */
+
+//TODO:#define AT_DCACHEBSIZE       19         /* Cache block sizes. Data cache block size. */
+//TODO:#define AT_ICACHEBSIZE       20         /* Instruction cache block size. */
+//TODO:#define AT_UCACHEBSIZE       21         /* Unified cache block size. */
+//TODO:#define AT_HWCAP2            26         /* More machine-dependent hints about processor capabilities. */
+//TODO:#define AT_RSEQ_FEATURE_SIZE 27         /* rseq supported feature size.  */
+//TODO:#define AT_RSEQ_ALIGN        28         /* rseq allocation alignment.  */
+//TODO:#define AT_HWCAP3            29         /* extension of AT_HWCAP.  */
+//TODO:#define AT_HWCAP4            30         /* extension of AT_HWCAP.  */
+//TODO:#define AT_SYSINFO           32         /* Pointer to the global system page used for system calls and other nice things. */
+//TODO:#define AT_SYSINFO_EHDR      33         /* *ditto* */
+//TODO:#define AT_L1I_CACHESHAPE    34         /* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains log2 of line size; mask those to get cache size. */
+//TODO:#define AT_L1D_CACHESHAPE    35         /* ... */
+//TODO:#define AT_L2_CACHESHAPE     36         /* ... */
+//TODO:#define AT_L3_CACHESHAPE     37         /* ... */
+//TODO:#define AT_L1I_CACHESIZE     40         /* Shapes of the caches, with more room to describe them. `AT_*GEOMETRY' are comprised of cache line size in bytes in the bottom 16 bits and the cache associativity in the next 16 bits. */
+//TODO:#define AT_L1I_CACHEGEOMETRY 41         /* ... */
+//TODO:#define AT_L1D_CACHESIZE     42         /* ... */
+//TODO:#define AT_L1D_CACHEGEOMETRY 43         /* ... */
+//TODO:#define AT_L2_CACHESIZE      44         /* ... */
+//TODO:#define AT_L2_CACHEGEOMETRY  45         /* ... */
+//TODO:#define AT_L3_CACHESIZE      46         /* ... */
+//TODO:#define AT_L3_CACHEGEOMETRY  47         /* ... */
+
 	default:
 not_found:
 		libc_seterrno(ENOENT);
+		ATTR_FALLTHROUGH
+	case AT_IGNORE:
 		result = 0;
 		break;
 	}