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

Commit 6ec9776c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Marcelo Tosatti.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86 emulator: use stack size attribute to mask rsp in stack ops
  KVM: MMU: Fix mmu_shrink() so that it can free mmu pages as intended
  ppc: e500_tlb memset clears nothing
  KVM: PPC: Add cache flush on page map
  KVM: PPC: Book3S HV: Fix incorrect branch in H_CEDE code
  KVM: x86: update KVM_SAVE_MSRS_BEGIN to correct value
parents e1d33a5c 5ad105e5

arch/powerpc/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/processor.h>

#include <asm/page.h>

#include <asm/cacheflush.h>



#define KVM_MAX_VCPUS		NR_CPUS

#define KVM_MAX_VCORES		NR_CPUS

arch/powerpc/include/asm/kvm_ppc.h

+12 −0
Original line number Diff line number Diff line
@@ -219,4 +219,16 @@ void kvmppc_claim_lpid(long lpid); 
void kvmppc_free_lpid(long lpid);

void kvmppc_init_lpid(unsigned long nr_lpids);



static inline void kvmppc_mmu_flush_icache(pfn_t pfn)

{

	/* Clear i-cache for new pages */

	struct page *page;

	page = pfn_to_page(pfn);

	if (!test_bit(PG_arch_1, &page->flags)) {

		flush_dcache_icache_page(page);

		set_bit(PG_arch_1, &page->flags);

	}

}





#endif /* __POWERPC_KVM_PPC_H__ */

arch/powerpc/kvm/book3s_32_mmu_host.c

+3 −0
Original line number Diff line number Diff line
@@ -211,6 +211,9 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 
		pteg1 |= PP_RWRX;

	}



	if (orig_pte->may_execute)

		kvmppc_mmu_flush_icache(hpaddr >> PAGE_SHIFT);



	local_irq_disable();



	if (pteg[rr]) {

arch/powerpc/kvm/book3s_64_mmu_host.c

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte) 


	if (!orig_pte->may_execute)

		rflags |= HPTE_R_N;

	else

		kvmppc_mmu_flush_icache(hpaddr >> PAGE_SHIFT);



	hash = hpt_hash(va, PTE_SIZE, MMU_SEGSIZE_256M);

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+7 −5
Original line number Diff line number Diff line
@@ -1421,13 +1421,13 @@ _GLOBAL(kvmppc_h_cede) 
	sync			/* order setting ceded vs. testing prodded */

	lbz	r5,VCPU_PRODDED(r3)

	cmpwi	r5,0

	bne	1f

	bne	kvm_cede_prodded

	li	r0,0		/* set trap to 0 to say hcall is handled */

	stw	r0,VCPU_TRAP(r3)

	li	r0,H_SUCCESS

	std	r0,VCPU_GPR(R3)(r3)

BEGIN_FTR_SECTION

	b	2f		/* just send it up to host on 970 */

	b	kvm_cede_exit	/* just send it up to host on 970 */

END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206)



	/*
@@ -1446,7 +1446,7 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_206) 
	or	r4,r4,r0

	PPC_POPCNTW(R7,R4)

	cmpw	r7,r8

	bge	2f

	bge	kvm_cede_exit

	stwcx.	r4,0,r6

	bne	31b

	li	r0,1
@@ -1555,7 +1555,8 @@ kvm_end_cede: 
	b	hcall_real_fallback



	/* cede when already previously prodded case */

1:	li	r0,0

kvm_cede_prodded:

	li	r0,0

	stb	r0,VCPU_PRODDED(r3)

	sync			/* order testing prodded vs. clearing ceded */

	stb	r0,VCPU_CEDED(r3)
@@ -1563,7 +1564,8 @@ kvm_end_cede: 
	blr



	/* we've ceded but we want to give control to the host */

2:	li	r3,H_TOO_HARD

kvm_cede_exit:

	li	r3,H_TOO_HARD

	blr



secondary_too_late: