Skip to content

Commit 414de7a

Browse files
Sean Christophersonbonzini
Sean Christopherson
authored and
bonzini
committed
KVM: Drop kvm_arch_create_memslot()
Remove kvm_arch_create_memslot() now that all arch implementations are effectively nops. Removing kvm_arch_create_memslot() eliminates the possibility for arch specific code to allocate memory prior to setting a memslot, which sets the stage for simplifying kvm_free_memslot(). Cc: Janosch Frank <frankja@linux.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 0dab98b commit 414de7a

File tree

7 files changed

+7
-46
lines changed

7 files changed

+7
-46
lines changed

‎arch/mips/kvm/mips.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,6 @@ long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl,
188188
return -ENOIOCTLCMD;
189189
}
190190

191-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
192-
unsigned long npages)
193-
{
194-
return 0;
195-
}
196-
197191
void kvm_arch_flush_shadow_all(struct kvm *kvm)
198192
{
199193
/* Flush whole GPA */

‎arch/powerpc/kvm/powerpc.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -691,12 +691,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
691691
kvmppc_core_free_memslot(kvm, free, dont);
692692
}
693693

694-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
695-
unsigned long npages)
696-
{
697-
return 0;
698-
}
699-
700694
int kvm_arch_prepare_memory_region(struct kvm *kvm,
701695
struct kvm_memory_slot *memslot,
702696
const struct kvm_userspace_memory_region *mem,

‎arch/s390/kvm/kvm-s390.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4507,12 +4507,6 @@ vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
45074507
return VM_FAULT_SIGBUS;
45084508
}
45094509

4510-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
4511-
unsigned long npages)
4512-
{
4513-
return 0;
4514-
}
4515-
45164510
/* Section: memory related */
45174511
int kvm_arch_prepare_memory_region(struct kvm *kvm,
45184512
struct kvm_memory_slot *memslot,

‎arch/x86/kvm/x86.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9873,12 +9873,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
98739873
kvm_page_track_free_memslot(free, dont);
98749874
}
98759875

9876-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
9877-
unsigned long npages)
9878-
{
9879-
return 0;
9880-
}
9881-
98829876
static int kvm_alloc_memslot_metadata(struct kvm_memory_slot *slot,
98839877
unsigned long npages)
98849878
{

‎include/linux/kvm_host.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,6 @@ int __kvm_set_memory_region(struct kvm *kvm,
671671
const struct kvm_userspace_memory_region *mem);
672672
void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
673673
struct kvm_memory_slot *dont);
674-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
675-
unsigned long npages);
676674
void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen);
677675
int kvm_arch_prepare_memory_region(struct kvm *kvm,
678676
struct kvm_memory_slot *memslot,

‎virt/kvm/arm/mmu.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,12 +2354,6 @@ void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free,
23542354
{
23552355
}
23562356

2357-
int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
2358-
unsigned long npages)
2359-
{
2360-
return 0;
2361-
}
2362-
23632357
void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen)
23642358
{
23652359
}

‎virt/kvm/kvm_main.c

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,12 +1040,13 @@ int __kvm_set_memory_region(struct kvm *kvm,
10401040
new.base_gfn = base_gfn;
10411041
new.npages = npages;
10421042
new.flags = mem->flags;
1043+
new.userspace_addr = mem->userspace_addr;
10431044

10441045
if (npages) {
10451046
if (!old.npages)
10461047
change = KVM_MR_CREATE;
10471048
else { /* Modify an existing slot. */
1048-
if ((mem->userspace_addr != old.userspace_addr) ||
1049+
if ((new.userspace_addr != old.userspace_addr) ||
10491050
(npages != old.npages) ||
10501051
((new.flags ^ old.flags) & KVM_MEM_READONLY))
10511052
goto out;
@@ -1080,22 +1081,14 @@ int __kvm_set_memory_region(struct kvm *kvm,
10801081
}
10811082
}
10821083

1083-
/* Free page dirty bitmap if unneeded */
1084-
if (!(new.flags & KVM_MEM_LOG_DIRTY_PAGES))
1085-
new.dirty_bitmap = NULL;
1086-
10871084
r = -ENOMEM;
1088-
if (change == KVM_MR_CREATE) {
1089-
new.userspace_addr = mem->userspace_addr;
10901085

1091-
if (kvm_arch_create_memslot(kvm, &new, npages))
1092-
goto out;
1093-
}
1094-
1095-
/* Allocate page dirty bitmap if needed */
1096-
if ((new.flags & KVM_MEM_LOG_DIRTY_PAGES) && !new.dirty_bitmap) {
1086+
/* Allocate/free page dirty bitmap as needed */
1087+
if (!(new.flags & KVM_MEM_LOG_DIRTY_PAGES))
1088+
new.dirty_bitmap = NULL;
1089+
else if (!new.dirty_bitmap) {
10971090
if (kvm_create_dirty_bitmap(&new) < 0)
1098-
goto out_free;
1091+
goto out;
10991092
}
11001093

11011094
slots = kvzalloc(sizeof(struct kvm_memslots), GFP_KERNEL_ACCOUNT);

0 commit comments

Comments
 (0)