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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7581CC433F5 for ; Wed, 13 Oct 2021 00:56:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5DD3E6101D for ; Wed, 13 Oct 2021 00:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237515AbhJMA6T (ORCPT ); Tue, 12 Oct 2021 20:58:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:41962 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237223AbhJMA5z (ORCPT ); Tue, 12 Oct 2021 20:57:55 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F352F6109E; Wed, 13 Oct 2021 00:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634086553; bh=9+9sOa2s70vt7+UuFUxQ/TgXeovhbDnUd1sR4b0gowo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TOPILK/r5Br7uIerzxVLGKcd/nKRxiQA8RORFSPHaB0Pkwkep3Ttr3BnWa/rUekvZ Xox3ythk2OAaF6CVeMgL1MhW4yskdrQ/ErxXR/V6GJwdZvxohlyqdSeWfcRViFrTug LJ+wfMEW18Rj/cyncKyFzUayQVScWeBkpEToun3jldNt8KmQ4av3gVwI8weylltDuJ LNKibecccFhJ6uiyH6LzGt++42qIdscq9U+LBrtduwaxrQDDxQ3R11QUy5oUhfLL35 JN78h63tEezbk5dUcRaCiKiB5N01nRXkvnOv3ipwcCVg6Mw6sQxMw8/CGsAkSZhFvB hHUKV5QGdz+eA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Naveen N. Rao" , Michael Ellerman , Sasha Levin , npiggin@gmail.com, dja@axtens.net, christophe.leroy@csgroup.eu, aik@ozlabs.ru, aneesh.kumar@linux.ibm.com, lihuafei1@huawei.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.10 10/11] powerpc/security: Add a helper to query stf_barrier type Date: Tue, 12 Oct 2021 20:55:30 -0400 Message-Id: <20211013005532.700190-10-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211013005532.700190-1-sashal@kernel.org> References: <20211013005532.700190-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Naveen N. Rao" [ Upstream commit 030905920f32e91a52794937f67434ac0b3ea41a ] Add a helper to return the stf_barrier type for the current processor. Signed-off-by: Naveen N. Rao Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/3bd5d7f96ea1547991ac2ce3137dc2b220bae285.1633464148.git.naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Sasha Levin --- arch/powerpc/include/asm/security_features.h | 5 +++++ arch/powerpc/kernel/security.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/arch/powerpc/include/asm/security_features.h b/arch/powerpc/include/asm/security_features.h index b774a4477d5f..e380acc6e413 100644 --- a/arch/powerpc/include/asm/security_features.h +++ b/arch/powerpc/include/asm/security_features.h @@ -39,6 +39,11 @@ static inline bool security_ftr_enabled(u64 feature) return !!(powerpc_security_features & feature); } +#ifdef CONFIG_PPC_BOOK3S_64 +enum stf_barrier_type stf_barrier_type_get(void); +#else +static inline enum stf_barrier_type stf_barrier_type_get(void) { return STF_BARRIER_NONE; } +#endif // Features indicating support for Spectre/Meltdown mitigations diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c index e4e1a94ccf6a..3f510c911b10 100644 --- a/arch/powerpc/kernel/security.c +++ b/arch/powerpc/kernel/security.c @@ -261,6 +261,11 @@ static int __init handle_no_stf_barrier(char *p) early_param("no_stf_barrier", handle_no_stf_barrier); +enum stf_barrier_type stf_barrier_type_get(void) +{ + return stf_enabled_flush_types; +} + /* This is the generic flag used by other architectures */ static int __init handle_ssbd(char *p) { -- 2.33.0