From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Garnier Subject: [PATCH v2 08/27] x86/CPU: Adapt assembly for PIE support Date: Tue, 13 Mar 2018 13:59:26 -0700 Message-ID: <20180313205945.245105-9-thgarnie@google.com> References: <20180313205945.245105-1-thgarnie@google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Greg Kroah-Hartman , Kate Stewart , Thomas Garnier , Arnd Bergmann , Philippe Ombredanne , Arnaldo Carvalho de Melo , Andrey Ryabinin , Matthias Kaehlcke , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Andy Lutomirski , Dominik Brodowski , Borislav Petkov , Borislav Petkov , "Raf Return-path: In-Reply-To: <20180313205945.245105-1-thgarnie@google.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" List-Id: linux-crypto.vger.kernel.org Q2hhbmdlIHRoZSBhc3NlbWJseSBjb2RlIHRvIHVzZSBvbmx5IHJlbGF0aXZlIHJlZmVyZW5jZXMg b2Ygc3ltYm9scyBmb3IgdGhlCmtlcm5lbCB0byBiZSBQSUUgY29tcGF0aWJsZS4gVXNlIHRoZSBu ZXcgX0FTTV9NT1ZBQlMgbWFjcm8gaW5zdGVhZCBvZgp0aGUgJ21vdiAkc3ltYm9sLCAlZHN0JyBj b25zdHJ1Y3QuCgpQb3NpdGlvbiBJbmRlcGVuZGVudCBFeGVjdXRhYmxlIChQSUUpIHN1cHBvcnQg d2lsbCBhbGxvdyB0byBleHRlbmRlZCB0aGUKS0FTTFIgcmFuZG9taXphdGlvbiByYW5nZSBiZWxv dyB0aGUgLTJHIG1lbW9yeSBsaW1pdC4KClNpZ25lZC1vZmYtYnk6IFRob21hcyBHYXJuaWVyIDx0 aGdhcm5pZUBnb29nbGUuY29tPgotLS0KIGFyY2gveDg2L2luY2x1ZGUvYXNtL3Byb2Nlc3Nvci5o IHwgOSArKysrKystLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDMgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYvaW5jbHVkZS9hc20vcHJvY2Vzc29yLmggYi9h cmNoL3g4Ni9pbmNsdWRlL2FzbS9wcm9jZXNzb3IuaAppbmRleCBiMGNjZDQ4NDdhNTguLjFiOTQ4 OGIxMDE4YSAxMDA2NDQKLS0tIGEvYXJjaC94ODYvaW5jbHVkZS9hc20vcHJvY2Vzc29yLmgKKysr IGIvYXJjaC94ODYvaW5jbHVkZS9hc20vcHJvY2Vzc29yLmgKQEAgLTUwLDcgKzUwLDcgQEAgc3Rh dGljIGlubGluZSB2b2lkICpjdXJyZW50X3RleHRfYWRkcih2b2lkKQogewogCXZvaWQgKnBjOwog Ci0JYXNtIHZvbGF0aWxlKCJtb3YgJDFmLCAlMDsgMToiOiI9ciIgKHBjKSk7CisJYXNtIHZvbGF0 aWxlKF9BU01fTU9WQUJTICIgJDFmLCAlMDsgMToiOiI9ciIgKHBjKSk7CiAKIAlyZXR1cm4gcGM7 CiB9CkBAIC03MTAsNiArNzEwLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIHN5bmNfY29yZSh2b2lk KQogCQk6IEFTTV9DQUxMX0NPTlNUUkFJTlQgOiA6ICJtZW1vcnkiKTsKICNlbHNlCiAJdW5zaWdu ZWQgaW50IHRtcDsKKwl1bnNpZ25lZCBsb25nIHRtcDI7CiAKIAlhc20gdm9sYXRpbGUgKAogCQlV TldJTkRfSElOVF9TQVZFCkBAIC03MjAsMTEgKzcyMSwxMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQg c3luY19jb3JlKHZvaWQpCiAJCSJwdXNoZnFcblx0IgogCQkibW92ICUlY3MsICUwXG5cdCIKIAkJ InB1c2hxICVxMFxuXHQiCi0JCSJwdXNocSAkMWZcblx0IgorCQkibGVhcSAxZiglJXJpcCksICUx XG5cdCIKKwkJInB1c2hxICUxXG5cdCIKIAkJImlyZXRxXG5cdCIKIAkJVU5XSU5EX0hJTlRfUkVT VE9SRQogCQkiMToiCi0JCTogIj0mciIgKHRtcCksIEFTTV9DQUxMX0NPTlNUUkFJTlQgOiA6ICJj YyIsICJtZW1vcnkiKTsKKwkJOiAiPSZyIiAodG1wKSwgIj0mciIgKHRtcDIpLCBBU01fQ0FMTF9D T05TVFJBSU5UCisJCTogOiAiY2MiLCAibWVtb3J5Iik7CiAjZW5kaWYKIH0KIAotLSAKMi4xNi4y LjY2MC5nNzA5ODg3OTcxYi1nb29nCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVu cHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZv L3hlbi1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: ARC-Seal: i=1; a=rsa-sha256; t=1520974828; cv=none; d=google.com; s=arc-20160816; b=lIsoQtHqpGFW09Vvgb43FxKA3+UfJm4C9prPVI6hEoJ2U0R6L+tCrspQcm8f/CgkNj 5puvFWVzdzpj2whvsaSrdpgHZbnU/JEHl1vh3qxU27MEShygyCC2i2EgvCNToGMy3DvX YUPcVatQ6elckT67gJZz9ii4g0bNX+K+HwUZoD7SkXtxaL0XfzeFM891FG/kz2wWaMHg Hp6ndwXy+4sjokhH5UHAyUqo5i6i+ljmMz8lLKU9OTt44WCna+a9cK4DGYjVyNmm3DIo f57q3L/Uz30+inINewqCuOl6gO0V5ddR2isEOsQlC4QCiSXFmzLXYMBykTD9tOwIvwJB o+xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=+5M2FaP3vfmPSEGTB3GVETrTQCHNNxealc15RUl+u6U=; b=o1YNJxHQYIVB1CCYaS9NUClFj7mj83UKRPqZdQcgvnX4S42RdOso7lTKCFfwbvlkw0 B2W8blUQztFokgATyTAwAQrp5sAJpeB5hzRH5heV3xRBVkEEnaDOm6p8zHgrWTkTiC82 F1nQK/HofK5RUEfNcg2C0IckbAS3WAnFR3c14BJRROB//yqXsZSwBJjzi6VzO+i1LmU6 uKjW5BHn1IKQm6VmpqPygZx+a6Em0LH6wtXms1VN1wAw/uxqaRqJ3xxJTXB6BvHy4ysv KLgMGxA68AAV8CheZuMH+xgU7tZ5Y1T7W0Fd6ODR3ebnaaNXB8EMdwzEIKRS6TVuf9Ey cICg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Z5TtevK5; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Z5TtevK5; spf=pass (google.com: domain of thgarnie@google.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=thgarnie@google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com X-Google-Smtp-Source: AG47ELuRdmqXLGKKl1PC4PR7zPkPKPxpWZW8c5JHEqNEEob2ZgBQfHXwfDsf2VSvQbsLF6GTrYMnjg== From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Greg Kroah-Hartman , Kate Stewart , Thomas Garnier , Arnd Bergmann , Philippe Ombredanne , Arnaldo Carvalho de Melo , Andrey Ryabinin , Matthias Kaehlcke , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Andy Lutomirski , Dominik Brodowski , Borislav Petkov , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Alok Kataria , Steven Rostedt , Tejun Heo , Christoph Lameter , Dennis Zhou , Boris Ostrovsky , David Woodhouse , Alexey Dobriyan , "Paul E . McKenney" , Andrew Morton , Nicolas Pitre , Randy Dunlap , "Luis R . Rodriguez" , Christopher Li , Jason Baron , Ashish Kalra , Kyle McMartin , Dou Liyang , Lukas Wunner , Petr Mladek , Sergey Senozhatsky , Masahiro Yamada , Ingo Molnar , Nicholas Piggin , Cao jin , "H . J . Lu" , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Dave Hansen , Rik van Riel , Jia Zhang , Jiri Slaby , Kyle Huey , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Rob Landley , Baoquan He , Daniel Micay , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= Cc: x86@kernel.org, linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-arch@vger.kernel.org, linux-sparse@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH v2 08/27] x86/CPU: Adapt assembly for PIE support Date: Tue, 13 Mar 2018 13:59:26 -0700 Message-Id: <20180313205945.245105-9-thgarnie@google.com> X-Mailer: git-send-email 2.16.2.660.g709887971b-goog In-Reply-To: <20180313205945.245105-1-thgarnie@google.com> References: <20180313205945.245105-1-thgarnie@google.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594857702197693665?= X-GMAIL-MSGID: =?utf-8?q?1594857702197693665?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Change the assembly code to use only relative references of symbols for the kernel to be PIE compatible. Use the new _ASM_MOVABS macro instead of the 'mov $symbol, %dst' construct. Position Independent Executable (PIE) support will allow to extended the KASLR randomization range below the -2G memory limit. Signed-off-by: Thomas Garnier --- arch/x86/include/asm/processor.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index b0ccd4847a58..1b9488b1018a 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -50,7 +50,7 @@ static inline void *current_text_addr(void) { void *pc; - asm volatile("mov $1f, %0; 1:":"=r" (pc)); + asm volatile(_ASM_MOVABS " $1f, %0; 1:":"=r" (pc)); return pc; } @@ -710,6 +710,7 @@ static inline void sync_core(void) : ASM_CALL_CONSTRAINT : : "memory"); #else unsigned int tmp; + unsigned long tmp2; asm volatile ( UNWIND_HINT_SAVE @@ -720,11 +721,13 @@ 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), %1\n\t" + "pushq %1\n\t" "iretq\n\t" UNWIND_HINT_RESTORE "1:" - : "=&r" (tmp), ASM_CALL_CONSTRAINT : : "cc", "memory"); + : "=&r" (tmp), "=&r" (tmp2), ASM_CALL_CONSTRAINT + : : "cc", "memory"); #endif } -- 2.16.2.660.g709887971b-goog