diff options
| author |   Christophe Leroy <christophe.leroy@csgroup.eu> | 2021-03-31 13:59:17 +0000 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2021-04-21 22:52:32 +1000 |
| commit | f56607e85ee38f2a5bb7096e24e2d40f35d714f9 (patch) | |
| tree | fb926036caf49d05db251b6832213b68a2b6782b /tools/testing/selftests/timens | |
| parent | powerpc/mce: save ignore_event flag unconditionally for UE (diff) | |
| download | wireguard-linux-f56607e85ee38f2a5bb7096e24e2d40f35d714f9.tar.xz wireguard-linux-f56607e85ee38f2a5bb7096e24e2d40f35d714f9.zip | |
selftests/timens: Fix gettime_perf to work on powerpc
On powerpc:
- VDSO library is named linux-vdso32.so.1 or linux-vdso64.so.1
- clock_gettime is named __kernel_clock_gettime()
Ensure gettime_perf tries these names before giving up.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/469f37ab91984309eb68c0fb47e8438cdf5b6463.1617198956.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'tools/testing/selftests/timens')
| -rw-r--r-- | tools/testing/selftests/timens/gettime_perf.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/timens/gettime_perf.c b/tools/testing/selftests/timens/gettime_perf.c index 7bf841a3967b..6b13dc277724 100644 --- a/tools/testing/selftests/timens/gettime_perf.c +++ b/tools/testing/selftests/timens/gettime_perf.c @@ -25,6 +25,12 @@ static void fill_function_pointers(void) if (!vdso) vdso = dlopen("linux-gate.so.1", RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); + if (!vdso) + vdso = dlopen("linux-vdso32.so.1", + RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); + if (!vdso) + vdso = dlopen("linux-vdso64.so.1", + RTLD_LAZY | RTLD_LOCAL | RTLD_NOLOAD); if (!vdso) { pr_err("[WARN]\tfailed to find vDSO\n"); return; @@ -32,6 +38,8 @@ static void fill_function_pointers(void) vdso_clock_gettime = (vgettime_t)dlsym(vdso, "__vdso_clock_gettime"); if (!vdso_clock_gettime) + vdso_clock_gettime = (vgettime_t)dlsym(vdso, "__kernel_clock_gettime"); + if (!vdso_clock_gettime) pr_err("Warning: failed to find clock_gettime in vDSO\n"); } |