KVM: const-ify all relevant uses of struct kvm_memory_slot
PATCH v2 1/1 KVM: const-ify all relevant uses of struct kvm_memory_slot
As alluded to in commit f36f3f2846b5 ("KVM: add "new" argument to kvm_arch_commit_memory_region"), a bunch of other places where struct kvm_memory_slot is used, needs to be refactored to preserve the "const"ness of struct kvm_memory_slot across-the-board.
Signed-off-by Hamza Mahfooz <[email protected]>
---
v2: fix an issue regarding an incorrect start_level being passed to rmap_walk_init_level()
--- arch/x86/include/asm/kvm_host.h | 4 +-- arch/x86/kvm/mmu/mmu.c | 58 ++++++++++++++++++--------------- arch/x86/kvm/mmu/mmu_internal.h | 4 +-- arch/x86/kvm/mmu/tdp_mmu.c | 7 ++-- arch/x86/kvm/mmu/tdp_mmu.h | 6 ++-- arch/x86/kvm/x86.c | 7 ++-- 6 files changed, 44 insertions(+), 42 deletions(-)
arch/x86/include/asm/kvm_host.h +2 -2
@@ -1536,12 +1536,12 @@ void kvm_mmu_uninit_vm(struct kvm *kvm);void kvm_mmu_after_set_cpuid (struct kvm_vcpu *vcpu);void kvm_mmu_reset_context (struct kvm_vcpu *vcpu);void kvm_mmu_slot_remove_write_access (struct kvm *kvm, -struct kvm_memory_slot *memslot, +const struct kvm_memory_slot *memslot,int start_level);void kvm_mmu_zap_collapsible_sptes (struct kvm *kvm,const struct kvm_memory_slot *memslot);void kvm_mmu_slot_leaf_clear_dirty (struct kvm *kvm, -struct kvm_memory_slot *memslot); +const struct kvm_memory_slot *memslot);void kvm_mmu_zap_all (struct kvm *kvm);void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,u64 gen);unsigned long kvm_mmu_calculate_default_mmu_pages (struct kvm *kvm);
arch/x86/kvm/mmu/mmu.c +31 -27
164 lines not on this page · raw message
arch/x86/kvm/mmu/mmu_internal.h +2 -2
@@ -124,8 +124,8 @@ static inline bool is_nx_huge_page_enabled(void)int mmu_try_to_unsync_pages (struct kvm_vcpu *vcpu,gfn_t gfn,bool can_unsync); -void kvm_mmu_gfn_disallow_lpage (struct kvm_memory_slot *slot,gfn_t gfn); -void kvm_mmu_gfn_allow_lpage (struct kvm_memory_slot *slot,gfn_t gfn); +void kvm_mmu_gfn_disallow_lpage (const struct kvm_memory_slot *slot,gfn_t gfn); +void kvm_mmu_gfn_allow_lpage (const struct kvm_memory_slot *slot,gfn_t gfn);bool kvm_mmu_slot_gfn_write_protect (struct kvm *kvm,struct kvm_memory_slot *slot,u64 gfn,int min_level);
arch/x86/kvm/mmu/tdp_mmu.c +4 -3
@@ -1242,8 +1242,8 @@ static bool wrprot_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,* only affect leaf SPTEs down to min_level. * Returns true if an SPTE has been changed and the TLBs need to be flushed. */ -bool kvm_tdp_mmu_wrprot_slot (struct kvm *kvm,struct kvm_memory_slot *slot, -int min_level) +bool kvm_tdp_mmu_wrprot_slot (struct kvm *kvm, +const struct kvm_memory_slot *slot,int min_level) {struct kvm_mmu_page *root;bool spte_set = false;
@@ -1313,7 +1313,8 @@ static bool clear_dirty_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,* each SPTE. Returns true if an SPTE has been changed and the TLBs need to * be flushed. */ -bool kvm_tdp_mmu_clear_dirty_slot (struct kvm *kvm,struct kvm_memory_slot *slot) +bool kvm_tdp_mmu_clear_dirty_slot (struct kvm *kvm, +const struct kvm_memory_slot *slot) {struct kvm_mmu_page *root;bool spte_set = false;
arch/x86/kvm/mmu/tdp_mmu.h +3 -3
@@ -61,10 +61,10 @@ bool kvm_tdp_mmu_age_gfn_range(struct kvm *kvm, struct kvm_gfn_range *range);bool kvm_tdp_mmu_test_age_gfn (struct kvm *kvm,struct kvm_gfn_range *range);bool kvm_tdp_mmu_set_spte_gfn (struct kvm *kvm,struct kvm_gfn_range *range); -bool kvm_tdp_mmu_wrprot_slot (struct kvm *kvm,struct kvm_memory_slot *slot, -int min_level); +bool kvm_tdp_mmu_wrprot_slot (struct kvm *kvm, +const struct kvm_memory_slot *slot,int min_level);bool kvm_tdp_mmu_clear_dirty_slot (struct kvm *kvm, -struct kvm_memory_slot *slot); +const struct kvm_memory_slot *slot); void kvm_tdp_mmu_clear_dirty_pt_masked(struct kvm *kvm, struct kvm_memory_slot *slot, gfn_t gfn, unsigned long mask,
arch/x86/kvm/x86.c +2 -5
@@ -11473,7 +11473,7 @@ static void kvm_mmu_update_cpu_dirty_logging(struct kvm *kvm, bool enable)static void kvm_mmu_slot_apply_flags (struct kvm *kvm,struct kvm_memory_slot *old, -struct kvm_memory_slot *new, +const struct kvm_memory_slot *new,enum kvm_mr_change change) {bool log_dirty_pages = new->flags &KVM_MEM_LOG_DIRTY_PAGES ;
@@ -11553,10 +11553,7 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,kvm_mmu_change_mmu_pages (kvm,kvm_mmu_calculate_default_mmu_pages (kvm)); -/* -* FIXME: const-ify all uses of struct kvm_memory_slot. -*/ -kvm_mmu_slot_apply_flags (kvm, old, (struct kvm_memory_slot *) new, change); +kvm_mmu_slot_apply_flags (kvm, old, new, change);/* Free the arrays associated with the old memslot. */ if (change ==KVM_MR_MOVE )
Signature · 1 line
2.32.0
Paolo Bonzini
maintainerQuoted 27 lines · Hamza Mahfooz
arch/x86/kvm/mmu/mmu.c +7
-7@@ -1440,7 +1440,7 @@ static bool kvm_set_pte_rmapp(struct kvm *kvm, struct kvm_rmap_head *rmap_head,struct slot_rmap_walk_iterator {/* input fields. */ -struct kvm_memory_slot *slot; +const struct kvm_memory_slot *slot;gfn_t start_gfn;gfn_t end_gfn;int start_level;@@ -1467,16 +1467,20 @@ rmap_walk_init_level(struct slot_rmap_walk_iterator *iterator, int level)static void slot_rmap_walk_init (struct slot_rmap_walk_iterator *iterator, -struct kvm_memory_slot *slot,int start_level, +const struct kvm_memory_slot *slot,int start_level,int end_level,gfn_t start_gfn,gfn_t end_gfn) { - iterator->slot = slot; - iterator->start_level = start_level; - iterator->end_level = end_level; - iterator->start_gfn = start_gfn; - iterator->end_gfn = end_gfn; +struct slot_rmap_walk_iterator iter = { + .slot = slot, + .start_gfn = start_gfn, + .end_gfn = end_gfn, + .start_level = start_level,
arch/x86/kvm/mmu/mmu.c rmap_walk_init_level(struct slot_rmap_walk_iterator *iterator, int level) · line 1486
Quoted 10 lines
arch/x86/kvm/mmu/mmu.c +5
-1+ .end_level = end_level + }; + +rmap_walk_init_level (&iter, start_level); -rmap_walk_init_level (iterator, iterator->start_level); +memcpy (iterator, &iter,sizeof (struct slot_rmap_walk_iterator )); }static bool slot_rmap_walk_okay (struct slot_rmap_walk_iterator *iterator)
I don't understand, just changing the argument works. There is no need to change the body of the function.
Paolo