From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
Thomas Gleixner <tglx@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] selftests: vDSO: vdso_standalone_test_x86: Replace source file with symlink
Date: Tue, 01 Jul 2025 13:59:13 -0000 [thread overview]
Message-ID: <175137835327.406.9253965691286380497.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250611-selftests-vdso-fixes-v3-9-e62e37a6bcf5@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 437079605c26dc7c98586580a8c01b5f7f746a79
Gitweb: https://git.kernel.org/tip/437079605c26dc7c98586580a8c01b5f7f746a79
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Wed, 11 Jun 2025 12:33:59 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Tue, 01 Jul 2025 15:50:43 +02:00
selftests: vDSO: vdso_standalone_test_x86: Replace source file with symlink
With the switch over to nolibc the source file vdso_standalone_test_x86.c
was intended to be replaced with a symlink to vdso_test_gettimeofday.c.
This was the patch that was submitted to LKML, but during application the
symlink was replaced by a textual copy of the linked-to file.
Having two copies introduces the possibility of divergence and increases
maintenance burden, switch back to a symlink.
Fixes: 8770a9183fe1 ("selftests: vDSO: vdso_standalone_test_x86: Switch to nolibc")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20250226-parse_vdso-nolibc-v2-16-28e14e031ed8@linutronix.de/
Link: https://lore.kernel.org/all/20250611-selftests-vdso-fixes-v3-9-e62e37a6bcf5@linutronix.de
---
tools/testing/selftests/vDSO/vdso_standalone_test_x86.c | 58 +--------
tools/testing/selftests/vDSO/vdso_standalone_test_x86.c | 1 +-
2 files changed, 1 insertion(+), 58 deletions(-)
delete mode 100644 tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
create mode 120000 tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
deleted file mode 100644
index 9ce795b..0000000
--- a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
+++ /dev/null
@@ -1,58 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * vdso_test_gettimeofday.c: Sample code to test parse_vdso.c and
- * vDSO gettimeofday()
- * Copyright (c) 2014 Andy Lutomirski
- *
- * Compile with:
- * gcc -std=gnu99 vdso_test_gettimeofday.c parse_vdso_gettimeofday.c
- *
- * Tested on x86, 32-bit and 64-bit. It may work on other architectures, too.
- */
-
-#include <stdio.h>
-#ifndef NOLIBC
-#include <sys/auxv.h>
-#include <sys/time.h>
-#endif
-
-#include "../kselftest.h"
-#include "parse_vdso.h"
-#include "vdso_config.h"
-#include "vdso_call.h"
-
-int main(int argc, char **argv)
-{
- const char *version = versions[VDSO_VERSION];
- const char **name = (const char **)&names[VDSO_NAMES];
-
- unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
- if (!sysinfo_ehdr) {
- printf("AT_SYSINFO_EHDR is not present!\n");
- return KSFT_SKIP;
- }
-
- vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));
-
- /* Find gettimeofday. */
- typedef long (*gtod_t)(struct timeval *tv, struct timezone *tz);
- gtod_t gtod = (gtod_t)vdso_sym(version, name[0]);
-
- if (!gtod) {
- printf("Could not find %s\n", name[0]);
- return KSFT_SKIP;
- }
-
- struct timeval tv;
- long ret = VDSO_CALL(gtod, 2, &tv, 0);
-
- if (ret == 0) {
- printf("The time is %lld.%06lld\n",
- (long long)tv.tv_sec, (long long)tv.tv_usec);
- } else {
- printf("%s failed\n", name[0]);
- return KSFT_FAIL;
- }
-
- return 0;
-}
diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
new file mode 120000
index 0000000..4d3d96f
--- /dev/null
+++ b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c
@@ -0,0 +1 @@
+vdso_test_gettimeofday.c
\ No newline at end of file
prev parent reply other threads:[~2025-07-01 13:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 10:33 [PATCH v3 0/9] selftests: vDSO: Some cleanups and (warning) fixes Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 1/9] selftests: vDSO: chacha: Correctly skip test if necessary Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 2/9] selftests: vDSO: clock_getres: Drop unused include of err.h Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 3/9] selftests: vDSO: vdso_test_getrandom: Drop unused include of linux/compiler.h Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 4/9] selftests: vDSO: vdso_test_getrandom: Avoid -Wunused Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 5/9] selftests: vDSO: vdso_config: Avoid -Wunused-variables Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 6/9] selftests: vDSO: enable -Wall Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] selftests: vDSO: Enable -Wall tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 7/9] selftests: vDSO: vdso_test_correctness: Fix -Wstrict-prototypes Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 8/9] selftests: vDSO: vdso_test_getrandom: Always print TAP header Thomas Weißschuh
2025-07-01 13:59 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-06-11 10:33 ` [PATCH v3 9/9] selftests: vDSO: vdso_standalone_test_x86: Replace source file with symlink Thomas Weißschuh
2025-07-01 13:59 ` tip-bot2 for Thomas Weißschuh [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=175137835327.406.9253965691286380497.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=thomas.weissschuh@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®