Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Mon, 8 Jul 2019 22:09:30 +0300
From:   Alexey Dobriyan <adobriyan@gmail.com>
To:     thgarnie@chromium.org
Cc:     linux-kernel@vger.kernel.org
Subject: Re: [PATCH v8 06/11] x86/CPU: Adapt assembly for PIE support
Message-ID: <20190708190930.GA16215@avx2>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Thomas Garnier wrote:
> -		"pushq $1f\n\t"
> +		"movabsq $1f, %q0\n\t"
> +		"pushq %q0\n\t"
>  		"iretq\n\t"
>  		UNWIND_HINT_RESTORE
>  		"1:"

Fake PIE. True PIE looks like this:

ffffffff81022d70 <do_sync_core>:
ffffffff81022d70:       8c d0                   mov    eax,ss
ffffffff81022d72:       50                      push   rax
ffffffff81022d73:       54                      push   rsp
ffffffff81022d74:       48 83 04 24 08          add    QWORD PTR [rsp],0x8
ffffffff81022d79:       9c                      pushf
ffffffff81022d7a:       8c c8                   mov    eax,cs
ffffffff81022d7c:       50                      push   rax
ffffffff81022d7d:  ===> 48 8d 05 03 00 00 00    lea    rax,[rip+0x3]        # ffffffff81022d87 <do_sync_core+0x17>
ffffffff81022d84:       50                      push   rax
ffffffff81022d85:       48 cf                   iretq
ffffffff81022d87:       c3                      ret

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -710,7 +710,8 @@ static inline void sync_core(void)
 		"pushfq\n\t"
 		"mov %%cs, %0\n\t"
 		"pushq %q0\n\t"
-		"pushq $1f\n\t"
+		"leaq 1f(%%rip), %q0\n\t"
+		"pushq %q0\n\t"
 		"iretq\n\t"
 		UNWIND_HINT_RESTORE
 		"1:"