Commit 09c8726f authored Jul 28, 2023 by Sean Christopherson Committed by Paolo Bonzini Aug 31, 2023

drm/i915/gvt: Drop final dependencies on KVM internal details



Open code gpa_to_gfn() in kvmgt_page_track_write() and drop KVMGT's
dependency on kvm_host.h, i.e. include only kvm_page_track.h.  KVMGT
assumes "gfn == gpa >> PAGE_SHIFT" all over the place, including a few
lines below in the same function with the same gpa, i.e. there's no
reason to use KVM's helper for this one case.

No functional change intended.

Reviewed-by: Yan Zhao <yan.y.zhao@intel.com>
Tested-by: Yongwei Ma <yongwei.ma@intel.com>
Reviewed-by: Zhi Wang <zhi.a.wang@intel.com>
Link: https://lore.kernel.org/r/20230729013535.1070024-30-seanjc@google.com


Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent f22b1e85

drivers/gpu/drm/i915/gvt/gvt.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,10 +34,11 @@
		#define _GVT_H_

		#include <uapi/linux/pci_regs.h>
		#include <linux/kvm_host.h>
		#include <linux/vfio.h>
		#include <linux/mdev.h>

		#include <asm/kvm_page_track.h>

		#include "i915_drv.h"
		#include "intel_gvt.h"

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1585,7 +1585,7 @@ static void kvmgt_page_track_write(gpa_t gpa, const u8 *val, int len,

		mutex_lock(&info->vgpu_lock);

		if (kvmgt_gfn_is_write_protected(info, gpa_to_gfn(gpa)))
		if (kvmgt_gfn_is_write_protected(info, gpa >> PAGE_SHIFT))
		intel_vgpu_page_track_handler(info, gpa,
		(void *)val, len);