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 X-Spam-Level: X-Spam-Status: No, score=-23.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_IN_DEF_DKIM_WL 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 17E60C433FE for ; Thu, 9 Sep 2021 05:09:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F21AA61131 for ; Thu, 9 Sep 2021 05:09:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350544AbhIIFKY (ORCPT ); Thu, 9 Sep 2021 01:10:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbhIIFKS (ORCPT ); Thu, 9 Sep 2021 01:10:18 -0400 Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE6E7C061757 for ; Wed, 8 Sep 2021 22:09:08 -0700 (PDT) Received: by mail-il1-x136.google.com with SMTP id v16so678919ilo.10 for ; Wed, 08 Sep 2021 22:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=xbj4bHxjm5asqasO4Vc5MjLZ0Sl3pjPtgh9Ovv91F4Q=; b=nGJ0Xr7BsULYVjLluGwgpxnkv7l5v9ML6g4sZm6j0Ck/Wc63e5MX9UeWpTexc0+XOb GaMJrf05btsC9KlhT9uyiHDMdcwz0vCewRK3pudeocIBWLCqJFRAr7V+BfQDB5e0UYzy CXjG+1FkSUaaEHun5Z6hQAMk59Rdsbvga9+EF2lpCiH8tF9rAl+7EtnNcfgPEYusnZbd JYglpi1njFXbXwyIhE+1H3+dO3w/8gANwbLp6PK9lwjcpzBiT6LtOGpd7HGe8sMG4KaC PCz3KvFpIsKsf969B2lTHEgST1VRrZav0Zjr8bGKH8DEeUe/BEzdz3+BTq/8EPTN+pv1 S5cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=xbj4bHxjm5asqasO4Vc5MjLZ0Sl3pjPtgh9Ovv91F4Q=; b=KJp/qiw22/31eSurqgQnFXyCsW2cgOOKdOQruJsghmv9rjsv9gNr0zG3D3fjaAlaJ7 1mpKP6Qaafk6CUPPXpinKvys6LuwIIqDgCN1MWjqxjghj9M4zhK+7PgFAU6XwTPjkFs0 K35+VORVIfk+9b2GKxmKVFttQyARAzOcqaypvHB9Xio+OFJ0tuiCHiUuYk6d5G85pI4p a7seqgaHpq0LrU2dQxy2ZptK52ECgIj4EzCzq4kFqVmrZx54u+aUOCSD/Dpeoqc3ryxH 2IUV2r2SOdeEPoSSZ0GyCYeeEA/I5PU86kNOLKvwmP5r5Wuzso4r2iS+oR/4mBzZi0uE lhtg== X-Gm-Message-State: AOAM533vyGggtwculcYFKpqhpMrmmZk9BoFYbOfA/YjmLVv1QC/AQZ47 WbIblkFQCXrWfhFcQPj8KNlGMQ== X-Google-Smtp-Source: ABdhPJwOXqYFYeLrtyB7/JxA0sr65qpDk6mbK5Ic2/+EtmxUrips9ElJ35ZyMr3Dk5BvHeQ6OyEgow== X-Received: by 2002:a92:c051:: with SMTP id o17mr918314ilf.308.1631164147930; Wed, 08 Sep 2021 22:09:07 -0700 (PDT) Received: from google.com (194.225.68.34.bc.googleusercontent.com. [34.68.225.194]) by smtp.gmail.com with ESMTPSA id g12sm381657iok.32.2021.09.08.22.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 22:09:07 -0700 (PDT) Date: Thu, 9 Sep 2021 05:09:03 +0000 From: Oliver Upton To: Raghavendra Rao Ananta Cc: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH v4 09/18] KVM: arm64: selftests: Add guest support to get the vcpuid Message-ID: References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-10-rananta@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210909013818.1191270-10-rananta@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 09, 2021 at 01:38:09AM +0000, Raghavendra Rao Ananta wrote: > At times, such as when in the interrupt handler, the guest wants > to get the vcpuid that it's running on. As a result, introduce > get_vcpuid() that returns the vcpuid of the calling vcpu. At its > backend, the VMM prepares a map of vcpuid and mpidr during VM > initialization and exports the map to the guest for it to read. > > Signed-off-by: Raghavendra Rao Ananta > --- > .../selftests/kvm/include/aarch64/processor.h | 3 ++ > .../selftests/kvm/lib/aarch64/processor.c | 46 +++++++++++++++++++ > 2 files changed, 49 insertions(+) > > diff --git a/tools/testing/selftests/kvm/include/aarch64/processor.h b/tools/testing/selftests/kvm/include/aarch64/processor.h > index b6088c3c67a3..150f63101f4c 100644 > --- a/tools/testing/selftests/kvm/include/aarch64/processor.h > +++ b/tools/testing/selftests/kvm/include/aarch64/processor.h > @@ -133,6 +133,7 @@ void vm_install_exception_handler(struct kvm_vm *vm, > int vector, handler_fn handler); > void vm_install_sync_handler(struct kvm_vm *vm, > int vector, int ec, handler_fn handler); > +void vm_vcpuid_map_init(struct kvm_vm *vm); > > static inline void cpu_relax(void) > { > @@ -194,4 +195,6 @@ static inline void local_irq_disable(void) > asm volatile("msr daifset, #3" : : : "memory"); > } > > +int get_vcpuid(void); > + I believe both of these functions could use some documentation. The former has implicit ordering requirements (can only be called after all vCPUs are created) and the latter can only be used within a guest. > #endif /* SELFTEST_KVM_PROCESSOR_H */ > diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c > index 632b74d6b3ca..9844b62227b1 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c > @@ -13,9 +13,17 @@ > #include "processor.h" > > #define DEFAULT_ARM64_GUEST_STACK_VADDR_MIN 0xac0000 > +#define VM_VCPUID_MAP_INVAL -1 > > static vm_vaddr_t exception_handlers; > > +struct vm_vcpuid_map { > + uint64_t mpidr; > + int vcpuid; > +}; > + > +static struct vm_vcpuid_map vcpuid_map[KVM_MAX_VCPUS]; > + Hmm. I'm not too big of a fan that the KVM_MAX_VCPUS macro is defined in the KVM selftests. Really, userspace should discover the limit from the kernel. Especially when we want to write tests that test behavior at KVM's limit. That being said, there are more instances of these static allocations in the selftests code, so you aren't to be blamed. Related: commit 074c82c8f7cf ("kvm: x86: Increase MAX_VCPUS to 1024") has raised this limit. > static uint64_t page_align(struct kvm_vm *vm, uint64_t v) > { > return (v + vm->page_size) & ~(vm->page_size - 1); > @@ -426,3 +434,41 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, > assert(vector < VECTOR_NUM); > handlers->exception_handlers[vector][0] = handler; > } > + > +void vm_vcpuid_map_init(struct kvm_vm *vm) > +{ > + int i = 0; > + struct vcpu *vcpu; > + struct vm_vcpuid_map *map; > + > + list_for_each_entry(vcpu, &vm->vcpus, list) { > + map = &vcpuid_map[i++]; > + map->vcpuid = vcpu->id; > + get_reg(vm, vcpu->id, > + ARM64_SYS_KVM_REG(SYS_MPIDR_EL1), &map->mpidr); > + map->mpidr &= MPIDR_HWID_BITMASK; > + } > + > + if (i < KVM_MAX_VCPUS) > + vcpuid_map[i].vcpuid = VM_VCPUID_MAP_INVAL; > + > + sync_global_to_guest(vm, vcpuid_map); > +} > + > +int get_vcpuid(void) nit: guest_get_vcpuid() > +{ > + int i, vcpuid; > + uint64_t mpidr = read_sysreg(mpidr_el1) & MPIDR_HWID_BITMASK; > + > + for (i = 0; i < KVM_MAX_VCPUS; i++) { > + vcpuid = vcpuid_map[i].vcpuid; > + GUEST_ASSERT_1(vcpuid != VM_VCPUID_MAP_INVAL, mpidr); > + > + if (mpidr == vcpuid_map[i].mpidr) > + return vcpuid; > + } > + > + /* We should not be reaching here */ > + GUEST_ASSERT_1(0, mpidr); > + return -1; > +} > -- > 2.33.0.153.gba50c8fa24-goog >