mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 21:33:52 +00:00
534aa1dc97
An inclusion of cache.h in printk.h was added in 2014 in commitc28aa1f0a8("printk/cache: mark printk_once test variable __read_mostly") in order to bring in the definition of __read_mostly. The usage of __read_mostly was later removed in commit3ec25826ae("printk: Tie printk_once / printk_deferred_once into .data.once for reset") which made the inclusion of cache.h unnecessary, so remove it. We have a small amount of code that depended on the inclusion of cache.h from printk.h; fix that code to include the appropriate header. This fixes a circular inclusion on arm64 (linux/printk.h -> linux/cache.h -> asm/cache.h -> linux/kasan-enabled.h -> linux/static_key.h -> linux/jump_label.h -> linux/bug.h -> asm/bug.h -> linux/printk.h) that would otherwise be introduced by the next patch. Build tested using {allyesconfig,defconfig} x {arm64,x86_64}. Link: https://linux-review.googlesource.com/id/I8fd51f72c9ef1f2d6afd3b2cbc875aa4792c1fba Link: https://lkml.kernel.org/r/20220427195820.1716975-1-pcc@google.com Signed-off-by: Peter Collingbourne <pcc@google.com> Cc: Alexander Potapenko <glider@google.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: David Rientjes <rientjes@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Eric W. Biederman <ebiederm@xmission.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Kees Cook <keescook@chromium.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Roman Gushchin <roman.gushchin@linux.dev> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
51 lines
1.4 KiB
C
51 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
#define pr_fmt(fmt) "smccc: KVM: " fmt
|
|
|
|
#include <linux/arm-smccc.h>
|
|
#include <linux/bitmap.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/hypervisor.h>
|
|
|
|
static DECLARE_BITMAP(__kvm_arm_hyp_services, ARM_SMCCC_KVM_NUM_FUNCS) __ro_after_init = { };
|
|
|
|
void __init kvm_init_hyp_services(void)
|
|
{
|
|
struct arm_smccc_res res;
|
|
u32 val[4];
|
|
|
|
if (arm_smccc_1_1_get_conduit() != SMCCC_CONDUIT_HVC)
|
|
return;
|
|
|
|
arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_CALL_UID_FUNC_ID, &res);
|
|
if (res.a0 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_0 ||
|
|
res.a1 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_1 ||
|
|
res.a2 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_2 ||
|
|
res.a3 != ARM_SMCCC_VENDOR_HYP_UID_KVM_REG_3)
|
|
return;
|
|
|
|
memset(&res, 0, sizeof(res));
|
|
arm_smccc_1_1_invoke(ARM_SMCCC_VENDOR_HYP_KVM_FEATURES_FUNC_ID, &res);
|
|
|
|
val[0] = lower_32_bits(res.a0);
|
|
val[1] = lower_32_bits(res.a1);
|
|
val[2] = lower_32_bits(res.a2);
|
|
val[3] = lower_32_bits(res.a3);
|
|
|
|
bitmap_from_arr32(__kvm_arm_hyp_services, val, ARM_SMCCC_KVM_NUM_FUNCS);
|
|
|
|
pr_info("hypervisor services detected (0x%08lx 0x%08lx 0x%08lx 0x%08lx)\n",
|
|
res.a3, res.a2, res.a1, res.a0);
|
|
}
|
|
|
|
bool kvm_arm_hyp_service_available(u32 func_id)
|
|
{
|
|
if (func_id >= ARM_SMCCC_KVM_NUM_FUNCS)
|
|
return false;
|
|
|
|
return test_bit(func_id, __kvm_arm_hyp_services);
|
|
}
|
|
EXPORT_SYMBOL_GPL(kvm_arm_hyp_service_available);
|