lkml.org 
[lkml]   [2021]   [Feb]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 15/24] KVM: x86/mmu: Move initial kvm_mmu_set_mask_ptes() call into MMU proper
    From
    Move kvm_mmu_set_mask_ptes() into mmu.c as prep for future cleanup of the
    mask initialization code.

    No functional change intended.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    arch/x86/kvm/mmu/mmu.c | 4 ++++
    arch/x86/kvm/x86.c | 3 ---
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
    index f92571b786a2..99d9c85a1820 100644
    --- a/arch/x86/kvm/mmu/mmu.c
    +++ b/arch/x86/kvm/mmu/mmu.c
    @@ -5796,6 +5796,10 @@ int kvm_mmu_module_init(void)

    kvm_set_mmio_spte_mask();

    + kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,
    + PT_DIRTY_MASK, PT64_NX_MASK, 0,
    + PT_PRESENT_MASK, 0, sme_me_mask);
    +
    pte_list_desc_cache = kmem_cache_create("pte_list_desc",
    sizeof(struct pte_list_desc),
    0, SLAB_ACCOUNT, NULL);
    diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
    index c1b7bdf47e7e..5a27468c6afa 100644
    --- a/arch/x86/kvm/x86.c
    +++ b/arch/x86/kvm/x86.c
    @@ -8024,9 +8024,6 @@ int kvm_arch_init(void *opaque)
    if (r)
    goto out_free_percpu;

    - kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK,
    - PT_DIRTY_MASK, PT64_NX_MASK, 0,
    - PT_PRESENT_MASK, 0, sme_me_mask);
    kvm_timer_init();

    perf_register_guest_info_callbacks(&kvm_guest_cbs);
    --
    2.30.1.766.gb4fecdf3b7-goog
    \
     
     \ /
      Last update: 2021-02-25 22:02    [W:2.757 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site