Skip to content

Commit de10b79

Browse files
Ben Gardonsean-jc
Ben Gardon
authored and
sean-jc
committed
KVM: selftests: Move dirty logging functions to memstress.(c|h)
Move some helper functions from dirty_log_perf_test.c to the memstress library so that they can be used in a future commit which tests page splitting during dirty logging. Reviewed-by: Vipin Sharma <vipinsh@google.com> Signed-off-by: Ben Gardon <bgardon@google.com> Link: https://lore.kernel.org/r/20230131181820.179033-2-bgardon@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 07b4b2f commit de10b79

3 files changed

Lines changed: 87 additions & 77 deletions

File tree

‎tools/testing/selftests/kvm/dirty_log_perf_test.c‎

Lines changed: 7 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -136,77 +136,6 @@ struct test_params {
136136
bool random_access;
137137
};
138138

139-
static void toggle_dirty_logging(struct kvm_vm *vm, int slots, bool enable)
140-
{
141-
int i;
142-
143-
for (i = 0; i < slots; i++) {
144-
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
145-
int flags = enable ? KVM_MEM_LOG_DIRTY_PAGES : 0;
146-
147-
vm_mem_region_set_flags(vm, slot, flags);
148-
}
149-
}
150-
151-
static inline void enable_dirty_logging(struct kvm_vm *vm, int slots)
152-
{
153-
toggle_dirty_logging(vm, slots, true);
154-
}
155-
156-
static inline void disable_dirty_logging(struct kvm_vm *vm, int slots)
157-
{
158-
toggle_dirty_logging(vm, slots, false);
159-
}
160-
161-
static void get_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[], int slots)
162-
{
163-
int i;
164-
165-
for (i = 0; i < slots; i++) {
166-
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
167-
168-
kvm_vm_get_dirty_log(vm, slot, bitmaps[i]);
169-
}
170-
}
171-
172-
static void clear_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[],
173-
int slots, uint64_t pages_per_slot)
174-
{
175-
int i;
176-
177-
for (i = 0; i < slots; i++) {
178-
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
179-
180-
kvm_vm_clear_dirty_log(vm, slot, bitmaps[i], 0, pages_per_slot);
181-
}
182-
}
183-
184-
static unsigned long **alloc_bitmaps(int slots, uint64_t pages_per_slot)
185-
{
186-
unsigned long **bitmaps;
187-
int i;
188-
189-
bitmaps = malloc(slots * sizeof(bitmaps[0]));
190-
TEST_ASSERT(bitmaps, "Failed to allocate bitmaps array.");
191-
192-
for (i = 0; i < slots; i++) {
193-
bitmaps[i] = bitmap_zalloc(pages_per_slot);
194-
TEST_ASSERT(bitmaps[i], "Failed to allocate slot bitmap.");
195-
}
196-
197-
return bitmaps;
198-
}
199-
200-
static void free_bitmaps(unsigned long *bitmaps[], int slots)
201-
{
202-
int i;
203-
204-
for (i = 0; i < slots; i++)
205-
free(bitmaps[i]);
206-
207-
free(bitmaps);
208-
}
209-
210139
static void run_test(enum vm_guest_mode mode, void *arg)
211140
{
212141
struct test_params *p = arg;
@@ -236,7 +165,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
236165
host_num_pages = vm_num_host_pages(mode, guest_num_pages);
237166
pages_per_slot = host_num_pages / p->slots;
238167

239-
bitmaps = alloc_bitmaps(p->slots, pages_per_slot);
168+
bitmaps = memstress_alloc_bitmaps(p->slots, pages_per_slot);
240169

241170
if (dirty_log_manual_caps)
242171
vm_enable_cap(vm, KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2,
@@ -277,7 +206,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
277206

278207
/* Enable dirty logging */
279208
clock_gettime(CLOCK_MONOTONIC, &start);
280-
enable_dirty_logging(vm, p->slots);
209+
memstress_enable_dirty_logging(vm, p->slots);
281210
ts_diff = timespec_elapsed(start);
282211
pr_info("Enabling dirty logging time: %ld.%.9lds\n\n",
283212
ts_diff.tv_sec, ts_diff.tv_nsec);
@@ -306,7 +235,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
306235
iteration, ts_diff.tv_sec, ts_diff.tv_nsec);
307236

308237
clock_gettime(CLOCK_MONOTONIC, &start);
309-
get_dirty_log(vm, bitmaps, p->slots);
238+
memstress_get_dirty_log(vm, bitmaps, p->slots);
310239
ts_diff = timespec_elapsed(start);
311240
get_dirty_log_total = timespec_add(get_dirty_log_total,
312241
ts_diff);
@@ -315,7 +244,8 @@ static void run_test(enum vm_guest_mode mode, void *arg)
315244

316245
if (dirty_log_manual_caps) {
317246
clock_gettime(CLOCK_MONOTONIC, &start);
318-
clear_dirty_log(vm, bitmaps, p->slots, pages_per_slot);
247+
memstress_clear_dirty_log(vm, bitmaps, p->slots,
248+
pages_per_slot);
319249
ts_diff = timespec_elapsed(start);
320250
clear_dirty_log_total = timespec_add(clear_dirty_log_total,
321251
ts_diff);
@@ -334,7 +264,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
334264

335265
/* Disable dirty logging */
336266
clock_gettime(CLOCK_MONOTONIC, &start);
337-
disable_dirty_logging(vm, p->slots);
267+
memstress_disable_dirty_logging(vm, p->slots);
338268
ts_diff = timespec_elapsed(start);
339269
pr_info("Disabling dirty logging time: %ld.%.9lds\n",
340270
ts_diff.tv_sec, ts_diff.tv_nsec);
@@ -359,7 +289,7 @@ static void run_test(enum vm_guest_mode mode, void *arg)
359289
clear_dirty_log_total.tv_nsec, avg.tv_sec, avg.tv_nsec);
360290
}
361291

