From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225RF6HWv3Hn2Htv6388GKo0OrFu9pZd0KCrjAD8/bUJMtEnUS+KDiqlbjWYltCUYqfbIecD ARC-Seal: i=1; a=rsa-sha256; t=1516721581; cv=none; d=google.com; s=arc-20160816; b=RQXG0CDVes5U9hfQXc4KpSUpDOYBeQssRqgyXT50ipH3aywURIwlPntkHxKJPiLu/J OIPBroWbKI1RXH+/MrhfJGCAsaYvZ8xs00wwwcySRRVDAPZcK7JpsoSFq9FKPgX+o2MN lQTNL4zEYj2YO7IEMfDExG7vU5wZp28dEpVCSevQCbjF8koOM3+rzwjYzTn4X3hKMhhU PC+VtqOirTBnZkMMjx36TbH7M9w0agA7WYeGlZ4r3xOhpShpfI3bf80+rmNS3+oWd/Sh k3KnnN/n6daqfrYTaunF0upXc/vHN7EuHoNSCVGHMaBknygiDGrdvhjJAlder6E/7g/I gwiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-disposition:mime-version:references:subject:cc:to:from:date :user-agent:message-id:dkim-signature:arc-authentication-results; bh=0Ex4p1z8Xg+Uo7+ggSuyyyQvO2m3dz6/bfCtl51DNfU=; b=IGhZMxmrCymLziBd3Mi/6djcEVPQ0IKyl5NQcmp9K+fxkxp3FVjJ7Wk2iDH9tMm3qR F/hfx19gRrtfLJOeuYqhLD3I9YJ0GMpXZmFN9LiU3Z+b41WzxXacvi80z0Ij51mSwVlt +gABH8Uyr3AZI0u+rilRyR1HQ8W7LCe9v7GL/UwnQnm+ICUpykx1uBzWYQ/gUMymmiKN nxeyYTkKum/dogKdlJ35wTk0vuhEI8+bDIQ06iNZfl0vHZYJPwTqMXUk0BOvbZxFz4Ct 0Z4TkuBrB/1esLi5FP2NIiE1mN7abfUx2J0+alHO0rigQgIBa0uPw8DDzO04p/c6vKBH t2+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=kJ6MZeno; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 65.50.211.133 as permitted sender) smtp.mailfrom=peterz@infradead.org Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=kJ6MZeno; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 65.50.211.133 as permitted sender) smtp.mailfrom=peterz@infradead.org Message-Id: <20180123152638.453859448@infradead.org> User-Agent: quilt/0.63-1 Date: Tue, 23 Jan 2018 16:25:47 +0100 From: Peter Zijlstra To: David Woodhouse , Thomas Gleixner , Josh Poimboeuf Cc: linux-kernel@vger.kernel.org, Dave Hansen , Ashok Raj , Tim Chen , Andy Lutomirski , Linus Torvalds , Greg KH , Andrea Arcangeli , Andi Kleen , Arjan Van De Ven , Dan Williams , Paolo Bonzini , Jun Nakajima , Asit Mallick , Jason Baron , Peter Zijlstra , Tom Lendacky , Borislav Petkov Subject: [PATCH 08/24] x86,sme: Annotate indirect call References: <20180123152539.374360046@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-retpoline-annotate-sme.patch X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590397849625954556?= X-GMAIL-MSGID: =?utf-8?q?1590397849625954556?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: This is boot code, we run this _way_ before userspace comes along to poison our branch predictor. Cc: Tom Lendacky Cc: Borislav Petkov Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/mm/mem_encrypt_boot.S | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/x86/mm/mem_encrypt_boot.S +++ b/arch/x86/mm/mem_encrypt_boot.S @@ -15,6 +15,7 @@ #include #include #include +#include .text .code64 @@ -59,6 +60,7 @@ ENTRY(sme_encrypt_execute) movq %rax, %r8 /* Workarea encryption routine */ addq $PAGE_SIZE, %r8 /* Workarea intermediate copy buffer */ + ANNOTATE_RETPOLINE_SAFE call *%rax /* Call the encryption routine */ pop %r12