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=ham 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 C2E9AC43381 for ; Mon, 1 Apr 2019 17:14:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8973220883 for ; Mon, 1 Apr 2019 17:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138860; bh=nGNiM+BArO2QBLMtRx8gpQ348rqcW3x58ZbMxU3LKAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lWgnTNKWyI4rvTPep9B0K2AljJcPX8gVn3Yve31L1zvEAU2auZ4mNOqcBcOsHPPco pS6vyoNUq0mxxvH0b81n6eO8hbbf+dc0cgsbRSrwpoPNINaFj+ABgBHT0drNnux3RU NQYHFrYm1KmkPhMTbBEGaYHU6uRQBpy92azL9qlM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729923AbfDAROS (ORCPT ); Mon, 1 Apr 2019 13:14:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:37378 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730684AbfDAROO (ORCPT ); Mon, 1 Apr 2019 13:14:14 -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 A457E205F4; Mon, 1 Apr 2019 17:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554138854; bh=nGNiM+BArO2QBLMtRx8gpQ348rqcW3x58ZbMxU3LKAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LJiX+rKu5vYyiqYtZ7BbIYYJWbeAHaPtnfPCmAafixb/Keu/WDHUvz8ZxdafdWfKB aWXcJItlwGO/0/AHCLKG/dubh5/8xj45hn4RKw8CPQWleCLu/yknaoeZdyUT0jjexp eUq3c5orUnAlSr29JFxkqzTm1vrCI25rg93siDPw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Diana Craciun , Michael Ellerman Subject: [PATCH 4.19 041/134] powerpc/fsl: Update Spectre v2 reporting Date: Mon, 1 Apr 2019 19:01:17 +0200 Message-Id: <20190401170048.500710977@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190401170044.243719205@linuxfoundation.org> References: <20190401170044.243719205@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Diana Craciun commit dfa88658fb0583abb92e062c7a9cd5a5b94f2a46 upstream. Report branch predictor state flush as a mitigation for Spectre variant 2. Signed-off-by: Diana Craciun Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/security.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/arch/powerpc/kernel/security.c +++ b/arch/powerpc/kernel/security.c @@ -212,8 +212,11 @@ ssize_t cpu_show_spectre_v2(struct devic if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW) seq_buf_printf(&s, "(hardware accelerated)"); - } else + } else if (btb_flush_enabled) { + seq_buf_printf(&s, "Mitigation: Branch predictor state flush"); + } else { seq_buf_printf(&s, "Vulnerable"); + } seq_buf_printf(&s, "\n");