From patchwork Wed May 4 22:48:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12838840 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 48D29C433FE for ; Wed, 4 May 2022 22:56:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356428AbiEDW6y (ORCPT ); Wed, 4 May 2022 18:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379756AbiEDW6X (ORCPT ); Wed, 4 May 2022 18:58:23 -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 AF51B554A5 for ; Wed, 4 May 2022 15:52:07 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id d64-20020a17090a6f4600b001da3937032fso3566023pjk.5 for ; Wed, 04 May 2022 15:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=VZbSQxn2Y662dXnhVG6459Fi3EyZ+qYww5u80HyOjBM=; b=dp+Wp6i8czCgkdFPl78kNqUGdemM1A6AJjQsjR+yeelmf48ZFVj3+vTb6SbjJ5LRjl it4+ASF0h0xjNqMFcZcXr8Mh3Z8g5rMgxZZd9gHzN122qwUb2o55AeCewHDAAanjDeZI F6J7knN7SoocwGlZ4obZ7jfRrmWxxP3SvqkkLYpUWDINZY+dN7QwPntxxcvx6E0fChgU zKlUVK8nIuf2mJAUP4jULBbQEcuZQwbempVhXvVMUITNxy5RayC0bNXPWD001VCoj7Tx aOsnYEPqz31YuIkt5nIlmACbHNJHiVw98WK3vnz+//UlMUlFxdOkKa8Vi5TnK4EOVaKz Vtpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=VZbSQxn2Y662dXnhVG6459Fi3EyZ+qYww5u80HyOjBM=; b=reKmNA4+ksWjIOKTk8M9fo0oDpxPVV+ZjhD7TeXfx+2H/AfVDgjvCHpA1uqmpZU5Dm KemPy8p9qsx06qeFAvG2Y6I1IkURpeD/NDMktZ6J06j+EtXAsvioev8pZ6iP/pKclSe1 fFfsxwh7gKOv4YbDbZ8d9zJm/bHGOiRGrVEhrjixFG1oZ5FNPdjnQr5o00sFMYgwZaVP 8phND4G0YVExxmiopIoNknneG583u9ZI3iwRacWP8Lm9d63TYnUqUglrA/+ziYjxxcbP Oo2j3TbJGDs4pDDMjdGUXkASKhhS29Incl8+SBlsY+ZAM1NEBWJlx5T8TIFdaQwdCDVK iBIQ== X-Gm-Message-State: AOAM533Riwd85LSNcGyKpV2XMx1iWFVKjJZhct6a3QYvATCUCnVZ4SY4 q7GlptehLLx82yHFHFOKokOozew8i+s= X-Google-Smtp-Source: ABdhPJwCheLbiybAQZnIcuCqxToD3V+umI6qVXqe139wtjr3RzT9xI7BSNbtBVEFh0yKA0GtMdmNGL8OVgc= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:902:ce02:b0:151:a86d:dc2b with SMTP id k2-20020a170902ce0200b00151a86ddc2bmr24295737plg.57.1651704722582; Wed, 04 May 2022 15:52:02 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 4 May 2022 22:48:34 +0000 In-Reply-To: <20220504224914.1654036-1-seanjc@google.com> Message-Id: <20220504224914.1654036-89-seanjc@google.com> Mime-Version: 1.0 References: <20220504224914.1654036-1-seanjc@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH 088/128] KVM: selftests: Convert fix_hypercall_test away from VCPU_ID From: Sean Christopherson To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Vitaly Kuznetsov , Andrew Jones , David Matlack , Ben Gardon , Oliver Upton , Sean Christopherson Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Convert fix_hypercall_test to use vm_create_with_one_vcpu() and pass around a 'struct kvm_vcpu' object instead of using a global VCPU_ID. Signed-off-by: Sean Christopherson --- .../selftests/kvm/x86_64/fix_hypercall_test.c | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c index 1f5c32146f3d..565c4ab8dbb7 100644 --- a/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c +++ b/tools/testing/selftests/kvm/x86_64/fix_hypercall_test.c @@ -14,8 +14,6 @@ #include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 - static bool ud_expected; static void guest_ud_handler(struct ex_regs *regs) @@ -94,22 +92,20 @@ static void guest_main(void) GUEST_DONE(); } -static void setup_ud_vector(struct kvm_vm *vm) +static void setup_ud_vector(struct kvm_vcpu *vcpu) { - vm_init_descriptor_tables(vm); - vcpu_init_descriptor_tables(vm, VCPU_ID); - vm_install_exception_handler(vm, UD_VECTOR, guest_ud_handler); + vm_init_descriptor_tables(vcpu->vm); + vcpu_init_descriptor_tables(vcpu->vm, vcpu->id); + vm_install_exception_handler(vcpu->vm, UD_VECTOR, guest_ud_handler); } -static void enter_guest(struct kvm_vm *vm) +static void enter_guest(struct kvm_vcpu *vcpu) { - struct kvm_run *run; + struct kvm_run *run = vcpu->run; struct ucall uc; - run = vcpu_state(vm, VCPU_ID); - - vcpu_run(vm, VCPU_ID); - switch (get_ucall(vm, VCPU_ID, &uc)) { + vcpu_run(vcpu->vm, vcpu->id); + switch (get_ucall(vcpu->vm, vcpu->id, &uc)) { case UCALL_SYNC: pr_info("%s: %016lx\n", (const char *)uc.args[2], uc.args[3]); break; @@ -125,26 +121,28 @@ static void enter_guest(struct kvm_vm *vm) static void test_fix_hypercall(void) { + struct kvm_vcpu *vcpu; struct kvm_vm *vm; - vm = vm_create_default(VCPU_ID, 0, guest_main); - setup_ud_vector(vm); + vm = vm_create_with_one_vcpu(&vcpu, guest_main); + setup_ud_vector(vcpu); ud_expected = false; sync_global_to_guest(vm, ud_expected); virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); - enter_guest(vm); + enter_guest(vcpu); } static void test_fix_hypercall_disabled(void) { struct kvm_enable_cap cap = {0}; + struct kvm_vcpu *vcpu; struct kvm_vm *vm; - vm = vm_create_default(VCPU_ID, 0, guest_main); - setup_ud_vector(vm); + vm = vm_create_with_one_vcpu(&vcpu, guest_main); + setup_ud_vector(vcpu); cap.cap = KVM_CAP_DISABLE_QUIRKS2; cap.args[0] = KVM_X86_QUIRK_FIX_HYPERCALL_INSN; @@ -155,7 +153,7 @@ static void test_fix_hypercall_disabled(void) virt_pg_map(vm, APIC_DEFAULT_GPA, APIC_DEFAULT_GPA); - enter_guest(vm); + enter_guest(vcpu); } int main(void)