From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELtHi2Aa2CKd/WS3j+hzyw18sSsvcPKgKNqKQp/FhIFyT726m5TEl0wbOvEkHbilvx1M7sRQ ARC-Seal: i=1; a=rsa-sha256; t=1520955124; cv=none; d=google.com; s=arc-20160816; b=c6oMCCK1fzMAFvatEhU7JCkm48QcGEw40MVskkl2Y+zyrZJzV0R0op+PZUMyuEFYVh zlMocNhqAqxXYLLM6n1b4Gk7+CcKLUawGxTE3fDzxNEfqHzO486Jmb7g/vpp56nvBMDy UqrOhL46nA3eyZ3JfsBoP0RhlFqdIXqPto0LnhTt5OGh15kstSZql82LYalpTadRA09W lHHmwlX5BsX+0oGKsomJqwle95kT0s9vXBX8oClRQDSjWI4xPPUgouC8V+f9cvSNg9o6 28jE6LUknkQB7ZvBSduOvFNkXHocKFUoXExRuvm3XUzTFUYEaApr8zrWzdI3RynP8Ysm Dxlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=8mLntzz7VZ/zVygkr3/H+/IBvIrMP2cZPxkp328oEOM=; b=lCFMxeTvggBf414s09vWzuIBSHGWwB4yUJNoGAVaHJwynesMCpwpM3LoJUO1S8jiV2 eUlDlV/EOhEu0amDZ+dxIbQA4+bC3yEQZ9X8bMOOvitjpcB9PS0O53P5+TETLiRvIcQ6 A66A1N/1KVpMIqPMGj0raI+EXTtgCKc5Mb85WLjH+bBfhqurjYe3wzHQS0HgyUT0PkDj VzJ3TIMM7BGOBoAT8J7IfbSzQIKQOBtn+LTASNikE0B5ae/l8K7rdjObnt1xDjdSCP5E Bbo6tUll/1uP7bTYfuDBkbUF5vuQgIY3vZJmGf8/9Vc7C2t3NepyZyucjko5QEofB4H2 MJCA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Thomas Gleixner , Josh Poimboeuf , Andy Lutomirski , Arjan van de Ven , Borislav Petkov , Borislav Petkov , Dan Williams , Dave Hansen , David Woodhouse , Linus Torvalds , Tom Lendacky , Ingo Molnar Subject: [PATCH 4.15 096/146] x86/mm/sme, objtool: Annotate indirect call in sme_encrypt_execute() Date: Tue, 13 Mar 2018 16:24:23 +0100 Message-Id: <20180313152328.018083861@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180313152320.439085687@linuxfoundation.org> References: <20180313152320.439085687@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1594837040408534730?= X-GMAIL-MSGID: =?utf-8?q?1594837040408534730?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Zijlstra commit 531bb52a869a9c6e08c8d17ba955fcbfc18037ad upstream. This is boot code and thus Spectre-safe: we run this _way_ before userspace comes along to have a chance to poison our branch predictor. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Thomas Gleixner Acked-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Arjan van de Ven Cc: Borislav Petkov Cc: Borislav Petkov Cc: Dan Williams Cc: Dave Hansen Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Tom Lendacky Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- 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