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 S1755287AbdKAUff (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Nov 2017 16:35:35 -0400
Received: from mail.kernel.org ([198.145.29.99]:35618 "EHLO mail.kernel.org"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1755182AbdKAUfe (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Nov 2017 16:35:34 -0400
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9534721937
Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org
Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=luto@kernel.org
X-Google-Smtp-Source: ABhQp+R/VpnWf3hl4X5WAPcMdNz/GZpkU0kMkH9WWTcK0jCBlPsCWm/mxiECjBINBzrlznXJOhS3b5PxHwsPXtuwWdY=
MIME-Version: 1.0
In-Reply-To: <CAMzpN2hw6q5G7A-2vb7mHqECf4-Vd8D7XEVGXg7U-Mi06qY_4w@mail.gmail.com>
References: <cover.1509006199.git.luto@kernel.org> <998a8c2c39546115f93e4c6e2ad7f918626f6145.1509006199.git.luto@kernel.org>
 <CAMzpN2hw6q5G7A-2vb7mHqECf4-Vd8D7XEVGXg7U-Mi06qY_4w@mail.gmail.com>
From: Andy Lutomirski <luto@kernel.org>
Date: Wed, 1 Nov 2017 13:35:12 -0700
X-Gmail-Original-Message-ID: <CALCETrWf8rwE7vVmfBPbyEaL5aBbBZKGGb2FASp3ytS96afpug@mail.gmail.com>
Message-ID: <CALCETrWf8rwE7vVmfBPbyEaL5aBbBZKGGb2FASp3ytS96afpug@mail.gmail.com>
Subject: Re: [PATCH 07/18] x86/asm/64: Merge the fast and slow SYSRET paths
To: Brian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@kernel.org>, X86 ML <x86@kernel.org>,
        Borislav Petkov <bpetkov@suse.de>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Dave Hansen <dave.hansen@intel.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Nov 1, 2017 at 10:25 AM, Brian Gerst <brgerst@gmail.com> wrote:
> On Thu, Oct 26, 2017 at 4:26 AM, Andy Lutomirski <luto@kernel.org> wrote:
>> They did almost the same thing.  Remove a bunch of pointless
>> instructions (mostly hidden in macros) and reduce cognitive load by
>> merging them.
>>
>> Signed-off-by: Andy Lutomirski <luto@kernel.org>
>> ---
>>  arch/x86/entry/entry_64.S | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
>> index 9dafafa3e0ec..c855ee91a3a5 100644
>> --- a/arch/x86/entry/entry_64.S
>> +++ b/arch/x86/entry/entry_64.S
>> @@ -220,10 +220,9 @@ entry_SYSCALL_64_fastpath:
>>         TRACE_IRQS_ON           /* user mode is traced as IRQs on */
>>         movq    RIP(%rsp), %rcx
>>         movq    EFLAGS(%rsp), %r11
>> -       RESTORE_C_REGS_EXCEPT_RCX_R11
>> -       movq    RSP(%rsp), %rsp
>> +       addq    $6*8, %rsp      /* skip extra regs -- they were preserved */
>>         UNWIND_HINT_EMPTY
>> -       USERGS_SYSRET64
>> +       jmp     .Lpop_c_regs_except_rcx_r11_and_sysret
>>
>>  1:
>>         /*
>> @@ -315,6 +314,7 @@ syscall_return_via_sysret:
>>         /* rcx and r11 are already restored (see code above) */
>>         UNWIND_HINT_EMPTY
>>         POP_EXTRA_REGS
>> +.Lpop_c_regs_except_rcx_r11_and_sysret:
>>         popq    %rsi    /* skip r11 */
>>         popq    %r10
>>         popq    %r9
>
> Wouldn't it be more logical to keep the SYSRET path at the end of the
> fast path (reverse of what you are doing here)?  That way the fast
> path falls through without jumping.

Ugh, probably.  I think I'll save that for v3, though.  I want to keep
this moving.