From: Borislav Petkov <bp@alien8.de>
To: "Chang S. Bae" <chang.seok.bae@intel.com>
Cc: tglx@linutronix.de, mingo@kernel.org, luto@kernel.org,
x86@kernel.org, len.brown@intel.com, dave.hansen@intel.com,
hjl.tools@gmail.com, Dave.Martin@arm.com, mpe@ellerman.id.au,
tony.luck@intel.com, ravi.v.shankar@intel.com,
libc-alpha@sourceware.org, linux-arch@vger.kernel.org,
linux-api@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 1/4] x86/signal: Introduce helpers to get the maximum signal frame size
Date: Wed, 25 Nov 2020 12:17:26 +0100 [thread overview]
Message-ID: <20201125111630.GA10378@zn.tnic> (raw)
In-Reply-To: <20201119190237.626-2-chang.seok.bae@intel.com>
On Thu, Nov 19, 2020 at 11:02:34AM -0800, Chang S. Bae wrote:
> Signal frames do not have a fixed format and can vary in size when a number
> of things change: support XSAVE features, 32 vs. 64-bit apps. Add the code
> to support a runtime method for userspace to dynamically discover how large
> a signal stack needs to be.
>
> Introduce a new variable, max_frame_size, and helper functions for the
> calculation to be used in a new user interface. Set max_frame_size to a
> system-wide worst-case value, instead of storing multiple app-specific
> values.
>
> Locate the body of the helper function -- fpu__get_fpstate_sigframe_size()
> in fpu/signal.c for its relevance.
This sentence is strange and not needed.
> diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
> index 84eab2724875..ac77f3f90bc9 100644
> --- a/arch/x86/include/asm/sigframe.h
> +++ b/arch/x86/include/asm/sigframe.h
> @@ -52,6 +52,15 @@ struct rt_sigframe_ia32 {
> char retcode[8];
> /* fp state follows here */
> };
> +
> +#define SIZEOF_sigframe_ia32 sizeof(struct sigframe_ia32)
> +#define SIZEOF_rt_sigframe_ia32 sizeof(struct rt_sigframe_ia32)
> +
> +#else
> +
> +#define SIZEOF_sigframe_ia32 0
> +#define SIZEOF_rt_sigframe_ia32 0
> +
> #endif /* defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION) */
>
> #ifdef CONFIG_X86_64
> @@ -81,8 +90,22 @@ struct rt_sigframe_x32 {
> /* fp state follows here */
> };
>
> +#define SIZEOF_rt_sigframe_x32 sizeof(struct rt_sigframe_x32)
> +
> #endif /* CONFIG_X86_X32_ABI */
>
> +#define SIZEOF_rt_sigframe sizeof(struct rt_sigframe)
> +
> +#else
> +
> +#define SIZEOF_rt_sigframe 0
> +
> #endif /* CONFIG_X86_64 */
>
> +#ifndef SIZEOF_rt_sigframe_x32
> +#define SIZEOF_rt_sigframe_x32 0
> +#endif
Those are defined here to be used in only one place -
init_sigframe_size() - where there already is ifdeffery. Just use the
normal sizeof() operator there instead of adding more gunk here.
> diff --git a/arch/x86/kernel/fpu/signal.c b/arch/x86/kernel/fpu/signal.c
> index a4ec65317a7f..9f009525f551 100644
> --- a/arch/x86/kernel/fpu/signal.c
> +++ b/arch/x86/kernel/fpu/signal.c
> @@ -507,6 +507,26 @@ fpu__alloc_mathframe(unsigned long sp, int ia32_frame,
>
> return sp;
> }
> +
> +unsigned long fpu__get_fpstate_sigframe_size(void)
> +{
> + unsigned long xstate_size = xstate_sigframe_size();
> + unsigned long fsave_header_size = 0;
> +
> + /*
> + * This space is needed on (most) 32-bit kernels, or when a 32-bit
> + * app is running on a 64-bit kernel. To keep things simple, just
> + * assume the worst case and always include space for 'freg_state',
> + * even for 64-bit apps on 64-bit kernels. This wastes a bit of
> + * space, but keeps the code simple.
> + */
> + if ((IS_ENABLED(CONFIG_IA32_EMULATION) ||
> + IS_ENABLED(CONFIG_X86_32)) && use_fxsr())
> + fsave_header_size = sizeof(struct fregs_state);
> +
> + return fsave_header_size + xstate_size;
> +}
I guess this can be simplified to:
unsigned long fpu__get_fpstate_sigframe_size(void)
{
unsigned long ret = xstate_sigframe_size();
/*
* This space is needed on (most) 32-bit kernels, or when a 32-bit
* app is running on a 64-bit kernel. To keep things simple, just
* assume the worst case and always include space for 'freg_state',
* even for 64-bit apps on 64-bit kernels. This wastes a bit of
* space, but keeps the code simple.
*/
if ((IS_ENABLED(CONFIG_IA32_EMULATION) ||
IS_ENABLED(CONFIG_X86_32)) && use_fxsr())
ret += sizeof(struct fregs_state);
return ret;
}
Also, this function simply gives you the xstate size, there's no need
for "sigframe" in the name.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2020-11-25 11:17 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-19 19:02 [PATCH v2 0/4] x86: Improve Minimum Alternate Stack Size Chang S. Bae
2020-11-19 19:02 ` [PATCH v2 1/4] x86/signal: Introduce helpers to get the maximum signal frame size Chang S. Bae
2020-11-25 11:17 ` Borislav Petkov [this message]
2020-11-30 20:40 ` Bae, Chang Seok
2020-12-01 14:27 ` Borislav Petkov
2020-11-19 19:02 ` [PATCH v2 2/4] x86/elf: Support a new ELF aux vector AT_MINSIGSTKSZ Chang S. Bae
2020-11-26 17:44 ` Borislav Petkov
2020-11-27 9:30 ` Michael Kerrisk (man-pages)
2020-11-19 19:02 ` [PATCH v2 3/4] x86/signal: Prevent an alternate stack overflow before a signal delivery Chang S. Bae
2020-11-20 23:04 ` Jann Horn
2020-11-24 18:22 ` Bae, Chang Seok
2020-11-24 18:41 ` Jann Horn
2020-11-24 20:43 ` Bae, Chang Seok
2020-11-24 20:47 ` Jann Horn
2020-11-24 20:55 ` Bae, Chang Seok
2021-02-08 20:29 ` Bae, Chang Seok
2020-11-19 19:02 ` [PATCH v2 4/4] selftest/x86/signal: Include test cases for validating sigaltstack Chang S. Bae
2020-11-27 17:32 ` Borislav Petkov
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=20201125111630.GA10378@zn.tnic \
--to=bp@alien8.de \
--cc=Dave.Martin@arm.com \
--cc=chang.seok.bae@intel.com \
--cc=dave.hansen@intel.com \
--cc=hjl.tools@gmail.com \
--cc=len.brown@intel.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=ravi.v.shankar@intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).