Commit 1c53a1ae authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/misc-5.17 into kvmarm-master/next 



* 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>
parents ad7937dc 6c9eeb5f

arch/arm64/include/asm/kvm_emulate.h

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu) 
		*vcpu_cpsr(vcpu) |= PSR_AA32_E_BIT;

	} else {

		u64 sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1);

		sctlr |= (1 << 25);

		sctlr |= SCTLR_ELx_EE;

		vcpu_write_sys_reg(vcpu, sctlr, SCTLR_EL1);

	}

}

arch/arm64/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -297,9 +297,6 @@ struct kvm_vcpu_arch { 
	/* Exception Information */

	struct kvm_vcpu_fault_info fault;



	/* State of various workarounds, see kvm_asm.h for bit assignment */

	u64 workaround_flags;



	/* Miscellaneous vcpu state flags */

	u64 flags;

arch/arm64/include/asm/kvm_pgtable.h

+4 −5
Original line number Diff line number Diff line
@@ -291,8 +291,7 @@ u64 kvm_get_vtcr(u64 mmfr0, u64 mmfr1, u32 phys_shift); 
/**

 * __kvm_pgtable_stage2_init() - Initialise a guest stage-2 page-table.

 * @pgt:	Uninitialised page-table structure to initialise.

 * @arch:	Arch-specific KVM structure representing the guest virtual

 *		machine.

 * @mmu:	S2 MMU context for this S2 translation

 * @mm_ops:	Memory management callbacks.

 * @flags:	Stage-2 configuration flags.

 * @force_pte_cb: Function that returns true if page level mappings must
@@ -300,13 +299,13 @@ u64 kvm_get_vtcr(u64 mmfr0, u64 mmfr1, u32 phys_shift); 
 *

 * Return: 0 on success, negative error code on failure.

 */

int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_arch *arch,

int __kvm_pgtable_stage2_init(struct kvm_pgtable *pgt, struct kvm_s2_mmu *mmu,

			      struct kvm_pgtable_mm_ops *mm_ops,

			      enum kvm_pgtable_stage2_flags flags,

			      kvm_pgtable_force_pte_cb_t force_pte_cb);



#define kvm_pgtable_stage2_init(pgt, arch, mm_ops) \

	__kvm_pgtable_stage2_init(pgt, arch, mm_ops, 0, NULL)

#define kvm_pgtable_stage2_init(pgt, mmu, mm_ops) \

	__kvm_pgtable_stage2_init(pgt, mmu, mm_ops, 0, NULL)



/**

 * kvm_pgtable_stage2_destroy() - Destroy an unused guest stage-2 page-table.

arch/arm64/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ int main(void) 
#ifdef CONFIG_KVM

  DEFINE(VCPU_CONTEXT,		offsetof(struct kvm_vcpu, arch.ctxt));

  DEFINE(VCPU_FAULT_DISR,	offsetof(struct kvm_vcpu, arch.fault.disr_el1));

  DEFINE(VCPU_WORKAROUND_FLAGS,	offsetof(struct kvm_vcpu, arch.workaround_flags));

  DEFINE(VCPU_HCR_EL2,		offsetof(struct kvm_vcpu, arch.hcr_el2));

  DEFINE(CPU_USER_PT_REGS,	offsetof(struct kvm_cpu_context, regs));

  DEFINE(CPU_RGSR_EL1,		offsetof(struct kvm_cpu_context, sys_regs[RGSR_EL1]));

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

+2 −2
Original line number Diff line number Diff line
@@ -124,19 +124,19 @@ int kvm_host_prepare_stage2(void *pgt_pool_base) 


	prepare_host_vtcr();

	hyp_spin_lock_init(&host_kvm.lock);

	mmu->arch = &host_kvm.arch;



	ret = prepare_s2_pool(pgt_pool_base);

	if (ret)

		return ret;



	ret = __kvm_pgtable_stage2_init(&host_kvm.pgt, &host_kvm.arch,

	ret = __kvm_pgtable_stage2_init(&host_kvm.pgt, mmu,

					&host_kvm.mm_ops, KVM_HOST_S2_FLAGS,

					host_stage2_force_pte_cb);

	if (ret)

		return ret;



	mmu->pgd_phys = __hyp_pa(host_kvm.pgt.pgd);

	mmu->arch = &host_kvm.arch;

	mmu->pgt = &host_kvm.pgt;

	WRITE_ONCE(mmu->vmid.vmid_gen, 0);

	WRITE_ONCE(mmu->vmid.vmid, 0);