Commit f2b8d76d authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge tag 'kvm-ppc-fixes-5.7-1' into topic/ppc-kvm 

This brings in a fix from the kvm-ppc tree that was merged to mainline
after rc2, and so isn't in the base of our topic branch. We'd like it
in the topic branch because it interacts with patches we plan to carry
in this branch.
parents ae83d0b4 ae49deda

arch/powerpc/kvm/book3s_64_mmu_hv.c

+5 −4
Original line number Diff line number Diff line
@@ -604,18 +604,19 @@ int kvmppc_book3s_hv_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu, 
	 */

	local_irq_disable();

	ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);

	pte = __pte(0);

	if (ptep)

		pte = *ptep;

	local_irq_enable();

	/*

	 * If the PTE disappeared temporarily due to a THP

	 * collapse, just return and let the guest try again.

	 */

	if (!ptep) {

		local_irq_enable();

	if (!pte_present(pte)) {

		if (page)

			put_page(page);

		return RESUME_GUEST;

	}

	pte = *ptep;

	local_irq_enable();

	hpa = pte_pfn(pte) << PAGE_SHIFT;

	pte_size = PAGE_SIZE;

	if (shift)

arch/powerpc/kvm/book3s_64_mmu_radix.c

+5 −4
Original line number Diff line number Diff line
@@ -815,18 +815,19 @@ int kvmppc_book3s_instantiate_page(struct kvm_vcpu *vcpu, 
	 */

	local_irq_disable();

	ptep = __find_linux_pte(vcpu->arch.pgdir, hva, NULL, &shift);

	pte = __pte(0);

	if (ptep)

		pte = *ptep;

	local_irq_enable();

	/*

	 * If the PTE disappeared temporarily due to a THP

	 * collapse, just return and let the guest try again.

	 */

	if (!ptep) {

		local_irq_enable();

	if (!pte_present(pte)) {

		if (page)

			put_page(page);

		return RESUME_GUEST;

	}

	pte = *ptep;

	local_irq_enable();



	/* If we're logging dirty pages, always map single pages */

	large_enable = !(memslot->flags & KVM_MEM_LOG_DIRTY_PAGES);

CRA Git | Maintained and supported by SUSTech CRA and CCSE