2021-02-04 14:54:12

by Tobias Klauser

Subject: [PATCH] selftests/vDSO: fix ABI selftest on riscv

Only older versions of the RISC-V GCC toolchain define __riscv__. Check
for __riscv as well, which is used by newer GCC toolchains. Also set
VDSO_32BIT based on __riscv_xlen.

Before (on riscv64):

$ ./vdso_test_abi
[vDSO kselftest] VDSO_VERSION: LINUX_4
Could not find __vdso_gettimeofday
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_REALTIME [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_BOOTTIME [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_TAI [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_REALTIME_COARSE [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_MONOTONIC [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_MONOTONIC_RAW [PASS]
Could not find __vdso_clock_gettime
Could not find __vdso_clock_getres
clock_id: CLOCK_MONOTONIC_COARSE [PASS]
Could not find __vdso_time

After (on riscv32):

$ ./vdso_test_abi
[vDSO kselftest] VDSO_VERSION: LINUX_4.15
The time is 1612449376.015086
The time is 1612449376.18340784
The resolution is 0 1
clock_id: CLOCK_REALTIME [PASS]
The time is 774.842586182
The resolution is 0 1
clock_id: CLOCK_BOOTTIME [PASS]
The time is 1612449376.22536565
The resolution is 0 1
clock_id: CLOCK_TAI [PASS]
The time is 1612449376.20885172
The resolution is 0 4000000
clock_id: CLOCK_REALTIME_COARSE [PASS]
The time is 774.845491269
The resolution is 0 1
clock_id: CLOCK_MONOTONIC [PASS]
The time is 774.849534200
The resolution is 0 1
clock_id: CLOCK_MONOTONIC_RAW [PASS]
The time is 774.842139684
The resolution is 0 4000000
clock_id: CLOCK_MONOTONIC_COARSE [PASS]
Could not find __vdso_time

Signed-off-by: Tobias Klauser <[email protected]>
---
tools/testing/selftests/vDSO/vdso_config.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h
index 6a6fe8d4ff55..6188b16827d1 100644
--- a/tools/testing/selftests/vDSO/vdso_config.h
+++ b/tools/testing/selftests/vDSO/vdso_config.h
@@ -47,10 +47,12 @@
#elif defined(__x86_64__)
#define VDSO_VERSION 0
#define VDSO_NAMES 1
-#elif defined(__riscv__)
+#elif defined(__riscv__) || defined(__riscv)
#define VDSO_VERSION 5
#define VDSO_NAMES 1
+#if __riscv_xlen == 32
#define VDSO_32BIT 1
+#endif
#else /* nds32 */
#define VDSO_VERSION 4
#define VDSO_NAMES 1
--
2.30.0

2021-02-05 07:10:19

by Palmer Dabbelt

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:
> Only older versions of the RISC-V GCC toolchain define __riscv__. Check
> for __riscv as well, which is used by newer GCC toolchains. Also set
> VDSO_32BIT based on __riscv_xlen.
>
> Before (on riscv64):
>
> $ ./vdso_test_abi
> [vDSO kselftest] VDSO_VERSION: LINUX_4
> Could not find __vdso_gettimeofday
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_REALTIME [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_BOOTTIME [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_TAI [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_REALTIME_COARSE [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_MONOTONIC [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_MONOTONIC_RAW [PASS]
> Could not find __vdso_clock_gettime
> Could not find __vdso_clock_getres
> clock_id: CLOCK_MONOTONIC_COARSE [PASS]
> Could not find __vdso_time
>
> After (on riscv32):
>
> $ ./vdso_test_abi
> [vDSO kselftest] VDSO_VERSION: LINUX_4.15
> The time is 1612449376.015086
> The time is 1612449376.18340784
> The resolution is 0 1
> clock_id: CLOCK_REALTIME [PASS]
> The time is 774.842586182
> The resolution is 0 1
> clock_id: CLOCK_BOOTTIME [PASS]
> The time is 1612449376.22536565
> The resolution is 0 1
> clock_id: CLOCK_TAI [PASS]
> The time is 1612449376.20885172
> The resolution is 0 4000000
> clock_id: CLOCK_REALTIME_COARSE [PASS]
> The time is 774.845491269
> The resolution is 0 1
> clock_id: CLOCK_MONOTONIC [PASS]
> The time is 774.849534200
> The resolution is 0 1
> clock_id: CLOCK_MONOTONIC_RAW [PASS]
> The time is 774.842139684
> The resolution is 0 4000000
> clock_id: CLOCK_MONOTONIC_COARSE [PASS]
> Could not find __vdso_time
>
> Signed-off-by: Tobias Klauser <[email protected]>
> ---
> tools/testing/selftests/vDSO/vdso_config.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/vDSO/vdso_config.h b/tools/testing/selftests/vDSO/vdso_config.h
> index 6a6fe8d4ff55..6188b16827d1 100644
> --- a/tools/testing/selftests/vDSO/vdso_config.h
> +++ b/tools/testing/selftests/vDSO/vdso_config.h
> @@ -47,10 +47,12 @@
> #elif defined(__x86_64__)
> #define VDSO_VERSION 0
> #define VDSO_NAMES 1
> -#elif defined(__riscv__)
> +#elif defined(__riscv__) || defined(__riscv)
> #define VDSO_VERSION 5
> #define VDSO_NAMES 1
> +#if __riscv_xlen == 32
> #define VDSO_32BIT 1
> +#endif
> #else /* nds32 */
> #define VDSO_VERSION 4
> #define VDSO_NAMES 1

Reviewed-by: Palmer Dabbelt <[email protected]>
Acked-by: Palmer Dabbelt <[email protected]>

Not sure if you want this through the RISC-V tree, so I'm leaving it out for
now and assuming it'll go through a kselftest tree.

Thanks!

2021-02-05 08:00:24

by Tobias Klauser

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On 2021-02-05 at 08:06:37 +0100, Palmer Dabbelt <[email protected]> wrote:
> On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:

[...]

> Reviewed-by: Palmer Dabbelt <[email protected]>
> Acked-by: Palmer Dabbelt <[email protected]>

Thank you!

> Not sure if you want this through the RISC-V tree, so I'm leaving it out for
> now and assuming it'll go through a kselftest tree.

Either way is fine for me.

2021-02-05 11:15:56

by Vincenzo Frascino

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On 2/5/21 7:06 AM, Palmer Dabbelt wrote:
> On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:
>> Only older versions of the RISC-V GCC toolchain define __riscv__. Check
>> for __riscv as well, which is used by newer GCC toolchains. Also set
>> VDSO_32BIT based on __riscv_xlen.
>>
>> Before (on riscv64):
>>
>> $ ./vdso_test_abi
>> [vDSO kselftest] VDSO_VERSION: LINUX_4
>> Could not find __vdso_gettimeofday
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_REALTIME [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_BOOTTIME [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_TAI [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_REALTIME_COARSE [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_MONOTONIC [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_MONOTONIC_RAW [PASS]
>> Could not find __vdso_clock_gettime
>> Could not find __vdso_clock_getres
>> clock_id: CLOCK_MONOTONIC_COARSE [PASS]
>> Could not find __vdso_time
>>
>> After (on riscv32):
>>
>> $ ./vdso_test_abi
>> [vDSO kselftest] VDSO_VERSION: LINUX_4.15
>> The time is 1612449376.015086
>> The time is 1612449376.18340784
>> The resolution is 0 1
>> clock_id: CLOCK_REALTIME [PASS]
>> The time is 774.842586182
>> The resolution is 0 1
>> clock_id: CLOCK_BOOTTIME [PASS]
>> The time is 1612449376.22536565
>> The resolution is 0 1
>> clock_id: CLOCK_TAI [PASS]
>> The time is 1612449376.20885172
>> The resolution is 0 4000000
>> clock_id: CLOCK_REALTIME_COARSE [PASS]
>> The time is 774.845491269
>> The resolution is 0 1
>> clock_id: CLOCK_MONOTONIC [PASS]
>> The time is 774.849534200
>> The resolution is 0 1
>> clock_id: CLOCK_MONOTONIC_RAW [PASS]
>> The time is 774.842139684
>> The resolution is 0 4000000
>> clock_id: CLOCK_MONOTONIC_COARSE [PASS]
>> Could not find __vdso_time
>>
>> Signed-off-by: Tobias Klauser <[email protected]>
>> ---
>>  tools/testing/selftests/vDSO/vdso_config.h | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/testing/selftests/vDSO/vdso_config.h
>> b/tools/testing/selftests/vDSO/vdso_config.h
>> index 6a6fe8d4ff55..6188b16827d1 100644
>> --- a/tools/testing/selftests/vDSO/vdso_config.h
>> +++ b/tools/testing/selftests/vDSO/vdso_config.h
>> @@ -47,10 +47,12 @@
>>  #elif defined(__x86_64__)
>>  #define VDSO_VERSION        0
>>  #define VDSO_NAMES        1
>> -#elif defined(__riscv__)
>> +#elif defined(__riscv__) || defined(__riscv)
>>  #define VDSO_VERSION        5
>>  #define VDSO_NAMES        1
>> +#if __riscv_xlen == 32
>>  #define VDSO_32BIT        1
>> +#endif
>>  #else /* nds32 */
>>  #define VDSO_VERSION        4
>>  #define VDSO_NAMES        1
>
> Reviewed-by: Palmer Dabbelt <[email protected]>
> Acked-by: Palmer Dabbelt <[email protected]>
>

Acked-by: Vincenzo Frascino <[email protected]>

> Not sure if you want this through the RISC-V tree, so I'm leaving it out for
> now and assuming it'll go through a kselftest tree.
>
> Thanks!

--
Regards,
Vincenzo

2021-02-08 23:42:04

by Shuah Khan

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On 2/5/21 12:57 AM, Tobias Klauser wrote:
> On 2021-02-05 at 08:06:37 +0100, Palmer Dabbelt <[email protected]> wrote:
>> On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:
>
> [...]
>
>> Reviewed-by: Palmer Dabbelt <[email protected]>
>> Acked-by: Palmer Dabbelt <[email protected]>
>
> Thank you!
>
>> Not sure if you want this through the RISC-V tree, so I'm leaving it out for
>> now and assuming it'll go through a kselftest tree.
>
> Either way is fine for me.
>

Thank you. Applied to linux-kselftest next for 5.12-rc1

thanks,
-- Shuah

2021-02-09 01:57:00

by Palmer Dabbelt

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On Mon, 08 Feb 2021 15:37:24 PST (-0800), [email protected] wrote:
> On 2/5/21 12:57 AM, Tobias Klauser wrote:
>> On 2021-02-05 at 08:06:37 +0100, Palmer Dabbelt <[email protected]> wrote:
>>> On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:
>>
>> [...]
>>
>>> Reviewed-by: Palmer Dabbelt <[email protected]>
>>> Acked-by: Palmer Dabbelt <[email protected]>
>>
>> Thank you!
>>
>>> Not sure if you want this through the RISC-V tree, so I'm leaving it out for
>>> now and assuming it'll go through a kselftest tree.
>>
>> Either way is fine for me.
>>
>
> Thank you. Applied to linux-kselftest next for 5.12-rc1

Thanks!

2021-02-10 08:44:05

by Tobias Klauser

Subject: Re: [PATCH] selftests/vDSO: fix ABI selftest on riscv

On 2021-02-09 at 00:37:24 +0100, Shuah Khan <[email protected]> wrote:
> On 2/5/21 12:57 AM, Tobias Klauser wrote:
> > On 2021-02-05 at 08:06:37 +0100, Palmer Dabbelt <[email protected]> wrote:
> > > On Thu, 04 Feb 2021 06:50:42 PST (-0800), [email protected] wrote:
> >
> > [...]
> >
> > > Reviewed-by: Palmer Dabbelt <[email protected]>
> > > Acked-by: Palmer Dabbelt <[email protected]>
> >
> > Thank you!
> >
> > > Not sure if you want this through the RISC-V tree, so I'm leaving it out for
> > > now and assuming it'll go through a kselftest tree.
> >
> > Either way is fine for me.
> >
>
> Thank you. Applied to linux-kselftest next for 5.12-rc1

Thank you Shuah!