From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226RhoglaSwsrOVs2P69N9A2L3zXjOjwSXu8mjPdxHmmZs1QEQ4NpLKnFYIbFeLJN3PgYxq0 ARC-Seal: i=1; a=rsa-sha256; t=1516610475; cv=none; d=google.com; s=arc-20160816; b=a5Umiouar9XWnDLDNrGYNooM5Gq/SfgBsvFFXeuUl/3ak3RRSpiKRRPrtsqXUfG+qh 2bfp9Eg+H1PetpZj+OPxW2NTorrY1SrBGQedYLS+f6IQS2p9oEDj9aA2onw4dUSN7GsF tv9HvoPQueLdmLE1q6fH432Sf824dpfeMvoeZGN0BIHHIVQQgaAw7fZFf33fp5epPlM7 LMMqHQEDuUD0lNwFpeMD80soS86dB5rsFB63F5EwLO3M+4SGVX4AdpuPxX/XeUwXwdxm AqlRP9zXXpIBQX1/6EVliE9bLJLyW9pNXTyA/YaAk2tAghfW5pxYNSGzXr8Fb0+hglmk ho3g== 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=kvNN1bhnZzqo/ElqgbsQJ386KQ3o6p4kwNL/db0I/14=; b=haNbJG8NR/2F0pP/dYiRnR9q/JaWrRdjXus/IHtj0KOTWshlJqDCOS0UDvjTKwr0L7 G/Y2v2fcRMpGg8mG4QNXfuZaDa1524AtulB/F+SXk/pTwRTH2Xb5OFenXBT54YS9ux8H 1jMz5+QxCR8ytwYsUDpSULSZ+U5uDz1gwstIWMJbzSVC/7K1Sok6fDE+6Zl4F/eX7qx7 Vafg497eg12+Ol4FNw33S0tvBk60UIvPo7Xqk8lves5+4xTQfJILUsS+PA4KOHgckh0k 3DrhXAfaNo/xiqPbK2izA+SYQxXdlEjWV7H4hguUZRdpo2dLJYq4Ys0e8kQo3PQVkq+6 JAhw== 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, David Woodhouse , Thomas Gleixner , Arjan van de Ven , Ingo Molnar , Juergen Gross , gnomes@lxorguk.ukuu.org.uk, Rik van Riel , Andi Kleen , Josh Poimboeuf , thomas.lendacky@amd.com, Peter Zijlstra , Linus Torvalds , Jiri Kosina , Andy Lutomirski , Dave Hansen , Kees Cook , Tim Chen , Paul Turner , Greg Kroah-Hartman Subject: [PATCH 4.4 16/53] x86/retpoline/xen: Convert Xen hypercall indirect jumps Date: Mon, 22 Jan 2018 09:40:08 +0100 Message-Id: <20180122083910.981021239@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083910.299610926@linuxfoundation.org> References: <20180122083910.299610926@linuxfoundation.org> User-Agent: quilt/0.65 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?1590281345511045209?= X-GMAIL-MSGID: =?utf-8?q?1590281345511045209?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable 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: David Woodhouse Signed-off-by: Greg Kroah-Hartman --- 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();