1. 07 Jan, 2022 16 commits
    • Eric Hankland's avatar
      KVM: x86: Update vPMCs when retiring branch instructions · 018d70ff
      Eric Hankland authored
      When KVM retires a guest branch instruction through emulation,
      increment any vPMCs that are configured to monitor "branch
      instructions retired," and update the sample period of those counters
      so that they will overflow at the right time.
      Signed-off-by: default avatarEric Hankland <ehankland@google.com>
      [jmattson:
        - Split the code to increment "branch instructions retired" into a
          separate commit.
        - Moved/consolidated the calls to kvm_pmu_trigger_event() in the
          emulation of VMLAUNCH/VMRESUME to accommodate the evolution of
          that code.
      ]
      Fixes: f5132b01 ("KVM: Expose a version 2 architectural PMU to a guests")
      Signed-off-by: default avatarJim Mattson <jmattson@google.com>
      Message-Id: <20211130074221.93635-7-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      018d70ff
    • Eric Hankland's avatar
      KVM: x86: Update vPMCs when retiring instructions · 9cd803d4
      Eric Hankland authored
      When KVM retires a guest instruction through emulation, increment any
      vPMCs that are configured to monitor "instructions retired," and
      update the sample period of those counters so that they will overflow
      at the right time.
      Signed-off-by: default avatarEric Hankland <ehankland@google.com>
      [jmattson:
        - Split the code to increment "branch instructions retired" into a
          separate commit.
        - Added 'static' to kvm_pmu_incr_counter() definition.
        - Modified kvm_pmu_incr_counter() to check pmc->perf_event->state ==
          PERF_EVENT_STATE_ACTIVE.
      ]
      Fixes: f5132b01 ("KVM: Expose a version 2 architectural PMU to a guests")
      Signed-off-by: default avatarJim Mattson <jmattson@google.com>
      [likexu:
        - Drop checks for pmc->perf_event or event state or event type
        - Increase a counter once its umask bits and the first 8 select bits are matched
        - Rewrite kvm_pmu_incr_counter() with a less invasive approach to the host perf;
        - Rename kvm_pmu_record_event to kvm_pmu_trigger_event;
        - Add counter enable and CPL check for kvm_pmu_trigger_event();
      ]
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarLike Xu <likexu@tencent.com>
      Message-Id: <20211130074221.93635-6-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      9cd803d4
    • Like Xu's avatar
      KVM: x86/pmu: Add pmc->intr to refactor kvm_perf_overflow{_intr}() · 40ccb96d
      Like Xu authored
      Depending on whether intr should be triggered or not, KVM registers
      two different event overflow callbacks in the perf_event context.
      
      The code skeleton of these two functions is very similar, so
      the pmc->intr can be stored into pmc from pmc_reprogram_counter()
      which provides smaller instructions footprint against the
      u-architecture branch predictor.
      
      The __kvm_perf_overflow() can be called in non-nmi contexts
      and a flag is needed to distinguish the caller context and thus
      avoid a check on kvm_is_in_guest(), otherwise we might get
      warnings from suspicious RCU or check_preemption_disabled().
      Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: default avatarLike Xu <likexu@tencent.com>
      Message-Id: <20211130074221.93635-5-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      40ccb96d
    • Like Xu's avatar
      KVM: x86/pmu: Reuse pmc_perf_hw_id() and drop find_fixed_event() · 6ed1298e
      Like Xu authored
      Since we set the same semantic event value for the fixed counter in
      pmc->eventsel, returning the perf_hw_id for the fixed counter via
      find_fixed_event() can be painlessly replaced by pmc_perf_hw_id()
      with the help of pmc_is_fixed() check.
      Signed-off-by: default avatarLike Xu <likexu@tencent.com>
      Message-Id: <20211130074221.93635-4-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      6ed1298e
    • Like Xu's avatar
      KVM: x86/pmu: Refactoring find_arch_event() to pmc_perf_hw_id() · 7c174f30
      Like Xu authored
      The find_arch_event() returns a "unsigned int" value,
      which is used by the pmc_reprogram_counter() to
      program a PERF_TYPE_HARDWARE type perf_event.
      
      The returned value is actually the kernel defined generic
      perf_hw_id, let's rename it to pmc_perf_hw_id() with simpler
      incoming parameters for better self-explanation.
      Signed-off-by: default avatarLike Xu <likexu@tencent.com>
      Message-Id: <20211130074221.93635-3-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      7c174f30
    • Like Xu's avatar
      KVM: x86/pmu: Setup pmc->eventsel for fixed PMCs · 76187563
      Like Xu authored
      The current pmc->eventsel for fixed counter is underutilised. The
      pmc->eventsel can be setup for all known available fixed counters
      since we have mapping between fixed pmc index and
      the intel_arch_events array.
      
      Either gp or fixed counter, it will simplify the later checks for
      consistency between eventsel and perf_hw_id.
      Signed-off-by: default avatarLike Xu <likexu@tencent.com>
      Message-Id: <20211130074221.93635-2-likexu@tencent.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      76187563
    • Paolo Bonzini's avatar
      KVM: x86: avoid out of bounds indices for fixed performance counters · 006a0f06
      Paolo Bonzini authored
      Because IceLake has 4 fixed performance counters but KVM only
      supports 3, it is possible for reprogram_fixed_counters to pass
      to reprogram_fixed_counter an index that is out of bounds for the
      fixed_pmc_events array.
      
      Ultimately intel_find_fixed_event, which is the only place that uses
      fixed_pmc_events, handles this correctly because it checks against the
      size of fixed_pmc_events anyway.  Every other place operates on the
      fixed_counters[] array which is sized according to INTEL_PMC_MAX_FIXED.
      However, it is cleaner if the unsupported performance counters are culled
      early on in reprogram_fixed_counters.
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      006a0f06
    • Lai Jiangshan's avatar
      KVM: VMX: Mark VCPU_EXREG_CR3 dirty when !CR0_PG -> CR0_PG if EPT + !URG · 5b61178c
      Lai Jiangshan authored
      When !CR0_PG -> CR0_PG, vcpu->arch.cr3 becomes active, but GUEST_CR3 is
      still vmx->ept_identity_map_addr if EPT + !URG.  So VCPU_EXREG_CR3 is
      considered to be dirty and GUEST_CR3 needs to be updated in this case.
      Reported-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
      Suggested-by: default avatarSean Christopherson <seanjc@google.com>
      Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
      Message-Id: <20211216021938.11752-4-jiangshanlai@gmail.com>
      Fixes: c62c7bd4 ("KVM: VMX: Update vmcs.GUEST_CR3 only when the guest CR3 is dirty")
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      5b61178c
    • Lai Jiangshan's avatar
      KVM: x86/mmu: Reconstruct shadow page root if the guest PDPTEs is changed · 6b123c3a
      Lai Jiangshan authored
      For shadow paging, the page table needs to be reconstructed before the
      coming VMENTER if the guest PDPTEs is changed.
      
      But not all paths that call load_pdptrs() will cause the page tables to be
      reconstructed. Normally, kvm_mmu_reset_context() and kvm_mmu_free_roots()
      are used to launch later reconstruction.
      
      The commit d81135a5("KVM: x86: do not reset mmu if CR0.CD and
      CR0.NW are changed") skips kvm_mmu_reset_context() after load_pdptrs()
      when changing CR0.CD and CR0.NW.
      
      The commit 21823fbd("KVM: x86: Invalidate all PGDs for the current
      PCID on MOV CR3 w/ flush") skips kvm_mmu_free_roots() after
      load_pdptrs() when rewriting the CR3 with the same value.
      
      The commit a91a7c70("KVM: X86: Don't reset mmu context when
      toggling X86_CR4_PGE") skips kvm_mmu_reset_context() after
      load_pdptrs() when changing CR4.PGE.
      
      Guests like linux would keep the PDPTEs unchanged for every instance of
      pagetable, so this missing reconstruction has no problem for linux
      guests.
      
      Fixes: d81135a5("KVM: x86: do not reset mmu if CR0.CD and CR0.NW are changed")
      Fixes: 21823fbd("KVM: x86: Invalidate all PGDs for the current PCID on MOV CR3 w/ flush")
      Fixes: a91a7c70("KVM: X86: Don't reset mmu context when toggling X86_CR4_PGE")
      Suggested-by: default avatarSean Christopherson <seanjc@google.com>
      Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
      Message-Id: <20211216021938.11752-3-jiangshanlai@gmail.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      6b123c3a
    • Lai Jiangshan's avatar
      KVM: VMX: Save HOST_CR3 in vmx_set_host_fs_gs() · a9f2705e
      Lai Jiangshan authored
      The host CR3 in the vcpu thread can only be changed when scheduling,
      so commit 15ad9762 ("KVM: VMX: Save HOST_CR3 in vmx_prepare_switch_to_guest()")
      changed vmx.c to only save it in vmx_prepare_switch_to_guest().
      
      However, it also has to be synced in vmx_sync_vmcs_host_state() when switching VMCS.
      vmx_set_host_fs_gs() is called in both places, so rename it to
      vmx_set_vmcs_host_state() and make it update HOST_CR3.
      
      Fixes: 15ad9762 ("KVM: VMX: Save HOST_CR3 in vmx_prepare_switch_to_guest()")
      Signed-off-by: default avatarLai Jiangshan <laijs@linux.alibaba.com>
      Message-Id: <20211216021938.11752-2-jiangshanlai@gmail.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      a9f2705e
    • Paolo Bonzini's avatar
      Revert "KVM: X86: Update mmu->pdptrs only when it is changed" · 46cbc040
      Paolo Bonzini authored
      This reverts commit 24cd19a2.
      Sean Christopherson reports:
      
      "Commit 24cd19a2 ('KVM: X86: Update mmu->pdptrs only when it is
      changed') breaks nested VMs with EPT in L0 and PAE shadow paging in L2.
      Reproducing is trivial, just disable EPT in L1 and run a VM.  I haven't
      investigating how it breaks things."
      Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      46cbc040
    • Peter Gonda's avatar
      selftests: KVM: sev_migrate_tests: Add mirror command tests · a6fec539
      Peter Gonda authored
      Add tests to confirm mirror vms can only run correct subset of commands.
      
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Sean Christopherson <seanjc@google.com>
      Cc: Marc Orr <marcorr@google.com>
      Signed-off-by: default avatarPeter Gonda <pgonda@google.com>
      Message-Id: <20211208191642.3792819-4-pgonda@google.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      a6fec539
    • Peter Gonda's avatar
      selftests: KVM: sev_migrate_tests: Fix sev_ioctl() · 427d046a
      Peter Gonda authored
      TEST_ASSERT in SEV ioctl was allowing errors because it checked return
      value was good OR the FW error code was OK. This TEST_ASSERT should
      require both (aka. AND) values are OK. Removes the LAUNCH_START from the
      mirror VM because this call correctly fails because mirror VMs cannot
      call this command. Currently issues with the PSP driver functions mean
      the firmware error is not always reset to SEV_RET_SUCCESS when a call is
      successful. Mainly sev_platform_init() doesn't correctly set the fw
      error if the platform has already been initialized.
      
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Sean Christopherson <seanjc@google.com>
      Cc: Marc Orr <marcorr@google.com>
      Signed-off-by: default avatarPeter Gonda <pgonda@google.com>
      Message-Id: <20211208191642.3792819-3-pgonda@google.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      427d046a
    • Peter Gonda's avatar
      selftests: KVM: sev_migrate_tests: Fix test_sev_mirror() · 4c66b567
      Peter Gonda authored
      Mirrors should not be able to call LAUNCH_START. Remove the call on the
      mirror to correct the test before fixing sev_ioctl() to correctly assert
      on this failed ioctl.
      
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Sean Christopherson <seanjc@google.com>
      Cc: Marc Orr <marcorr@google.com>
      Signed-off-by: default avatarPeter Gonda <pgonda@google.com>
      Message-Id: <20211208191642.3792819-2-pgonda@google.com>
      Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
      4c66b567
    • Paolo Bonzini's avatar
      Merge tag 'kvm-riscv-5.17-1' of https://github.com/kvm-riscv/linux into HEAD · 1b0c9d00
      Paolo Bonzini authored
      KVM/riscv changes for 5.17, take #1
      
      - Use common KVM implementation of MMU memory caches
      - SBI v0.2 support for Guest
      - Initial KVM selftests support
      - Fix to avoid spurious virtual interrupts after clearing hideleg CSR
      - Update email address for Anup and Atish
      1b0c9d00
    • Paolo Bonzini's avatar
      Merge tag 'kvmarm-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD · 7fd55a02
      Paolo Bonzini authored
      KVM/arm64 updates for Linux 5.16
      
      - Simplification of the 'vcpu first run' by integrating it into
        KVM's 'pid change' flow
      
      - Refactoring of the FP and SVE state tracking, also leading to
        a simpler state and less shared data between EL1 and EL2 in
        the nVHE case
      
      - Tidy up the header file usage for the nvhe hyp object
      
      - New HYP unsharing mechanism, finally allowing pages to be
        unmapped from the Stage-1 EL2 page-tables
      
      - Various pKVM cleanups around refcounting and sharing
      
      - A couple of vgic fixes for bugs that would trigger once
        the vcpu xarray rework is merged, but not sooner
      
      - Add minimal support for ARMv8.7's PMU extension
      
      - Rework kvm_pgtable initialisation ahead of the NV work
      
      - New selftest for IRQ injection
      
      - Teach selftests about the lack of default IPA space and
        page sizes
      
      - Expand sysreg selftest to deal with Pointer Authentication
      
      - The usual bunch of cleanups and doc update
      7fd55a02
  2. 06 Jan, 2022 14 commits
  3. 04 Jan, 2022 6 commits
    • Marc Zyngier's avatar
      Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next · 1c53a1ae
      Marc Zyngier authored
      * kvm-arm64/misc-5.17:
        : .
        : Misc fixes and improvements:
        : - Add minimal support for ARMv8.7's PMU extension
        : - Constify kvm_io_gic_ops
        : - Drop kvm_is_transparent_hugepage() prototype
        : - Drop unused workaround_flags field
        : - Rework kvm_pgtable initialisation
        : - Documentation fixes
        : - Replace open-coded SCTLR_EL1.EE useage with its defined macro
        : - Sysreg list selftest update to handle PAuth
        : - Include cleanups
        : .
        KVM: arm64: vgic: Replace kernel.h with the necessary inclusions
        KVM: arm64: Fix comment typo in kvm_vcpu_finalize_sve()
        KVM: arm64: selftests: get-reg-list: Add pauth configuration
        KVM: arm64: Fix comment on barrier in kvm_psci_vcpu_on()
        KVM: arm64: Fix comment for kvm_reset_vcpu()
        KVM: arm64: Use defined value for SCTLR_ELx_EE
        KVM: arm64: Rework kvm_pgtable initialisation
        KVM: arm64: Drop unused workaround_flags vcpu field
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      1c53a1ae
    • Andy Shevchenko's avatar
      KVM: arm64: vgic: Replace kernel.h with the necessary inclusions · 6c9eeb5f
      Andy Shevchenko authored
      arm_vgic.h does not require all the stuff that kernel.h provides.
      Replace kernel.h inclusion with the list of what is really being used.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      Link: https://lore.kernel.org/r/20220104151940.55399-1-andriy.shevchenko@linux.intel.com
      6c9eeb5f
    • Marc Zyngier's avatar
      Merge branch kvm-arm64/selftest/irq-injection into kvmarm-master/next · ad7937dc
      Marc Zyngier authored
      * kvm-arm64/selftest/irq-injection:
        : .
        : New tests from Ricardo Koller:
        : "This series adds a new test, aarch64/vgic-irq, that validates the injection of
        : different types of IRQs from userspace using various methods and configurations"
        : .
        KVM: selftests: aarch64: Add test for restoring active IRQs
        KVM: selftests: aarch64: Add ISPENDR write tests in vgic_irq
        KVM: selftests: aarch64: Add tests for IRQFD in vgic_irq
        KVM: selftests: Add IRQ GSI routing library functions
        KVM: selftests: aarch64: Add test_inject_fail to vgic_irq
        KVM: selftests: aarch64: Add tests for LEVEL_INFO in vgic_irq
        KVM: selftests: aarch64: Level-sensitive interrupts tests in vgic_irq
        KVM: selftests: aarch64: Add preemption tests in vgic_irq
        KVM: selftests: aarch64: Cmdline arg to set EOI mode in vgic_irq
        KVM: selftests: aarch64: Cmdline arg to set number of IRQs in vgic_irq test
        KVM: selftests: aarch64: Abstract the injection functions in vgic_irq
        KVM: selftests: aarch64: Add vgic_irq to test userspace IRQ injection
        KVM: selftests: aarch64: Add vGIC library functions to deal with vIRQ state
        KVM: selftests: Add kvm_irq_line library function
        KVM: selftests: aarch64: Add GICv3 register accessor library functions
        KVM: selftests: aarch64: Add function for accessing GICv3 dist and redist registers
        KVM: selftests: aarch64: Move gic_v3.h to shared headers
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      ad7937dc
    • Marc Zyngier's avatar
      Merge branch kvm-arm64/selftest/ipa into kvmarm-master/next · 089606c0
      Marc Zyngier authored
      * kvm-arm64/selftest/ipa:
        : .
        : Expand the KVM/arm64 selftest infrastructure to discover
        : supported page sizes at runtime, support 16kB pages, and
        : find out about the original M1 stupidly small IPA space.
        : .
        KVM: selftests: arm64: Add support for various modes with 16kB page size
        KVM: selftests: arm64: Add support for VM_MODE_P36V48_{4K,64K}
        KVM: selftests: arm64: Rework TCR_EL1 configuration
        KVM: selftests: arm64: Check for supported page sizes
        KVM: selftests: arm64: Introduce a variable default IPA size
        KVM: selftests: arm64: Initialise default guest mode at test startup time
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      089606c0
    • Zenghui Yu's avatar
      KVM: arm64: Fix comment typo in kvm_vcpu_finalize_sve() · e938eddb
      Zenghui Yu authored
      kvm_arm_init_arch_resources() was renamed to kvm_arm_init_sve() in
      commit a3be836d ("KVM: arm/arm64: Demote
      kvm_arm_init_arch_resources() to just set up SVE"). Fix the function
      name in comment of kvm_vcpu_finalize_sve().
      Signed-off-by: default avatarZenghui Yu <yuzenghui@huawei.com>
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      Link: https://lore.kernel.org/r/20211230141535.1389-1-yuzenghui@huawei.com
      e938eddb
    • Marc Zyngier's avatar
      KVM: arm64: selftests: get-reg-list: Add pauth configuration · f15dcf1b
      Marc Zyngier authored
      The get-reg-list test ignores the Pointer Authentication features,
      which is a shame now that we have relatively common HW with this feature.
      
      Define two new configurations (with and without PMU) that exercise the
      KVM capabilities.
      Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
      Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
      Link: https://lore.kernel.org/r/20211228121414.1013250-1-maz@kernel.org
      f15dcf1b
  4. 28 Dec, 2021 4 commits