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=-18.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 B70AEC4332F for ; Fri, 10 Sep 2021 18:04:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91F52611CC for ; Fri, 10 Sep 2021 18:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230064AbhIJSFZ (ORCPT ); Fri, 10 Sep 2021 14:05:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229451AbhIJSFX (ORCPT ); Fri, 10 Sep 2021 14:05:23 -0400 Received: from mail-yb1-xb29.google.com (mail-yb1-xb29.google.com [IPv6:2607:f8b0:4864:20::b29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 95B09C061756 for ; Fri, 10 Sep 2021 11:04:12 -0700 (PDT) Received: by mail-yb1-xb29.google.com with SMTP id z5so5573555ybj.2 for ; Fri, 10 Sep 2021 11:04:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=OftdWZEwD9jdXht+HSnlAwhydSymZg+fXMuExwKIPpWPSdPet2l673kSg8FcGtw/6d q/A8Jammz5TZedHA0AghaMGGChHtT4/kVWecAClUWj5q1tcoBkPQ91R8uZfezyXn1maC dYBLtWCRik7kgp43oQveNCvzkjyyNnCZtQRG8fAd0m1JyDBsgXnolXRZtTMW7Nd24Dm9 /R+toReJ9Jkosf8Ny7n9oy64MKoI6hxdAt9vg8RHkQ6J5ZouUO23IUvUJGlNZsriSIUT y/mncKScphEyMFh6hYP3TjUIv7at+65xBbQO8YlIAu7cB6/3mLMu/squbAehr5XeI1qJ osVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=3LMRN40LeF+iLGrzYIYQw9G69NZkqrjsn37JgQZEsULtrz2UPSHG02DNX4vBa+OAYi zssu/h/dzPFqLCvE5nso066+aRCq+xpfQtuF39DRVO99OxBLeLOiSr+8Wcz/Fy//3QID MWc6nbZWU7VLyYDfn5tctmfP9OyOu+Iwojk6pCAjSQTDLHgHs7t3anX2VU251odP+eXW LD9onAT5UVfdAxsVMa5BVxuxoTMQJ3Yq4qyCcwZQWtE1qN8yYhgTTd3bZU0ob4H1GLUU 1hB6grDqc0WWR6L6Km8jmM/8CwRI/oDajfJVQ7BAnTsKCU8aQ7YaICRKQVLrjcYg3Ga9 xWmg== X-Gm-Message-State: AOAM533/+HkaVIP96yhPp5Gu2nxxBZx9C56PU73Ct3W6s9u3C/f6tG9+ ho2GX96WpgGxmt8ns6uSLzPqA5XMSjK0GxtVgHWfDg== X-Google-Smtp-Source: ABdhPJzWgdNOv8FFFa8yER05OfPRQry5w0Mk8yQAnalMrVdKBP5XCEEVprWbGAlMxK82fvaBzfD7oAiOSSVboVdVasw= X-Received: by 2002:a25:8093:: with SMTP id n19mr12994954ybk.414.1631297049652; Fri, 10 Sep 2021 11:04:09 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-10-rananta@google.com> <20210909075643.fhngqu6tqrpe33gl@gator> <20210910081001.4gljsvmcovvoylwt@gator> In-Reply-To: <20210910081001.4gljsvmcovvoylwt@gator> From: Raghavendra Rao Ananta Date: Fri, 10 Sep 2021 11:03:58 -0700 Message-ID: Subject: Re: [PATCH v4 09/18] KVM: arm64: selftests: Add guest support to get the vcpuid To: Andrew Jones Cc: Paolo Bonzini , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 10, 2021 at 1:10 AM Andrew Jones wrote: > > On Thu, Sep 09, 2021 at 10:10:56AM -0700, Raghavendra Rao Ananta wrote: > > On Thu, Sep 9, 2021 at 12:56 AM Andrew Jones wrote: > > > > > > On Thu, Sep 09, 2021 at 01:38:09AM +0000, Raghavendra Rao Ananta wrote: > ... > > > > + for (i = 0; i < KVM_MAX_VCPUS; i++) { > > > > + vcpuid = vcpuid_map[i].vcpuid; > > > > + GUEST_ASSERT_1(vcpuid != VM_VCPUID_MAP_INVAL, mpidr); > > > > > > We don't want this assert if it's possible to have sparse maps, which > > > it probably isn't ever going to be, but... > > > > > If you look at the way the array is arranged, the element with > > VM_VCPUID_MAP_INVAL acts as a sentinel for us and all the proper > > elements would lie before this. So, I don't think we'd have a sparse > > array here. > > If we switch to my suggestion of adding map entries at vcpu-add time and > removing them at vcpu-rm time, then the array may become sparse depending > on the order of removals. > Oh, I get it now. But like you mentioned, we add entries to the map while the vCPUs are getting added and then sync_global_to_guest() later. This seems like a lot of maintainance, unless I'm interpreting it wrong or not seeing an advantage. I like your idea of coming up an arch-independent interface, however. So I modified it similar to the familiar ucall interface that we have and does everything in one shot to avoid any confusion: diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 010b59b13917..0e87cb0c980b 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -400,4 +400,24 @@ 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); +#define VM_CPUID_MAP_INVAL -1 + +struct vm_cpuid_map { + uint64_t hw_cpuid; + int vcpuid; +}; + +/* + * Create a vcpuid:hw_cpuid map and export it to the guest + * + * Input Args: + * vm - KVM VM. + * + * Output Args: None + * + * Must be called after all the vCPUs are added to the VM + */ +void vm_cpuid_map_init(struct kvm_vm *vm); +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..e796bb3984a6 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -16,6 +16,8 @@ static vm_vaddr_t exception_handlers; +static struct vm_cpuid_map cpuid_map[KVM_MAX_VCPUS]; + static uint64_t page_align(struct kvm_vm *vm, uint64_t v) { return (v + vm->page_size) & ~(vm->page_size - 1); @@ -426,3 +428,42 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, assert(vector < VECTOR_NUM); handlers->exception_handlers[vector][0] = handler; } + +void vm_cpuid_map_init(struct kvm_vm *vm) +{ + int i = 0; + struct vcpu *vcpu; + struct vm_cpuid_map *map; + + TEST_ASSERT(!list_empty(&vm->vcpus), "vCPUs must have been created\n"); + + list_for_each_entry(vcpu, &vm->vcpus, list) { + map = &cpuid_map[i++]; + map->vcpuid = vcpu->id; + get_reg(vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &map->hw_cpuid); + map->hw_cpuid &= MPIDR_HWID_BITMASK; + } + + if (i < KVM_MAX_VCPUS) + cpuid_map[i].vcpuid = VM_CPUID_MAP_INVAL; + + sync_global_to_guest(vm, cpuid_map); +} + +int guest_get_vcpuid(void) +{ + int i, vcpuid; + uint64_t mpidr = read_sysreg(mpidr_el1) & MPIDR_HWID_BITMASK; + + for (i = 0; i < KVM_MAX_VCPUS; i++) { + vcpuid = cpuid_map[i].vcpuid; + + /* Was this vCPU added to the VM after the map was initialized? */ + GUEST_ASSERT_1(vcpuid != VM_CPUID_MAP_INVAL, mpidr); + + if (mpidr == cpuid_map[i].hw_cpuid) + return vcpuid; + } + + /* We should not be reaching here */ + GUEST_ASSERT_1(0, mpidr); + return -1; +} This would ensure that we don't have a sparse array and can use the last non-vCPU element as a sentinal node. If you still feel preparing the map as and when the vCPUs are created makes more sense, I can go for it. Regards, Raghavendra > Thanks, > drew > 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=-8.5 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 781AAC433F5 for ; Fri, 10 Sep 2021 18:04:15 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id D4D96611EE for ; Fri, 10 Sep 2021 18:04:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D4D96611EE Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 58ABF4B16E; Fri, 10 Sep 2021 14:04:14 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@google.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bNJmnjLYy6nS; Fri, 10 Sep 2021 14:04:13 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 320194B1B5; Fri, 10 Sep 2021 14:04:13 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id ABF9B4B1B5 for ; Fri, 10 Sep 2021 14:04:11 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IZboIwie0hHk for ; Fri, 10 Sep 2021 14:04:10 -0400 (EDT) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 806B14B1B3 for ; Fri, 10 Sep 2021 14:04:10 -0400 (EDT) Received: by mail-yb1-f175.google.com with SMTP id i12so5258458ybq.9 for ; Fri, 10 Sep 2021 11:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=OftdWZEwD9jdXht+HSnlAwhydSymZg+fXMuExwKIPpWPSdPet2l673kSg8FcGtw/6d q/A8Jammz5TZedHA0AghaMGGChHtT4/kVWecAClUWj5q1tcoBkPQ91R8uZfezyXn1maC dYBLtWCRik7kgp43oQveNCvzkjyyNnCZtQRG8fAd0m1JyDBsgXnolXRZtTMW7Nd24Dm9 /R+toReJ9Jkosf8Ny7n9oy64MKoI6hxdAt9vg8RHkQ6J5ZouUO23IUvUJGlNZsriSIUT y/mncKScphEyMFh6hYP3TjUIv7at+65xBbQO8YlIAu7cB6/3mLMu/squbAehr5XeI1qJ osVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=GUBP66Ot0RkP7tqaF0VsmjARRqb3wYUW7OnOG0KGB6QTdZdK1S6Yz2gDiQxqrgd6ZL nOQYGDtkFbfZe5eDGL1fjD/ydk+TNi6nRoTCrYMIqbxotlrVTyWycs5IvH86TklbVdhB mRyaRLYbUHDvM48WbPmt6BzFmADE6YOrR+DopfdDcidpHeQV5BCpJW/+1FxLcECO9+4H X/UKcfNKeyT/qUg9oZtsH5BDBAru+RSrGXU64Haj5l/s3ZAq8tuz8WgGbMGvAyzZC7aX DSBGXAebFJUAr3Qs+QU6L/yMu9gFj7Fs2aNKMCbv1hNwzgZTzlraDRlAvlwrNFZns9pi fxGw== X-Gm-Message-State: AOAM530Eyzx/jLZCqYxI1ROddBbvo8UdCLStasQVho5DSnRV7ecLZwoU M2EvokHaErFCMAKCri0c8bT9Z4XG+/AC+nvxswQKtA== X-Google-Smtp-Source: ABdhPJzWgdNOv8FFFa8yER05OfPRQry5w0Mk8yQAnalMrVdKBP5XCEEVprWbGAlMxK82fvaBzfD7oAiOSSVboVdVasw= X-Received: by 2002:a25:8093:: with SMTP id n19mr12994954ybk.414.1631297049652; Fri, 10 Sep 2021 11:04:09 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-10-rananta@google.com> <20210909075643.fhngqu6tqrpe33gl@gator> <20210910081001.4gljsvmcovvoylwt@gator> In-Reply-To: <20210910081001.4gljsvmcovvoylwt@gator> From: Raghavendra Rao Ananta Date: Fri, 10 Sep 2021 11:03:58 -0700 Message-ID: Subject: Re: [PATCH v4 09/18] KVM: arm64: selftests: Add guest support to get the vcpuid To: Andrew Jones Cc: kvm@vger.kernel.org, Will Deacon , Catalin Marinas , Peter Shier , linux-kernel@vger.kernel.org, Marc Zyngier , Paolo Bonzini , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu On Fri, Sep 10, 2021 at 1:10 AM Andrew Jones wrote: > > On Thu, Sep 09, 2021 at 10:10:56AM -0700, Raghavendra Rao Ananta wrote: > > On Thu, Sep 9, 2021 at 12:56 AM Andrew Jones wrote: > > > > > > On Thu, Sep 09, 2021 at 01:38:09AM +0000, Raghavendra Rao Ananta wrote: > ... > > > > + for (i = 0; i < KVM_MAX_VCPUS; i++) { > > > > + vcpuid = vcpuid_map[i].vcpuid; > > > > + GUEST_ASSERT_1(vcpuid != VM_VCPUID_MAP_INVAL, mpidr); > > > > > > We don't want this assert if it's possible to have sparse maps, which > > > it probably isn't ever going to be, but... > > > > > If you look at the way the array is arranged, the element with > > VM_VCPUID_MAP_INVAL acts as a sentinel for us and all the proper > > elements would lie before this. So, I don't think we'd have a sparse > > array here. > > If we switch to my suggestion of adding map entries at vcpu-add time and > removing them at vcpu-rm time, then the array may become sparse depending > on the order of removals. > Oh, I get it now. But like you mentioned, we add entries to the map while the vCPUs are getting added and then sync_global_to_guest() later. This seems like a lot of maintainance, unless I'm interpreting it wrong or not seeing an advantage. I like your idea of coming up an arch-independent interface, however. So I modified it similar to the familiar ucall interface that we have and does everything in one shot to avoid any confusion: diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 010b59b13917..0e87cb0c980b 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -400,4 +400,24 @@ 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); +#define VM_CPUID_MAP_INVAL -1 + +struct vm_cpuid_map { + uint64_t hw_cpuid; + int vcpuid; +}; + +/* + * Create a vcpuid:hw_cpuid map and export it to the guest + * + * Input Args: + * vm - KVM VM. + * + * Output Args: None + * + * Must be called after all the vCPUs are added to the VM + */ +void vm_cpuid_map_init(struct kvm_vm *vm); +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..e796bb3984a6 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -16,6 +16,8 @@ static vm_vaddr_t exception_handlers; +static struct vm_cpuid_map cpuid_map[KVM_MAX_VCPUS]; + static uint64_t page_align(struct kvm_vm *vm, uint64_t v) { return (v + vm->page_size) & ~(vm->page_size - 1); @@ -426,3 +428,42 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, assert(vector < VECTOR_NUM); handlers->exception_handlers[vector][0] = handler; } + +void vm_cpuid_map_init(struct kvm_vm *vm) +{ + int i = 0; + struct vcpu *vcpu; + struct vm_cpuid_map *map; + + TEST_ASSERT(!list_empty(&vm->vcpus), "vCPUs must have been created\n"); + + list_for_each_entry(vcpu, &vm->vcpus, list) { + map = &cpuid_map[i++]; + map->vcpuid = vcpu->id; + get_reg(vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &map->hw_cpuid); + map->hw_cpuid &= MPIDR_HWID_BITMASK; + } + + if (i < KVM_MAX_VCPUS) + cpuid_map[i].vcpuid = VM_CPUID_MAP_INVAL; + + sync_global_to_guest(vm, cpuid_map); +} + +int guest_get_vcpuid(void) +{ + int i, vcpuid; + uint64_t mpidr = read_sysreg(mpidr_el1) & MPIDR_HWID_BITMASK; + + for (i = 0; i < KVM_MAX_VCPUS; i++) { + vcpuid = cpuid_map[i].vcpuid; + + /* Was this vCPU added to the VM after the map was initialized? */ + GUEST_ASSERT_1(vcpuid != VM_CPUID_MAP_INVAL, mpidr); + + if (mpidr == cpuid_map[i].hw_cpuid) + return vcpuid; + } + + /* We should not be reaching here */ + GUEST_ASSERT_1(0, mpidr); + return -1; +} This would ensure that we don't have a sparse array and can use the last non-vCPU element as a sentinal node. If you still feel preparing the map as and when the vCPUs are created makes more sense, I can go for it. Regards, Raghavendra > Thanks, > drew > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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=-9.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 5357BC433EF for ; Fri, 10 Sep 2021 18:06:32 +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 1D82E611CB for ; Fri, 10 Sep 2021 18:06:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1D82E611CB 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:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tmFekXbVjJJ2678oGrkTLVNVDBrfH4Iqa0Uq4G38Srs=; b=e+E9FIkLej3P3J COTk3nD8JG9UZsG4Iw5vyOkDOdjhvoYe0oY+WvupCjQOo0YOo71CWijE2dssfmxTA+J6YTKyvp+cs LsZbQDs2kBYyJzK/Vvs4xuM+88vhoVe2wArQ5UPTvDhVTmH1XTpswsFkqAJxxMT5KaTw5idOruBw0 ZkbVAd/fCM6Bcxek7EqBDFoDJrtspVMF7AspC6VfLDFvTRi8DLsY4fhjlwTOURDAQZ4kspXM2oscQ 4E3acgDbEQtXo17fhD9CTyzf1ganp8iARSSNtUUh/wHg9lZeZSFdMspMyerSfqthPE7H+ceS2RfZo JbhuThbYhpWbf85+361A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOksr-00DJ6F-9p; Fri, 10 Sep 2021 18:04:17 +0000 Received: from mail-yb1-xb31.google.com ([2607:f8b0:4864:20::b31]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mOksm-00DJ5T-Dk for linux-arm-kernel@lists.infradead.org; Fri, 10 Sep 2021 18:04:14 +0000 Received: by mail-yb1-xb31.google.com with SMTP id r4so5567752ybp.4 for ; Fri, 10 Sep 2021 11:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=OftdWZEwD9jdXht+HSnlAwhydSymZg+fXMuExwKIPpWPSdPet2l673kSg8FcGtw/6d q/A8Jammz5TZedHA0AghaMGGChHtT4/kVWecAClUWj5q1tcoBkPQ91R8uZfezyXn1maC dYBLtWCRik7kgp43oQveNCvzkjyyNnCZtQRG8fAd0m1JyDBsgXnolXRZtTMW7Nd24Dm9 /R+toReJ9Jkosf8Ny7n9oy64MKoI6hxdAt9vg8RHkQ6J5ZouUO23IUvUJGlNZsriSIUT y/mncKScphEyMFh6hYP3TjUIv7at+65xBbQO8YlIAu7cB6/3mLMu/squbAehr5XeI1qJ osVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=FdiZIU18HRQNVcUBqI1gOpJDuHw72fPqFgD0vfSbxiM=; b=YH9L+bZM3W9iuYGBT+leMitFHjYRc2cEKlm3RhIINfSEXyKIGXJtZAFgfEr7XsvKkX /N0Z0dCyVVMXPN7Q0X5irGcP/eQsaPeIuaRZcaeDMBGWKic6JLsw3uFb2pyoVxcJEmMd osaBxFK0jIGL258ezuqZuKR/EmIB/xaqrnj4nzWg4Zzhk4BQ6orFNE33ZIX3SBvsq6Ho upJWd1XgPuvGbkyIRmbCApRrLqDGnQQWyZPpG6IQKPKSH83O1eA2ML/eDVhnzfD1Bs2Z Sm9S6dZ5ODVN3Lb0RtGfY/X5cJ1VjfnS+rimr1hQM1i/4JkQ+dySECMr7HD/oIshRUmA IDnw== X-Gm-Message-State: AOAM5315QiCITEftVQafpDeSMwaN/6dJ8rFoqzVB+ueN2RyKMHwRliBm +fbOKuu5/cdKaZZZ/tB9VJr2mbpqDww3ngozAX4m7A== X-Google-Smtp-Source: ABdhPJzWgdNOv8FFFa8yER05OfPRQry5w0Mk8yQAnalMrVdKBP5XCEEVprWbGAlMxK82fvaBzfD7oAiOSSVboVdVasw= X-Received: by 2002:a25:8093:: with SMTP id n19mr12994954ybk.414.1631297049652; Fri, 10 Sep 2021 11:04:09 -0700 (PDT) MIME-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> <20210909013818.1191270-10-rananta@google.com> <20210909075643.fhngqu6tqrpe33gl@gator> <20210910081001.4gljsvmcovvoylwt@gator> In-Reply-To: <20210910081001.4gljsvmcovvoylwt@gator> From: Raghavendra Rao Ananta Date: Fri, 10 Sep 2021 11:03:58 -0700 Message-ID: Subject: Re: [PATCH v4 09/18] KVM: arm64: selftests: Add guest support to get the vcpuid To: Andrew Jones Cc: Paolo Bonzini , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , 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-20210910_110412_531719_B44947B9 X-CRM114-Status: GOOD ( 32.37 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Sep 10, 2021 at 1:10 AM Andrew Jones wrote: > > On Thu, Sep 09, 2021 at 10:10:56AM -0700, Raghavendra Rao Ananta wrote: > > On Thu, Sep 9, 2021 at 12:56 AM Andrew Jones wrote: > > > > > > On Thu, Sep 09, 2021 at 01:38:09AM +0000, Raghavendra Rao Ananta wrote: > ... > > > > + for (i = 0; i < KVM_MAX_VCPUS; i++) { > > > > + vcpuid = vcpuid_map[i].vcpuid; > > > > + GUEST_ASSERT_1(vcpuid != VM_VCPUID_MAP_INVAL, mpidr); > > > > > > We don't want this assert if it's possible to have sparse maps, which > > > it probably isn't ever going to be, but... > > > > > If you look at the way the array is arranged, the element with > > VM_VCPUID_MAP_INVAL acts as a sentinel for us and all the proper > > elements would lie before this. So, I don't think we'd have a sparse > > array here. > > If we switch to my suggestion of adding map entries at vcpu-add time and > removing them at vcpu-rm time, then the array may become sparse depending > on the order of removals. > Oh, I get it now. But like you mentioned, we add entries to the map while the vCPUs are getting added and then sync_global_to_guest() later. This seems like a lot of maintainance, unless I'm interpreting it wrong or not seeing an advantage. I like your idea of coming up an arch-independent interface, however. So I modified it similar to the familiar ucall interface that we have and does everything in one shot to avoid any confusion: diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 010b59b13917..0e87cb0c980b 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -400,4 +400,24 @@ 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); +#define VM_CPUID_MAP_INVAL -1 + +struct vm_cpuid_map { + uint64_t hw_cpuid; + int vcpuid; +}; + +/* + * Create a vcpuid:hw_cpuid map and export it to the guest + * + * Input Args: + * vm - KVM VM. + * + * Output Args: None + * + * Must be called after all the vCPUs are added to the VM + */ +void vm_cpuid_map_init(struct kvm_vm *vm); +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..e796bb3984a6 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -16,6 +16,8 @@ static vm_vaddr_t exception_handlers; +static struct vm_cpuid_map cpuid_map[KVM_MAX_VCPUS]; + static uint64_t page_align(struct kvm_vm *vm, uint64_t v) { return (v + vm->page_size) & ~(vm->page_size - 1); @@ -426,3 +428,42 @@ void vm_install_exception_handler(struct kvm_vm *vm, int vector, assert(vector < VECTOR_NUM); handlers->exception_handlers[vector][0] = handler; } + +void vm_cpuid_map_init(struct kvm_vm *vm) +{ + int i = 0; + struct vcpu *vcpu; + struct vm_cpuid_map *map; + + TEST_ASSERT(!list_empty(&vm->vcpus), "vCPUs must have been created\n"); + + list_for_each_entry(vcpu, &vm->vcpus, list) { + map = &cpuid_map[i++]; + map->vcpuid = vcpu->id; + get_reg(vm, vcpu->id, KVM_ARM64_SYS_REG(SYS_MPIDR_EL1), &map->hw_cpuid); + map->hw_cpuid &= MPIDR_HWID_BITMASK; + } + + if (i < KVM_MAX_VCPUS) + cpuid_map[i].vcpuid = VM_CPUID_MAP_INVAL; + + sync_global_to_guest(vm, cpuid_map); +} + +int guest_get_vcpuid(void) +{ + int i, vcpuid; + uint64_t mpidr = read_sysreg(mpidr_el1) & MPIDR_HWID_BITMASK; + + for (i = 0; i < KVM_MAX_VCPUS; i++) { + vcpuid = cpuid_map[i].vcpuid; + + /* Was this vCPU added to the VM after the map was initialized? */ + GUEST_ASSERT_1(vcpuid != VM_CPUID_MAP_INVAL, mpidr); + + if (mpidr == cpuid_map[i].hw_cpuid) + return vcpuid; + } + + /* We should not be reaching here */ + GUEST_ASSERT_1(0, mpidr); + return -1; +} This would ensure that we don't have a sparse array and can use the last non-vCPU element as a sentinal node. If you still feel preparing the map as and when the vCPUs are created makes more sense, I can go for it. Regards, Raghavendra > Thanks, > drew > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel