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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,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 166A3C433F5 for ; Fri, 3 Sep 2021 10:00:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E7E4B60FC4 for ; Fri, 3 Sep 2021 10:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234262AbhICKBo (ORCPT ); Fri, 3 Sep 2021 06:01:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35876 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348980AbhICKBi (ORCPT ); Fri, 3 Sep 2021 06:01:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630663238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=3igdTtHZJcoCoJpD7fojeApCBGls6BL/jvmH1WvOuDM=; b=UKIVNTtZFlMeNP4DEP8kRUuJrwvKm7GMtrcFGoJfFQjCms4H7eHmcb0aSJSpXujANYkAL/ e9VYb6CA4iMB+ODDUM7ZNgrEzWrXcsz+pN5AaX5QfqxWzK5I92bTNbtrHPYWKZ8vEEscQ9 2eNWofP60WmDk2OyqFvyaqU259Bd4Tk= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-219-n2IkXl7nMICAI7-ZU2Z_Bg-1; Fri, 03 Sep 2021 06:00:35 -0400 X-MC-Unique: n2IkXl7nMICAI7-ZU2Z_Bg-1 Received: by mail-ej1-f71.google.com with SMTP id r21-20020a1709067055b02904be5f536463so2482003ejj.0 for ; Fri, 03 Sep 2021 03:00:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=3igdTtHZJcoCoJpD7fojeApCBGls6BL/jvmH1WvOuDM=; b=efr/L90KwsPGEOTOOg3X0avkhImI54TTVenNWviiJOQmpJVToyLeXElLD/tPVTLnrt Z+lEesWhmECWqEOqFubNwXA47guGJnjDn0E3hP/uyhRmN6NU48l3et14VjJyzlyFbme+ tDRpzFghCuXiysWMRycHzTZfmzQlUvanABVxjv8DymnctqBM9quZbgaz6+pNiy7NEDlK 1te/VTDQNQBkPi+CVH3DbvzGgzviNu7r6ViKijaUScrAcw8kTAoQ2Kk6QK3w7go1teMZ 8kL9/buyXiRQXndwB8W8sf1aGkSFQHdWY14DUaoe4oc8JET/juwgmsGp+UwUTwpLP4uH 8aVg== X-Gm-Message-State: AOAM531SHZi2nd3LUPwhmdLRqYnffoFBl6nizTIRTK00e0WujhNyMP8o ORCLbC8Ec/x1ZbO27n8TBWATOTq0Krn+0Xmi+LGpaaH5SWLLV8y1Z0Oxb1Mdh+1srAHlnS0x9vO 2w+YFKcGrvHTl X-Received: by 2002:a05:6402:158f:: with SMTP id c15mr3048039edv.253.1630663234096; Fri, 03 Sep 2021 03:00:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDFUlMIDXE+IsSeYUl/hyYHI/i3tITRvKEpzHkdvvPmhLT5T+fjuMEkkNmx9WOl1vnNskKow== X-Received: by 2002:a05:6402:158f:: with SMTP id c15mr3048026edv.253.1630663233899; Fri, 03 Sep 2021 03:00:33 -0700 (PDT) Received: from gator.home (cst2-174-132.cust.vodafone.cz. [31.30.174.132]) by smtp.gmail.com with ESMTPSA id i11sm2572030edu.97.2021.09.03.03.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 03:00:33 -0700 (PDT) Date: Fri, 3 Sep 2021 12:00:31 +0200 From: Andrew Jones To: Raghavendra Rao Ananta Cc: Paolo Bonzini , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , kvm@vger.kernel.org, Catalin Marinas , Peter Shier , linux-kernel@vger.kernel.org, Will Deacon , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v3 10/12] KVM: arm64: selftests: Add host support for vGIC Message-ID: <20210903100031.hptfzo5vqsgjteod@gator.home> References: <20210901211412.4171835-1-rananta@google.com> <20210901211412.4171835-11-rananta@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210901211412.4171835-11-rananta@google.com> Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Wed, Sep 01, 2021 at 09:14:10PM +0000, Raghavendra Rao Ananta wrote: > Implement a simple library to do perform vGIC-v3 s/do// > setup from a host of view. ^ point > This includes creating > a vGIC device, setting up distributor and redistributor > attributes, and mapping the guest physical addresses. > > Signed-off-by: Raghavendra Rao Ananta > > --- > tools/testing/selftests/kvm/Makefile | 2 +- > .../selftests/kvm/include/aarch64/vgic.h | 14 ++++ > .../testing/selftests/kvm/lib/aarch64/vgic.c | 67 +++++++++++++++++++ > 3 files changed, 82 insertions(+), 1 deletion(-) > create mode 100644 tools/testing/selftests/kvm/include/aarch64/vgic.h > create mode 100644 tools/testing/selftests/kvm/lib/aarch64/vgic.c > > diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile > index 5476a8ddef60..8342f65c1d96 100644 > --- a/tools/testing/selftests/kvm/Makefile > +++ b/tools/testing/selftests/kvm/Makefile > @@ -35,7 +35,7 @@ endif > > LIBKVM = lib/assert.c lib/elf.c lib/io.c lib/kvm_util.c lib/rbtree.c lib/sparsebit.c lib/test_util.c lib/guest_modes.c lib/perf_test_util.c > LIBKVM_x86_64 = lib/x86_64/apic.c lib/x86_64/processor.c lib/x86_64/vmx.c lib/x86_64/svm.c lib/x86_64/ucall.c lib/x86_64/handlers.S > -LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c lib/aarch64/handlers.S lib/aarch64/spinlock.c lib/aarch64/gic.c lib/aarch64/gic_v3.c > +LIBKVM_aarch64 = lib/aarch64/processor.c lib/aarch64/ucall.c lib/aarch64/handlers.S lib/aarch64/spinlock.c lib/aarch64/gic.c lib/aarch64/gic_v3.c lib/aarch64/vgic.c > LIBKVM_s390x = lib/s390x/processor.c lib/s390x/ucall.c lib/s390x/diag318_test_handler.c > > TEST_GEN_PROGS_x86_64 = x86_64/cr4_cpuid_sync_test > diff --git a/tools/testing/selftests/kvm/include/aarch64/vgic.h b/tools/testing/selftests/kvm/include/aarch64/vgic.h > new file mode 100644 > index 000000000000..45bbf238147a > --- /dev/null > +++ b/tools/testing/selftests/kvm/include/aarch64/vgic.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * ARM Generic Interrupt Controller (GIC) host specific defines > + */ > + > +#ifndef SELFTEST_KVM_VGIC_H > +#define SELFTEST_KVM_VGIC_H > + > +#include > + > +int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, > + uint64_t gicd_base_gpa, uint64_t gicr_base_gpa, uint32_t slot); > + > +#endif /* SELFTEST_KVM_VGIC_H */ > diff --git a/tools/testing/selftests/kvm/lib/aarch64/vgic.c b/tools/testing/selftests/kvm/lib/aarch64/vgic.c > new file mode 100644 > index 000000000000..a0e4b986d335 > --- /dev/null > +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c > @@ -0,0 +1,67 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ARM Generic Interrupt Controller (GIC) v3 host support > + */ > + > +#include > +#include > + > +#include "kvm_util.h" > + > +#define VGIC_V3_GICD_SZ (SZ_64K) > +#define VGIC_V3_GICR_SZ (2 * SZ_64K) > + > +#define REDIST_REGION_ATTR_ADDR(count, base, flags, index) \ > + (((uint64_t)(count) << 52) | \ > + ((uint64_t)((base) >> 16) << 16) | \ > + ((uint64_t)(flags) << 12) | \ > + index) This could go in vgic.h allowing us to share it in aarch64/vgic_init.c, where we already have the same definition. > + > +static void vgic_v3_map(struct kvm_vm *vm, uint64_t addr, unsigned int size) > +{ > + unsigned int n_pages = DIV_ROUND_UP(size, vm_get_page_size(vm)); > + > + virt_map(vm, addr, addr, n_pages); > +} > + > +/* > + * vGIC-v3 default host setup > + * > + * Input args: > + * vm - KVM VM > + * nr_vcpus - Number of vCPUs for this VM > + * gicd_base_gpa - Guest Physical Address of the Distributor region > + * gicr_base_gpa - Guest Physical Address of the Redistributor region > + * > + * Output args: None > + * > + * Return: GIC file-descriptor or negative error code upon failure > + * > + * The function creates a vGIC-v3 device and maps the distributor and > + * redistributor regions of the guest. > + */ > +int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, > + uint64_t gicd_base_gpa, uint64_t gicr_base_gpa) > +{ > + uint64_t redist_attr; > + int gic_fd; > + > + TEST_ASSERT(nr_vcpus <= KVM_MAX_VCPUS, > + "Invalid number of CPUs: %u\n", nr_vcpus); TEST_ASSERT(!list_empty(&vm->vcpus), ...) to ensure we've created vcpus first. To be really paranoid we could even confirm the number of vcpus in the list matches nr_vcpus. > + > + gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); > + > + kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, > + KVM_VGIC_V3_ADDR_TYPE_DIST, &gicd_base_gpa, true); > + vgic_v3_map(vm, gicd_base_gpa, VGIC_V3_GICD_SZ); > + > + redist_attr = REDIST_REGION_ATTR_ADDR(nr_vcpus, gicr_base_gpa, 0, 0); > + kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, > + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &redist_attr, true); > + vgic_v3_map(vm, gicr_base_gpa, VGIC_V3_GICR_SZ * nr_vcpus); > + > + kvm_device_access(gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, > + KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); > + > + return gic_fd; > +} > -- > 2.33.0.153.gba50c8fa24-goog Otherwise Reviewed-by: Andrew Jones Thanks, drew