From: "H. Peter Anvin" <hpa@zytor.com>
To: Brian Gerst <brgerst@gmail.com>, Sohil Mehta <sohil.mehta@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>, Andy Lutomirski <luto@kernel.org>,
Juergen Gross <jgross@suse.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
X86-kernel <x86@kernel.org>,
LKML Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 7/7] x86/syscall/32: Add comment to conditional
Date: Fri, 14 Mar 2025 11:30:57 -0700 [thread overview]
Message-ID: <B6BD4B23-1EF8-48CD-A668-BA1D5BA7489E@zytor.com> (raw)
In-Reply-To: <CAMzpN2gTiPKKsQsg48MEx_OawX60nAbhxRxqkwXa3NGHfBhfHQ@mail.gmail.com>
On March 14, 2025 10:43:34 AM PDT, Brian Gerst <brgerst@gmail.com> wrote:
>On Fri, Mar 14, 2025 at 1:19 PM Sohil Mehta <sohil.mehta@intel.com> wrote:
>>
>> On 3/14/2025 8:12 AM, Brian Gerst wrote:
>> > Add a CONFIG_X86_FRED comment, since this conditional is nested.
>> >
>> > Signed-off-by: Brian Gerst <brgerst@gmail.com>
>> > Suggested-by: Sohil Mehta <sohil.mehta@intel.com>
>> > ---
>> > arch/x86/entry/syscall_32.c | 3 ++-
>> > 1 file changed, 2 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/arch/x86/entry/syscall_32.c b/arch/x86/entry/syscall_32.c
>> > index 993d72504fc5..2b15ea17bb7c 100644
>> > --- a/arch/x86/entry/syscall_32.c
>> > +++ b/arch/x86/entry/syscall_32.c
>> > @@ -238,7 +238,8 @@ DEFINE_FREDENTRY_RAW(int80_emulation)
>> > instrumentation_end();
>> > syscall_exit_to_user_mode(regs);
>> > }
>> > -#endif
>> > +#endif /* CONFIG_X86_FRED */
>> > +
>> > #else /* CONFIG_IA32_EMULATION */
>> >
>> > /* Handles int $0x80 on a 32bit kernel */
>>
>> Also, there seem to be a couple of adjacent CONFIG_IA32_EMULATION
>> sections in the file. It might be better to bring them together under
>> one section in this patch or a follow-up. Something like below:
>>
>> > diff --git a/arch/x86/entry/syscall_32.c b/arch/x86/entry/syscall_32.c
>> > index 2b15ea17bb7c..a84f9d3c1695 100644
>> > --- a/arch/x86/entry/syscall_32.c
>> > +++ b/arch/x86/entry/syscall_32.c
>> > @@ -57,16 +57,6 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs)
>> > return (int)regs->orig_ax;
>> > }
>> >
>> > -#ifdef CONFIG_IA32_EMULATION
>> > -bool __ia32_enabled __ro_after_init = !IS_ENABLED(CONFIG_IA32_EMULATION_DEFAULT_DISABLED);
>> > -
>> > -static int __init ia32_emulation_override_cmdline(char *arg)
>> > -{
>> > - return kstrtobool(arg, &__ia32_enabled);
>> > -}
>> > -early_param("ia32_emulation", ia32_emulation_override_cmdline);
>> > -#endif
>> > -
>> > /*
>> > * Invoke a 32-bit syscall. Called with IRQs on in CT_STATE_KERNEL.
>> > */
>> > @@ -87,6 +77,14 @@ static __always_inline void do_syscall_32_irqs_on(struct pt_regs *regs, int nr)
>> > }
>> >
>> > #ifdef CONFIG_IA32_EMULATION
>> > +bool __ia32_enabled __ro_after_init = !IS_ENABLED(CONFIG_IA32_EMULATION_DEFAULT_DISABLED);
>> > +
>> > +static int __init ia32_emulation_override_cmdline(char *arg)
>> > +{
>> > + return kstrtobool(arg, &__ia32_enabled);
>> > +}
>> > +early_param("ia32_emulation", ia32_emulation_override_cmdline);
>> > +
>> > static __always_inline bool int80_is_external(void)
>> > {
>> > const unsigned int offs = (0x80 / 32) * 0x10;
>
>The 32-bit syscall code is a bit of a mess right now, and it was hard
>to see its state while it was lumped in with everything else in
>common.c. I'd like to see the INT80 code merged back into one
>function, but that will probably have to wait until the dust settles
>with FRED.
>
>
>Brian Gerst
>
That function gets really, really ugly. The reason we factored out the FRED code is that the number of conditionals ended up grotesque, *and* that they are part of completely separate flows – they should have separate every points, not dynamic conditionals.
next prev parent reply other threads:[~2025-03-14 18:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-14 15:12 [PATCH v2 0/7] x86/entry: Break up common.c Brian Gerst
2025-03-14 15:12 ` [PATCH v2 1/7] x86/xen: Move Xen upcall handler Brian Gerst
2025-03-14 15:16 ` Juergen Gross
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 2/7] x86/syscall/32: Move 32-bit syscall dispatch code Brian Gerst
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 3/7] x86/syscall/64: Move 64-bit " Brian Gerst
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 4/7] x86/syscall/x32: Move x32 syscall table Brian Gerst
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 5/7] x86/syscall: Move sys_ni_syscall() Brian Gerst
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 6/7] x86/syscall: Remove stray semicolons Brian Gerst
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 15:12 ` [PATCH v2 7/7] x86/syscall/32: Add comment to conditional Brian Gerst
2025-03-14 17:19 ` Sohil Mehta
2025-03-14 17:43 ` Brian Gerst
2025-03-14 18:30 ` H. Peter Anvin [this message]
2025-03-16 11:01 ` [tip: x86/cpu] " tip-bot2 for Brian Gerst
2025-03-19 11:03 ` [tip: x86/core] " tip-bot2 for Brian Gerst
2025-03-14 17:22 ` [PATCH v2 0/7] x86/entry: Break up common.c Sohil Mehta
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=B6BD4B23-1EF8-48CD-A668-BA1D5BA7489E@zytor.com \
--to=hpa@zytor.com \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brgerst@gmail.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--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
all inboxes | Powered by JetHome®