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 90910CCA47B for ; Fri, 3 Jun 2022 00:56:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237005AbiFCA4T (ORCPT ); Thu, 2 Jun 2022 20:56:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240520AbiFCArS (ORCPT ); Thu, 2 Jun 2022 20:47:18 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A62537BD1 for ; Thu, 2 Jun 2022 17:46:29 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id s204-20020a632cd5000000b003fc8fd3c242so3055057pgs.7 for ; Thu, 02 Jun 2022 17:46:29 -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=O9z5OCEb467ZbVZHbJcf5IG27G4WEK+6SdTj7Frn6ss=; b=Tz/OHaQUbmHyXU0TwaoYO6G9b+QzS5uNfvu+PnqZBXh2jiDYGMlVGVSXlI/zA4BK3P JbkLgZcR40bDTJg3PfatF9G+MHQ4wOzcTOxG16BGeKOSpqrJyCsWGMJIcbWIu15zu6i1 mnOPtWmB5IVs6vACFWM8J03rIWwOGUTMPe4wMoB219vX8dG9+qO/3oRPV8rypmyOy7Rr 4LMgYQX+mzFkOAUBEcOI4nPvHVQ0GqQmGQDhNXsweoRz2LtOtiBEwebbpdGmBnOhZTUy Nv7L86v33kHybG5ro47jnCW4unPzBZxDPwkpI+cepaaot/iABX0n0aoa2uvS8SBiJGqH 4n5Q== 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=O9z5OCEb467ZbVZHbJcf5IG27G4WEK+6SdTj7Frn6ss=; b=RzE4dzf6Tiu7OMB46LiY+iOhcSAF61ttIXAPggi+5Zlk21AdKHHLId39Gdx/AM0E5n thJnapdIZzwmbIRv5B521bh+YQQ7OFDHVglKnqzBbwxuN5QK23FBamt8QbLFqmhtwTnz v4KQHxY7ggmD3DuzBKLZv+S7T5nQVru2xNYC0Q+rUPM0x5EV1BAsVVMixfT3OGlKO96s 8rlCNY95tc4buy0SPJdFPHeDK+QbXO5WhbrXlnpwyL4ur73dFn1WGeCmr4Hd3OfPpCZj dQjc2hODyMf1md/BbKmTbyMTM1UEVsLwASvfJKQ6fDLNko3IzJDSy2aKuvNJYqAaO0U8 xNqw== X-Gm-Message-State: AOAM5306uRqOz8jKQtELdyf07phx4tIB6q1LRk/dHwVWep9HDUDj9Fp2 eSdinHBaV/awSfm8UvABbr9ac8EPmo4= X-Google-Smtp-Source: ABdhPJxDsx6UvBtsJofMNd1XygyxMgqxc64JFFMEkRk3vS9zTRqN66znWSgWelaM/nqAIerVPDfQz5zNaAI= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:aa7:8895:0:b0:518:9fa0:7da with SMTP id z21-20020aa78895000000b005189fa007damr7766436pfe.48.1654217188843; Thu, 02 Jun 2022 17:46:28 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 3 Jun 2022 00:42:42 +0000 In-Reply-To: <20220603004331.1523888-1-seanjc@google.com> Message-Id: <20220603004331.1523888-96-seanjc@google.com> Mime-Version: 1.0 References: <20220603004331.1523888-1-seanjc@google.com> X-Mailer: git-send-email 2.36.1.255.ge46751e96f-goog Subject: [PATCH v2 095/144] KVM: selftests: Convert debug-exceptions away from VCPU_ID From: Sean Christopherson To: Paolo Bonzini Cc: kvm@vger.kernel.org, Vitaly Kuznetsov , Andrew Jones , David Matlack , Ben Gardon , Oliver Upton , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Convert debug-exceptions 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/aarch64/debug-exceptions.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c index 63b2178210c4..b69db0942169 100644 --- a/tools/testing/selftests/kvm/aarch64/debug-exceptions.c +++ b/tools/testing/selftests/kvm/aarch64/debug-exceptions.c @@ -3,8 +3,6 @@ #include #include -#define VCPU_ID 0 - #define MDSCR_KDE (1 << 13) #define MDSCR_MDE (1 << 15) #define MDSCR_SS (1 << 0) @@ -240,27 +238,28 @@ static void guest_svc_handler(struct ex_regs *regs) svc_addr = regs->pc; } -static int debug_version(struct kvm_vm *vm) +static int debug_version(struct kvm_vcpu *vcpu) { uint64_t id_aa64dfr0; - get_reg(vm, VCPU_ID, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); + get_reg(vcpu->vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_ID_AA64DFR0_EL1), &id_aa64dfr0); return id_aa64dfr0 & 0xf; } int main(int argc, char *argv[]) { + struct kvm_vcpu *vcpu; struct kvm_vm *vm; struct ucall uc; int stage; - vm = vm_create_default(VCPU_ID, 0, guest_code); + vm = vm_create_with_one_vcpu(&vcpu, guest_code); ucall_init(vm, NULL); vm_init_descriptor_tables(vm); - vcpu_init_descriptor_tables(vm, VCPU_ID); + vcpu_init_descriptor_tables(vm, vcpu->id); - if (debug_version(vm) < 6) { + if (debug_version(vcpu) < 6) { print_skip("Armv8 debug architecture not supported."); kvm_vm_free(vm); exit(KSFT_SKIP); @@ -278,9 +277,9 @@ int main(int argc, char *argv[]) ESR_EC_SVC64, guest_svc_handler); for (stage = 0; stage < 11; stage++) { - vcpu_run(vm, VCPU_ID); + vcpu_run(vm, vcpu->id); - switch (get_ucall(vm, VCPU_ID, &uc)) { + switch (get_ucall(vm, vcpu->id, &uc)) { case UCALL_SYNC: TEST_ASSERT(uc.args[1] == stage, "Stage %d: Unexpected sync ucall, got %lx", -- 2.36.1.255.ge46751e96f-goog