[Intel-gfx] [PATCH v4 15/29] KVM: drm/i915/gvt: Drop @vcpu from KVM's ->track_write() hook

[Wang, Zhi A]

On 7/29/2023 4:35 AM, Sean Christopherson wrote:
> Drop @vcpu from KVM's ->track_write() hook provided for external users of
> the page-track APIs now that KVM itself doesn't use the page-track
> mechanism.
> 
> Reviewed-by: Yan Zhao <yan.y.zhao at intel.com>
> Tested-by: Yongwei Ma <yongwei.ma at intel.com>
> Signed-off-by: Sean Christopherson <seanjc at google.com>
> ---
>   arch/x86/include/asm/kvm_page_track.h |  5 ++---
>   arch/x86/kvm/mmu/page_track.c         |  2 +-
>   drivers/gpu/drm/i915/gvt/kvmgt.c      | 10 ++++------
>   3 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/include/asm/kvm_page_track.h b/arch/x86/include/asm/kvm_page_track.h
> index eb186bc57f6a..8c4d216e3b2b 100644
> --- a/arch/x86/include/asm/kvm_page_track.h
> +++ b/arch/x86/include/asm/kvm_page_track.h
> @@ -26,14 +26,13 @@ struct kvm_page_track_notifier_node {
>   	 * It is called when guest is writing the write-tracked page
>   	 * and write emulation is finished at that time.
>   	 *
> -	 * @vcpu: the vcpu where the write access happened.
>   	 * @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, struct kvm_page_track_notifier_node *node);
> +	void (*track_write)(gpa_t gpa, const u8 *new, 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
> diff --git a/arch/x86/kvm/mmu/page_track.c b/arch/x86/kvm/mmu/page_track.c
> index 23088c90d2fd..891e5cc52b45 100644
> --- a/arch/x86/kvm/mmu/page_track.c
> +++ b/arch/x86/kvm/mmu/page_track.c
> @@ -272,7 +272,7 @@ void kvm_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,
>   	hlist_for_each_entry_srcu(n, &head->track_notifier_list, node,
>   				srcu_read_lock_held(&head->track_srcu))
>   		if (n->track_write)
> -			n->track_write(vcpu, gpa, new, bytes, n);
> +			n->track_write(gpa, new, bytes, n);
>   	srcu_read_unlock(&head->track_srcu, idx);
>   
>   	kvm_mmu_track_write(vcpu, gpa, new, bytes);
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 034be0655daa..e9276500435d 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -106,9 +106,8 @@ struct gvt_dma {
>   #define vfio_dev_to_vgpu(vfio_dev) \
>   	container_of((vfio_dev), struct intel_vgpu, vfio_device)
>   
> -static void kvmgt_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa,
> -		const u8 *val, int len,
> -		struct kvm_page_track_notifier_node *node);
> +static void kvmgt_page_track_write(gpa_t gpa, const u8 *val, int len,
> +				   struct kvm_page_track_notifier_node *node);
>   static void kvmgt_page_track_flush_slot(struct kvm *kvm,
>   		struct kvm_memory_slot *slot,
>   		struct kvm_page_track_notifier_node *node);
> @@ -1603,9 +1602,8 @@ int intel_gvt_page_track_remove(struct intel_vgpu *info, u64 gfn)
>   	return 0;
>   }
>   
> -static void kvmgt_page_track_write(struct kvm_vcpu *vcpu, gpa_t gpa,
> -		const u8 *val, int len,
> -		struct kvm_page_track_notifier_node *node)
> +static void kvmgt_page_track_write(gpa_t gpa, const u8 *val, int len,
> +				   struct kvm_page_track_notifier_node *node)
>   {
>   	struct intel_vgpu *info =
>   		container_of(node, struct intel_vgpu, track_node);
Reviewed-by: Zhi Wang <zhi.a.wang at intel.com>