Commit bdb4094e authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-arm-for-4.7' of... 

Merge tag 'kvm-arm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/ARM Changes for Linux v4.7

Reworks our stage 2 page table handling to have page table manipulation
macros separate from those of the host systems as the underlying
hardware page tables can be configured to be noticably different in
layout from the stage 1 page tables used by the host.

Adds 16K page size support based on the above.

Adds a generic firmware probing layer for the timer and GIC so that KVM
initializes using the same logic based on both ACPI and FDT.

Finally adds support for hardware updating of the access flag.
parents 6ac0f61f 06485053

arch/arm/include/asm/kvm_mmu.h

+11 −32
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <linux/highmem.h>

#include <asm/cacheflush.h>

#include <asm/pgalloc.h>

#include <asm/stage2_pgtable.h>



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

int create_hyp_io_mappings(void *from, void *to, phys_addr_t);
@@ -105,14 +106,16 @@ static inline void kvm_clean_pte(pte_t *pte) 
	clean_pte_table(pte);

}



static inline void kvm_set_s2pte_writable(pte_t *pte)

static inline pte_t kvm_s2pte_mkwrite(pte_t pte)

{

	pte_val(*pte) |= L_PTE_S2_RDWR;

	pte_val(pte) |= L_PTE_S2_RDWR;

	return pte;

}



static inline void kvm_set_s2pmd_writable(pmd_t *pmd)

static inline pmd_t kvm_s2pmd_mkwrite(pmd_t pmd)

{

	pmd_val(*pmd) |= L_PMD_S2_RDWR;

	pmd_val(pmd) |= L_PMD_S2_RDWR;

	return pmd;

}



static inline void kvm_set_s2pte_readonly(pte_t *pte)
@@ -135,22 +138,6 @@ static inline bool kvm_s2pmd_readonly(pmd_t *pmd) 
	return (pmd_val(*pmd) & L_PMD_S2_RDWR) == L_PMD_S2_RDONLY;

}





/* Open coded p*d_addr_end that can deal with 64bit addresses */

#define kvm_pgd_addr_end(addr, end)					\

({	u64 __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK;		\

	(__boundary - 1 < (end) - 1)? __boundary: (end);		\

})



#define kvm_pud_addr_end(addr,end)		(end)



#define kvm_pmd_addr_end(addr, end)					\

({	u64 __boundary = ((addr) + PMD_SIZE) & PMD_MASK;		\

	(__boundary - 1 < (end) - 1)? __boundary: (end);		\

})



#define kvm_pgd_index(addr)			pgd_index(addr)



static inline bool kvm_page_empty(void *ptr)

{

	struct page *ptr_page = virt_to_page(ptr);
@@ -159,19 +146,11 @@ static inline bool kvm_page_empty(void *ptr) 


#define kvm_pte_table_empty(kvm, ptep) kvm_page_empty(ptep)

#define kvm_pmd_table_empty(kvm, pmdp) kvm_page_empty(pmdp)

#define kvm_pud_table_empty(kvm, pudp) (0)



#define KVM_PREALLOC_LEVEL	0

#define kvm_pud_table_empty(kvm, pudp) false



static inline void *kvm_get_hwpgd(struct kvm *kvm)

{

	return kvm->arch.pgd;

}



static inline unsigned int kvm_get_hwpgd_size(void)

{

	return PTRS_PER_S2_PGD * sizeof(pgd_t);

}

#define hyp_pte_table_empty(ptep) kvm_page_empty(ptep)

#define hyp_pmd_table_empty(pmdp) kvm_page_empty(pmdp)

#define hyp_pud_table_empty(pudp) false



struct kvm;

arch/arm/include/asm/stage2_pgtable.h

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 - ARM Ltd

 *

 * stage2 page table helpers

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __ARM_S2_PGTABLE_H_

#define __ARM_S2_PGTABLE_H_



#define stage2_pgd_none(pgd)			pgd_none(pgd)

#define stage2_pgd_clear(pgd)			pgd_clear(pgd)

#define stage2_pgd_present(pgd)			pgd_present(pgd)

#define stage2_pgd_populate(pgd, pud)		pgd_populate(NULL, pgd, pud)

#define stage2_pud_offset(pgd, address)		pud_offset(pgd, address)

#define stage2_pud_free(pud)			pud_free(NULL, pud)



#define stage2_pud_none(pud)			pud_none(pud)

#define stage2_pud_clear(pud)			pud_clear(pud)

#define stage2_pud_present(pud)			pud_present(pud)

#define stage2_pud_populate(pud, pmd)		pud_populate(NULL, pud, pmd)

#define stage2_pmd_offset(pud, address)		pmd_offset(pud, address)

#define stage2_pmd_free(pmd)			pmd_free(NULL, pmd)



#define stage2_pud_huge(pud)			pud_huge(pud)



/* Open coded p*d_addr_end that can deal with 64bit addresses */

static inline phys_addr_t stage2_pgd_addr_end(phys_addr_t addr, phys_addr_t end)

{

	phys_addr_t boundary = (addr + PGDIR_SIZE) & PGDIR_MASK;



	return (boundary - 1 < end - 1) ? boundary : end;

}



#define stage2_pud_addr_end(addr, end)		(end)



static inline phys_addr_t stage2_pmd_addr_end(phys_addr_t addr, phys_addr_t end)

{

	phys_addr_t boundary = (addr + PMD_SIZE) & PMD_MASK;



	return (boundary - 1 < end - 1) ? boundary : end;

}



#define stage2_pgd_index(addr)				pgd_index(addr)



#define stage2_pte_table_empty(ptep)			kvm_page_empty(ptep)

#define stage2_pmd_table_empty(pmdp)			kvm_page_empty(pmdp)

#define stage2_pud_table_empty(pudp)			false



#endif	/* __ARM_S2_PGTABLE_H_ */

arch/arm/kvm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static void update_vttbr(struct kvm *kvm) 
	kvm_next_vmid &= (1 << kvm_vmid_bits) - 1;



	/* update vttbr to be used with the new vmid */

	pgd_phys = virt_to_phys(kvm_get_hwpgd(kvm));

	pgd_phys = virt_to_phys(kvm->arch.pgd);

	BUG_ON(pgd_phys & ~VTTBR_BADDR_MASK);

	vmid = ((u64)(kvm->arch.vmid) << VTTBR_VMID_SHIFT) & VTTBR_VMID_MASK(kvm_vmid_bits);

	kvm->arch.vttbr = pgd_phys | vmid;

arch/arm/kvm/mmu.c

+221 −187

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/include/asm/kvm_arm.h

+50 −35

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE