Please pull a few smallish KVM-wide changes.  This will conflict with the MMU
pull request, which changed a WARN_ON() to a WARN_ON_ONCE().  The resolution
is pretty straightfoward.

diff --cc arch/x86/kvm/mmu/tdp_mmu.c
index 6250bd3d20c1,b5629bc60e36..6c63f2d1675f
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@@ -1241,7 -1241,7 +1241,7 @@@ static bool set_spte_gfn(struct kvm *kv
        u64 new_spte;
  
        /* Huge pages aren't expected to be modified without first being zapped. */
-       WARN_ON(pte_huge(range->arg.pte) || range->start + 1 != range->end);
 -      WARN_ON_ONCE(pte_huge(range->pte) || range->start + 1 != range->end);
++      WARN_ON_ONCE(pte_huge(range->arg.pte) || range->start + 1 != range->end);
  
        if (iter->level != PG_LEVEL_4K ||
            !is_shadow_present_pte(iter->old_spte))

The following changes since commit fdf0eaf11452d72945af31804e2a1048ee1b574c:

  Linux 6.5-rc2 (2023-07-16 15:10:37 -0700)

are available in the Git repository at:

  https://github.com/kvm-x86/linux.git tags/kvm-x86-generic-6.6

for you to fetch changes up to 458933d33af2cb3663bd8c0080c1efd1f9483db4:

  KVM: Remove unused kvm_make_cpus_request_mask() declaration (2023-08-17 11:59:43 -0700)

----------------------------------------------------------------
Common KVM changes for 6.6:

 - Wrap kvm_{gfn,hva}_range.pte in a union to allow mmu_notifier events to pass
   action specific data without needing to constantly update the main handlers.

 - Drop unused function declarations

----------------------------------------------------------------
Sean Christopherson (1):
      KVM: Wrap kvm_{gfn,hva}_range.pte in a per-action union

Yue Haibing (2):
      KVM: Remove unused kvm_device_{get,put}() declarations
      KVM: Remove unused kvm_make_cpus_request_mask() declaration

 arch/arm64/kvm/mmu.c       |  2 +-
 arch/mips/kvm/mmu.c        |  2 +-
 arch/riscv/kvm/mmu.c       |  2 +-
 arch/x86/kvm/mmu/mmu.c     |  2 +-
 arch/x86/kvm/mmu/tdp_mmu.c |  6 +++---
 include/linux/kvm_host.h   | 10 +++++-----
 virt/kvm/kvm_main.c        | 19 ++++++++++---------
 7 files changed, 22 insertions(+), 21 deletions(-)

On Wed, Aug 30, 2023 at 2:06 AM Sean Christopherson <seanjc@google.com> wrote:
>
> Please pull a few smallish KVM-wide changes.  This will conflict with the MMU
> pull request, which changed a WARN_ON() to a WARN_ON_ONCE().  The resolution
> is pretty straightfoward.
>
> diff --cc arch/x86/kvm/mmu/tdp_mmu.c
> index 6250bd3d20c1,b5629bc60e36..6c63f2d1675f
> --- a/arch/x86/kvm/mmu/tdp_mmu.c
> +++ b/arch/x86/kvm/mmu/tdp_mmu.c
> @@@ -1241,7 -1241,7 +1241,7 @@@ static bool set_spte_gfn(struct kvm *kv
>         u64 new_spte;
>
>         /* Huge pages aren't expected to be modified without first being zapped. */
> -       WARN_ON(pte_huge(range->arg.pte) || range->start + 1 != range->end);
>  -      WARN_ON_ONCE(pte_huge(range->pte) || range->start + 1 != range->end);
> ++      WARN_ON_ONCE(pte_huge(range->arg.pte) || range->start + 1 != range->end);
>
>         if (iter->level != PG_LEVEL_4K ||
>             !is_shadow_present_pte(iter->old_spte))
>
> The following changes since commit fdf0eaf11452d72945af31804e2a1048ee1b574c:
>
>   Linux 6.5-rc2 (2023-07-16 15:10:37 -0700)
>
> are available in the Git repository at:
>
>   https://github.com/kvm-x86/linux.git tags/kvm-x86-generic-6.6
>
> for you to fetch changes up to 458933d33af2cb3663bd8c0080c1efd1f9483db4:
>
>   KVM: Remove unused kvm_make_cpus_request_mask() declaration (2023-08-17 11:59:43 -0700)

Pulled, thanks.

Paolo

> ----------------------------------------------------------------
> Common KVM changes for 6.6:
>
>  - Wrap kvm_{gfn,hva}_range.pte in a union to allow mmu_notifier events to pass
>    action specific data without needing to constantly update the main handlers.
>
>  - Drop unused function declarations
>
> ----------------------------------------------------------------
> Sean Christopherson (1):
>       KVM: Wrap kvm_{gfn,hva}_range.pte in a per-action union
>
> Yue Haibing (2):
>       KVM: Remove unused kvm_device_{get,put}() declarations
>       KVM: Remove unused kvm_make_cpus_request_mask() declaration
>
>  arch/arm64/kvm/mmu.c       |  2 +-
>  arch/mips/kvm/mmu.c        |  2 +-
>  arch/riscv/kvm/mmu.c       |  2 +-
>  arch/x86/kvm/mmu/mmu.c     |  2 +-
>  arch/x86/kvm/mmu/tdp_mmu.c |  6 +++---
>  include/linux/kvm_host.h   | 10 +++++-----
>  virt/kvm/kvm_main.c        | 19 ++++++++++---------
>  7 files changed, 22 insertions(+), 21 deletions(-)
>