From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Zhi Wang <zhi.a.wang@intel.com>
Cc: Yan Zhao <yan.y.zhao@intel.com>,
kvm@vger.kernel.org, intel-gfx@lists.freedesktop.org,
linux-kernel@vger.kernel.org, Yongwei Ma <yongwei.ma@intel.com>,
Ben Gardon <bgardon@google.com>,
intel-gvt-dev@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v4 29/29] drm/i915/gvt: Drop final dependencies on KVM internal details
Date: Fri, 28 Jul 2023 18:35:35 -0700 [thread overview]
Message-ID: <20230729013535.1070024-30-seanjc@google.com> (raw)
In-Reply-To: <20230729013535.1070024-1-seanjc@google.com>
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>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
drivers/gpu/drm/i915/gvt/gvt.h | 3 ++-
drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 2d65800d8e93..53a0a42a50db 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -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"
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index eb50997dd369..aaed3969f204 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -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);
--
2.41.0.487.g6d72f3e995-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Zhi Wang <zhi.a.wang@intel.com>
Cc: kvm@vger.kernel.org, intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Yan Zhao <yan.y.zhao@intel.com>,
Yongwei Ma <yongwei.ma@intel.com>,
Ben Gardon <bgardon@google.com>
Subject: [PATCH v4 29/29] drm/i915/gvt: Drop final dependencies on KVM internal details
Date: Fri, 28 Jul 2023 18:35:35 -0700 [thread overview]
Message-ID: <20230729013535.1070024-30-seanjc@google.com> (raw)
In-Reply-To: <20230729013535.1070024-1-seanjc@google.com>
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>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
drivers/gpu/drm/i915/gvt/gvt.h | 3 ++-
drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gvt/gvt.h b/drivers/gpu/drm/i915/gvt/gvt.h
index 2d65800d8e93..53a0a42a50db 100644
--- a/drivers/gpu/drm/i915/gvt/gvt.h
+++ b/drivers/gpu/drm/i915/gvt/gvt.h
@@ -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"
diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
index eb50997dd369..aaed3969f204 100644
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@ -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);
--
2.41.0.487.g6d72f3e995-goog
next prev parent reply other threads:[~2023-07-29 1:36 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-29 1:35 [PATCH v4 00/29] drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-07-29 1:35 ` [PATCH v4 01/29] drm/i915/gvt: Verify pfn is "valid" before dereferencing "struct page" Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 11:21 ` Wang, Zhi A
2023-08-01 11:21 ` Wang, Zhi A
2023-07-29 1:35 ` [PATCH v4 02/29] drm/i915/gvt: remove interface intel_gvt_is_valid_gfn Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-07-29 1:35 ` [PATCH v4 03/29] drm/i915/gvt: Verify hugepages are contiguous in physical address space Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 1:47 ` Yan Zhao
2023-08-01 1:47 ` [Intel-gfx] " Yan Zhao
2023-08-01 11:22 ` Wang, Zhi A
2023-08-01 11:22 ` Wang, Zhi A
2023-07-29 1:35 ` [PATCH v4 04/29] drm/i915/gvt: Don't try to unpin an empty page range Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 11:18 ` Wang, Zhi A
2023-08-01 11:18 ` Wang, Zhi A
2023-07-29 1:35 ` [PATCH v4 05/29] drm/i915/gvt: Put the page reference obtained by KVM's gfn_to_pfn() Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 11:25 ` Wang, Zhi A
2023-08-01 11:25 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [PATCH v4 06/29] drm/i915/gvt: Explicitly check that vGPU is attached before shadowing Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 1:44 ` Yan Zhao
2023-08-01 1:44 ` [Intel-gfx] " Yan Zhao
2023-08-01 23:20 ` Sean Christopherson
2023-08-01 23:20 ` [Intel-gfx] " Sean Christopherson
2023-08-01 23:05 ` [PATCH v4.1] " Sean Christopherson
2023-08-01 23:05 ` [Intel-gfx] " Sean Christopherson
2023-08-02 1:22 ` Yan Zhao
2023-08-02 1:22 ` [Intel-gfx] " Yan Zhao
2023-07-29 1:35 ` [PATCH v4 07/29] drm/i915/gvt: Error out on an attempt to shadowing an unknown GTT entry type Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 1:45 ` Yan Zhao
2023-08-01 1:45 ` Yan Zhao
2023-07-29 1:35 ` [PATCH v4 08/29] drm/i915/gvt: Don't rely on KVM's gfn_to_pfn() to query possible 2M GTT Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] " Sean Christopherson
2023-08-01 11:28 ` Wang, Zhi A
2023-08-01 11:28 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 09/29] drm/i915/gvt: Use an "unsigned long" to iterate over memslot gfns Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:28 ` Wang, Zhi A
2023-08-01 11:28 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 10/29] drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt() Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:30 ` Wang, Zhi A
2023-08-01 11:30 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 11/29] drm/i915/gvt: Protect gfn hash table with vgpu_lock Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:32 ` Wang, Zhi A
2023-08-01 11:32 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 12/29] KVM: x86/mmu: Move kvm_arch_flush_shadow_{all, memslot}() to mmu.c Sean Christopherson
2023-07-29 1:35 ` [PATCH v4 12/29] KVM: x86/mmu: Move kvm_arch_flush_shadow_{all,memslot}() " Sean Christopherson
2023-08-03 23:50 ` Isaku Yamahata
2023-08-03 23:50 ` [Intel-gfx] [PATCH v4 12/29] KVM: x86/mmu: Move kvm_arch_flush_shadow_{all, memslot}() " Isaku Yamahata
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 13/29] KVM: x86/mmu: Don't rely on page-track mechanism to flush on memslot change Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 14/29] KVM: x86/mmu: Don't bounce through page-track mechanism for guest PTEs Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 15/29] KVM: drm/i915/gvt: Drop @vcpu from KVM's ->track_write() hook Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:35 ` Wang, Zhi A
2023-08-01 11:35 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 16/29] KVM: x86: Reject memslot MOVE operations if KVMGT is attached Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-30 15:04 ` Like Xu
2023-08-30 15:04 ` [Intel-gfx] " Like Xu
2023-08-30 20:50 ` Sean Christopherson
2023-08-30 20:50 ` Sean Christopherson
2023-08-31 6:20 ` Like Xu
2023-08-31 6:20 ` [Intel-gfx] " Like Xu
2023-08-31 16:11 ` Sean Christopherson
2023-08-31 16:11 ` [Intel-gfx] " Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 17/29] drm/i915/gvt: Don't bother removing write-protection on to-be-deleted slot Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:37 ` Wang, Zhi A
2023-08-01 11:37 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 18/29] KVM: x86: Add a new page-track hook to handle memslot deletion Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 19/29] drm/i915/gvt: switch from ->track_flush_slot() to ->track_remove_region() Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-08-01 11:39 ` Wang, Zhi A
2023-08-01 11:39 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 20/29] KVM: x86: Remove the unused page-track hook track_flush_slot() Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 21/29] KVM: x86/mmu: Move KVM-only page-track declarations to internal header Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 22/29] KVM: x86/mmu: Use page-track notifiers iff there are external users Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 23/29] KVM: x86/mmu: Drop infrastructure for multiple page-track modes Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 24/29] KVM: x86/mmu: Rename page-track APIs to reflect the new reality Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 25/29] KVM: x86/mmu: Assert that correct locks are held for page write-tracking Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 26/29] KVM: x86/mmu: Bug the VM if write-tracking is used but not enabled Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 27/29] KVM: x86/mmu: Drop @slot param from exported/external page-track APIs Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` [Intel-gfx] [PATCH v4 28/29] KVM: x86/mmu: Handle KVM bookkeeping in page-track APIs, not callers Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson
2023-07-29 1:35 ` Sean Christopherson [this message]
2023-07-29 1:35 ` [PATCH v4 29/29] drm/i915/gvt: Drop final dependencies on KVM internal details Sean Christopherson
2023-08-01 11:42 ` Wang, Zhi A
2023-08-01 11:42 ` [Intel-gfx] " Wang, Zhi A
2023-07-29 2:02 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups (rev9) Patchwork
2023-08-01 23:44 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups (rev10) Patchwork
2023-08-01 23:54 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-08-02 1:13 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2023-08-04 0:41 ` [PATCH v4 00/29] drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups Sean Christopherson
2023-08-04 0:41 ` [Intel-gfx] " Sean Christopherson
2023-09-01 1:26 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for drm/i915/gvt: KVM: KVMGT fixes and page-track cleanups (rev11) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230729013535.1070024-30-seanjc@google.com \
--to=seanjc@google.com \
--cc=bgardon@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=yan.y.zhao@intel.com \
--cc=yongwei.ma@intel.com \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.