Commit fd0bf5da authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Yu Zhang
Browse files

i915: kvmgt: the KVM mmu_lock is now an rwlock 

mainline inclusion
from mainline-v5.12-rc1
commit e36b250e
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I7S3VQ
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e36b250e502a6145fa95a3d93af83ba66fc6ae1b


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

Adjust the KVMGT page tracking callbacks.

Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Cc: intel-gvt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarYu Zhang <yu.c.zhang@linux.intel.com>
parent 91f65ea3

drivers/gpu/drm/i915/gvt/kvmgt.c

+6 −6
Original line number Diff line number Diff line
@@ -1703,7 +1703,7 @@ static int kvmgt_page_track_add(unsigned long handle, u64 gfn) 
		return -EINVAL;

	}



	spin_lock(&kvm->mmu_lock);

	write_lock(&kvm->mmu_lock);



	if (kvmgt_gfn_is_write_protected(info, gfn))

		goto out;
@@ -1712,7 +1712,7 @@ static int kvmgt_page_track_add(unsigned long handle, u64 gfn) 
	kvmgt_protect_table_add(info, gfn);



out:

	spin_unlock(&kvm->mmu_lock);

	write_unlock(&kvm->mmu_lock);

	srcu_read_unlock(&kvm->srcu, idx);

	return 0;

}
@@ -1737,7 +1737,7 @@ static int kvmgt_page_track_remove(unsigned long handle, u64 gfn) 
		return -EINVAL;

	}



	spin_lock(&kvm->mmu_lock);

	write_lock(&kvm->mmu_lock);



	if (!kvmgt_gfn_is_write_protected(info, gfn))

		goto out;
@@ -1746,7 +1746,7 @@ static int kvmgt_page_track_remove(unsigned long handle, u64 gfn) 
	kvmgt_protect_table_del(info, gfn);



out:

	spin_unlock(&kvm->mmu_lock);

	write_unlock(&kvm->mmu_lock);

	srcu_read_unlock(&kvm->srcu, idx);

	return 0;

}
@@ -1772,7 +1772,7 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm, 
	struct kvmgt_guest_info *info = container_of(node,

					struct kvmgt_guest_info, track_node);



	spin_lock(&kvm->mmu_lock);

	write_lock(&kvm->mmu_lock);

	for (i = 0; i < slot->npages; i++) {

		gfn = slot->base_gfn + i;

		if (kvmgt_gfn_is_write_protected(info, gfn)) {
@@ -1781,7 +1781,7 @@ static void kvmgt_page_track_flush_slot(struct kvm *kvm, 
			kvmgt_protect_table_del(info, gfn);

		}

	}

	spin_unlock(&kvm->mmu_lock);

	write_unlock(&kvm->mmu_lock);

}



static bool __kvmgt_vgpu_exist(struct intel_vgpu *vgpu, struct kvm *kvm)