Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6314a17f authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'tags/for-kvmgt' into HEAD 

The three KVM patches that KVMGT needs.

Conflicts:
	arch/x86/include/asm/kvm_page_track.h
	arch/x86/kvm/mmu.c
parents ad361091 871b7ef2

arch/x86/include/asm/kvm_page_track.h

+5 −2
Original line number Diff line number Diff line
@@ -29,17 +29,20 @@ struct kvm_page_track_notifier_node { 
	 * @gpa: the physical address written by guest.

	 * @new: the data was written to the address.

	 * @bytes: the written length.

	 * @node: this node

	 */

	void (*track_write)(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,

			    int bytes);

			    int bytes, struct kvm_page_track_notifier_node *node);

	/*

	 * It is called when memory slot is being moved or removed

	 * users can drop write-protection for the pages in that memory slot

	 *

	 * @kvm: the kvm where memory slot being moved or removed

	 * @slot: the memory slot being moved or removed

	 * @node: this node

	 */

	void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot);

	void (*track_flush_slot)(struct kvm *kvm, struct kvm_memory_slot *slot,

			    struct kvm_page_track_notifier_node *node);

};



void kvm_page_track_init(struct kvm *kvm);

arch/x86/kvm/mmu.c

+4 −2
Original line number Diff line number Diff line
@@ -4397,7 +4397,8 @@ static u64 *get_written_sptes(struct kvm_mmu_page *sp, gpa_t gpa, int *nspte) 
}



static void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,

			      const u8 *new, int bytes)

			      const u8 *new, int bytes,

			      struct kvm_page_track_notifier_node *node)

{

	gfn_t gfn = gpa >> PAGE_SHIFT;

	struct kvm_mmu_page *sp;
@@ -4610,7 +4611,8 @@ void kvm_mmu_setup(struct kvm_vcpu *vcpu) 
}



static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,

			struct kvm_memory_slot *slot)

			struct kvm_memory_slot *slot,

			struct kvm_page_track_notifier_node *node)

{

	kvm_mmu_invalidate_zap_all_pages(kvm);

}

arch/x86/kvm/page_track.c

+6 −2
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ void kvm_slot_page_track_add_page(struct kvm *kvm, 
		if (kvm_mmu_slot_gfn_write_protect(kvm, slot, gfn))

			kvm_flush_remote_tlbs(kvm);

}

EXPORT_SYMBOL_GPL(kvm_slot_page_track_add_page);



/*

 * remove the guest page from the tracking pool which stops the interception
@@ -135,6 +136,7 @@ void kvm_slot_page_track_remove_page(struct kvm *kvm, 
	 */

	kvm_mmu_gfn_allow_lpage(slot, gfn);

}

EXPORT_SYMBOL_GPL(kvm_slot_page_track_remove_page);



/*

 * check if the corresponding access on the specified guest page is tracked.
@@ -181,6 +183,7 @@ kvm_page_track_register_notifier(struct kvm *kvm, 
	hlist_add_head_rcu(&n->node, &head->track_notifier_list);

	spin_unlock(&kvm->mmu_lock);

}

EXPORT_SYMBOL_GPL(kvm_page_track_register_notifier);



/*

 * stop receiving the event interception. It is the opposed operation of
@@ -199,6 +202,7 @@ kvm_page_track_unregister_notifier(struct kvm *kvm, 
	spin_unlock(&kvm->mmu_lock);

	synchronize_srcu(&head->track_srcu);

}

EXPORT_SYMBOL_GPL(kvm_page_track_unregister_notifier);



/*

 * Notify the node that write access is intercepted and write emulation is
@@ -222,7 +226,7 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new, 
	idx = srcu_read_lock(&head->track_srcu);

	hlist_for_each_entry_rcu(n, &head->track_notifier_list, node)

		if (n->track_write)

			n->track_write(vcpu, gpa, new, bytes);

			n->track_write(vcpu, gpa, new, bytes, n);

	srcu_read_unlock(&head->track_srcu, idx);

}
@@ -247,6 +251,6 @@ void kvm_page_track_flush_slot(struct kvm *kvm, struct kvm_memory_slot *slot) 
	idx = srcu_read_lock(&head->track_srcu);

	hlist_for_each_entry_rcu(n, &head->track_notifier_list, node)

		if (n->track_flush_slot)

			n->track_flush_slot(kvm, slot);

			n->track_flush_slot(kvm, slot, n);

	srcu_read_unlock(&head->track_srcu, idx);

}