When pKVM is enabled, the FF-A driver must be initialized after pKVM. Otherwise, pKVM cannot negotiate the FF-A version or obtain RX/TX buffer information, leading to failures in FF-A calls.
During FF-A driver initialization, check whether pKVM has been initialized. If pKVM isn't initailised, register notifier and do initialisation of FF-A driver when pKVM is initialized. Signed-off-by: Yeoreum Yun <[email protected]> --- arch/arm64/include/asm/virt.h | 11 ++++++++++ arch/arm64/kvm/arm.c | 21 ++++++++++++++++++ arch/arm64/kvm/pkvm.c | 2 ++ drivers/firmware/arm_ffa/common.h | 4 ++-- drivers/firmware/arm_ffa/driver.c | 36 ++++++++++++++++++++++++++++++- drivers/firmware/arm_ffa/smccc.c | 2 +- 6 files changed, 72 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index b51ab6840f9c..ad038a3b8727 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -68,6 +68,8 @@ #include <asm/sysreg.h> #include <asm/cpufeature.h> +struct notifier_block; + /* * __boot_cpu_mode records what mode CPUs were booted in. * A correctly-implemented bootloader must start all CPUs in the same mode: @@ -166,6 +168,15 @@ static inline bool is_hyp_nvhe(void) return is_hyp_mode_available() && !is_kernel_in_hyp_mode(); } +enum kvm_arm_event { + PKVM_INITIALISED, + KVM_ARM_EVENT_MAX, +}; + +extern int kvm_arm_event_notifier_call_chain(enum kvm_arm_event event, void *data); +extern int kvm_arm_event_notifier_register(struct notifier_block *nb); +extern int kvm_arm_event_notifier_unregister(struct notifier_block *nb); + #endif /* __ASSEMBLER__ */ #endif /* ! __ASM__VIRT_H */ diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 410ffd41fd73..8da10049ab65 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -14,6 +14,7 @@ #include <linux/vmalloc.h> #include <linux/fs.h> #include <linux/mman.h> +#include <linux/notifier.h> #include <linux/sched.h> #include <linux/kvm.h> #include <linux/kvm_irqfd.h> @@ -111,6 +112,8 @@ DECLARE_KVM_NVHE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params); DECLARE_KVM_NVHE_PER_CPU(struct kvm_cpu_context, kvm_hyp_ctxt); +BLOCKING_NOTIFIER_HEAD(kvm_arm_event_notifier_head); + static bool vgic_present, kvm_arm_initialised; static DEFINE_PER_CPU(unsigned char, kvm_hyp_initialized); @@ -3064,4 +3067,22 @@ enum kvm_mode kvm_get_mode(void) return kvm_mode; } +int kvm_arm_event_notifier_call_chain(enum kvm_arm_event event, void *data) +{ + return blocking_notifier_call_chain(&kvm_arm_event_notifier_head, + event, data); +} + +int kvm_arm_event_notifier_register(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&kvm_arm_event_notifier_head, nb); +} +EXPORT_SYMBOL_GPL(kvm_arm_event_notifier_register); + +int kvm_arm_event_notifier_unregister(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&kvm_arm_event_notifier_head, nb); +} +EXPORT_SYMBOL_GPL(kvm_arm_event_notifier_unregister); + module_init(kvm_arm_init); diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index d7a0f69a9982..e76562b0a45a 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -280,6 +280,8 @@ static int __init finalize_pkvm(void) ret = pkvm_drop_host_privileges(); if (ret) pr_err("Failed to finalize Hyp protection: %d\n", ret); + else + kvm_arm_event_notifier_call_chain(PKVM_INITIALISED, NULL); return ret; } diff --git a/drivers/firmware/arm_ffa/common.h b/drivers/firmware/arm_ffa/common.h index 9c6425a81d0d..5cdf4bd222c6 100644 --- a/drivers/firmware/arm_ffa/common.h +++ b/drivers/firmware/arm_ffa/common.h @@ -18,9 +18,9 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev); void ffa_device_match_uuid(struct ffa_device *ffa_dev, const uuid_t *uuid); #ifdef CONFIG_ARM_FFA_SMCCC -int __init ffa_transport_init(ffa_fn **invoke_ffa_fn); +int ffa_transport_init(ffa_fn **invoke_ffa_fn); #else -static inline int __init ffa_transport_init(ffa_fn **invoke_ffa_fn) +static inline int ffa_transport_init(ffa_fn **invoke_ffa_fn) { return -EOPNOTSUPP; } diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index 02c76ac1570b..67df053e65b8 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -35,6 +35,7 @@ #include <linux/module.h> #include <linux/mm.h> #include <linux/mutex.h> +#include <linux/notifier.h> #include <linux/of_irq.h> #include <linux/scatterlist.h> #include <linux/slab.h> @@ -42,6 +43,8 @@ #include <linux/uuid.h> #include <linux/xarray.h> +#include <asm/virt.h> + #include "common.h" #define FFA_DRIVER_VERSION FFA_VERSION_1_2 @@ -2029,7 +2032,7 @@ static void ffa_notifications_setup(void) ffa_notifications_cleanup(); } -static int __init ffa_init(void) +static int __ffa_init(void) { int ret; u32 buf_sz; @@ -2105,11 +2108,42 @@ static int __init ffa_init(void) free_drv_info: kfree(drv_info); return ret; + +} + +static int ffa_kvm_arm_event_handler(struct notifier_block *nb, + unsigned long event, void *unused) +{ + if (event == PKVM_INITIALISED) + __ffa_init(); + + return NOTIFY_DONE; +} + +static struct notifier_block ffa_kvm_arm_event_notifier = { + .notifier_call = ffa_kvm_arm_event_handler, +}; + +static int __init ffa_init(void) +{ + /* + * When pKVM is enabled, the FF-A driver must be initialized + * after pKVM initialization. Otherwise, pKVM cannot negotiate + * the FF-A version or obtain RX/TX buffer information, + * which leads to failures in FF-A calls. + */ + if (IS_ENABLED(CONFIG_KVM) && is_protected_kvm_enabled() && + !is_pkvm_initialized()) + return kvm_arm_event_notifier_register(&ffa_kvm_arm_event_notifier); + + return __ffa_init(); } device_initcall(ffa_init); static void __exit ffa_exit(void) { + if (IS_ENABLED(CONFIG_KVM)) + kvm_arm_event_notifier_unregister(&ffa_kvm_arm_event_notifier); ffa_notifications_cleanup(); ffa_partitions_cleanup(); ffa_rxtx_unmap(); diff --git a/drivers/firmware/arm_ffa/smccc.c b/drivers/firmware/arm_ffa/smccc.c index 4d85bfff0a4e..e6125dd9f58f 100644 --- a/drivers/firmware/arm_ffa/smccc.c +++ b/drivers/firmware/arm_ffa/smccc.c @@ -17,7 +17,7 @@ static void __arm_ffa_fn_hvc(ffa_value_t args, ffa_value_t *res) arm_smccc_1_2_hvc(&args, res); } -int __init ffa_transport_init(ffa_fn **invoke_ffa_fn) +int ffa_transport_init(ffa_fn **invoke_ffa_fn) { enum arm_smccc_conduit conduit; -- LEVI:{C3F47F37-75D8-414A-A8BA-3980EC8A46D7}
