History

KVM: Move memslot deletion to helper function

Move memslot deletion into its own routine so that the success path for other memslot updates does not need to use kvm_free_memslot(), i.e. can explicitly destroy the dirty bitmap when necessary. This paves the way for dropping @dont from kvm_free_memslot(), i.e. all callers now pass NULL for @dont. Add a comment above the code to make a copy of the existing memslot prior to deletion, it is not at all obvious that the pointer will become stale during sorting and/or installation of new memslots. Note, kvm_arch_commit_memory_region() allows an architecture to free resources when moving a memslot or changing its flags, e.g. x86 frees its arch specific memslot metadata during commit_memory_region().

Sean Christopherson committed 6 years ago

Commit 5c0b4f31 parent 21198841 file · +46 −29Browse files

Unified · Split

virt/kvm/kvm_main.c+46−29
@@ -1043,6 +1043,27 @@ out_slots: · 1042 unmodified lines
10431043 return r;
10441044 }
10451045
1046+static int kvm_delete_memslot(struct kvm *kvm,
1047+ const struct kvm_userspace_memory_region *mem,
1048+ struct kvm_memory_slot *old, int as_id)
1049+{
1050+ struct kvm_memory_slot new;
1051+ int r;
1052+
1053+ if (!old->npages)
1054+ return -EINVAL;
1055+
1056+ memset(&new, 0, sizeof(new));
1057+ new.id = old->id;
1058+
1059+ r = kvm_set_memslot(kvm, mem, old, &new, as_id, KVM_MR_DELETE);
1060+ if (r)
1061+ return r;
1062+
1063+ kvm_free_memslot(kvm, old, NULL);
1064+ return 0;
1065+}
1066+
10461067 /*
10471068 * Allocate some memory and give it an address in the guest physical address
10481069 * space.
@@ -1092,7 +1113,17 @@ int __kvm_set_memory_region(struct kvm *kvm, · 43 unmodified lines
10921113 if (npages > KVM_MEM_MAX_NR_PAGES)
10931114 return -EINVAL;
10941115
1095− new = old = *slot;
1116+ /*
1117+ * Make a full copy of the old memslot, the pointer will become stale
1118+ * when the memslots are re-sorted by update_memslots(), and the old
1119+ * memslot needs to be referenced after calling update_memslots(), e.g.
1120+ * to free its resources and for arch specific behavior.
1121+ */
1122+ old = *slot;
1123+ if (!mem->memory_size)
1124+ return kvm_delete_memslot(kvm, mem, &old, as_id);
1125+
1126+ new = old;
10961127
10971128 new.id = id;
10981129 new.base_gfn = base_gfn;
@@ -1100,29 +1131,20 @@ int __kvm_set_memory_region(struct kvm *kvm, · 1 unmodified line
11001131 new.flags = mem->flags;
11011132 new.userspace_addr = mem->userspace_addr;
11021133
1103− if (npages) {
1104− if (!old.npages)
1105− change = KVM_MR_CREATE;
1106− else { /* Modify an existing slot. */
1107− if ((new.userspace_addr != old.userspace_addr) ||
1108− (npages != old.npages) ||
1109− ((new.flags ^ old.flags) & KVM_MEM_READONLY))
1110− return -EINVAL;
1111−
1112− if (base_gfn != old.base_gfn)
1113− change = KVM_MR_MOVE;
1114− else if (new.flags != old.flags)
1115− change = KVM_MR_FLAGS_ONLY;
1116− else /* Nothing to change. */
1117− return 0;
1118− }
1119− } else {
1120− if (!old.npages)
1134+ if (!old.npages) {
1135+ change = KVM_MR_CREATE;
1136+ } else { /* Modify an existing slot. */
1137+ if ((new.userspace_addr != old.userspace_addr) ||
1138+ (npages != old.npages) ||
1139+ ((new.flags ^ old.flags) & KVM_MEM_READONLY))
11211140 return -EINVAL;
11221141
1123− change = KVM_MR_DELETE;
1124− new.base_gfn = 0;
1125− new.flags = 0;
1142+ if (base_gfn != old.base_gfn)
1143+ change = KVM_MR_MOVE;
1144+ else if (new.flags != old.flags)
1145+ change = KVM_MR_FLAGS_ONLY;
1146+ else /* Nothing to change. */
1147+ return 0;
11261148 }
11271149
11281150 if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) {
@@ -1145,17 +1167,12 @@ int __kvm_set_memory_region(struct kvm *kvm, · 16 unmodified lines
11451167 return r;
11461168 }
11471169
1148− /* actual memory is freed via old in kvm_free_memslot below */
1149− if (change == KVM_MR_DELETE) {
1150− new.dirty_bitmap = NULL;
1151− memset(&new.arch, 0, sizeof(new.arch));
1152− }
1153−
11541170 r = kvm_set_memslot(kvm, mem, &old, &new, as_id, change);
11551171 if (r)
11561172 goto out_bitmap;
11571173
1158− kvm_free_memslot(kvm, &old, &new);
1174+ if (old.dirty_bitmap && !new.dirty_bitmap)
1175+ kvm_destroy_dirty_bitmap(&old);
11591176 return 0;
11601177
11611178 out_bitmap:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t