Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm updates from Paolo Bonzini:
 "The biggest change here is eliminating the awful idea that KVM had of
  essentially guessing which pfns are refcounted pages.

  The reason to do so was that KVM needs to map both non-refcounted
  pages (for example BARs of VFIO devices) and VM_PFNMAP/VM_MIXMEDMAP
  VMAs that contain refcounted pages.

  However, the result was security issues in the past, and more recently
  the inability to map VM_IO and VM_PFNMAP memory that _is_ backed by
  struct page but is not refcounted. In particular this broke virtio-gpu
  blob resources (which directly map host graphics buffers into the
  guest as "vram" for the virtio-gpu device) with the amdgpu driver,
  because amdgpu allocates non-compound higher order pages and the tail
  pages could not be mapped into KVM.

  This requires adjusting all uses of struct page in the
  per-architecture code, to always work on the pfn whenever possible.
  The large series that did this, from David Stevens and Sean
  Christopherson, also cleaned up substantially the set of functions
  that provided arch code with the pfn for a host virtual addresses.

  The previous maze of twisty little passages, all different, is
  replaced by five functions (__gfn_to_page, __kvm_faultin_pfn, the
  non-__ versions of these two, and kvm_prefetch_pages) saving almost
  200 lines of code.

  ARM:

   - Support for stage-1 permission indirection (FEAT_S1PIE) and
     permission overlays (FEAT_S1POE), including nested virt + the
     emulated page table walker

   - Introduce PSCI SYSTEM_OFF2 support to KVM + client driver. This
     call was introduced in PSCIv1.3 as a mechanism to request
     hibernation, similar to the S4 state in ACPI

   - Explicitly trap + hide FEAT_MPAM (QoS controls) from KVM guests. As
     part of it, introduce trivial initialization of the host's MPAM
     context so KVM can use the corresponding traps

   - PMU support under nested virtualization, honoring the guest
     hypervisor's trap configuration and event filtering when running a
     nested guest

   - Fixes to vgic ITS serialization where stale device/interrupt table
     entries are not zeroed when the mapping is invalidated by the VM

   - Avoid emulated MMIO completion if userspace has requested
     synchronous external abort injection

   - Various fixes and cleanups affecting pKVM, vCPU initialization, and
     selftests

  LoongArch:

   - Add iocsr and mmio bus simulation in kernel.

   - Add in-kernel interrupt controller emulation.

   - Add support for virtualization extensions to the eiointc irqchip.

  PPC:

   - Drop lingering and utterly obsolete references to PPC970 KVM, which
     was removed 10 years ago.

   - Fix incorrect documentation references to non-existing ioctls

  RISC-V:

   - Accelerate KVM RISC-V when running as a guest

   - Perf support to collect KVM guest statistics from host side

  s390:

   - New selftests: more ucontrol selftests and CPU model sanity checks

   - Support for the gen17 CPU model

   - List registers supported by KVM_GET/SET_ONE_REG in the
     documentation

  x86:

   - Cleanup KVM's handling of Accessed and Dirty bits to dedup code,
     improve documentation, harden against unexpected changes.

     Even if the hardware A/D tracking is disabled, it is possible to
     use the hardware-defined A/D bits to track if a PFN is Accessed
     and/or Dirty, and that removes a lot of special cases.

   - Elide TLB flushes when aging secondary PTEs, as has been done in
     x86's primary MMU for over 10 years.

   - Recover huge pages in-place in the TDP MMU when dirty page logging
     is toggled off, instead of zapping them and waiting until the page
     is re-accessed to create a huge mapping. This reduces vCPU jitter.

   - Batch TLB flushes when dirty page logging is toggled off. This
     reduces the time it takes to disable dirty logging by ~3x.

   - Remove the shrinker that was (poorly) attempting to reclaim shadow
     page tables in low-memory situations.

   - Clean up and optimize KVM's handling of writes to
     MSR_IA32_APICBASE.

   - Advertise CPUIDs for new instructions in Clearwater Forest

   - Quirk KVM's misguided behavior of initialized certain feature MSRs
     to their maximum supported feature set, which can result in KVM
     creating invalid vCPU state. E.g. initializing PERF_CAPABILITIES to
     a non-zero value results in the vCPU having invalid state if
     userspace hides PDCM from the guest, which in turn can lead to
     save/restore failures.

   - Fix KVM's handling of non-canonical checks for vCPUs that support
     LA57 to better follow the "architecture", in quotes because the
     actual behavior is poorly documented. E.g. most MSR writes and
     descriptor table loads ignore CR4.LA57 and operate purely on
     whether the CPU supports LA57.

   - Bypass the register cache when querying CPL from kvm_sched_out(),
     as filling the cache from IRQ context is generally unsafe; harden
     the cache accessors to try to prevent similar issues from occuring
     in the future. The issue that triggered this change was already
     fixed in 6.12, but was still kinda latent.

   - Advertise AMD_IBPB_RET to userspace, and fix a related bug where
     KVM over-advertises SPEC_CTRL when trying to support cross-vendor
     VMs.

   - Minor cleanups

   - Switch hugepage recovery thread to use vhost_task.

     These kthreads can consume significant amounts of CPU time on
     behalf of a VM or in response to how the VM behaves (for example
     how it accesses its memory); therefore KVM tried to place the
     thread in the VM's cgroups and charge the CPU time consumed by that
     work to the VM's container.

     However the kthreads did not process SIGSTOP/SIGCONT, and therefore
     cgroups which had KVM instances inside could not complete freezing.

     Fix this by replacing the kthread with a PF_USER_WORKER thread, via
     the vhost_task abstraction. Another 100+ lines removed, with
     generally better behavior too like having these threads properly
     parented in the process tree.

   - Revert a workaround for an old CPU erratum (Nehalem/Westmere) that
     didn't really work; there was really nothing to work around anyway:
     the broken patch was meant to fix nested virtualization, but the
     PERF_GLOBAL_CTRL MSR is virtualized and therefore unaffected by the
     erratum.

   - Fix 6.12 regression where CONFIG_KVM will be built as a module even
     if asked to be builtin, as long as neither KVM_INTEL nor KVM_AMD is
     'y'.

  x86 selftests:

   - x86 selftests can now use AVX.

  Documentation:

   - Use rST internal links

   - Reorganize the introduction to the API document

  Generic:

   - Protect vcpu->pid accesses outside of vcpu->mutex with a rwlock
     instead of RCU, so that running a vCPU on a different task doesn't
     encounter long due to having to wait for all CPUs become quiescent.

     In general both reads and writes are rare, but userspace that
     supports confidential computing is introducing the use of "helper"
     vCPUs that may jump from one host processor to another. Those will
     be very happy to trigger a synchronize_rcu(), and the effect on
     performance is quite the disaster"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (298 commits)
  KVM: x86: Break CONFIG_KVM_X86's direct dependency on KVM_INTEL || KVM_AMD
  KVM: x86: add back X86_LOCAL_APIC dependency
  Revert "KVM: VMX: Move LOAD_IA32_PERF_GLOBAL_CTRL errata handling out of setup_vmcs_config()"
  KVM: x86: switch hugepage recovery thread to vhost_task
  KVM: x86: expose MSR_PLATFORM_INFO as a feature MSR
  x86: KVM: Advertise CPUIDs for new instructions in Clearwater Forest
  Documentation: KVM: fix malformed table
  irqchip/loongson-eiointc: Add virt extension support
  LoongArch: KVM: Add irqfd support
  LoongArch: KVM: Add PCHPIC user mode read and write functions
  LoongArch: KVM: Add PCHPIC read and write functions
  LoongArch: KVM: Add PCHPIC device support
  LoongArch: KVM: Add EIOINTC user mode read and write functions
  LoongArch: KVM: Add EIOINTC read and write functions
  LoongArch: KVM: Add EIOINTC device support
  LoongArch: KVM: Add IPI user mode read and write function
  LoongArch: KVM: Add IPI read and write function
  LoongArch: KVM: Add IPI device support
  LoongArch: KVM: Add iocsr and mmio bus simulation in kernel
  KVM: arm64: Pass on SVE mapping failures
  ...

