From: Laurent Vivier <laurent@vivier.eu>
To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com,
richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org,
aurelien@aurel32.net
Subject: Re: [PATCH v2 12/12] linux-user: fix clock_nanosleep()
Date: Wed, 22 Jul 2020 08:49:56 +0200 [thread overview]
Message-ID: <2c1c17a6-9bae-322b-9e28-722d11074405@vivier.eu> (raw)
In-Reply-To: <20200722062902.24509-13-alex.bennee@linaro.org>
Le 22/07/2020 à 08:29, Alex Bennée a écrit :
> From: Laurent Vivier <laurent@vivier.eu>
>
> If clock_nanosleep() encounters an error, it returns one of the positive
> error number.
>
> If the call is interrupted by a signal handler, it fails with error EINTR
> and if "remain" is not NULL and "flags" is not TIMER_ABSTIME, it returns
> the remaining unslept time in "remain".
>
> Update linux-user to not overwrite the "remain" structure if there is no
> error.
>
> Found with "make check-tcg", linux-test fails on nanosleep test:
>
> TEST linux-test on x86_64
> .../tests/tcg/multiarch/linux-test.c:242: nanosleep
> make[2]: *** [../Makefile.target:153: run-linux-test] Error 1
> make[1]: *** [.../tests/tcg/Makefile.qemu:76: run-guest-tests] Error 2
> make: *** [.../tests/Makefile.include:857: run-tcg-tests-x86_64-linux-user] Error 2
>
> Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> Message-Id: <20200721201754.2731479-1-laurent@vivier.eu>
> ---
> linux-user/syscall.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 1211e759c26..caa7cd3cab9 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -11829,10 +11829,19 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
> {
> struct timespec ts;
> target_to_host_timespec(&ts, arg3);
> - ret = get_errno(safe_clock_nanosleep(arg1, arg2,
> - &ts, arg4 ? &ts : NULL));
> - if (arg4)
> + /*
> + * clock_nanosleep() returns 0 or one of the *positive* error number.
> + */
> + ret = host_to_target_errno(safe_clock_nanosleep(arg1, arg2, &ts,
> + arg4 ? &ts : NULL));
> + /*
> + * if the call is interrupted by a signal handler, it fails
> + * with error TARGET_EINTR and if arg4 is not NULL and arg2 is not
> + * TIMER_ABSTIME, it returns the remaining unslept time in arg4.
> + */
> + if (ret == TARGET_EINTR && arg4 && arg2 != TIMER_ABSTIME) {
> host_to_target_timespec(arg4, &ts);
> + }
>
> #if defined(TARGET_PPC)
> /* clock_nanosleep is odd in that it returns positive errno values.
>
Wait a little before pushing that: I've made more tests and it seems to
break something in LTP. I have to analyze.
Thanks,
Laurent
next prev parent reply other threads:[~2020-07-22 6:51 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-22 6:28 [PATCH v2 00/12] candidate fixes for 5.1-rc1 (testing, semihosting, OOM tcg, x86 fpu) Alex Bennée
2020-07-22 6:28 ` [PATCH v2 01/12] shippable: add one more qemu to registry url Alex Bennée
2020-07-22 6:28 ` [PATCH v2 02/12] semihosting: defer connect_chardevs a little more to use serialx Alex Bennée
2020-07-22 6:28 ` [PATCH v2 03/12] semihosting: don't send the trailing '\0' Alex Bennée
2020-07-22 6:28 ` [PATCH v2 04/12] util: add qemu_get_host_physmem utility function Alex Bennée
2020-07-22 15:51 ` Richard Henderson
2020-07-22 6:28 ` [PATCH v2 05/12] util/oslib-win32: add qemu_get_host_physmem implementation Alex Bennée
2020-07-22 6:49 ` Philippe Mathieu-Daudé
2020-07-22 10:03 ` Stefan Weil
2020-07-22 10:13 ` Daniel P. Berrangé
2020-07-22 11:33 ` Alex Bennée
2020-07-22 11:38 ` Daniel P. Berrangé
2020-07-22 10:32 ` 罗勇刚(Yonggang Luo)
2020-07-22 10:50 ` Stefan Weil
2020-07-22 11:31 ` Alex Bennée
2020-07-22 11:41 ` Daniel P. Berrangé
2020-07-22 6:28 ` [PATCH v2 06/12] accel/tcg: better handle memory constrained systems Alex Bennée
2020-07-22 15:57 ` Richard Henderson
2020-07-22 16:29 ` Alex Bennée
2020-07-22 16:44 ` Daniel P. Berrangé
2020-07-22 19:02 ` Richard Henderson
2020-07-23 9:00 ` Daniel P. Berrangé
2020-07-23 9:22 ` Alex Bennée
2020-07-23 9:31 ` Daniel P. Berrangé
2020-07-23 10:06 ` Alex Bennée
2020-07-22 6:28 ` [PATCH v2 07/12] target/i386: floatx80: avoid compound literals in static initializers Alex Bennée
2020-07-22 6:45 ` Philippe Mathieu-Daudé
2020-07-22 6:28 ` [PATCH v2 08/12] linux-user: don't use MAP_FIXED in pgd_find_hole_fallback Alex Bennée
2020-07-22 16:00 ` Richard Henderson
2020-07-22 6:28 ` [PATCH v2 09/12] tests/docker: fix update command due to python3 str/bytes distinction Alex Bennée
2020-07-22 6:29 ` [PATCH v2 10/12] tests/docker: fix binfmt_misc image building Alex Bennée
2020-07-22 6:35 ` Philippe Mathieu-Daudé
2020-07-22 6:29 ` [PATCH v2 11/12] tests/docker: add support for DEB_KEYRING Alex Bennée
2020-07-22 14:27 ` Philippe Mathieu-Daudé
2020-07-22 16:03 ` Richard Henderson
2020-07-22 6:29 ` [PATCH v2 12/12] linux-user: fix clock_nanosleep() Alex Bennée
2020-07-22 6:49 ` Laurent Vivier [this message]
2020-07-22 8:33 ` Laurent Vivier
2020-07-22 8:55 ` Alex Bennée
2020-07-22 12:03 ` Laurent Vivier
2020-07-22 7:05 ` Philippe Mathieu-Daudé
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=2c1c17a6-9bae-322b-9e28-722d11074405@vivier.eu \
--to=laurent@vivier.eu \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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;
as well as URLs for NNTP newsgroup(s).