Skip to content

Commit d104d5b

Browse files
yanzhao56bonzini
authored andcommitted
KVM: x86: Remove the unused page-track hook track_flush_slot()
Remove ->track_remove_slot(), there are no longer any users and it's unlikely a "flush" hook will ever be the correct API to provide to an external page-track user. Cc: Zhenyu Wang <[email protected]> Suggested-by: Sean Christopherson <[email protected]> Signed-off-by: Yan Zhao <[email protected]> Tested-by: Yongwei Ma <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sean Christopherson <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent c15fcf1 commit d104d5b

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

arch/x86/include/asm/kvm_page_track.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ struct kvm_page_track_notifier_node {
3333
*/
3434
void (*track_write)(gpa_t gpa, const u8 *new, int bytes,
3535
struct kvm_page_track_notifier_node *node);
36-
/*
37-
* It is called when memory slot is being moved or removed
38-
* users can drop write-protection for the pages in that memory slot
39-
*
40-
* @kvm: the kvm where memory slot being moved or removed
41-
* @slot: the memory slot being moved or removed
42-
* @node: this node
43-
*/
44-
void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot,
45-
struct kvm_page_track_notifier_node *node);
4636

4737
/*
4838
* Invoked when a memory region is removed from the guest. Or in KVM
@@ -85,7 +75,6 @@ kvm_page_track_unregister_notifier(struct kvm *kvm,
8575
struct kvm_page_track_notifier_node *n);
8676
void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,
8777
int bytes);
88-
void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot);
8978
void kvm_page_track_delete_slot(struct kvm *kvm, struct kvm_memory_slot *slot);
9079

9180
bool kvm_page_track_has_external_user(struct kvm *kvm);

arch/x86/kvm/mmu/mmu.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6695,8 +6695,6 @@ void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
66956695
struct kvm_memory_slot *slot)
66966696
{
66976697
kvm_mmu_zap_all_fast(kvm);
6698-
6699-
kvm_page_track_flush_slot(kvm, slot);
67006698
}
67016699

67026700
void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm, u64 gen)

arch/x86/kvm/mmu/page_track.c

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -278,32 +278,6 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,
278278
kvm_mmu_track_write(vcpu, gpa, new, bytes);
279279
}
280280

281-
/*
282-
* Notify the node that memory slot is being removed or moved so that it can
283-
* drop write-protection for the pages in the memory slot.
284-
*
285-
* The node should figure out it has any write-protected pages in this slot
286-
* by itself.
287-
*/
288-
void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot)
289-
{
290-
struct kvm_page_track_notifier_head *head;
291-
struct kvm_page_track_notifier_node *n;
292-
int idx;
293-
294-
head = &kvm->arch.track_notifier_head;
295-
296-
if (hlist_empty(&head->track_notifier_list))
297-
return;
298-
299-
idx = srcu_read_lock(&head->track_srcu);
300-
hlist_for_each_entry_srcu(n, &head->track_notifier_list, node,
301-
srcu_read_lock_held(&head->track_srcu))
302-
if (n->track_flush_slot)
303-
n->track_flush_slot(kvm, slot, n);
304-
srcu_read_unlock(&head->track_srcu, idx);
305-
}
306-
307281
/*
308282
* Notify external page track nodes that a memory region is being removed from
309283
* the VM, e.g. so that users can free any associated metadata.

0 commit comments

Comments
 (0)