diff --cc arch/arm64/include/asm/cpucaps.h
Simple merge

diff --cc arch/arm64/include/asm/cpufeature.h
index 3d63c20ccefcd4391b37723b5b17c41f1d2bdcbe,93fe8e6beb64911eca4344d2980f030fd927bb3f..b64e49bd9d106109e3319e596aec5917b65b0783
--- 1/arch/arm64/include/asm/cpufeature.h
--- 2/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@@ -835,21 -841,20 +842,31 @@@ static inline bool system_supports_lpa2
  
  static inline bool system_supports_poe(void)
  {
 -      return IS_ENABLED(CONFIG_ARM64_POE) &&
 -              alternative_has_cap_unlikely(ARM64_HAS_S1POE);
 +      return alternative_has_cap_unlikely(ARM64_HAS_S1POE);
 +}
 +
 +static inline bool system_supports_gcs(void)
 +{
 +      return IS_ENABLED(CONFIG_ARM64_GCS) &&
 +              alternative_has_cap_unlikely(ARM64_HAS_GCS);
 +}
 +
 +static inline bool system_supports_haft(void)
 +{
 +      return IS_ENABLED(CONFIG_ARM64_HAFT) &&
 +              cpus_have_final_cap(ARM64_HAFT);
  }
  
+ static __always_inline bool system_supports_mpam(void)
+ {
+       return alternative_has_cap_unlikely(ARM64_MPAM);
+ }
+ 
+ static __always_inline bool system_supports_mpam_hcr(void)
+ {
+       return alternative_has_cap_unlikely(ARM64_MPAM_HCR);
+ }
+ 
  int do_emulate_mrs(struct pt_regs *regs, u32 sys_reg, u32 rt);
  bool try_emulate_mrs(struct pt_regs *regs, u32 isn);
  

