From patchwork Mon Sep 13 23:09:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghavendra Rao Ananta X-Patchwork-Id: 12490993 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F816C433EF for ; Mon, 13 Sep 2021 23:15:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C95A561029 for ; Mon, 13 Sep 2021 23:15:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C95A561029 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=s05/bgoc4Z+PblQ0MVBctxgcB/h3EuRtLEmc2lu/PBQ=; b=TUdLmvDWtgKb/zTx9bfDMaS3nA olSPf/wjpixkO13HickLB1DCv+/DyK0ACykeog0V1QX1yQt13vNy4o8aiOgn0peElxu+Gf/J0Wf2q Gmq/TgEtPqW0YTOT6sa4NzWxsf78aA27UwlTZftatz1lH3sQZKEo7iFVDg3Iit/Db8YhJh1leETwM o6soS/8ROWoCVULHs9FE8okbEU69BqaZkUth2Y3h8lqE1dFpu4v3xLzXH+xnZaykFtQ1UHS4tZXzy hruEMi/abRNMZRqPl/C6bg9AhVFNtTve5I6aHoqbLDuols1I0iOFlyLHO3Cah0OGQeymzE3pCAHb9 oLMomW/A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPv8z-003Z7H-SO; Mon, 13 Sep 2021 23:13:46 +0000 Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mPv5i-003Xbs-Ky for linux-arm-kernel@lists.infradead.org; Mon, 13 Sep 2021 23:10:24 +0000 Received: by mail-pf1-x449.google.com with SMTP id k29-20020aa7973d000000b0043937d52143so4162729pfg.10 for ; Mon, 13 Sep 2021 16:10:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=jdwTA49s72LWLd7aNpa4ghDw/4j1WuhjFn5j/D8GsKA=; b=n9IHIL7bqWWJD9kNSg5x8CuLrTI9h5Nlf3qcTL82NsOsbPvZjAM++dxfL1gcBp/ysQ QwfFtElGGknpfwz9plM5DZUQIg5HuDCKnAqSDlctEwAX/gZo62+5c8FEvib+ygdg6swf y98cfLdVHya9zyhXkc7DSH6X/1HmBnFcOWOgqhY9mYh+T9yBDK0/Bc9/8Est/tYdIMal JRfwQ/tzTwrwtVFJaXOgq9J7yKw6Pya7nTw9QoT+KV5MmebT1ghbtxvJK+kND2f8pENG /Aeu27Kh4Q/y1EbNcX4Iyhf9/84mPqNMD4KH9qUbT1Cz0wHc+vy7gpE5mBskMhWmAOX1 Xi6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=jdwTA49s72LWLd7aNpa4ghDw/4j1WuhjFn5j/D8GsKA=; b=Ged+PrSKGTmU6zkZx+zcoEjAqC5vtfYNPS1lRqZHNiqll7V8bUqHY+SQt3QtnRPNhK +TDL1nFOs+3uQlgxEGp/gi8jTtDW2ckUwtbsu4tZRR/GYAOd/QUPJVJfAbmI4hBxeamj FwZrv3ck7hAJhW/o1rBaqq2cXVtOSTKLUqUPCmS7Ou/QQq+kIc4w5db/rdGYHYWrvXKV L3RYKJii8QI5kX33UV896nTHXkyp0/nIeaiE5j2lrOPFt++VtohBcR9DLg0JiWs04B+t h4zOsw+xElozfVmlEC4pJzC+7TkT+H3uxZYvw2dxArt5OG64nrT2zXW1VhLb3SjzngKn jZKA== X-Gm-Message-State: AOAM532GIlZULBXoFmfBtCJqC1hwGCNlEiOhTkO1fV0RhEpH0UA+WyQb XEadgxARMkHpCBsR+VJg52sKezMd/tX9 X-Google-Smtp-Source: ABdhPJz9fG9ixXo+sDZ6n+RdZIfFHnjUskmE5ujgE+bNojfUBpJxqnL7knfeD+0FzFBU55ltwscmWDw//1kC X-Received: from rananta-virt.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1bcc]) (user=rananta job=sendgmr) by 2002:a62:5a47:0:b0:411:d83a:3db4 with SMTP id o68-20020a625a47000000b00411d83a3db4mr1689702pfb.35.1631574621438; Mon, 13 Sep 2021 16:10:21 -0700 (PDT) Date: Mon, 13 Sep 2021 23:09:50 +0000 In-Reply-To: <20210913230955.156323-1-rananta@google.com> Message-Id: <20210913230955.156323-10-rananta@google.com> Mime-Version: 1.0 References: <20210913230955.156323-1-rananta@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog Subject: [PATCH v6 09/14] KVM: arm64: selftests: Add guest support to get the vcpuid From: Raghavendra Rao Ananta To: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose Cc: Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , Raghavendra Rao Anata , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210913_161022_779734_661ED7A3 X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org At times, such as when in the interrupt handler, the guest wants to get the vcpuid that it's running on to pull the per-cpu private data. As a result, introduce guest_get_vcpuid() that returns the vcpuid of the calling vcpu. The interface is architecture independent, but defined only for arm64 as of now. Suggested-by: Reiji Watanabe Signed-off-by: Raghavendra Rao Ananta Reviewed-by: Ricardo Koller Reviewed-by: Reiji Watanabe --- tools/testing/selftests/kvm/include/kvm_util.h | 2 ++ tools/testing/selftests/kvm/lib/aarch64/processor.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 010b59b13917..5770751a5735 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -400,4 +400,6 @@ uint64_t get_ucall(struct kvm_vm *vm, uint32_t vcpu_id, struct ucall *uc); int vm_get_stats_fd(struct kvm_vm *vm); int vcpu_get_stats_fd(struct kvm_vm *vm, uint32_t vcpuid); +int guest_get_vcpuid(void); + #endif /* SELFTEST_KVM_UTIL_H */ diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index db64ee206064..f1255f44dad0 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -277,6 +277,7 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TCR_EL1), tcr_el1); set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), vm->pgd); + set_reg(vm, vcpuid, KVM_ARM64_SYS_REG(SYS_TPIDR_EL1), vcpuid); } void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent) @@ -426,3 +427,8 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, assert(vector < VECTOR_NUM); handlers->exception_handlers[vector][0] = handler; } + +int guest_get_vcpuid(void) +{ + return read_sysreg(tpidr_el1); +}