From nobody Mon Apr 6 09:48:19 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46060ECAAD5 for ; Thu, 8 Sep 2022 23:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230466AbiIHXe4 (ORCPT ); Thu, 8 Sep 2022 19:34:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbiIHXeE (ORCPT ); Thu, 8 Sep 2022 19:34:04 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5E7C10F8ED for ; Thu, 8 Sep 2022 16:31:49 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id v18-20020a17090a899200b00200a2c60f3aso2199679pjn.5 for ; Thu, 08 Sep 2022 16:31:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date; bh=pR1IVVufUDoLTi7sM6oCGasuX8D5bEWKzHsK5TFQcjA=; b=SX1Arlkk9SXL+yXwVHelHtbPesxMkKFSWRgdWNPe60pe4PPF/Ksx+DrYv59q+p822t qdRaYY+1oiHQYa2apG6DXI3edxKcbkRVV5uiZdk5Bf49RmqsP5R3AsSks6vjDVRMpwFh 3nAbt5iAnC3qgauHbLFi5iTpfj+bfOHXiG9KvrfficB8mHmR8/py1j+cwrHjypH99zpi DHAA+kAEjL6wARYr/gYUDnr3rtT5g6RaCCjHVs8Fin8Trw0kJ9IL9qbA0p+ZcbOmib7O e74dOXCziorpnV2ITxi+Qdr1l3brBLOcbvFtTWB5oHN71YWuHV7ICn74Ecd6pPD4BKS4 UJcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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; bh=pR1IVVufUDoLTi7sM6oCGasuX8D5bEWKzHsK5TFQcjA=; b=B6EGgFtxW19dWiBYdwALOcoVYN425Kem2RMdtgRvUIxXN+DkLfqFm26q3I8B/QC3qv EAY9iQcQjvwTZL2GX/+n7zIirpoBMletlalf/Lid+VDIL1UjGSfQzFyzboyUGa+ZwSYK mUIWBnXkR5um5nolDcQPV3pvdJfGgdE0KDBiRjXXB3ID/N5NQSbPKiq7m8Sj8v1996UF SWKui2njUmGk+o4lbFH3DazaVOJG2JGC3eAN81yR95dQ76XF9ZUX/5alRrP2l1okpU50 Oxie6FnpIKyjqpC4SrPXSg2JRQCGOM6FQ2pxID3/CeZSV/WUQ7lw4rPNkB0FtKBFO33o a1AQ== X-Gm-Message-State: ACgBeo2x1A6h8QkpgTMgipZItfCMjVXWef6+0rA1EwZrTTLNvyrZOdWF I9WeIp2ARju2ytEkzgAmpKq3MFbbCSw= X-Google-Smtp-Source: AA6agR4XlUDA4rSv8HuDaVOd7n0uD2AzVoaUOTKU3me7i+UtljPpFWgpXphG8R/kJnJaK8ckDWoeZLVZjJA= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:249:b0:1e0:a8a3:3c6c with SMTP id t9-20020a17090a024900b001e0a8a33c6cmr118903pje.0.1662679908489; Thu, 08 Sep 2022 16:31:48 -0700 (PDT) Reply-To: Sean Christopherson Date: Thu, 8 Sep 2022 23:31:34 +0000 In-Reply-To: <20220908233134.3523339-1-seanjc@google.com> Mime-Version: 1.0 References: <20220908233134.3523339-1-seanjc@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220908233134.3523339-6-seanjc@google.com> Subject: [PATCH 5/5] KVM: selftests: Dedup subtests of fix_hypercall_test From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Andrew Jones , Anup Patel , Atish Patra , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Sean Christopherson , Oliver Upton Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Combine fix_hypercall_test's two subtests into a common routine, the only difference between the two is whether or not disable the quirk. Passing a boolean is a little gross, but using an enum to make it super obvious that the callers are enabling/disabling the quirk seems like overkill. No functional change intended. Signed-off-by: Sean Christopherson Reviewed-by: Oliver Upton --- .../selftests/kvm/x86_64/fix_hypercall_test.c | 45 ++++++------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c b/tool= s/testing/selftests/kvm/x86_64/fix_hypercall_test.c index 5925da3b3648..4bbc4b95136f 100644 --- a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +++ b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c @@ -17,7 +17,7 @@ /* VMCALL and VMMCALL are both 3-byte opcodes. */ #define HYPERCALL_INSN_SIZE 3 =20 -static bool ud_expected; +static bool quirk_disabled; =20 static void guest_ud_handler(struct ex_regs *regs) { @@ -81,7 +81,7 @@ static void guest_main(void) * enabled, verify that the hypercall succeeded and that KVM patched in * the "right" hypercall. */ - if (ud_expected) { + if (quirk_disabled) { GUEST_ASSERT(ret =3D=3D (uint64_t)-EFAULT); =20 /* @@ -101,13 +101,6 @@ static void guest_main(void) GUEST_DONE(); } =20 -static void setup_ud_vector(struct kvm_vcpu *vcpu) -{ - vm_init_descriptor_tables(vcpu->vm); - vcpu_init_descriptor_tables(vcpu); - vm_install_exception_handler(vcpu->vm, UD_VECTOR, guest_ud_handler); -} - static void enter_guest(struct kvm_vcpu *vcpu) { struct kvm_run *run =3D vcpu->run; @@ -128,35 +121,23 @@ static void enter_guest(struct kvm_vcpu *vcpu) } } =20 -static void test_fix_hypercall(void) +static void test_fix_hypercall(bool disable_quirk) { struct kvm_vcpu *vcpu; struct kvm_vm *vm; =20 vm =3D vm_create_with_one_vcpu(&vcpu, guest_main); - setup_ud_vector(vcpu); =20 - ud_expected =3D false; - sync_global_to_guest(vm, ud_expected); + vm_init_descriptor_tables(vcpu->vm); + vcpu_init_descriptor_tables(vcpu); + vm_install_exception_handler(vcpu->vm, UD_VECTOR, guest_ud_handler); =20 - virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); + if (disable_quirk) + vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, + KVM_X86_QUIRK_FIX_HYPERCALL_INSN); =20 - enter_guest(vcpu); -} - -static void test_fix_hypercall_disabled(void) -{ - struct kvm_vcpu *vcpu; - struct kvm_vm *vm; - - vm =3D vm_create_with_one_vcpu(&vcpu, guest_main); - setup_ud_vector(vcpu); - - vm_enable_cap(vm, KVM_CAP_DISABLE_QUIRKS2, - KVM_X86_QUIRK_FIX_HYPERCALL_INSN); - - ud_expected =3D true; - sync_global_to_guest(vm, ud_expected); + quirk_disabled =3D disable_quirk; + sync_global_to_guest(vm, quirk_disabled); =20 virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); =20 @@ -167,6 +148,6 @@ int main(void) { TEST_REQUIRE(kvm_check_cap(KVM_CAP_DISABLE_QUIRKS2) & KVM_X86_QUIRK_FIX_H= YPERCALL_INSN); =20 - test_fix_hypercall(); - test_fix_hypercall_disabled(); + test_fix_hypercall(false); + test_fix_hypercall(true); } --=20 2.37.2.789.g6183377224-goog