Skip to content

Commit

Permalink
powerpc: Reintroduce is_kvm_guest() as a fast-path check
Browse files Browse the repository at this point in the history
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
  • Loading branch information
srikard authored and mpe committed Dec 3, 2020
1 parent 16520a8 commit a21d1be
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
10 changes: 10 additions & 0 deletions arch/powerpc/include/asm/kvm_guest.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,18 @@
#define _ASM_POWERPC_KVM_GUEST_H_

#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);
#else
static inline bool is_kvm_guest(void) { return false; }
static inline bool check_kvm_guest(void) { return false; }
#endif

Expand Down
2 changes: 1 addition & 1 deletion arch/powerpc/include/asm/kvm_para.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

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)
Expand Down
2 changes: 2 additions & 0 deletions arch/powerpc/kernel/firmware.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ EXPORT_SYMBOL_GPL(powerpc_firmware_features);
#endif

#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_KVM_GUEST)
DEFINE_STATIC_KEY_FALSE(kvm_guest);
bool check_kvm_guest(void)
{
struct device_node *hyper_node;
Expand All @@ -33,6 +34,7 @@ bool check_kvm_guest(void)
if (!of_device_is_compatible(hyper_node, "linux,kvm"))
return false;

static_branch_enable(&kvm_guest);
return true;
}
#endif

0 comments on commit a21d1be

Please sign in to comment.