From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELvgbVX9aE56oZIfPDFDRpOZM4WPK6ezPGj7HoR1jRBfrNmuCVeabCV429/PaVKjBoE+YLGx ARC-Seal: i=1; a=rsa-sha256; t=1519411232; cv=none; d=google.com; s=arc-20160816; b=eJGk2r0v7lgXB7IGnrTjeYkBXYvzF8JQGNTwDs7XAlP9b+lxk3/ee6Ocp+dh6wbG5F n6q8S/MGmwBaVEW8fNPQlYDACpPkP/7GoGvtjtP+ldVS25C72j3uLWf6AfSx0/Jh8WjO QCWTawtL5n/a0/ZdEOvnaDw1lew4qyDPvcil7HWItkjmh2yB/I0+eSfV144sWoo2nZ63 17l3kCWuWUZLDdYOPOOcoPQE1xfU3pmTYufQPZQdCs11Ka1fgQAQu1JzuvkE/jN1B5sJ HLa85RkAESAKKgU789n6MdxIvbZoz31hPK0XnSQGNP6S+4kZGG9e4rQ9dvMhEAvbQ6Kj jTZA== 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=8VKifSbo5V/hJVx00oirItETWkNUhM0BXOUtDUG7TQg=; b=VcgZ03eocEA34m69pPbxVkUZiZz71GMslQ67fS12HmscoIDe4rWi1ab4FJDwusDO+Q m9Orw6x33CcyI85mHONv0bM71rz4Tly0TPGdndK6lp+yS6DNwNv4udqZKDLnvQ4+rMAH w9fS5rQijkbdyTIlArmrIWPwwR+ua4+8E4P7b4BC1TyAQ80g9ryHKZWITcCIkU0u8vxP ezvrJWFs8Scb5JOAbrxQmbHZSE4A5wgmSH+M4UxrQIhsAHlRw6Va6Yl0BBEqyLvI737C t/M+5T75Vr+cn/JKforT5VCjFDTkw7TTv2ws8KDIsQp2wwF9+Jvc2TgeGkXlDjAaG6Vd +8WQ== 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, "Peter Zijlstra (Intel)" , Thomas Gleixner , David Woodhouse , Andrea Arcangeli , Andi Kleen , Ashok Raj , Jun Nakajima , David Woodhouse , Linus Torvalds , rga@amazon.de, Dave Hansen , Asit Mallick , Andy Lutomirski , Josh Poimboeuf , Jason Baron , Paolo Bonzini , Dan Williams , Arjan Van De Ven , Tim Chen , Jack Wang Subject: [PATCH 4.4 167/193] KVM: VMX: Make indirect call speculation safe Date: Fri, 23 Feb 2018 19:26:40 +0100 Message-Id: <20180223170352.192414345@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170325.997716448@linuxfoundation.org> References: <20180223170325.997716448@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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?1593218151996189200?= X-GMAIL-MSGID: =?utf-8?q?1593218151996189200?= 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: Peter Zijlstra (cherry picked from commit c940a3fb1e2e9b7d03228ab28f375fb5a47ff699) Replace indirect call with CALL_NOSPEC. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Thomas Gleixner Reviewed-by: David Woodhouse Cc: Andrea Arcangeli Cc: Andi Kleen Cc: Ashok Raj Cc: Greg KH Cc: Jun Nakajima Cc: David Woodhouse Cc: Linus Torvalds Cc: rga@amazon.de Cc: Dave Hansen Cc: Asit Mallick Cc: Andy Lutomirski Cc: Josh Poimboeuf Cc: Jason Baron Cc: Paolo Bonzini Cc: Dan Williams Cc: Arjan Van De Ven Cc: Tim Chen Link: https://lkml.kernel.org/r/20180125095843.645776917@infradead.org Signed-off-by: David Woodhouse [backport to 4.4] Signed-off-by: Jack Wang Signed-off-by: Greg Kroah-Hartman --- 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 @@ -8377,13 +8377,13 @@ static void vmx_handle_external_intr(str "pushf\n\t" "orl $0x200, (%%" _ASM_SP ")\n\t" __ASM_SIZE(push) " $%c[cs]\n\t" - "call *%[entry]\n\t" + CALL_NOSPEC : #ifdef CONFIG_X86_64 [sp]"=&r"(tmp) #endif : - [entry]"r"(entry), + THUNK_TARGET(entry), [ss]"i"(__KERNEL_DS), [cs]"i"(__KERNEL_CS) );