From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753088AbbLSGfR (ORCPT <rfc822;w@1wt.eu>);
	Sat, 19 Dec 2015 01:35:17 -0500
Received: from terminus.zytor.com ([198.137.202.10]:34937 "EHLO mail.zytor.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752478AbbLSGfQ (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 19 Dec 2015 01:35:16 -0500
Subject: Re: [PATCH] x86/signal: Cleanup get_nr_restart_syscall
To: "Dmitry V. Levin" <ldv@altlinux.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Andy Lutomirski <luto@kernel.org>
References: <CALCETrVKUY3UiSae9mo-3+nBnZRgfFbSFGBrj2g6tgkEzYKryw@mail.gmail.com>
 <20151213034437.GA2392@altlinux.org>
 <CALCETrUDmn_FoQXnQopO4H2c+N4P=Tv60w2T6G92c4L5_=soQA@mail.gmail.com>
 <20151218233736.GA28013@altlinux.org>
Cc: Elvira Khabirova <lineprinter0@gmail.com>, X86 ML <x86@kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
From: "H. Peter Anvin" <hpa@zytor.com>
Message-ID: <5674FA8A.60806@zytor.com>
Date: Fri, 18 Dec 2015 22:34:50 -0800
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20151218233736.GA28013@altlinux.org>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 12/18/15 15:37, Dmitry V. Levin wrote:
> Check for TS_COMPAT instead of TIF_IA32 to distinguish ia32 tasks
> from 64-bit tasks.
> Check for __X32_SYSCALL_BIT only if CONFIG_X86_X32_ABI is defined.
>
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> Cc: Elvira Khabirova <lineprinter0@gmail.com>
> Cc: Andy Lutomirski <luto@amacapital.net>
> ---
>   arch/x86/kernel/signal.c | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
> index cb6282c..ff7dedc 100644
> --- a/arch/x86/kernel/signal.c
> +++ b/arch/x86/kernel/signal.c
> @@ -692,12 +692,15 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)
>
>   static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs)
>   {
> -#if defined(CONFIG_X86_32) || !defined(CONFIG_X86_64)
> +#ifdef CONFIG_X86_64
> +	if (is_ia32_task())
> +		return __NR_ia32_restart_syscall;
> +# ifdef CONFIG_X86_X32_ABI
> +	if (regs->orig_ax & __X32_SYSCALL_BIT)
> +		return __NR_restart_syscall | __X32_SYSCALL_BIT;
> +# endif
> +#endif
>   	return __NR_restart_syscall;
> -#else /* !CONFIG_X86_32 && CONFIG_X86_64 */
> -	return test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall :
> -		__NR_restart_syscall | (regs->orig_ax & __X32_SYSCALL_BIT);
> -#endif /* CONFIG_X86_32 || !CONFIG_X86_64 */
>   }
>
>   /*
>

I bet you actually made the code slower.

	-hpa