From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933154AbeAJB4V (ORCPT + 1 other); Tue, 9 Jan 2018 20:56:21 -0500 Received: from mga14.intel.com ([192.55.52.115]:45335 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933054AbeAJB4T (ORCPT ); Tue, 9 Jan 2018 20:56:19 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,337,1511856000"; d="scan'208";a="193713762" From: Andi Kleen To: tglx@linutronix.de Cc: x86@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, dwmw@amazon.co.uk, pjt@google.com, luto@kernel.org, peterz@infradead.org, thomas.lendacky@amd.com, tim.c.chen@linux.intel.com, gregkh@linux-foundation.org, dave.hansen@intel.com, jikos@kernel.org, Andi Kleen Subject: [PATCH v2 2/2] x86/retpoline: Use X86_RETPOLINE_COMMON to enable 32bit retpoline Date: Tue, 9 Jan 2018 17:56:01 -0800 Message-Id: <20180110015601.27370-2-andi@firstfloor.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110015601.27370-1-andi@firstfloor.org> References: <20180110015601.27370-1-andi@firstfloor.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: From: Andi Kleen 32bit uses a single retpoline sequence for AMD/Intel. Previously X86_RETPOLINE was always set for AMD/Intel but that's not true anymore. So now use the new X86_FEATURE_RETPOLINE_COMMON flag that is set for both. Signed-off-by: Andi Kleen --- arch/x86/include/asm/nospec-branch.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index c1cef78f0e12..bbd5343f2fea 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -116,7 +116,7 @@ # define CALL_NOSPEC ALTERNATIVE( \ "call *%[thunk_target]\n", \ "call __x86_indirect_thunk_%V[thunk_target]\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE_COMMON) # define THUNK_TARGET(addr) [thunk_target] "r" (addr) #elif defined(CONFIG_X86_32) && defined(CONFIG_RETPOLINE) /* @@ -142,7 +142,7 @@ " .align 16\n" \ "do_call%=:\n" \ " call do_retpoline%=;\n", \ - X86_FEATURE_RETPOLINE) + X86_FEATURE_RETPOLINE_COMMON) # define THUNK_TARGET(addr) [thunk_target] "rm" (addr) #else /* No retpoline */ -- 2.14.3