Commit 9079b7a0 authored by Peter Xu's avatar Peter Xu Committed by wenzhiwei
Browse files

KVM: Pass in kvm pointer into mark_page_dirty_in_slot() 

mainline inclusion
from mainline-v5.11-rc1
commit 28bd726a
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9BPVF
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.11.y&id=28bd726aa404c0da8fd6852fe69bb4538a103b71



--------------------------------

The context will be needed to implement the kvm dirty ring.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Message-Id: <20201001012044.5151-5-peterx@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Conflicts:
	arch/x86/kvm/x86.c
Signed-off-by: default avatarwenzhiwei <wenzhiwei@kylinos.cn>
parent 84fe6361

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -3205,7 +3205,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu) 
 out:

	user_access_end();

 dirty:

	mark_page_dirty_in_slot(ghc->memslot, gpa_to_gfn(ghc->gpa));

	mark_page_dirty_in_slot(vcpu->kvm, ghc->memslot, gpa_to_gfn(ghc->gpa));

}



int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
@@ -4347,7 +4347,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) 
	if (!copy_to_user_nofault(&st->preempted, &preempted, sizeof(preempted)))

		vcpu->arch.st.preempted = KVM_VCPU_PREEMPTED;



	mark_page_dirty_in_slot(ghc->memslot, gpa_to_gfn(ghc->gpa));

	mark_page_dirty_in_slot(vcpu->kvm, ghc->memslot, gpa_to_gfn(ghc->gpa));

}



void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn); 
bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);

bool kvm_vcpu_is_visible_gfn(struct kvm_vcpu *vcpu, gfn_t gfn);

unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn);

void mark_page_dirty_in_slot(struct kvm_memory_slot *memslot, gfn_t gfn);

void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot, gfn_t gfn);

void mark_page_dirty(struct kvm *kvm, gfn_t gfn);



struct kvm_memslots *kvm_vcpu_memslots(struct kvm_vcpu *vcpu);

virt/kvm/kvm_main.c

+15 −13
Original line number Diff line number Diff line
@@ -2606,7 +2606,8 @@ int kvm_vcpu_map(struct kvm_vcpu *vcpu, gfn_t gfn, struct kvm_host_map *map) 
}

EXPORT_SYMBOL_GPL(kvm_vcpu_map);



