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

Commit 1d2ebacc authored by Marc Zyngier's avatar Marc Zyngier Committed by Christoffer Dall
Browse files

arm/arm64: KVM: Allow handle_hva_to_gpa to return a value 



So far, handle_hva_to_gpa was never required to return a value.
As we prepare to age pages at Stage-2, we need to be able to
return a value from the iterator (kvm_test_age_hva).

Adapt the code to handle this situation. No semantic change.

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

arch/arm/kvm/mmu.c

+14 −9
Original line number Diff line number Diff line
@@ -1377,15 +1377,16 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) 
	return ret;

}



static void handle_hva_to_gpa(struct kvm *kvm,

static int handle_hva_to_gpa(struct kvm *kvm,

			     unsigned long start,

			     unsigned long end,

			      void (*handler)(struct kvm *kvm,

			     int (*handler)(struct kvm *kvm,

					    gpa_t gpa, void *data),

			     void *data)

{

	struct kvm_memslots *slots;

	struct kvm_memory_slot *memslot;

	int ret = 0;



	slots = kvm_memslots(kvm);
@@ -1409,14 +1410,17 @@ static void handle_hva_to_gpa(struct kvm *kvm, 


		for (; gfn < gfn_end; ++gfn) {

			gpa_t gpa = gfn << PAGE_SHIFT;

			handler(kvm, gpa, data);

			ret |= handler(kvm, gpa, data);

		}

	}



	return ret;

}



static void kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, void *data)

static int kvm_unmap_hva_handler(struct kvm *kvm, gpa_t gpa, void *data)

{

	unmap_stage2_range(kvm, gpa, PAGE_SIZE);

	return 0;

}



int kvm_unmap_hva(struct kvm *kvm, unsigned long hva)
@@ -1442,7 +1446,7 @@ int kvm_unmap_hva_range(struct kvm *kvm, 
	return 0;

}



static void kvm_set_spte_handler(struct kvm *kvm, gpa_t gpa, void *data)

static int kvm_set_spte_handler(struct kvm *kvm, gpa_t gpa, void *data)

{

	pte_t *pte = (pte_t *)data;
@@ -1454,6 +1458,7 @@ static void kvm_set_spte_handler(struct kvm *kvm, gpa_t gpa, void *data) 
	 * through this calling path.

	 */

	stage2_set_pte(kvm, NULL, gpa, pte, 0);

	return 0;

}