diff --cc arch/arm64/include/asm/el2_setup.h
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc arch/arm64/kernel/cpufeature.c
Simple merge

diff --cc arch/arm64/kernel/cpuinfo.c
Simple merge

diff --cc arch/arm64/kvm/guest.c
index e738a353b20e43c192ac2b15688e720851077ba8,4cd7ffa7679460cb2424324558e1d58105277f36..12dad841f2a51276eee4d4da7400c1b2a5732ff8
--- 1/arch/arm64/kvm/guest.c
--- 2/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@@ -1051,13 -1051,11 +1051,12 @@@ int kvm_vm_ioctl_mte_copy_tags(struct k
        }
  
        while (length > 0) {
-               kvm_pfn_t pfn = gfn_to_pfn_prot(kvm, gfn, write, NULL);
+               struct page *page = __gfn_to_page(kvm, gfn, write);
                void *maddr;
                unsigned long num_tags;
-               struct page *page;
 +              struct folio *folio;
  
-               if (is_error_noslot_pfn(pfn)) {
+               if (!page) {
                        ret = -EFAULT;
                        goto out;
                }
@@@ -1099,12 -1090,8 +1097,12 @@@
                        /* uaccess failed, don't leave stale tags */
                        if (num_tags != MTE_GRANULES_PER_PAGE)
                                mte_clear_page_tags(maddr);
 -                      set_page_mte_tagged(page);
 +                      if (folio_test_hugetlb(folio))
 +                              folio_set_hugetlb_mte_tagged(folio);
 +                      else
 +                              set_page_mte_tagged(page);
 +
-                       kvm_release_pfn_dirty(pfn);
+                       kvm_release_page_dirty(page);
                }
  
                if (num_tags != MTE_GRANULES_PER_PAGE) {

diff --cc arch/arm64/kvm/mmu.c
Simple merge

diff --cc arch/arm64/tools/cpucaps
Simple merge

diff --cc arch/arm64/tools/sysreg
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_nested.c
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge

diff --cc arch/riscv/include/asm/perf_event.h
index 665bbc9b2f840a5272eb493d799f21dab73dfd25,38926b4a902d3c813d85108913870d77a8f2751a..bcc928fd3785c16b54a9a802525bad07c86f3690
--- 1/arch/riscv/include/asm/perf_event.h
--- 2/arch/riscv/include/asm/perf_event.h
+++ b/arch/riscv/include/asm/perf_event.h
@@@ -8,7 -8,11 +8,8 @@@
  #ifndef _ASM_RISCV_PERF_EVENT_H
  #define _ASM_RISCV_PERF_EVENT_H
  
+ #ifdef CONFIG_PERF_EVENTS
  #include <linux/perf_event.h>
 -extern unsigned long perf_instruction_pointer(struct pt_regs *regs);
 -extern unsigned long perf_misc_flags(struct pt_regs *regs);
 -#define perf_misc_flags(regs) perf_misc_flags(regs)
  #define perf_arch_bpf_user_pt_regs(regs) (struct user_regs_struct *)regs
  
  #define perf_arch_fetch_caller_regs(regs, __ip) { \

diff --cc arch/riscv/kernel/perf_callchain.c
index c7468af77c663ab30d5728476e882d0882d1afa5,c2c81a80f81640fc58ad5f96dd1a569aa567a301..b465bc9eb870ec1ab8a638d07f3fd9edcd047bc3
--- 1/arch/riscv/kernel/perf_callchain.c
--- 2/arch/riscv/kernel/perf_callchain.c
+++ b/arch/riscv/kernel/perf_callchain.c
@@@ -34,5 -39,38 +39,10 @@@ void perf_callchain_user(struct perf_ca
  void perf_callchain_kernel(struct perf_callchain_entry_ctx *entry,
                           struct pt_regs *regs)
  {
+       if (perf_guest_state()) {
+               /* TODO: We don't support guest os callchain now */
+               return;
+       }
+ 
        walk_stackframe(NULL, regs, fill_callchain, entry);
  }
 -
 -unsigned long perf_instruction_pointer(struct pt_regs *regs)
 -{
 -      if (perf_guest_state())
 -              return perf_guest_get_ip();
 -
 -      return instruction_pointer(regs);
 -}
 -
 -unsigned long perf_misc_flags(struct pt_regs *regs)
 -{
 -      unsigned int guest_state = perf_guest_state();
 -      unsigned long misc = 0;
 -
 -      if (guest_state) {
 -              if (guest_state & PERF_GUEST_USER)
 -                      misc |= PERF_RECORD_MISC_GUEST_USER;
 -              else
 -                      misc |= PERF_RECORD_MISC_GUEST_KERNEL;
 -      } else {
 -              if (user_mode(regs))
 -                      misc |= PERF_RECORD_MISC_USER;
 -              else
 -                      misc |= PERF_RECORD_MISC_KERNEL;
 -      }
 -
 -      return misc;
 -}

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/s390/kvm/kvm-s390.c
index deeb32034ad5e98779795df61666afffa73549a9,0676c41ac9b8f30f0380f037e6a06ae26b4f18a9..442d4a227c0e68e69d5522c79f9a1c2d23af1d2f
--- 1/arch/s390/kvm/kvm-s390.c
--- 2/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@@ -341,13 -340,24 +341,23 @@@ static inline int plo_test_bit(unsigne
                "       lgr     0,%[function]\n"
                /* Parameter registers are ignored for "test bit" */
                "       plo     0,0,0,0(0)\n"
 -              "       ipm     %0\n"
 -              "       srl     %0,28\n"
 -              : "=d" (cc)
 +              CC_IPM(cc)
 +              : CC_OUT(cc, cc)
                : [function] "d" (function)
 -              : "cc", "0");
 -      return cc == 0;
 +              : CC_CLOBBER_LIST("0"));
 +      return CC_TRANSFORM(cc) == 0;
  }
  
+ static __always_inline void pfcr_query(u8 (*query)[16])
+ {
+       asm volatile(
+               "       lghi    0,0\n"
+               "       .insn   rsy,0xeb0000000016,0,0,%[query]\n"
+               : [query] "=QS" (*query)
+               :
+               : "cc", "0");
+ }
+ 
  static __always_inline void __sortl_query(u8 (*query)[32])
  {
        asm volatile(

diff --cc arch/s390/kvm/vsie.c
Simple merge

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/kvm/svm/sev.c
Simple merge