From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CE8DC04E53 for ; Wed, 15 May 2019 12:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAB3720843 for ; Wed, 15 May 2019 12:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922422; bh=633E/uWvic+e/PGw/A5H8U59uYTHutHJn6+Sw+W1DBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RLD8EbADXkr9eyjky0wyFO33BBeDgKE6rsykGOR2j0HG0wxj5NlGNppSQLk8H53T7 NGj5pfcD0V+E9yPAuXTR6OWPPZv5zknpcumILZC3Yu0QpbvzCDw2fIOv8I1F33JSMU A+OF2Ni7VlaRgXTWyCjkdGXueNCuF+j0zyUlx28c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727919AbfEOLE4 (ORCPT ); Wed, 15 May 2019 07:04:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:34718 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727582AbfEOLEz (ORCPT ); Wed, 15 May 2019 07:04:55 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BE14220644; Wed, 15 May 2019 11:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557918295; bh=633E/uWvic+e/PGw/A5H8U59uYTHutHJn6+Sw+W1DBk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1qXO/E2pDmMiyR2Ov4mk3pau5kyjvwS4qm09NLSwCESz5WgKMxGixU4mEOu8cjl9N c04+2N7CmRVag5bM9ucOoqMCRQ/adjgy2hy9wE8H2ob3ogARDbC7AxZlwZFb6K5MWJ qk3pCN5sjN4tlFRcV6yUKmuLp2pWTx8duIQ/p+oQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "linuxppc-dev@ozlabs.org, mpe@ellerman.id.au, Diana Craciun" , Michael Ellerman , Diana Craciun Subject: [PATCH 4.4 080/266] powerpc/fsl: Flush branch predictor when entering KVM Date: Wed, 15 May 2019 12:53:07 +0200 Message-Id: <20190515090725.147293414@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090722.696531131@linuxfoundation.org> References: <20190515090722.696531131@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Diana Craciun commit e7aa61f47b23afbec41031bc47ca8d6cb6516abc upstream. Switching from the guest to host is another place where the speculative accesses can be exploited. Flush the branch predictor when entering KVM. Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kvm/bookehv_interrupts.S | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/powerpc/kvm/bookehv_interrupts.S +++ b/arch/powerpc/kvm/bookehv_interrupts.S @@ -75,6 +75,10 @@ PPC_LL r1, VCPU_HOST_STACK(r4) PPC_LL r2, HOST_R2(r1) +START_BTB_FLUSH_SECTION + BTB_FLUSH(r10) +END_BTB_FLUSH_SECTION + mfspr r10, SPRN_PID lwz r8, VCPU_HOST_PID(r4) PPC_LL r11, VCPU_SHARED(r4)