From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226C5yatdHeD8M/5YISEFQM+JQehyG38lTxbBorv/DkzO2itGOtQb6Ql7RZUsxfmWAIZcFrf ARC-Seal: i=1; a=rsa-sha256; t=1518439976; cv=none; d=google.com; s=arc-20160816; b=FAh8o9QZIBPQoNsnkeS8DY2/Bb5hDTseBlxzxPWPj3/IVqLAAOEImIp1VxM6mC8a3O XMYbx5lafMvaxHCyw9RyXZj/3/TzITfh8PIUcrP6FlGz5vtyhbzpAlFWZNKe9+Mb/n7A jLpmPlEG7Jt41jAtlKiYZhVHt9OJxPcWReUzpf6hoB2PIIjk4DVufA6pDuhnmkSO+dKW ugxItM9iGQCBbQo+tkb5a+RBDbW9GzcGX808JCPiJE7oCUM6qJvR1BVJKKZhDggPt8yF zwgcfCseJLEs9aSRK8zke3j+YHQ5r/2Zc9K/YocNDsLVRs9p5dAieb6YP4HglnE+WaGC BOjw== 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=ukBBv9QGGOPGiwmosgfvkbK4dpPKFnxVrRHzTsStnXI=; b=NsmWNJUjt6YnYzTYyXJ6oWhakN6Z39xuVuIKasBl4Tmh1JrFJIDX2mWiP/LJS5vZnG hbPt++CYcUS6a6TCQxH9VuAq7+6Qx5NPf3cxHwx6HAxgcHIcZ9QbnQzQNyj1D3VxQAlm Mwhml3fy+DHnjuaf4OhTSSL9BO98fpM53DuMFCofNqYPRH+7xkY4cNOn0AF5jlIByVR+ ixrFrVZrodMbav4/MSve/rMkIvIVDHEG2nvnZi0SNf/fNWF9qQ2iZQSBXMMEsF829OmQ TVtECyYAQPYPghzuNejpWMSBTG/K11t5l72rjj1UoWW4e+Dvf6hPv5vmVToF0alLwtl8 b2HQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=xjTwyZwN; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=xjTwyZwN; spf=pass (google.com: best guess record for domain of peterz@infradead.org designates 205.233.59.134 as permitted sender) smtp.mailfrom=peterz@infradead.org Message-Id: <20180212125033.664379153@infradead.org> User-Agent: quilt/0.63-1 Date: Mon, 12 Feb 2018 13:49:03 +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 , Peter Zijlstra , Tom Lendacky , Borislav Petkov Subject: [PATCH v2 8/8] x86,sme: Annotate indirect call References: <20180212124855.882405399@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?1592199716448647320?= X-GMAIL-MSGID: =?utf-8?q?1592199716448647320?= 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 Acked-by: Josh Poimboeuf 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