From patchwork Fri Sep 27 00:16:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 13813783 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 865B663A9 for ; Fri, 27 Sep 2024 00:16:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727396201; cv=none; b=cLsof6bJj9DvTPmwbY3Lw4MzMgroZOJtbbg5PoXvHDc1FuDa3967AwU85LinK7OaxWs2493p50XreVSii5eKZfkqHAMrkbhcO/B0pbRMI1wiz2800uof7KQRZXe6qmCDw6NYzZ+q1vNhprYmzouUt8t/gN6ZNUrpwFRcdnO7/SA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727396201; c=relaxed/simple; bh=KHhB1JvodiEZlYG0K/aIr41oOeymhmWOlg3SNBHxxp4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OuCyFJriAetaIClyEvRePUyiyPh05wrASYuV/l1JoKbzY5jG590ILiiJRPmRNbMttTnNo0dkwvgGfHVdOpMmV9fmr5skRX7dyKdyCiCTHTQDrK+Rhw7S3TrcgBXHGOeQC6yT5r/AQ7g7Q3NNAKKB4XkCjG321ftInU5rF9elXLg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ho0FAqYC; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ho0FAqYC" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2070e327014so13149055ad.1 for ; Thu, 26 Sep 2024 17:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1727396200; x=1728001000; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=qCS+Ka3w15waaZmhKt3WbYhaBaIYN1wdPlmBW/+h3qE=; b=ho0FAqYCRu5llEQ1wYBU1WkdA0anXl/Btv0JjNzpR2yaY04S37qBr0K5yGG0a6PrH5 knUOLqTT3V9OiBV62eYlN6okYiEaJEqtYy3rskCSf2qg2zjxCNaOWfBMzh1+7LXdHWaY XM9nlGHjs8w5QgE17pwCLrWP5Qrxl5+sxgqLM/ujoHL4krTwyMp9rkhQVq1ex/Hja/H/ MGYFk7R/PdkOO9O2DdGxUkmn2wdaSqpQjSWJ5CggsByiLDr9nGe1F3lALWZAMT8llGa9 8a4hr9ypLktnDaojeTBIlBY8Dcr2e1Vcq3PzUOcLsdn6KkZngoeAWjvxQ+aKPmxnuNKU VLbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727396200; x=1728001000; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qCS+Ka3w15waaZmhKt3WbYhaBaIYN1wdPlmBW/+h3qE=; b=vLqj3gk6JVsmLrV0YWIIc9k50EIuwYDM1ZSDDygvlA89U5VTh1/LPq7wU1sg6YubjL gdD/nboKLYxR1ThB9A9sMgu33/1i7vsmcxddPiVIOVVXv/0hdfcZMOhUOKXaEa833MR5 BNIXeGsRRFjRBXpljgUICvT5FLPWDsGQwpWADsEHQhz9oj4eYuawBuUfY6PIPc0I6n8S XDQa3jjdzwBsINTHTK9HrpN1GuMhLkXQoOjRf1BpJlT+QM7foNsM1e/2mjlOv9ppnR+h i6T697f61araA8ryPMLs1ey6QkOxaDHqKT2ZlYPUqARYVQL7Qpf39hPgNuIBNl2Qs7jl nYEA== X-Gm-Message-State: AOJu0YwdnUqRl9xmiGr/n8nSnv941McwM1BQzSZsu25Tc3323qWwsflF J8d4LR7wXoONwE+6N4vPI+u0yjSnZQD+9dWxRyNX110Sxc3yq31rG4VzibttCYOPweWZnt6Rw7+ MGw== X-Google-Smtp-Source: AGHT+IHGZHd87jRSKB1vMMfqB2NkUEzbiC7nAZzkcFWnI6OrmacXeP3BVJ5c97nGJzj2dRpAEXFGoCIYE78= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:902:e891:b0:205:6e76:e1b1 with SMTP id d9443c01a7336-20b37b73820mr247965ad.4.1727396199576; Thu, 26 Sep 2024 17:16:39 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 26 Sep 2024 17:16:32 -0700 In-Reply-To: <20240927001635.501418-1-seanjc@google.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240927001635.501418-1-seanjc@google.com> X-Mailer: git-send-email 2.46.1.824.gd892dcdcdd-goog Message-ID: <20240927001635.501418-2-seanjc@google.com> Subject: [PATCH 1/4] Revert "KVM: selftests: Test memslot move in memslot_perf_test with quirk disabled" From: Sean Christopherson To: Paolo Bonzini , Sean Christopherson Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Kai Huang , Rick Edgecombe , Yan Zhao 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 --- 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) {