From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225NfeNo1e+eHsjuF/AIZ9Gn7ePpzV4R88IaX8+3Z6LDu29qQY9Zwo4cMvNqPnq3c/cymSeI ARC-Seal: i=1; a=rsa-sha256; t=1516874573; cv=none; d=google.com; s=arc-20160816; b=LGT52aGWM9sdlq9iD6KmWNo07pdF0IKsmCeU2r2flFPEAUWrMoaX7CWn/iuVPJzMvJ tp9updxGo19SoUHgJni3KJESWM++Ijlc++S89twrudK3/c4HE0NlxfjI6EW6gydWHC0h RrTvLlOPUxZsrKmJO0lXVK2pAAqRZjtGm3pijgbLgVNB9bkBV5cB2Ohyh8/q8G+KYBA2 PkkR5kmr2PvmvQdHJIlyHqAW/gaHLHAbSQVgEXkQMMP7NcDotaHm1E32QbOrOdgJWlxh xGb4rDlO1PwL+botbEaexsnAUisORHzHmOv2dgBSaDm3vY6gm0+9Yv4WxIDHBfD8JdIf A0gg== 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=RepDN66fVLsV6vEr3S/wde8/V1GMeAO6S13NWtOC4ek=; b=an3t97yHeSL3ZGigUNSlMLH5gTUsTmyonbao9JfHlGAP/ePch4/qlUigIIz5A/DAgb qwNsN6LI2vfJ+un4N1XayvINifRbihQpyjS9zRaE0yqqwyMbcUDdDF7nB0F1Xs+ylGAx /8WNMr+abaNfxPDVS6ku59A3f5kh2NHXlqU2pAednm0o5+X93xNTtAn5novaMwy7skjQ ERSKOMW+4mZhN9kSSmEfke/A2JXSbh4TU/f0cs6dlquNriYAMa8xEbrbie9sorMmYckN ksAU61ev+yzdrRAfPJS9XxfgP7mDLvYg4g1crSSIgPnZaMwXFybVpD9MaPyEISYsvlc9 zHPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=merlin.20170209 header.b=M5uNkctW; 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=M5uNkctW; 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: <20180125095843.645776917@infradead.org> User-Agent: quilt/0.63-1 Date: Thu, 25 Jan 2018 10:58:14 +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 , Jason Baron , rga@amazon.de, Peter Zijlstra , David Woodhouse Subject: [PATCH 2/2] x86,vmx: Fix indirect call References: <20180125095812.447754815@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-kvm-vmx-retpoline.patch X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590397845684854555?= X-GMAIL-MSGID: =?utf-8?q?1590558272373770249?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Replace indirect call with CALL_NOSPEC. Cc: Paolo Bonzini Reviewed-by: David Woodhouse Signed-off-by: Peter Zijlstra (Intel) --- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -9129,14 +9129,14 @@ static void vmx_handle_external_intr(str #endif "pushf\n\t" __ASM_SIZE(push) " $%c[cs]\n\t" - "call *%[entry]\n\t" + CALL_NOSPEC : #ifdef CONFIG_X86_64 [sp]"=&r"(tmp), #endif ASM_CALL_CONSTRAINT : - [entry]"r"(entry), + THUNK_TARGET(entry), [ss]"i"(__KERNEL_DS), [cs]"i"(__KERNEL_CS) );