Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b12164b 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:
 "A smattering of bug fixes across most architectures"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  powerpc/kvm/cma: Fix panic introduces by signed shift operation
  KVM: s390/mm: Fix guest storage key corruption in ptep_set_access_flags
  KVM: s390/mm: Fix storage key corruption during swapping
  arm/arm64: KVM: Complete WFI/WFE instructions
  ARM/ARM64: KVM: Nuke Hyp-mode tlbs before enabling MMU
  KVM: s390/mm: try a cow on read only pages for key ops
  KVM: s390: Fix user triggerable bug in dead code
parents 56c22854 02a68d05

arch/arm/kvm/handle_exit.c

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	else

		kvm_vcpu_block(vcpu);



	kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));



	return 1;

}

arch/arm/kvm/init.S

+4 −0
Original line number Diff line number Diff line
@@ -99,6 +99,10 @@ __do_hyp_init: 
	mrc	p15, 0, r0, c10, c2, 1

	mcr	p15, 4, r0, c10, c2, 1



	@ Invalidate the stale TLBs from Bootloader

	mcr	p15, 4, r0, c8, c7, 0	@ TLBIALLH

	dsb	ish



	@ Set the HSCTLR to:

	@  - ARM/THUMB exceptions: Kernel config (Thumb-2 kernel)

	@  - Endianness: Kernel config

arch/arm64/kvm/handle_exit.c

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ static int kvm_handle_wfx(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	else

		kvm_vcpu_block(vcpu);



	kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu));



	return 1;

}

arch/arm64/kvm/hyp-init.S

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ __do_hyp_init: 
	msr	mair_el2, x4

	isb



	/* Invalidate the stale TLBs from Bootloader */

	tlbi	alle2

	dsb	sy



	mrs	x4, sctlr_el2

	and	x4, x4, #SCTLR_EL2_EE	// preserve endianness of EL2

	ldr	x5, =SCTLR_EL2_FLAGS

arch/powerpc/kvm/book3s_64_mmu_hv.c

+2 −2
Original line number Diff line number Diff line
@@ -62,10 +62,10 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp) 
	}



	kvm->arch.hpt_cma_alloc = 0;

	page = kvm_alloc_hpt(1 << (order - PAGE_SHIFT));

	page = kvm_alloc_hpt(1ul << (order - PAGE_SHIFT));

	if (page) {

		hpt = (unsigned long)pfn_to_kaddr(page_to_pfn(page));

		memset((void *)hpt, 0, (1 << order));

		memset((void *)hpt, 0, (1ul << order));

		kvm->arch.hpt_cma_alloc = 1;

	}