Revert memslot_perf_test's testcase for KVM_X86_QUIRK_SLOT_ZAP_ALL, as the
quirk is being removed, i.e. the KVM side of things is being reverted.
This reverts commit 61de4c34b51c5b9c7ef8229eb246346254638446.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
tools/testing/selftests/kvm/memslot_perf_test.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/tools/testing/selftests/kvm/memslot_perf_test.c b/tools/testing/selftests/kvm/memslot_perf_test.c
index 893366982f77..579a64f97333 100644
--- a/tools/testing/selftests/kvm/memslot_perf_test.c
+++ b/tools/testing/selftests/kvm/memslot_perf_test.c
@@ -113,7 +113,6 @@ static_assert(ATOMIC_BOOL_LOCK_FREE == 2, "atomic bool is not lockless");
static sem_t vcpu_ready;
static bool map_unmap_verify;
-static bool disable_slot_zap_quirk;
static bool verbose;
#define pr_info_v(...) \
@@ -579,9 +578,6 @@ static bool test_memslot_move_prepare(struct vm_data *data,
uint32_t guest_page_size = data->vm->page_size;
uint64_t movesrcgpa, movetestgpa;
- if (disable_slot_zap_quirk)
- vm_enable_cap(data->vm, KVM_CAP_DISABLE_QUIRKS2, KVM_X86_QUIRK_SLOT_ZAP_ALL);
-
movesrcgpa = vm_slot2gpa(data, data->nslots - 1);
if (isactive) {
@@ -900,7 +896,6 @@ static void help(char *name, struct test_args *targs)
pr_info(" -h: print this help screen.\n");
pr_info(" -v: enable verbose mode (not for benchmarking).\n");
pr_info(" -d: enable extra debug checks.\n");
- pr_info(" -q: Disable memslot zap quirk during memslot move.\n");
pr_info(" -s: specify memslot count cap (-1 means no cap; currently: %i)\n",
targs->nslots);
pr_info(" -f: specify the first test to run (currently: %i; max %zu)\n",
@@ -959,7 +954,7 @@ static bool parse_args(int argc, char *argv[],
uint32_t max_mem_slots;
int opt;
- while ((opt = getopt(argc, argv, "hvdqs:f:e:l:r:")) != -1) {
+ while ((opt = getopt(argc, argv, "hvds:f:e:l:r:")) != -1) {
switch (opt) {
case 'h':
default:
@@ -971,11 +966,6 @@ static bool parse_args(int argc, char *argv[],
case 'd':
map_unmap_verify = true;
break;
- case 'q':
- disable_slot_zap_quirk = true;
- TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) &
- KVM_X86_QUIRK_SLOT_ZAP_ALL);
- break;
case 's':
targs->nslots = atoi_paranoid(optarg);
if (targs->nslots <= 1 && targs->nslots != -1) {
--
2.46.1.824.gd892dcdcdd-goog
