Commit e86dc967 authored by Bibo Mao's avatar Bibo Mao Committed by Xianglai Li
Browse files

LoongArch: KVM: Select huge page only if secondary mmu supports it 

mainline inclusion
from mainline-v6.11-rc1
commit 2f56f9ea4dc3892c1265751a1c09038f365107ed
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZJDO


CVE: NA

--------------------------------

Currently page level selection about secondary mmu depends on memory
slot and page level about host mmu. There will be problems if page level
of secondary mmu is zero already. Huge page cannot be selected if there is
normal page mapped in secondary mmu already, since it is not supported to
merge normal pages into huge pages now.

So page level selection should depend on the following three conditions.
 1. Memslot is aligned for huge page and vm is not migrating.
 2. Page level of host mmu is also huge page.
 3. Page level of secondary mmu is suituable for huge page.

Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarXianglai Li <lixianglai@loongson.cn>
parent 3f5dde7e

arch/loongarch/kvm/mmu.c

+13 −3
Original line number Diff line number Diff line
@@ -890,10 +890,20 @@ static int kvm_map_page(struct kvm_vcpu *vcpu, unsigned long gpa, bool write) 


	/* Disable dirty logging on HugePages */

	level = 0;

	if (!fault_supports_huge_mapping(memslot, hva, write)) {

		level = 0;

	} else {

	if (fault_supports_huge_mapping(memslot, hva, write)) {

		/* Check page level about host mmu*/

		level = host_pfn_mapping_level(kvm, gfn, memslot);

		if (level == 1) {

			/*

			 * Check page level about secondary mmu

			 * Disable hugepage if it is normal page on

			 * secondary mmu already

			 */

			ptep = kvm_populate_gpa(kvm, NULL, gpa, 0);

			if (ptep && !kvm_pte_huge(*ptep))

				level = 0;

		}



		if (level == 1) {

			gfn = gfn & ~(PTRS_PER_PTE - 1);

			pfn = pfn & ~(PTRS_PER_PTE - 1);

arch/loongarch/kvm/vcpu.c

+0 −1
Original line number Diff line number Diff line
@@ -1403,7 +1403,6 @@ static int _kvm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 


	/* Control guest page CCA attribute */

	change_csr_gcfg(CSR_GCFG_MATC_MASK, CSR_GCFG_MATC_ROOT);

	kvm_make_request(KVM_REQ_RECORD_STEAL, vcpu);



	/* Restore hardware PMU CSRs */

	kvm_restore_pmu(vcpu);