MIME-Version: 1.0
In-Reply-To: <20150427113506.GG6774@pd.tnic>
References: <5d120f358612d73fc909f5bfa47e7bd082db0af0.1429841474.git.luto@kernel.org>
	<20150425211206.GE32099@pd.tnic>
	<CALCETrWvqyCYOzCYXz7ZnzaM0obbidqo5CxVp2Hn1ELEiC3m3g@mail.gmail.com>
	<20150427085305.GB6774@pd.tnic>
	<20150427113506.GG6774@pd.tnic>
Date: Mon, 27 Apr 2015 07:57:36 -0700
Message-ID: <CA+55aFykNBrdHFSVeLftG7Ujx4Tk=MuUJXD2rNYn9kwL+kLN5w@mail.gmail.com>
Subject: Re: [PATCH] x86_64, asm: Work around AMD SYSRET SS descriptor
 attribute issue
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>, Andy Lutomirski <luto@kernel.org>,
        X86 ML <x86@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
        Denys Vlasenko <vda.linux@googlemail.com>,
        Brian Gerst <brgerst@gmail.com>, Denys Vlasenko <dvlasenk@redhat.com>,
        Ingo Molnar <mingo@kernel.org>, Steven Rostedt <rostedt@goodmis.org>,
        Oleg Nesterov <oleg@redhat.com>,
        Frederic Weisbecker <fweisbec@gmail.com>,
        Alexei Starovoitov <ast@plumgrid.com>, Will Drewry <wad@chromium.org>,
        Kees Cook <keescook@chromium.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1351
Lines: 33

On Mon, Apr 27, 2015 at 4:35 AM, Borislav Petkov <bp@alien8.de> wrote:
>
>         /*
>          * Change top 16 bits to be the sign-extension of 47th bit, if this
>          * changed %rcx, it was not canonical.
>          */
>         ALTERNATIVE "", \
>                 "shl    $(64 - (47+1)), %rcx; \
>                  sar    $(64 - (47+1)), %rcx; \
>                  cmpq   %rcx, %r11; \
>                  jne    opportunistic_sysret_failed", X86_BUG_SYSRET_CANON_RCX

Guys, if we're looking at cycles for this, then don't do the "exact
canonical test". and go back to just doing

        shr $__VIRTUAL_MASK_SHIFT, %rcx
        jnz opportunistic_sysret_failed

which is much smaller. In fact, aim to make the conditional jump be a
two-byte one (jump forward to another jump if required - it's a
slow-path that doesn't matter at *all* for the taken case), and the
end result is just six bytes. That way you can use alternative to
replace it with one single noop on AMD.

Because dammit, if we're playing these kinds of games, let's do it
*right*. No half measures.

                          Linus
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/