lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 22/24] kvm: arm64: Keep nVHE EL2 vector installed
    Date
    KVM by default keeps the stub vector installed and installs the nVHE
    vector only briefly for init and later on demand. Change this policy
    to install the vector at init and then never uninstall it if the kernel
    was given the protected KVM command line parameter.

    Signed-off-by: David Brazdil <dbrazdil@google.com>
    ---
    arch/arm64/kvm/arm.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
    index 49d2474f2a80..45bc7a6b9e0b 100644
    --- a/arch/arm64/kvm/arm.c
    +++ b/arch/arm64/kvm/arm.c
    @@ -1443,7 +1443,8 @@ static void _kvm_arch_hardware_disable(void *discard)

    void kvm_arch_hardware_disable(void)
    {
    - _kvm_arch_hardware_disable(NULL);
    + if (!is_protected_kvm_enabled())
    + _kvm_arch_hardware_disable(NULL);
    }

    #ifdef CONFIG_CPU_PM
    @@ -1486,11 +1487,13 @@ static struct notifier_block hyp_init_cpu_pm_nb = {

    static void __init hyp_cpu_pm_init(void)
    {
    - cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);
    + if (!is_protected_kvm_enabled())
    + cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);
    }
    static void __init hyp_cpu_pm_exit(void)
    {
    - cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
    + if (!is_protected_kvm_enabled())
    + cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
    }
    #else
    static inline void hyp_cpu_pm_init(void)
    @@ -1575,7 +1578,8 @@ static int init_subsystems(void)
    kvm_coproc_table_init();

    out:
    - on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);
    + if (err || !is_protected_kvm_enabled())
    + on_each_cpu(_kvm_arch_hardware_disable, NULL, 1);

    return err;
    }
    --
    2.29.2.299.gdc1121823c-goog
    \
     
     \ /
      Last update: 2020-11-16 22:09    [W:7.178 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site