static void __kvm_unmap_gfn(struct kvm_memory_slot *memslot,

static void __kvm_unmap_gfn(struct kvm *kvm,

			struct kvm_memory_slot *memslot,

			struct kvm_host_map *map,

			struct gfn_to_pfn_cache *cache,

			bool dirty, bool atomic)
@@ -2631,7 +2632,7 @@ static void __kvm_unmap_gfn(struct kvm_memory_slot *memslot, 
#endif



	if (dirty)

		mark_page_dirty_in_slot(memslot, map->gfn);

		mark_page_dirty_in_slot(kvm, memslot, map->gfn);



	if (cache)

		cache->dirty |= dirty;
@@ -2645,7 +2646,7 @@ static void __kvm_unmap_gfn(struct kvm_memory_slot *memslot, 
int kvm_unmap_gfn(struct kvm_vcpu *vcpu, struct kvm_host_map *map, 

		  struct gfn_to_pfn_cache *cache, bool dirty, bool atomic)

{

	__kvm_unmap_gfn(gfn_to_memslot(vcpu->kvm, map->gfn), map,

	__kvm_unmap_gfn(vcpu->kvm, gfn_to_memslot(vcpu->kvm, map->gfn), map,

			cache, dirty, atomic);

	return 0;

}
@@ -2653,8 +2654,8 @@ EXPORT_SYMBOL_GPL(kvm_unmap_gfn); 


void kvm_vcpu_unmap(struct kvm_vcpu *vcpu, struct kvm_host_map *map, bool dirty)

{

	__kvm_unmap_gfn(kvm_vcpu_gfn_to_memslot(vcpu, map->gfn), map, NULL,

			dirty, false);

	__kvm_unmap_gfn(vcpu->kvm, kvm_vcpu_gfn_to_memslot(vcpu, map->gfn),

			map, NULL, dirty, false);

}

EXPORT_SYMBOL_GPL(kvm_vcpu_unmap);
@@ -2840,7 +2841,8 @@ int kvm_vcpu_read_guest_atomic(struct kvm_vcpu *vcpu, gpa_t gpa, 
}

EXPORT_SYMBOL_GPL(kvm_vcpu_read_guest_atomic);



static int __kvm_write_guest_page(struct kvm_memory_slot *memslot, gfn_t gfn,

static int __kvm_write_guest_page(struct kvm *kvm,

				  struct kvm_memory_slot *memslot, gfn_t gfn,

			          const void *data, int offset, int len)

{

	int r;
@@ -2852,7 +2854,7 @@ static int __kvm_write_guest_page(struct kvm_memory_slot *memslot, gfn_t gfn, 
	r = __copy_to_user((void __user *)addr + offset, data, len);

	if (r)

		return -EFAULT;

	mark_page_dirty_in_slot(memslot, gfn);

	mark_page_dirty_in_slot(kvm, memslot, gfn);

	return 0;

}
@@ -2861,7 +2863,7 @@ int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, 
{

	struct kvm_memory_slot *slot = gfn_to_memslot(kvm, gfn);



	return __kvm_write_guest_page(slot, gfn, data, offset, len);

	return __kvm_write_guest_page(kvm, slot, gfn, data, offset, len);

}

EXPORT_SYMBOL_GPL(kvm_write_guest_page);
@@ -2870,7 +2872,7 @@ int kvm_vcpu_write_guest_page(struct kvm_vcpu *vcpu, gfn_t gfn, 
{

	struct kvm_memory_slot *slot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);



	return __kvm_write_guest_page(slot, gfn, data, offset, len);

	return __kvm_write_guest_page(vcpu->kvm, slot, gfn, data, offset, len);

}

EXPORT_SYMBOL_GPL(kvm_vcpu_write_guest_page);
@@ -2990,7 +2992,7 @@ int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, 
	r = __copy_to_user((void __user *)ghc->hva + offset, data, len);

	if (r)

		return -EFAULT;

	mark_page_dirty_in_slot(ghc->memslot, gpa >> PAGE_SHIFT);

	mark_page_dirty_in_slot(kvm, ghc->memslot, gpa >> PAGE_SHIFT);



	return 0;

}
@@ -3067,7 +3069,7 @@ int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) 
}

EXPORT_SYMBOL_GPL(kvm_clear_guest);



void mark_page_dirty_in_slot(struct kvm_memory_slot *memslot, gfn_t gfn)

void mark_page_dirty_in_slot(struct kvm *kvm, struct kvm_memory_slot *memslot, gfn_t gfn)

{

	if (memslot && memslot->dirty_bitmap) {

		unsigned long rel_gfn = gfn - memslot->base_gfn;
@@ -3082,7 +3084,7 @@ void mark_page_dirty(struct kvm *kvm, gfn_t gfn) 
	struct kvm_memory_slot *memslot;



	memslot = gfn_to_memslot(kvm, gfn);

	mark_page_dirty_in_slot(memslot, gfn);

	mark_page_dirty_in_slot(kvm, memslot, gfn);

}

EXPORT_SYMBOL_GPL(mark_page_dirty);
@@ -3091,7 +3093,7 @@ void kvm_vcpu_mark_page_dirty(struct kvm_vcpu *vcpu, gfn_t gfn) 
	struct kvm_memory_slot *memslot;



	memslot = kvm_vcpu_gfn_to_memslot(vcpu, gfn);

	mark_page_dirty_in_slot(memslot, gfn);

	mark_page_dirty_in_slot(vcpu->kvm, memslot, gfn);

}

EXPORT_SYMBOL_GPL(kvm_vcpu_mark_page_dirty);