Commit 4a51fe91 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 arm64 kvm fixes from Paolo Bonzini:

 - Ensure early return semantics are preserved for pKVM fault handlers

 - Fix case where the kernel runs with the guest's PAN value when
   CONFIG_ARM64_PAN is not set

 - Make stage-1 walks to set the access flag respect the access
   permission of the underlying stage-2, when enabled

 - Propagate computed FGT values to the pKVM view of the vCPU at
   vcpu_load()

 - Correctly program PXN and UXN privilege bits for hVHE's stage-1 page
   tables

 - Check that the VM is actually using VGICv3 before accessing the GICv3
   CPU interface

 - Delete some unused code

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: arm64: Invert KVM_PGTABLE_WALK_HANDLE_FAULT to fix pKVM walkers
  KVM: arm64: Don't blindly set set PSTATE.PAN on guest exit
  KVM: arm64: nv: Respect stage-2 write permssion when setting stage-1 AF
  KVM: arm64: Remove unused vcpu_{clear,set}_wfx_traps()
  KVM: arm64: Remove unused parameter in synchronize_vcpu_pstate()
  KVM: arm64: Remove extra argument for __pvkm_host_{share,unshare}_hyp()
  KVM: arm64: Inject UNDEF for a register trap without accessor
  KVM: arm64: Copy FGT traps to unprotected pKVM VCPU on VCPU load
  KVM: arm64: Fix EL2 S1 XN handling for hVHE setups
  KVM: arm64: gic: Check for vGICv3 when clearing TWI
parents 62085877 e89f0e9a

arch/arm64/include/asm/kvm_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ void kvm_get_kimage_voffset(struct alt_instr *alt, 
	__le32 *origptr, __le32 *updptr, int nr_inst);

void kvm_compute_final_ctr_el0(struct alt_instr *alt,

	__le32 *origptr, __le32 *updptr, int nr_inst);

void kvm_pan_patch_el2_entry(struct alt_instr *alt,

			     __le32 *origptr, __le32 *updptr, int nr_inst);

void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr, u64 elr_virt,

	u64 elr_phys, u64 par, uintptr_t vcpu, u64 far, u64 hpfar);

arch/arm64/include/asm/kvm_emulate.h

+0 −16
Original line number Diff line number Diff line
@@ -119,22 +119,6 @@ static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu) 
	return (unsigned long *)&vcpu->arch.hcr_el2;

}



static inline void vcpu_clear_wfx_traps(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr_el2 &= ~HCR_TWE;

	if (atomic_read(&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count) ||

	    vcpu->kvm->arch.vgic.nassgireq)

		vcpu->arch.hcr_el2 &= ~HCR_TWI;

	else

		vcpu->arch.hcr_el2 |= HCR_TWI;

}



static inline void vcpu_set_wfx_traps(struct kvm_vcpu *vcpu)

{

	vcpu->arch.hcr_el2 |= HCR_TWE;

	vcpu->arch.hcr_el2 |= HCR_TWI;

}



static inline unsigned long vcpu_get_vsesr(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.vsesr_el2;

arch/arm64/include/asm/kvm_pgtable.h

+12 −4
Original line number Diff line number Diff line
@@ -87,7 +87,15 @@ typedef u64 kvm_pte_t; 


#define KVM_PTE_LEAF_ATTR_HI_SW		GENMASK(58, 55)



#define KVM_PTE_LEAF_ATTR_HI_S1_XN	BIT(54)

#define __KVM_PTE_LEAF_ATTR_HI_S1_XN	BIT(54)

#define __KVM_PTE_LEAF_ATTR_HI_S1_UXN	BIT(54)

#define __KVM_PTE_LEAF_ATTR_HI_S1_PXN	BIT(53)



#define KVM_PTE_LEAF_ATTR_HI_S1_XN					\

	({ cpus_have_final_cap(ARM64_KVM_HVHE) ?			\

			(__KVM_PTE_LEAF_ATTR_HI_S1_UXN |		\

			 __KVM_PTE_LEAF_ATTR_HI_S1_PXN) :		\

			__KVM_PTE_LEAF_ATTR_HI_S1_XN; })



#define KVM_PTE_LEAF_ATTR_HI_S2_XN	GENMASK(54, 53)
@@ -293,8 +301,8 @@ typedef bool (*kvm_pgtable_force_pte_cb_t)(u64 addr, u64 end, 
 *					children.

 * @KVM_PGTABLE_WALK_SHARED:		Indicates the page-tables may be shared

 *					with other software walkers.

 * @KVM_PGTABLE_WALK_HANDLE_FAULT:	Indicates the page-table walk was

 *					invoked from a fault handler.

 * @KVM_PGTABLE_WALK_IGNORE_EAGAIN:	Don't terminate the walk early if

 *					the walker returns -EAGAIN.

 * @KVM_PGTABLE_WALK_SKIP_BBM_TLBI:	Visit and update table entries

 *					without Break-before-make's

 *					TLB invalidation.
@@ -307,7 +315,7 @@ enum kvm_pgtable_walk_flags { 
	KVM_PGTABLE_WALK_TABLE_PRE		= BIT(1),

	KVM_PGTABLE_WALK_TABLE_POST		= BIT(2),

	KVM_PGTABLE_WALK_SHARED			= BIT(3),

	KVM_PGTABLE_WALK_HANDLE_FAULT		= BIT(4),

	KVM_PGTABLE_WALK_IGNORE_EAGAIN		= BIT(4),

	KVM_PGTABLE_WALK_SKIP_BBM_TLBI		= BIT(5),

	KVM_PGTABLE_WALK_SKIP_CMO		= BIT(6),

};

arch/arm64/include/asm/sysreg.h

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ 
 */

#define pstate_field(op1, op2)		((op1) << Op1_shift | (op2) << Op2_shift)

#define PSTATE_Imm_shift		CRm_shift

#define SET_PSTATE(x, r)		__emit_inst(0xd500401f | PSTATE_ ## r | ((!!x) << PSTATE_Imm_shift))

#define ENCODE_PSTATE(x, r)		(0xd500401f | PSTATE_ ## r | ((!!x) << PSTATE_Imm_shift))

#define SET_PSTATE(x, r)		__emit_inst(ENCODE_PSTATE(x, r))



#define PSTATE_PAN			pstate_field(0, 4)

#define PSTATE_UAO			pstate_field(0, 3)

arch/arm64/kernel/image-vars.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ KVM_NVHE_ALIAS(kvm_patch_vector_branch); 
KVM_NVHE_ALIAS(kvm_update_va_mask);

KVM_NVHE_ALIAS(kvm_get_kimage_voffset);

KVM_NVHE_ALIAS(kvm_compute_final_ctr_el0);

KVM_NVHE_ALIAS(kvm_pan_patch_el2_entry);

KVM_NVHE_ALIAS(spectre_bhb_patch_loop_iter);

KVM_NVHE_ALIAS(spectre_bhb_patch_loop_mitigation_enable);

KVM_NVHE_ALIAS(spectre_bhb_patch_wa3);