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().
Unified · Split
| @@ -1043,6 +1043,27 @@ out_slots: · 1042 unmodified lines | |||
| 1043 | return r; | 1043 | return r; |
| 1044 | } | 1044 | } |
| 1045 | 1045 | ||
| 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 | |||
| 1046 | /* | 1067 | /* |
| 1047 | * Allocate some memory and give it an address in the guest physical address | 1068 | * Allocate some memory and give it an address in the guest physical address |
| 1048 | * space. | 1069 | * space. |
| @@ -1092,7 +1113,17 @@ int __kvm_set_memory_region(struct kvm *kvm, · 43 unmodified lines | |||
| 1092 | if (npages > KVM_MEM_MAX_NR_PAGES) | 1113 | if (npages > KVM_MEM_MAX_NR_PAGES) |
| 1093 | return -EINVAL; | 1114 | return -EINVAL; |
| 1094 | 1115 | ||
| 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; | ||
| 1096 | 1127 | ||
| 1097 | new.id = id; | 1128 | new.id = id; |
| 1098 | new.base_gfn = base_gfn; | 1129 | new.base_gfn = base_gfn; |
| @@ -1100,29 +1131,20 @@ int __kvm_set_memory_region(struct kvm *kvm, · 1 unmodified line | |||
| 1100 | new.flags = mem->flags; | 1131 | new.flags = mem->flags; |
| 1101 | new.userspace_addr = mem->userspace_addr; | 1132 | new.userspace_addr = mem->userspace_addr; |
| 1102 | 1133 | ||
| 1103 | if (npages) { | 1134 | if (!old.npages) { |
| 1104 | if (!old.npages) | 1135 | change = KVM_MR_CREATE; |
| 1105 | change = KVM_MR_CREATE; | 1136 | } else { /* Modify an existing slot. */ |
| 1106 | else { /* Modify an existing slot. */ | 1137 | if ((new.userspace_addr != old.userspace_addr) || |
| 1107 | if ((new.userspace_addr != old.userspace_addr) || | 1138 | (npages != old.npages) || |
| 1108 | (npages != old.npages) || | 1139 | ((new.flags ^ old.flags) & KVM_MEM_READONLY)) |
| 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) | ||
| 1121 | return -EINVAL; | 1140 | return -EINVAL; |
| 1122 | 1141 | ||
| 1123 | change = KVM_MR_DELETE; | 1142 | if (base_gfn != old.base_gfn) |
| 1124 | new.base_gfn = 0; | 1143 | change = KVM_MR_MOVE; |
| 1125 | new.flags = 0; | 1144 | else if (new.flags != old.flags) |
| 1145 | change = KVM_MR_FLAGS_ONLY; | ||
| 1146 | else /* Nothing to change. */ | ||
| 1147 | return 0; | ||
| 1126 | } | 1148 | } |
| 1127 | 1149 | ||
| 1128 | if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) { | 1150 | if ((change == KVM_MR_CREATE) || (change == KVM_MR_MOVE)) { |
| @@ -1145,17 +1167,12 @@ int __kvm_set_memory_region(struct kvm *kvm, · 16 unmodified lines | |||
| 1145 | return r; | 1167 | return r; |
| 1146 | } | 1168 | } |
| 1147 | 1169 | ||
| 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 | |||
| 1154 | r = kvm_set_memslot(kvm, mem, &old, &new, as_id, change); | 1170 | r = kvm_set_memslot(kvm, mem, &old, &new, as_id, change); |
| 1155 | if (r) | 1171 | if (r) |
| 1156 | goto out_bitmap; | 1172 | goto out_bitmap; |
| 1157 | 1173 | ||
| 1158 | kvm_free_memslot(kvm, &old, &new); | 1174 | if (old.dirty_bitmap && !new.dirty_bitmap) |
| 1175 | kvm_destroy_dirty_bitmap(&old); | ||
| 1159 | return 0; | 1176 | return 0; |
| 1160 | 1177 | ||
| 1161 | out_bitmap: | 1178 | out_bitmap: |