From mboxrd@z Thu Jan 1 00:00:00 1970 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 E084FC433EF for ; Wed, 4 May 2022 22:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379278AbiEDW6L (ORCPT ); Wed, 4 May 2022 18:58:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379572AbiEDWy5 (ORCPT ); Wed, 4 May 2022 18:54:57 -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 380A353E2E for ; Wed, 4 May 2022 15:51:13 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id q14-20020a17090a178e00b001dc970bf587so1943841pja.1 for ; Wed, 04 May 2022 15:51:13 -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=KStJxbQXxEW7Z2FlFuAOa9BN6coGSiFbzvl2Gq1jN2A=; b=RNWe0l2kZGk/kFvcdyuQ07vf5mKrt91fj7IDzGGEeR6I0vwlWCLP3/rpyg5lhqL5HF bLOy2cYQ9yJ2Bh+d28jACVLlQBb9bdZlyq6W6deya+151Y0s+8w+fTAWW9GlIbB2GcYU jcQ4cAGpwQSVzX17ZbhWGp1PFtYU/BvMHXkrGUl71ejYC1UA2o8btqp2JD+DfPXjTtXQ izMgY2OuM00z7nr6WdwhusgS/TV9E7NhS4SbV1z6bDk/HY2HPA00jy0w6lCa2zg9JmeN C+SrOqcq2gSd+EVDZMjqcTj5kzIES7thFUr3dNhD4uonM0Rkmuss/ajk1pxxQedAzjqW DEeg== 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=KStJxbQXxEW7Z2FlFuAOa9BN6coGSiFbzvl2Gq1jN2A=; b=n1jvEN6L6/z+RoaGWYbSngJiBjMsaW9DwsjlCO7+ci9NLa5dj2uFfrIOrcbVtcsul/ Y3J5hFQR/BgtiNUbUv239BK4Ik/yTAGRA8QMFpCHtCYXDoAHJDTOfx9V63mb5OfBo0hl ePKb7J9DGcEk4gRIBRYo6WQ742HyBZeCd+0aKytIMb/1JwL1HiuXPdoadiZgB1uQRmh/ e/+iBJPGAKctPDyQfGqKe9DA212XXwuWKFFJ6GWqO8dBMwQ9buFM57n9vYx4W9VF8qjR 4kHFfX+cR8YDLkZJoHtSefxXeLYojvKKExMfArnyulaRuygA3pdLCJIOPE+6UHvVa43q Z14w== X-Gm-Message-State: AOAM532dVC3FtVo/fOXkLXVeIBr4G5vsP4O5I5xOaBJui15epTvK9FHc 0Y/4G+3NI/s2OzkXH0L6szIYDI9EPB4= X-Google-Smtp-Source: ABdhPJzEtY/7+wJ/MQgg8J1pYdbI3+lPeKCc+mHMAIUN6USXpmz0DNrEs9cuBBszzAbI6MsLHGVgKP+UgUw= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:90a:c7d2:b0:1d9:34fe:10dc with SMTP id gf18-20020a17090ac7d200b001d934fe10dcmr2214850pjb.109.1651704672704; Wed, 04 May 2022 15:51:12 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 4 May 2022 22:48:05 +0000 In-Reply-To: <20220504224914.1654036-1-seanjc@google.com> Message-Id: <20220504224914.1654036-60-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 059/128] KVM: selftests: Convert vmx_nested_tsc_scaling_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 Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert vmx_nested_tsc_scaling_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 --- .../kvm/x86_64/vmx_nested_tsc_scaling_test.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c index c35ada9f7f9c..c9cb29f06244 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_nested_tsc_scaling_test.c @@ -15,9 +15,6 @@ #include "vmx.h" #include "kselftest.h" - -#define VCPU_ID 0 - /* L2 is scaled up (from L1's perspective) by this factor */ #define L2_SCALE_FACTOR 4ULL @@ -150,6 +147,7 @@ static void stable_tsc_check_supported(void) int main(int argc, char *argv[]) { + struct kvm_vcpu *vcpu; struct kvm_vm *vm; vm_vaddr_t vmx_pages_gva; @@ -182,28 +180,28 @@ int main(int argc, char *argv[]) l0_tsc_freq = tsc_end - tsc_start; printf("real TSC frequency is around: %"PRIu64"\n", l0_tsc_freq); - vm = vm_create_default(VCPU_ID, 0, (void *) l1_guest_code); + vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code); vcpu_alloc_vmx(vm, &vmx_pages_gva); - vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva); + vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva); - tsc_khz = __vcpu_ioctl(vm, VCPU_ID, KVM_GET_TSC_KHZ, NULL); + tsc_khz = __vcpu_ioctl(vm, vcpu->id, KVM_GET_TSC_KHZ, NULL); TEST_ASSERT(tsc_khz != -1, "vcpu ioctl KVM_GET_TSC_KHZ failed"); /* scale down L1's TSC frequency */ - vcpu_ioctl(vm, VCPU_ID, KVM_SET_TSC_KHZ, + vcpu_ioctl(vm, vcpu->id, KVM_SET_TSC_KHZ, (void *) (tsc_khz / l1_scale_factor)); for (;;) { - volatile struct kvm_run *run = vcpu_state(vm, VCPU_ID); + volatile struct kvm_run *run = vcpu->run; struct ucall uc; - vcpu_run(vm, VCPU_ID); + vcpu_run(vm, vcpu->id); TEST_ASSERT(run->exit_reason == KVM_EXIT_IO, "Got exit_reason other than KVM_EXIT_IO: %u (%s)\n", run->exit_reason, exit_reason_str(run->exit_reason)); - switch (get_ucall(vm, VCPU_ID, &uc)) { + switch (get_ucall(vm, vcpu->id, &uc)) { case UCALL_ABORT: TEST_FAIL("%s", (const char *) uc.args[0]); case UCALL_SYNC: -- 2.36.0.464.gb9c8b46e94-goog