xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Reintroduce is_kvm_guest() as a fast-path check

Browse Source 
[ Upstream commit a21d1becaa3f17a97b933ffa677b526afc514ec5 ]

Introduce a static branch that would be set during boot if the OS
happens to be a KVM guest. Subsequent checks to see if we are on KVM
will rely on this static branch. This static branch would be used in
vcpu_is_preempted() in a subsequent patch.

Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: Waiman Long <longman@redhat.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201202050456.164005-4-srikar@linux.vnet.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Srikar Dronamraju
2020-12-02 10:34:55 +05:30
committed by Greg Kroah-Hartman
parent 113207234a
commit e01a4d7560
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/kvm_guest.h
View File

@@ -7,8 +7,18 @@
#define _ASM_POWERPC_KVM_GUEST_H_ #define _ASM_POWERPC_KVM_GUEST_H_
#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST) #if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
#include <linux/jump_label.h>
DECLARE_STATIC_KEY_FALSE(kvm_guest);
static inline bool is_kvm_guest(void)
{
return static_branch_unlikely(&kvm_guest);
}
bool check_kvm_guest(void); bool check_kvm_guest(void);
#else #else
static inline bool is_kvm_guest(void) { return false; }
static inline bool check_kvm_guest(void) { return false; } static inline bool check_kvm_guest(void) { return false; }
#endif #endif

2
arch/powerpc/include/asm/kvm_para.h
View File

@@ -14,7 +14,7 @@
static inline int kvm_para_available(void) static inline int kvm_para_available(void)
{ {
return IS_ENABLED(CONFIG_KVM_GUEST) && check_kvm_guest(); return IS_ENABLED(CONFIG_KVM_GUEST) && is_kvm_guest();
} }
static inline unsigned int kvm_arch_para_features(void) static inline unsigned int kvm_arch_para_features(void)

2
arch/powerpc/kernel/firmware.c
View File

@@ -22,6 +22,7 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);
#endif #endif
#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST) #if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
DEFINE_STATIC_KEY_FALSE(kvm_guest);
bool check_kvm_guest(void) bool check_kvm_guest(void)
{ {
struct device_node *hyper_node; struct device_node *hyper_node;
@@ -33,6 +34,7 @@ bool check_kvm_guest(void)
if (!of_device_is_compatible(hyper_node, "linux,kvm")) if (!of_device_is_compatible(hyper_node, "linux,kvm"))
return false; return false;
static_branch_enable(&kvm_guest);
return true; return true;
} }
#endif #endif