Commit b066935b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull kvm fixes from Paolo Bonzini:
 "ARM:

   - Address some fallout of the locking rework, this time affecting the
     way the vgic is configured

   - Fix an issue where the page table walker frees a subtree and then
     proceeds with walking what it has just freed...

   - Check that a given PA donated to the guest is actually memory (only
     affecting pKVM)

   - Correctly handle MTE CMOs by Set/Way

   - Fix the reported address of a watchpoint forwarded to userspace

   - Fix the freeing of the root of stage-2 page tables

   - Stop creating spurious PMU events to perform detection of the
     default PMU and use the existing PMU list instead

  x86:

   - Fix a memslot lookup bug in the NX recovery thread that could
     theoretically let userspace bypass the NX hugepage mitigation

   - Fix a s/BLOCKING/PENDING bug in SVM's vNMI support

   - Account exit stats for fastpath VM-Exits that never leave the super
     tight run-loop

   - Fix an out-of-bounds bug in the optimized APIC map code, and add a
     regression test for the race"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: selftests: Add test for race in kvm_recalculate_apic_map()
  KVM: x86: Bail from kvm_recalculate_phys_map() if x2APIC ID is out-of-bounds
  KVM: x86: Account fastpath-only VM-Exits in vCPU stats
  KVM: SVM: vNMI pending bit is V_NMI_PENDING_MASK not V_NMI_BLOCKING_MASK
  KVM: x86/mmu: Grab memslot for correct address space in NX recovery worker
  KVM: arm64: Document default vPMU behavior on heterogeneous systems
  KVM: arm64: Iterate arm_pmus list to probe for default PMU
  KVM: arm64: Drop last page ref in kvm_pgtable_stage2_free_removed()
  KVM: arm64: Populate fault info for watchpoint
  KVM: arm64: Reload PTE after invoking walker callback on preorder traversal
  KVM: arm64: Handle trap of tagged Set/Way CMOs
  arm64: Add missing Set/Way CMO encodings
  KVM: arm64: Prevent unconditional donation of unmapped regions from the host
  KVM: arm64: vgic: Fix a comment
  KVM: arm64: vgic: Fix locking comment
  KVM: arm64: vgic: Wrap vgic_its_create() with config_lock
  KVM: arm64: vgic: Fix a circular locking issue
parents 9455b4b6 f211b450

arch/arm64/include/asm/kvm_pgtable.h

+3 −3
Original line number Diff line number Diff line
@@ -632,9 +632,9 @@ int kvm_pgtable_stage2_flush(struct kvm_pgtable *pgt, u64 addr, u64 size); 
 *

 * The walker will walk the page-table entries corresponding to the input

 * address range specified, visiting entries according to the walker flags.

 * Invalid entries are treated as leaf entries. Leaf entries are reloaded

 * after invoking the walker callback, allowing the walker to descend into

 * a newly installed table.

 * Invalid entries are treated as leaf entries. The visited page table entry is

 * reloaded after invoking the walker callback, allowing the walker to descend

 * into a newly installed table.

 *

 * Returning a negative error code from the walker callback function will

 * terminate the walk immediately with the same error code.

arch/arm64/include/asm/sysreg.h

+6 −0
Original line number Diff line number Diff line
@@ -115,8 +115,14 @@ 
#define SB_BARRIER_INSN			__SYS_BARRIER_INSN(0, 7, 31)



#define SYS_DC_ISW			sys_insn(1, 0, 7, 6, 2)

#define SYS_DC_IGSW			sys_insn(1, 0, 7, 6, 4)

#define SYS_DC_IGDSW			sys_insn(1, 0, 7, 6, 6)

#define SYS_DC_CSW			sys_insn(1, 0, 7, 10, 2)

#define SYS_DC_CGSW			sys_insn(1, 0, 7, 10, 4)

#define SYS_DC_CGDSW			sys_insn(1, 0, 7, 10, 6)

#define SYS_DC_CISW			sys_insn(1, 0, 7, 14, 2)

#define SYS_DC_CIGSW			sys_insn(1, 0, 7, 14, 4)

#define SYS_DC_CIGDSW			sys_insn(1, 0, 7, 14, 6)



