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

Commit 26781f9c authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm/arm64: KVM: Kill free_boot_hyp_pgd 



There is no way to free the boot PGD, because it doesn't exist
anymore as a standalone entity.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 12fda812

arch/arm/include/asm/kvm_mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 


int create_hyp_mappings(void *from, void *to, pgprot_t prot);

int create_hyp_io_mappings(void *from, void *to, phys_addr_t);

void free_boot_hyp_pgd(void);

void free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);

arch/arm/kvm/arm.c

+0 −4
Original line number Diff line number Diff line
@@ -1323,10 +1323,6 @@ static int init_hyp_mode(void) 
		}

	}



#ifndef CONFIG_HOTPLUG_CPU

	free_boot_hyp_pgd();

#endif



	/* set size of VMID supported by CPU */

	kvm_vmid_bits = kvm_get_vmid_bits();

	kvm_info("%d-bit VMID\n", kvm_vmid_bits);

arch/arm/kvm/mmu.c

+7 −23
Original line number Diff line number Diff line
@@ -481,27 +481,6 @@ static void unmap_hyp_range(pgd_t *pgdp, phys_addr_t start, u64 size) 
	} while (pgd++, addr = next, addr != end);

}



/**

 * free_boot_hyp_pgd - free HYP boot page tables

 *

 * Free the HYP boot page tables. The bounce page is also freed.

 */

void free_boot_hyp_pgd(void)

{

	mutex_lock(&kvm_hyp_pgd_mutex);



	if (boot_hyp_pgd) {

		unmap_hyp_range(boot_hyp_pgd, hyp_idmap_start, PAGE_SIZE);

		free_pages((unsigned long)boot_hyp_pgd, hyp_pgd_order);

		boot_hyp_pgd = NULL;

	}



	if (hyp_pgd)

		unmap_hyp_range(hyp_pgd, hyp_idmap_start, PAGE_SIZE);



	mutex_unlock(&kvm_hyp_pgd_mutex);

}



/**

 * free_hyp_pgds - free Hyp-mode page tables

 *
@@ -516,11 +495,16 @@ void free_hyp_pgds(void) 
{

	unsigned long addr;



	free_boot_hyp_pgd();



	mutex_lock(&kvm_hyp_pgd_mutex);



	if (boot_hyp_pgd) {

		unmap_hyp_range(boot_hyp_pgd, hyp_idmap_start, PAGE_SIZE);

		free_pages((unsigned long)boot_hyp_pgd, hyp_pgd_order);

		boot_hyp_pgd = NULL;

	}



	if (hyp_pgd) {

		unmap_hyp_range(hyp_pgd, hyp_idmap_start, PAGE_SIZE);

		for (addr = PAGE_OFFSET; virt_addr_valid(addr); addr += PGDIR_SIZE)

			unmap_hyp_range(hyp_pgd, KERN_TO_HYP(addr), PGDIR_SIZE);

		for (addr = VMALLOC_START; is_vmalloc_addr((void*)addr); addr += PGDIR_SIZE)

arch/arm64/include/asm/kvm_mmu.h

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ static inline unsigned long __kern_hyp_va(unsigned long v) 


int create_hyp_mappings(void *from, void *to, pgprot_t prot);

int create_hyp_io_mappings(void *from, void *to, phys_addr_t);

void free_boot_hyp_pgd(void);

void free_hyp_pgds(void);



void stage2_unmap_vm(struct kvm *kvm);