Commit 05c204ac authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Thomas Gleixner
Browse files

selftests: vDSO: vdso_standalone_test_x86: Use vdso_init_form_sysinfo_ehdr



vdso_standalone_test_x86 is the only user of vdso_init_from_auxv().
Instead of combining the parsing the aux vector with the parsing of the
vDSO, split them apart into getauxval() and the regular
vdso_init_from_sysinfo_ehdr().

The implementation of getauxval() is taken from
tools/include/nolibc/stdlib.h.

Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Acked-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://lore.kernel.org/all/20250226-parse_vdso-nolibc-v2-10-28e14e031ed8@linutronix.de
parent 5caaa0aa
Loading
Loading
Loading
Loading
+26 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
#include <sys/time.h>
#include <unistd.h>
#include <stdint.h>
#include <linux/auxvec.h>

#include "parse_vdso.h"

@@ -84,6 +85,30 @@ void to_base10(char *lastdig, time_t n)
	}
}

unsigned long getauxval(const unsigned long *auxv, unsigned long type)
{
	unsigned long ret;

	if (!auxv)
		return 0;

	while (1) {
		if (!auxv[0] && !auxv[1]) {
			ret = 0;
			break;
		}

		if (auxv[0] == type) {
			ret = auxv[1];
			break;
		}

		auxv += 2;
	}

	return ret;
}

void c_main(void **stack)
{
	/* Parse the stack */
@@ -96,7 +121,7 @@ void c_main(void **stack)
	stack++;

	/* Now we're pointing at auxv.  Initialize the vDSO parser. */
	vdso_init_from_auxv((void *)stack);
	vdso_init_from_sysinfo_ehdr(getauxval((unsigned long *)stack, AT_SYSINFO_EHDR));

	/* Find gettimeofday. */
	typedef long (*gtod_t)(struct timeval *tv, struct timezone *tz);