lkml.org 
[lkml]   [2022]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 092/144] KVM: selftests: Convert system_counter_offset_test away from VCPU_ID
    From
    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 <seanjc@google.com>
    ---
    .../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.1.255.ge46751e96f-goog
    \
     
     \ /
      Last update: 2022-06-03 02:57    [W:4.592 / U:0.316 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site