Commit 370a17f5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/hyp-header-split into kvmarm-master/next 



* kvm-arm64/hyp-header-split:
  : .
  : Tidy up the header file usage for the nvhe hyp object so
  : that header files under arch/arm64/kvm/hyp/include are not
  : included by host code running at EL1.
  : .
  KVM: arm64: Move host EL1 code out of hyp/ directory
  KVM: arm64: Generate hyp_constants.h for the host
  arm64: Add missing include of asm/cpufeature.h to asm/mmu.h

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 2d761dbf 9429f4b0

arch/arm64/include/asm/kvm_pkvm.h

0 → 100644
+71 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2020 - Google LLC

 * Author: Quentin Perret <qperret@google.com>

 */

#ifndef __ARM64_KVM_PKVM_H__

#define __ARM64_KVM_PKVM_H__



#include <linux/memblock.h>

#include <asm/kvm_pgtable.h>



#define HYP_MEMBLOCK_REGIONS 128



extern struct memblock_region kvm_nvhe_sym(hyp_memory)[];

extern unsigned int kvm_nvhe_sym(hyp_memblock_nr);



static inline unsigned long __hyp_pgtable_max_pages(unsigned long nr_pages)

{

	unsigned long total = 0, i;



	/* Provision the worst case scenario */

	for (i = 0; i < KVM_PGTABLE_MAX_LEVELS; i++) {

		nr_pages = DIV_ROUND_UP(nr_pages, PTRS_PER_PTE);

		total += nr_pages;

	}



	return total;

}



static inline unsigned long __hyp_pgtable_total_pages(void)

{

	unsigned long res = 0, i;



	/* Cover all of memory with page-granularity */

	for (i = 0; i < kvm_nvhe_sym(hyp_memblock_nr); i++) {

		struct memblock_region *reg = &kvm_nvhe_sym(hyp_memory)[i];

		res += __hyp_pgtable_max_pages(reg->size >> PAGE_SHIFT);

	}



	return res;

}



static inline unsigned long hyp_s1_pgtable_pages(void)

{

	unsigned long res;



	res = __hyp_pgtable_total_pages();



	/* Allow 1 GiB for private mappings */

	res += __hyp_pgtable_max_pages(SZ_1G >> PAGE_SHIFT);



	return res;

}



static inline unsigned long host_s2_pgtable_pages(void)

{

	unsigned long res;



	/*

	 * Include an extra 16 pages to safely upper-bound the worst case of

	 * concatenated pgds.

	 */

	res = __hyp_pgtable_total_pages() + 16;



	/* Allow 1 GiB for MMIO mappings */

	res += __hyp_pgtable_max_pages(SZ_1G >> PAGE_SHIFT);



	return res;

}



#endif	/* __ARM64_KVM_PKVM_H__ */

arch/arm64/include/asm/mmu.h

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#ifndef __ASSEMBLY__



#include <linux/refcount.h>

#include <asm/cpufeature.h>



typedef struct {

	atomic64_t	id;

arch/arm64/kvm/.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

hyp_constants.h

arch/arm64/kvm/Makefile

+17 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \ 
	 arm.o mmu.o mmio.o psci.o perf.o hypercalls.o pvtime.o \

	 inject_fault.o va_layout.o handle_exit.o \

	 guest.o debug.o reset.o sys_regs.o \

	 vgic-sys-reg-v3.o fpsimd.o pmu.o \

	 vgic-sys-reg-v3.o fpsimd.o pmu.o pkvm.o \

	 arch_timer.o trng.o\

	 vgic/vgic.o vgic/vgic-init.o \

	 vgic/vgic-irqfd.o vgic/vgic-v2.o \
@@ -25,3 +25,19 @@ kvm-y := $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o \ 
	 vgic/vgic-its.o vgic/vgic-debug.o



kvm-$(CONFIG_HW_PERF_EVENTS)  += pmu-emul.o



always-y := hyp_constants.h hyp-constants.s



define rule_gen_hyp_constants

	$(call filechk,offsets,__HYP_CONSTANTS_H__)

endef



CFLAGS_hyp-constants.o = -I $(srctree)/$(src)/hyp/include

$(obj)/hyp-constants.s: $(src)/hyp/hyp-constants.c FORCE

	$(call if_changed_dep,cc_s_c)



$(obj)/hyp_constants.h: $(obj)/hyp-constants.s FORCE

	$(call if_changed_rule,gen_hyp_constants)



obj-kvm := $(addprefix $(obj)/, $(kvm-y))

$(obj-kvm): $(obj)/hyp_constants.h

arch/arm64/kvm/hyp/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ subdir-ccflags-y := -I$(incdir) \ 
		    -DDISABLE_BRANCH_PROFILING		\

		    $(DISABLE_STACKLEAK_PLUGIN)



obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o reserved_mem.o
 
obj-$(CONFIG_KVM) += vhe/ nvhe/ pgtable.o