/*

 * Automatically generated definitions for system registers, the

arch/arm64/kvm/hyp/include/hyp/switch.h

+6 −2
Original line number Diff line number Diff line
@@ -412,17 +412,21 @@ static bool kvm_hyp_handle_cp15_32(struct kvm_vcpu *vcpu, u64 *exit_code) 
	return false;

}



static bool kvm_hyp_handle_iabt_low(struct kvm_vcpu *vcpu, u64 *exit_code)

static bool kvm_hyp_handle_memory_fault(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	if (!__populate_fault_info(vcpu))

		return true;



	return false;

}

static bool kvm_hyp_handle_iabt_low(struct kvm_vcpu *vcpu, u64 *exit_code)

	__alias(kvm_hyp_handle_memory_fault);

static bool kvm_hyp_handle_watchpt_low(struct kvm_vcpu *vcpu, u64 *exit_code)

	__alias(kvm_hyp_handle_memory_fault);



static bool kvm_hyp_handle_dabt_low(struct kvm_vcpu *vcpu, u64 *exit_code)

{

	if (!__populate_fault_info(vcpu))

	if (kvm_hyp_handle_memory_fault(vcpu, exit_code))

		return true;



	if (static_branch_unlikely(&vgic_v2_cpuif_trap)) {

arch/arm64/kvm/hyp/nvhe/mem_protect.c

+7 −7
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ struct pkvm_mem_donation { 


struct check_walk_data {

	enum pkvm_page_state	desired;

	enum pkvm_page_state	(*get_page_state)(kvm_pte_t pte);

	enum pkvm_page_state	(*get_page_state)(kvm_pte_t pte, u64 addr);

};



static int __check_page_state_visitor(const struct kvm_pgtable_visit_ctx *ctx,
@@ -583,10 +583,7 @@ static int __check_page_state_visitor(const struct kvm_pgtable_visit_ctx *ctx, 
{

	struct check_walk_data *d = ctx->arg;



	if (kvm_pte_valid(ctx->old) && !addr_is_allowed_memory(kvm_pte_to_phys(ctx->old)))

		return -EINVAL;



	return d->get_page_state(ctx->old) == d->desired ? 0 : -EPERM;

	return d->get_page_state(ctx->old, ctx->addr) == d->desired ? 0 : -EPERM;

}



static int check_page_state_range(struct kvm_pgtable *pgt, u64 addr, u64 size,
@@ -601,8 +598,11 @@ static int check_page_state_range(struct kvm_pgtable *pgt, u64 addr, u64 size, 
	return kvm_pgtable_walk(pgt, addr, size, &walker);

}



static enum pkvm_page_state host_get_page_state(kvm_pte_t pte)

static enum pkvm_page_state host_get_page_state(kvm_pte_t pte, u64 addr)

{

	if (!addr_is_allowed_memory(addr))

		return PKVM_NOPAGE;



	if (!kvm_pte_valid(pte) && pte)

		return PKVM_NOPAGE;
@@ -709,7 +709,7 @@ static int host_complete_donation(u64 addr, const struct pkvm_mem_transition *tx 
	return host_stage2_set_owner_locked(addr, size, host_id);

}



static enum pkvm_page_state hyp_get_page_state(kvm_pte_t pte)

static enum pkvm_page_state hyp_get_page_state(kvm_pte_t pte, u64 addr)

{

	if (!kvm_pte_valid(pte))

		return PKVM_NOPAGE;

arch/arm64/kvm/hyp/nvhe/switch.c

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static const exit_handler_fn hyp_exit_handlers[] = { 
	[ESR_ELx_EC_FP_ASIMD]		= kvm_hyp_handle_fpsimd,

	[ESR_ELx_EC_IABT_LOW]		= kvm_hyp_handle_iabt_low,

	[ESR_ELx_EC_DABT_LOW]		= kvm_hyp_handle_dabt_low,

	[ESR_ELx_EC_WATCHPT_LOW]	= kvm_hyp_handle_watchpt_low,

	[ESR_ELx_EC_PAC]		= kvm_hyp_handle_ptrauth,

};
@@ -196,6 +197,7 @@ static const exit_handler_fn pvm_exit_handlers[] = { 
	[ESR_ELx_EC_FP_ASIMD]		= kvm_hyp_handle_fpsimd,

	[ESR_ELx_EC_IABT_LOW]		= kvm_hyp_handle_iabt_low,

	[ESR_ELx_EC_DABT_LOW]		= kvm_hyp_handle_dabt_low,

	[ESR_ELx_EC_WATCHPT_LOW]	= kvm_hyp_handle_watchpt_low,

	[ESR_ELx_EC_PAC]		= kvm_hyp_handle_ptrauth,

};