362-
free_bitmaps(bitmaps, p->slots);
292+
memstress_free_bitmaps(bitmaps, p->slots);
363293
arch_cleanup_vm(vm);
364294
memstress_destroy_vm(vm);
365295
}

‎tools/testing/selftests/kvm/include/memstress.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,12 @@ void memstress_guest_code(uint32_t vcpu_id);
7272
uint64_t memstress_nested_pages(int nr_vcpus);
7373
void memstress_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vcpu *vcpus[]);
7474

75+
void memstress_enable_dirty_logging(struct kvm_vm *vm, int slots);
76+
void memstress_disable_dirty_logging(struct kvm_vm *vm, int slots);
77+
void memstress_get_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[], int slots);
78+
void memstress_clear_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[],
79+
int slots, uint64_t pages_per_slot);
80+
unsigned long **memstress_alloc_bitmaps(int slots, uint64_t pages_per_slot);
81+
void memstress_free_bitmaps(unsigned long *bitmaps[], int slots);
82+
7583
#endif /* SELFTEST_KVM_MEMSTRESS_H */

‎tools/testing/selftests/kvm/lib/memstress.c‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#define _GNU_SOURCE
66

77
#include <inttypes.h>
8+
#include <linux/bitmap.h>
89

910
#include "kvm_util.h"
1011
#include "memstress.h"
@@ -323,3 +324,74 @@ void memstress_join_vcpu_threads(int nr_vcpus)
323324
for (i = 0; i < nr_vcpus; i++)
324325
pthread_join(vcpu_threads[i].thread, NULL);
325326
}
327+
328+
static void toggle_dirty_logging(struct kvm_vm *vm, int slots, bool enable)
329+
{
330+
int i;
331+
332+
for (i = 0; i < slots; i++) {
333+
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
334+
int flags = enable ? KVM_MEM_LOG_DIRTY_PAGES : 0;
335+
336+
vm_mem_region_set_flags(vm, slot, flags);
337+
}
338+
}
339+
340+
void memstress_enable_dirty_logging(struct kvm_vm *vm, int slots)
341+
{
342+
toggle_dirty_logging(vm, slots, true);
343+
}
344+
345+
void memstress_disable_dirty_logging(struct kvm_vm *vm, int slots)
346+
{
347+
toggle_dirty_logging(vm, slots, false);
348+
}
349+
350+
void memstress_get_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[], int slots)
351+
{
352+
int i;
353+
354+
for (i = 0; i < slots; i++) {
355+
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
356+
357+
kvm_vm_get_dirty_log(vm, slot, bitmaps[i]);
358+
}
359+
}
360+
361+
void memstress_clear_dirty_log(struct kvm_vm *vm, unsigned long *bitmaps[],
362+
int slots, uint64_t pages_per_slot)
363+
{
364+
int i;
365+
366+
for (i = 0; i < slots; i++) {
367+
int slot = MEMSTRESS_MEM_SLOT_INDEX + i;
368+
369+
kvm_vm_clear_dirty_log(vm, slot, bitmaps[i], 0, pages_per_slot);
370+
}
371+
}
372+
373+
unsigned long **memstress_alloc_bitmaps(int slots, uint64_t pages_per_slot)
374+
{
375+
unsigned long **bitmaps;
376+
int i;
377+
378+
bitmaps = malloc(slots * sizeof(bitmaps[0]));
379+
TEST_ASSERT(bitmaps, "Failed to allocate bitmaps array.");
380+
381+
for (i = 0; i < slots; i++) {
382+
bitmaps[i] = bitmap_zalloc(pages_per_slot);
383+
TEST_ASSERT(bitmaps[i], "Failed to allocate slot bitmap.");
384+
}
385+
386+
return bitmaps;
387+
}
388+
389+
void memstress_free_bitmaps(unsigned long *bitmaps[], int slots)
390+
{
391+
int i;
392+
393+
for (i = 0; i < slots; i++)
394+
free(bitmaps[i]);
395+
396+
free(bitmaps);
397+
}

0 commit comments

Comments
 (0)