From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>, Michael Ellerman <mpe@ellerman.id.au>, Sasha Levin <sashal@kernel.org>, 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 [thread overview] Message-ID: <20211013005532.700190-10-sashal@kernel.org> (raw) In-Reply-To: <20211013005532.700190-1-sashal@kernel.org> From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> [ Upstream commit 030905920f32e91a52794937f67434ac0b3ea41a ] Add a helper to return the stf_barrier type for the current processor. Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/3bd5d7f96ea1547991ac2ce3137dc2b220bae285.1633464148.git.naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Sasha Levin <sashal@kernel.org> --- 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
WARNING: multiple messages have this Message-ID (diff)
From: Sasha Levin <sashal@kernel.org> To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin <sashal@kernel.org>, lihuafei1@huawei.com, aik@ozlabs.ru, npiggin@gmail.com, aneesh.kumar@linux.ibm.com, "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>, linuxppc-dev@lists.ozlabs.org, dja@axtens.net 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 [thread overview] Message-ID: <20211013005532.700190-10-sashal@kernel.org> (raw) In-Reply-To: <20211013005532.700190-1-sashal@kernel.org> From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com> [ Upstream commit 030905920f32e91a52794937f67434ac0b3ea41a ] Add a helper to return the stf_barrier type for the current processor. Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/3bd5d7f96ea1547991ac2ce3137dc2b220bae285.1633464148.git.naveen.n.rao@linux.vnet.ibm.com Signed-off-by: Sasha Levin <sashal@kernel.org> --- 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
next prev parent reply other threads:[~2021-10-13 0:56 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-10-13 0:55 [PATCH AUTOSEL 5.10 01/11] arm: dts: vexpress-v2p-ca9: Fix the SMB unit-address Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 02/11] ARM: config: mutli v7: Reenable FB dependency Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 03/11] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 04/11] block: decode QUEUE_FLAG_HCTX_ACTIVE in debugfs output Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 05/11] xen/x86: prevent PVH type from getting clobbered Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 06/11] drm/amdgpu/display: fix dependencies for DRM_AMD_DC_SI Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 07/11] xtensa: xtfpga: use CONFIG_USE_OF instead of CONFIG_OF Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 08/11] xtensa: xtfpga: Try software restart before simulating CPU reset Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 09/11] NFSD: Keep existing listeners on portlist error Sasha Levin 2021-10-13 0:55 ` Sasha Levin [this message] 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 10/11] powerpc/security: Add a helper to query stf_barrier type Sasha Levin 2021-10-13 0:55 ` [PATCH AUTOSEL 5.10 11/11] firmware: include drivers/firmware/Kconfig unconditionally Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 0:55 ` Sasha Levin 2021-10-13 5:58 ` Greg KH 2021-10-13 5:58 ` Greg KH 2021-10-13 5:58 ` Greg KH 2021-10-13 5:58 ` Greg KH 2021-10-13 8:38 ` Arnd Bergmann 2021-10-13 8:38 ` Arnd Bergmann 2021-10-13 8:38 ` Arnd Bergmann 2021-10-13 8:38 ` Arnd Bergmann 2021-10-13 8:45 ` Uwe Kleine-König 2021-10-13 8:45 ` Uwe Kleine-König 2021-10-13 8:45 ` Uwe Kleine-König 2021-10-13 8:45 ` Uwe Kleine-König 2021-10-13 8:50 ` Arnd Bergmann 2021-10-13 8:50 ` Arnd Bergmann 2021-10-13 8:50 ` Arnd Bergmann 2021-10-13 8:50 ` Arnd Bergmann
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211013005532.700190-10-sashal@kernel.org \ --to=sashal@kernel.org \ --cc=aik@ozlabs.ru \ --cc=aneesh.kumar@linux.ibm.com \ --cc=christophe.leroy@csgroup.eu \ --cc=dja@axtens.net \ --cc=lihuafei1@huawei.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=naveen.n.rao@linux.vnet.ibm.com \ --cc=npiggin@gmail.com \ --cc=stable@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.