From: Laurent Vivier <laurent@vivier.eu>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@iki.fi>,
Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>,
Richard Henderson <rth@twiddle.net>,
patches@linaro.org
Subject: Re: [Qemu-devel] [PATCH v2 05/28] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific
Date: Tue, 24 May 2016 02:29:48 +0200 [thread overview]
Message-ID: <cc04a55b-a88f-1edc-a574-1e80f29db64d@vivier.eu> (raw)
In-Reply-To: <1463075272-9933-6-git-send-email-peter.maydell@linaro.org>
Le 12/05/2016 à 19:47, Peter Maydell a écrit :
> From: Timothy E Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
>
> Currently we define a QEMU-internal errno TARGET_QEMU_ESIGRETURN
> only on the MIPS and PPC targets; move this to errno_defs.h
> so it is available for all architectures, and renumber it to 513.
> We pick 513 because this is safe from future use as a system call return
> value: Linux uses it as ERESTART_NOINTR internally and never allows that
> errno to escape to userspace.
>
> Signed-off-by: Timothy Edward Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
> Message-id: 1441497448-32489-4-git-send-email-T.E.Baldwin99@members.leeds.ac.uk
> [PMM: TARGET_ERESTARTSYS split out into preceding patch, add comment]
> Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> ---
> linux-user/errno_defs.h | 9 +++++++++
> linux-user/mips/target_syscall.h | 4 ----
> linux-user/mips64/target_syscall.h | 4 ----
> linux-user/ppc/target_syscall.h | 2 --
> 4 files changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/linux-user/errno_defs.h b/linux-user/errno_defs.h
> index b7a8c9f..65522c4 100644
> --- a/linux-user/errno_defs.h
> +++ b/linux-user/errno_defs.h
> @@ -147,3 +147,12 @@
> * kernel uses for the same purpose.
> */
> #define TARGET_ERESTARTSYS 512 /* Restart system call (if SA_RESTART) */
> +
> +/* QEMU internal, not visible to the guest. This is returned by the
> + * do_sigreturn() code after a successful sigreturn syscall, to indicate
> + * that it has correctly set the guest registers and so the main loop
> + * should not touch them. We use the value the guest would use for
> + * ERESTART_NOINTR (which is kernel internal) to guarantee that we won't
> + * clash with a valid guest errno now or in the future.
> + */
> +#define TARGET_QEMU_ESIGRETURN 513 /* Return from signal */
> diff --git a/linux-user/mips/target_syscall.h b/linux-user/mips/target_syscall.h
> index 68db160..e8e305c 100644
> --- a/linux-user/mips/target_syscall.h
> +++ b/linux-user/mips/target_syscall.h
> @@ -222,10 +222,6 @@ struct target_pt_regs {
> #define TARGET_ENOTRECOVERABLE 166 /* State not recoverable */
>
>
> -
> -/* Nasty hack: define a fake errno value for use by sigreturn. */
> -#define TARGET_QEMU_ESIGRETURN 255
> -
> #define UNAME_MACHINE "mips"
> #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> diff --git a/linux-user/mips64/target_syscall.h b/linux-user/mips64/target_syscall.h
> index 0e0c2d2..5789e86 100644
> --- a/linux-user/mips64/target_syscall.h
> +++ b/linux-user/mips64/target_syscall.h
> @@ -219,10 +219,6 @@ struct target_pt_regs {
> #define TARGET_ENOTRECOVERABLE 166 /* State not recoverable */
>
>
> -
> -/* Nasty hack: define a fake errno value for use by sigreturn. */
> -#define TARGET_QEMU_ESIGRETURN 255
> -
> #define UNAME_MACHINE "mips64"
> #define UNAME_MINIMUM_RELEASE "2.6.32"
>
> diff --git a/linux-user/ppc/target_syscall.h b/linux-user/ppc/target_syscall.h
> index 35cab59..7ca83c2 100644
> --- a/linux-user/ppc/target_syscall.h
> +++ b/linux-user/ppc/target_syscall.h
> @@ -53,8 +53,6 @@ struct target_revectored_struct {
> abi_ulong __map[8]; /* 256 bits */
> };
>
> -/* Nasty hack: define a fake errno value for use by sigreturn. */
> -#define TARGET_QEMU_ESIGRETURN 255
>
> /*
> * flags masks
>
next prev parent reply other threads:[~2016-05-24 0:30 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 17:47 [Qemu-devel] [PATCH v2 00/28] linux-user: fix race between signals and syscalls Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 01/28] linux-user: Check array bounds in errno conversion Peter Maydell
2016-05-23 23:54 ` Laurent Vivier
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 02/28] linux-user: Consistently return host errnos from do_openat() Peter Maydell
2016-05-24 0:05 ` Laurent Vivier
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 03/28] linux-user: Reindent signal handling Peter Maydell
2016-05-24 0:21 ` Laurent Vivier
2016-05-24 6:47 ` Riku Voipio
2016-05-24 7:31 ` Laurent Vivier
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 04/28] linux-user: Define TARGET_ERESTART* errno values Peter Maydell
2016-05-24 9:42 ` Laurent Vivier
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 05/28] linux-user: Renumber TARGET_QEMU_ESIGRETURN, make it not arch-specific Peter Maydell
2016-05-24 0:29 ` Laurent Vivier [this message]
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 06/28] linux-user: Support for restarting system calls for x86 targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 07/28] linux-user: Support for restarting system calls for ARM targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 08/28] linux-user: Support for restarting system calls for MIPS targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 09/28] linux-user: Support for restarting system calls for PPC targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 10/28] linux-user: Support for restarting system calls for SPARC targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 11/28] linux-user: Support for restarting system calls for SH4 targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 12/28] linux-user: Support for restarting system calls for Alpha targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 13/28] linux-user: Support for restarting system calls for UniCore32 targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 14/28] linux-user: Support for restarting system calls for OpenRISC targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 15/28] linux-user: Support for restarting system calls for M68K targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 16/28] linux-user: Support for restarting system calls for S390 targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 17/28] linux-user: Support for restarting system calls for CRIS targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 18/28] linux-user: Support for restarting system calls for tilegx targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 19/28] linux-user: Set r14 on exit from microblaze syscall Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 20/28] linux-user: Support for restarting system calls for Microblaze targets Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 21/28] linux-user: Add debug code to exercise restarting system calls Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 22/28] linux-user: Provide safe_syscall for fixing races between signals and syscalls Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 23/28] linux-user: Use safe_syscall for read and write system calls Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 24/28] linux-user: Use safe_syscall for open and openat " Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 25/28] linux-user: Use safe_syscall for wait " Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 26/28] linux-user: Use safe_syscall for execve syscall Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 27/28] linux-user: Use safe_syscall for pselect, select syscalls Peter Maydell
2016-05-12 17:47 ` [Qemu-devel] [PATCH v2 28/28] linux-user: Use safe_syscall for futex syscall Peter Maydell
2016-05-23 18:55 ` [Qemu-devel] [PATCH v2 00/28] linux-user: fix race between signals and syscalls Peter Maydell
2016-05-24 8:04 ` Riku Voipio
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=cc04a55b-a88f-1edc-a574-1e80f29db64d@vivier.eu \
--to=laurent@vivier.eu \
--cc=T.E.Baldwin99@members.leeds.ac.uk \
--cc=patches@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=riku.voipio@iki.fi \
--cc=rth@twiddle.net \
/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).