From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvDAIWTXya5wvt7+7e6B+jsaKIU8wNqgaoLxTHDcKFQirOJihMdz7Q3UEo0OIE6Urn2pFvl ARC-Seal: i=1; a=rsa-sha256; t=1520824090; cv=none; d=google.com; s=arc-20160816; b=R2vKR09dWMqcEjP3xaehYQG+HFilr6T0B4nBaPGIYHnWi3yWmjBgIN7CD6juVOHtLT aX2WpPbIUCD/cQAk9uu+Mi3OKIhxY3raovUVnBsajCrdDMh0JwzTqHZ8UzOVQalMfai1 pxVAwd1wHKrl5uKLXoCAAnehm5cwOze1/mgltBLmfUVF+pwsaNHr2L94UFqcPc8IQFuV y0ozrKNfaTaWRyNu8naNncd7TmyeCDrEqBCwy3Cj1JNXF7CdR9i2BB1MmS1SfwydC2MG uCzWgM9xH9UtXqV6rTXqjy04iQG4AWm9n7yDootfqLHCJhvUuYk1yygCkAA1XMjxrlP+ 343w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:subject:message-id:date:cc:to:from:mime-version :content-transfer-encoding:content-disposition :arc-authentication-results; bh=2Tcjsh6P7f9lEUgZ2bhosVZhrrPZtcykQSjEWlRqyW0=; b=0JfEesqYbx7ZmxnSFnNdvmV9Tn1ryrI/HYDy4c+IWjUrKOY2/A/BUQDMQvz1hcAmAl tsgC4Wd6TGlWTFif1lbQO95mhmEeYzewe/SkohKdmz8WkLjqbGqORtX+pI2vXtD4pFqc d+DASJqzR14NR5yEr06nahgGgPE2XT+w/qVM4RNIzReZSYSwOU4wTNhjHLVvobh9fAJO 3NfMdAEQlJlHasvrbJq5Jj2NHMcUnWDrt/GzvZXX5UE06JyuALlgeSBzVZmXwzv6dHC7 0uK8Tza+Vm3JWMo/+eA0rgQZnrOiGzXAmcO9mtefriow6LVkuaivsVQOq4JED3WNxI0h RbkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Authentication-Results: mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Ingo Molnar" , "Thomas Gleixner" , gnomes@lxorguk.ukuu.org.uk, "Juergen Gross" , "Andy Lutomirski" , "Peter Zijlstra" , "Josh Poimboeuf" , "Arjan van de Ven" , "Rik van Riel" , "Kees Cook" , "Dave Hansen" , "Greg Kroah-Hartman" , "Jiri Kosina" , "David Woodhouse" , thomas.lendacky@amd.com, "Paul Turner" , "Andi Kleen" , "Linus Torvalds" , "Tim Chen" Date: Mon, 12 Mar 2018 03:06:12 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 29/76] x86/retpoline/xen: Convert Xen hypercall indirect jumps In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594699641637563018?= X-GMAIL-MSGID: =?utf-8?q?1594699641637563018?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.16.56-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: David Woodhouse commit ea08816d5b185ab3d09e95e393f265af54560350 upstream. Convert indirect call in Xen hypercall to use non-speculative sequence, when CONFIG_RETPOLINE is enabled. Signed-off-by: David Woodhouse Signed-off-by: Thomas Gleixner Acked-by: Arjan van de Ven Acked-by: Ingo Molnar Reviewed-by: Juergen Gross Cc: gnomes@lxorguk.ukuu.org.uk Cc: Rik van Riel Cc: Andi Kleen Cc: Josh Poimboeuf Cc: thomas.lendacky@amd.com Cc: Peter Zijlstra Cc: Linus Torvalds Cc: Jiri Kosina Cc: Andy Lutomirski Cc: Dave Hansen Cc: Kees Cook Cc: Tim Chen Cc: Greg Kroah-Hartman Cc: Paul Turner Link: https://lkml.kernel.org/r/1515707194-20531-10-git-send-email-dwmw@amazon.co.uk Signed-off-by: Ben Hutchings --- arch/x86/include/asm/xen/hypercall.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -215,9 +216,9 @@ privcmd_call(unsigned call, __HYPERCALL_5ARG(a1, a2, a3, a4, a5); stac(); - asm volatile("call *%[call]" + asm volatile(CALL_NOSPEC : __HYPERCALL_5PARAM - : [call] "a" (&hypercall_page[call]) + : [thunk_target] "a" (&hypercall_page[call]) : __HYPERCALL_CLOBBER5); clac();