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 14A56C4332F for ; Wed, 4 May 2022 23:07:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381431AbiEDXEi (ORCPT ); Wed, 4 May 2022 19:04:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379731AbiEDW5l (ORCPT ); Wed, 4 May 2022 18:57:41 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AAFA355499 for ; Wed, 4 May 2022 15:51:56 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id t15-20020a17090a3b4f00b001d67e27715dso3590038pjf.0 for ; Wed, 04 May 2022 15:51:56 -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=rs1BtKhHSNKSuG7x36AJhVcaryKQnmqCldVkUeJOBBE=; b=Gv4LU82MN2vqFI6C8LIdH2O96qaJFehZybMBMu5Sr3DTDhTUqgYy7Q12YR9XXv3T0a RqQtfoOcJ6dTfyIISIuAqXje3VQIB9BJC9UoGMRhr+Y1MBvG25x8B8yIRn5saRiW76Gn 0bD1AkAhdaIZcVuqdVJ2E4r2HmH6+fD1AuInMMpFIE+jwfzymgeVzWCSgECpC8cHzh7/ taeLbb1OFks5gTRuuRKMto/JBS/xODTpSN3Ykut/EkknG7VNNLCldvAboI566/7KLH9g 4raUTpWvUcIiySl4nvBBq5d4YBagRF1JspqsbzM/wUVJ/xAqmc5Bxgu1wqMoARqhtAnA BiYg== 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=rs1BtKhHSNKSuG7x36AJhVcaryKQnmqCldVkUeJOBBE=; b=XRBo+3CaAs/WodDQEoTt4gZqwbVWczhidhFsNV3I8TAwBlp8PtTMgt5aaAMkL3sYN2 kd49mqt/mWWTOEzPyloLXJkOUYj8H35KRTX3VWTxWcNEbFvBdNW1bjfEygPiktYJVAw9 my7vHYRR7eG+YSaOVh1FN9B6N9tcSzTrqRmlk3xv7YirivvL4Tul6PHsIH5Z5lFvsTvq +J5bWkDEDktewIFiryIeGhRmEDc2x6gO6Vv0gbE8pxv/jHjWicNlOWuo++/JEeJDZ7uI tKnsxv5Jn4pjI1x0L0sEBUDlJpGMDOl0rnN9ZxhbZiNtL0sn0md9raXPMFqVZpqtqQpl Phbw== X-Gm-Message-State: AOAM532StazKjyaSWvdDaNhXTQkUWKAhGHNBWAAKjY0oGr3feFXFnzGs nVSXJwj6ufol6CQ3vLhEPwfKjYaZu9o= X-Google-Smtp-Source: ABdhPJwio7KenHpq/S8gufojR0HQzC9mvZWotnyqksp0nNvCjcHqoerubbVnVSQqzEqVGTe/neOvvoLcuYQ= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a05:6a00:164c:b0:50a:472a:6b0a with SMTP id m12-20020a056a00164c00b0050a472a6b0amr23136375pfc.77.1651704715802; Wed, 04 May 2022 15:51:55 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 4 May 2022 22:48:30 +0000 In-Reply-To: <20220504224914.1654036-1-seanjc@google.com> Message-Id: <20220504224914.1654036-85-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 084/128] KVM: selftests: Convert system_counter_offset_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 system_counter_offset_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/system_counter_offset_test.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/kvm/system_counter_offset_test.c b/tools/testing/selftests/kvm/system_counter_offset_test.c index 5dd9d28efb97..0690ce0ae4fa 100644 --- a/tools/testing/selftests/kvm/system_counter_offset_test.c +++ b/tools/testing/selftests/kvm/system_counter_offset_test.c @@ -14,8 +14,6 @@ #include "kvm_util.h" #include "processor.h" -#define VCPU_ID 0 - #ifdef __x86_64__ struct test_case { @@ -28,18 +26,19 @@ static struct test_case test_cases[] = { { -180 * NSEC_PER_SEC }, }; -static void check_preconditions(struct kvm_vm *vm) +static void check_preconditions(struct kvm_vcpu *vcpu) { - if (!__vcpu_has_device_attr(vm, VCPU_ID, KVM_VCPU_TSC_CTRL, KVM_VCPU_TSC_OFFSET)) + if (!__vcpu_has_device_attr(vcpu->vm, vcpu->id, KVM_VCPU_TSC_CTRL, + KVM_VCPU_TSC_OFFSET)) return; print_skip("KVM_VCPU_TSC_OFFSET not supported; skipping test"); exit(KSFT_SKIP); } -static void setup_system_counter(struct kvm_vm *vm, struct test_case *test) +static void setup_system_counter(struct kvm_vcpu *vcpu, struct test_case *test) { - vcpu_device_attr_set(vm, VCPU_ID, KVM_VCPU_TSC_CTRL, + vcpu_device_attr_set(vcpu->vm, vcpu->id, KVM_VCPU_TSC_CTRL, KVM_VCPU_TSC_OFFSET, &test->tsc_offset); } @@ -91,7 +90,7 @@ static void handle_abort(struct ucall *uc) __FILE__, uc->args[1]); } -static void enter_guest(struct kvm_vm *vm) +static void enter_guest(struct kvm_vcpu *vcpu) { uint64_t start, end; struct ucall uc; @@ -100,12 +99,12 @@ static void enter_guest(struct kvm_vm *vm) for (i = 0; i < ARRAY_SIZE(test_cases); i++) { struct test_case *test = &test_cases[i]; - setup_system_counter(vm, test); + setup_system_counter(vcpu, test); start = host_read_guest_system_counter(test); - vcpu_run(vm, VCPU_ID); + vcpu_run(vcpu->vm, vcpu->id); end = host_read_guest_system_counter(test); - switch (get_ucall(vm, VCPU_ID, &uc)) { + switch (get_ucall(vcpu->vm, vcpu->id, &uc)) { case UCALL_SYNC: handle_sync(&uc, start, end); break; @@ -114,19 +113,20 @@ static void enter_guest(struct kvm_vm *vm) return; default: TEST_ASSERT(0, "unhandled ucall %ld\n", - get_ucall(vm, VCPU_ID, &uc)); + get_ucall(vcpu->vm, vcpu->id, &uc)); } } } int main(void) { + struct kvm_vcpu *vcpu; struct kvm_vm *vm; - vm = vm_create_default(VCPU_ID, 0, guest_main); - check_preconditions(vm); + vm = vm_create_with_one_vcpu(&vcpu, guest_main); + check_preconditions(vcpu); ucall_init(vm, NULL); - enter_guest(vm); + enter_guest(vcpu); kvm_vm_free(vm); } -- 2.36.0.464.gb9c8b46e94-goog