Skip to content

Commit

Permalink
KVM: selftests: Rename perf_test_util.[ch] to memstress.[ch]
Browse files Browse the repository at this point in the history
Rename the perf_test_util.[ch] files to memstress.[ch]. Symbols are
renamed in the following commit to reduce the amount of churn here in
hopes of playiing nice with git's file rename detection.

The name "memstress" was chosen to better describe the functionality
proveded by this library, which is to create and run a VM that
reads/writes to guest memory on all vCPUs in parallel.

"memstress" also contains the same number of chracters as "perf_test",
making it a drop-in replacement in symbols, e.g. function names, without
impacting line lengths. Also the lack of underscore between "mem" and
"stress" makes it clear "memstress" is a noun.

Signed-off-by: David Matlack <dmatlack@google.com>
Reviewed-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20221012165729.3505266-2-dmatlack@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
  • Loading branch information
David Matlack authored and Sean Christopherson committed Nov 16, 2022
1 parent c967a47 commit 9fda675
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions tools/testing/selftests/kvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ LIBKVM += lib/elf.c
LIBKVM += lib/guest_modes.c
LIBKVM += lib/io.c
LIBKVM += lib/kvm_util.c
LIBKVM += lib/perf_test_util.c
LIBKVM += lib/memstress.c
LIBKVM += lib/rbtree.c
LIBKVM += lib/sparsebit.c
LIBKVM += lib/test_util.c
Expand All @@ -52,7 +52,7 @@ LIBKVM_STRING += lib/string_override.c

LIBKVM_x86_64 += lib/x86_64/apic.c
LIBKVM_x86_64 += lib/x86_64/handlers.S
LIBKVM_x86_64 += lib/x86_64/perf_test_util.c
LIBKVM_x86_64 += lib/x86_64/memstress.c
LIBKVM_x86_64 += lib/x86_64/processor.c
LIBKVM_x86_64 += lib/x86_64/svm.c
LIBKVM_x86_64 += lib/x86_64/ucall.c
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/kvm/access_tracking_perf_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

#include "kvm_util.h"
#include "test_util.h"
#include "perf_test_util.h"
#include "memstress.h"
#include "guest_modes.h"

/* Global variable used to synchronize all of the vCPU threads. */
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/kvm/demand_paging_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "kvm_util.h"
#include "test_util.h"
#include "perf_test_util.h"
#include "memstress.h"
#include "guest_modes.h"

#ifdef __NR_userfaultfd
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/kvm/dirty_log_perf_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "kvm_util.h"
#include "test_util.h"
#include "perf_test_util.h"
#include "memstress.h"
#include "guest_modes.h"

#ifdef __aarch64__
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// SPDX-License-Identifier: GPL-2.0
/*
* tools/testing/selftests/kvm/include/perf_test_util.h
* tools/testing/selftests/kvm/include/memstress.h
*
* Copyright (C) 2020, Google LLC.
*/

#ifndef SELFTEST_KVM_PERF_TEST_UTIL_H
#define SELFTEST_KVM_PERF_TEST_UTIL_H
#ifndef SELFTEST_KVM_MEMSTRESS_H
#define SELFTEST_KVM_MEMSTRESS_H

#include <pthread.h>

Expand Down Expand Up @@ -69,4 +69,4 @@ void perf_test_guest_code(uint32_t vcpu_id);
uint64_t perf_test_nested_pages(int nr_vcpus);
void perf_test_setup_nested(struct kvm_vm *vm, int nr_vcpus, struct kvm_vcpu *vcpus[]);

#endif /* SELFTEST_KVM_PERF_TEST_UTIL_H */
#endif /* SELFTEST_KVM_MEMSTRESS_H */
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <inttypes.h>

#include "kvm_util.h"
#include "perf_test_util.h"
#include "memstress.h"
#include "processor.h"

struct perf_test_args perf_test_args;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* x86_64-specific extensions to perf_test_util.c.
* x86_64-specific extensions to memstress.c.
*
* Copyright (C) 2022, Google, Inc.
*/
Expand All @@ -11,7 +11,7 @@

#include "test_util.h"
#include "kvm_util.h"
#include "perf_test_util.h"
#include "memstress.h"
#include "processor.h"
#include "vmx.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <linux/bitops.h>
#include <linux/userfaultfd.h>

#include "perf_test_util.h"
#include "memstress.h"
#include "processor.h"
#include "test_util.h"
#include "guest_modes.h"
Expand Down Expand Up @@ -72,7 +72,7 @@ static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay,
int i;

/*
* Add the dummy memslot just below the perf_test_util memslot, which is
* Add the dummy memslot just below the memstress memslot, which is
* at the top of the guest physical address space.
*/
gpa = perf_test_args.gpa - pages * vm->page_size;
Expand Down

0 comments on commit 9fda675

Please sign in to comment.