Skip to contentSkip to conversation

Patch "ARM: KVM: Unmap IPA on memslot delete/move" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Jun 27, 2015

Subsystems (2)
Stable branch Arm (32-bit)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: KVM: Unmap IPA on memslot delete/move

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-kvm-unmap-ipa-on-memslot-delete-move.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From df6ce24f2ee485c4f9a5cb610063a5eb60da8267 Mon Sep 17 00:00:00 2001

From: Eric Auger <[email protected]>
Date: Fri, 6 Jun 2014 11:10:23 +0200
Subject: ARM: KVM: Unmap IPA on memslot delete/move

From: Eric Auger <[email protected]>

commit df6ce24f2ee485c4f9a5cb610063a5eb60da8267 upstream.

Currently when a KVM region is deleted or moved after KVM_SET_USER_MEMORY_REGION ioctl, the corresponding intermediate physical memory is not unmapped.

This patch corrects this and unmaps the region's IPA range in kvm_arch_commit_memory_region using unmap_stage2_range.

Signed-off-by Eric Auger <[email protected]>
Signed-off-by Christoffer Dall <[email protected]>
Signed-off-by Shannon Zhao <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/arm/kvm/arm.c |   37 -------------------------------------
 arch/arm/kvm/mmu.c |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 37 deletions(-)
arch/arm/kvm/arm.c +0 -37
@@ -155,16 +155,6 @@ int kvm_arch_vcpu_fault(struct kvm_vcpu
 	return VM_FAULT_SIGBUS;
 }
 
-void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
-			   struct kvm_memory_slot *dont)
-{
-}
-
-int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
-			    unsigned long npages)
-{
-	return 0;
-}
 
 /**
  * kvm_arch_destroy_vm - destroy the VM data structure

@@ -224,33 +214,6 @@ long kvm_arch_dev_ioctl(struct file *fil
 	return -EINVAL;
 }
 
-void kvm_arch_memslots_updated(struct kvm *kvm)
-{
-}
-
-int kvm_arch_prepare_memory_region(struct kvm *kvm,
-				   struct kvm_memory_slot *memslot,
-				   struct kvm_userspace_memory_region *mem,
-				   enum kvm_mr_change change)
-{
-	return 0;
-}
-
-void kvm_arch_commit_memory_region(struct kvm *kvm,
-				   struct kvm_userspace_memory_region *mem,
-				   const struct kvm_memory_slot *old,
-				   enum kvm_mr_change change)
-{
-}
-
-void kvm_arch_flush_shadow_all(struct kvm *kvm)
-{
-}
-
-void kvm_arch_flush_shadow_memslot(struct kvm *kvm,
-				   struct kvm_memory_slot *slot)
-{
-}
 
 struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
 {
arch/arm/kvm/mmu.c +46 -0

49 lines not on this page · raw message

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/arm-kvm-unmap-ipa-on-memslot-delete-move.patch