Commit c63c50fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Two fixes for bugs introduced this cycle:

   - fix a crash when shutting down a KVM PR guest (our original style
     of KVM which doesn't use hypervisor mode)

   - fix for the recently added 32-bit KASAN_VMALLOC support

  Thanks to: Christophe Leroy, Greg Kurz, Sean Christopherson"

* tag 'powerpc-5.6-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  KVM: PPC: Fix kernel crash with PR KVM
  powerpc/kasan: Fix shadow memory protection with CONFIG_KASAN_VMALLOC
parents 5ad0ec0b 1d0c32ec

arch/powerpc/kvm/book3s_pr.c

+1 −0
Original line number Diff line number Diff line
@@ -1817,6 +1817,7 @@ static void kvmppc_core_vcpu_free_pr(struct kvm_vcpu *vcpu) 
{

	struct kvmppc_vcpu_book3s *vcpu_book3s = to_book3s(vcpu);



	kvmppc_mmu_destroy_pr(vcpu);

	free_page((unsigned long)vcpu->arch.shared & PAGE_MASK);

#ifdef CONFIG_KVM_BOOK3S_32_HANDLER

	kfree(vcpu->arch.shadow_vcpu);

arch/powerpc/kvm/powerpc.c

+0 −2
Original line number Diff line number Diff line
@@ -759,7 +759,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) 
	return 0;



out_vcpu_uninit:

	kvmppc_mmu_destroy(vcpu);

	kvmppc_subarch_vcpu_uninit(vcpu);

	return err;

}
@@ -792,7 +791,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 


	kvmppc_core_vcpu_free(vcpu);



	kvmppc_mmu_destroy(vcpu);

	kvmppc_subarch_vcpu_uninit(vcpu);

}

arch/powerpc/mm/kasan/kasan_init_32.c

+2 −7
Original line number Diff line number Diff line
@@ -120,12 +120,6 @@ static void __init kasan_unmap_early_shadow_vmalloc(void) 
	unsigned long k_cur;

	phys_addr_t pa = __pa(kasan_early_shadow_page);



	if (!early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) {

		int ret = kasan_init_shadow_page_tables(k_start, k_end);



		if (ret)

			panic("kasan: kasan_init_shadow_page_tables() failed");

	}

	for (k_cur = k_start & PAGE_MASK; k_cur < k_end; k_cur += PAGE_SIZE) {

		pmd_t *pmd = pmd_offset(pud_offset(pgd_offset_k(k_cur), k_cur), k_cur);

		pte_t *ptep = pte_offset_kernel(pmd, k_cur);
@@ -143,7 +137,8 @@ void __init kasan_mmu_init(void) 
	int ret;

	struct memblock_region *reg;



	if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE)) {

	if (early_mmu_has_feature(MMU_FTR_HPTE_TABLE) ||

	    IS_ENABLED(CONFIG_KASAN_VMALLOC)) {

		ret = kasan_init_shadow_page_tables(KASAN_SHADOW_START, KASAN_SHADOW_END);



		if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE