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 5903AC433FE 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 35A6460FC4 for ; Fri, 3 Sep 2021 10:00:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348990AbhICKBo (ORCPT ); Fri, 3 Sep 2021 06:01:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26982 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348965AbhICKBg (ORCPT ); Fri, 3 Sep 2021 06:01:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630663236; 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=diVxGNX0UN8lnWsf9G9P0i0XL6AyU9SiawhPm4DzAk0a2R3aA0XuyXxyI3+gVu486ujqWa PeHc0zWla8+B2wYzS9dI3pjlrQdCGT0iI0OSNgP59y1xxRGhyfFm0kfYLqqLpyjZ7eIuQ6 huFfKYm8qSDDKUL4WpEt/GqhfykJLeg= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-6Jn1l9m2PF2SDrATmvKTMA-1; Fri, 03 Sep 2021 06:00:35 -0400 X-MC-Unique: 6Jn1l9m2PF2SDrATmvKTMA-1 Received: by mail-ed1-f71.google.com with SMTP id j13-20020aa7ca4d000000b003c44c679d73so2517644edt.8 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=b/ypj5FXPfFmo4I7L6Qj+r3VtgBRe5UovHAKMRGOzwxjYXnsMHAP2QXtlEA1b/4SVA T+QJ5tLoxhZyNGClUx00q8YZb1+txlv7c6TL3/ilYa0Wp8zY7ZJerrm+cWDPVtRhrT2A 0YGiZqMBSy4e5TMn5pprZyWt82UPgnUJCEF5rMWI4SVDG9sL+4A9iKQboER4K93N9P6L /vw8Pd+a60uO0n/Ab/80urWN6CU7Fh2wTJf4S//bsjupaK9SFBHtTek/HazgirFw+FHJ T16ewoLkwO9ThCaR5QMHu8Z/jN5bFpubEsqHdffUtPWhsnw47lGjcm2DaxstazKsjq0u q+ug== X-Gm-Message-State: AOAM530A5I7wFDG+YrTnxfJipniUUFA8sG55Ycmd1N7a1KmMBYN+tHw7 nCJtqvT3Gdr5s61UrMrIQZQiZGXQ3bsC9Aor4y12JHljpxHAS73QCXIaNRAA2I2uo3FFlFlMfQM n5T+/egY5wjAQL21DASY2Du22 X-Received: by 2002:a05:6402:158f:: with SMTP id c15mr3048049edv.253.1630663234130; 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: linux-kernel@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 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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 C7A85C433F5 for ; Fri, 3 Sep 2021 10:00:41 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 4BF83610CC for ; Fri, 3 Sep 2021 10:00:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4BF83610CC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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 CDBE34B19A; Fri, 3 Sep 2021 06:00:40 -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=@redhat.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 y8ypmOYN55bu; Fri, 3 Sep 2021 06:00:39 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 951854B172; Fri, 3 Sep 2021 06:00:39 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id AD62F4B13A for ; Fri, 3 Sep 2021 06:00:37 -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 0K7Eerl7017c for ; Fri, 3 Sep 2021 06:00:36 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mm01.cs.columbia.edu (Postfix) with ESMTP id A45554B126 for ; Fri, 3 Sep 2021 06:00:36 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630663236; 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=diVxGNX0UN8lnWsf9G9P0i0XL6AyU9SiawhPm4DzAk0a2R3aA0XuyXxyI3+gVu486ujqWa PeHc0zWla8+B2wYzS9dI3pjlrQdCGT0iI0OSNgP59y1xxRGhyfFm0kfYLqqLpyjZ7eIuQ6 huFfKYm8qSDDKUL4WpEt/GqhfykJLeg= 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-120-BTCRU6t5P0Sfvu6pzCWrfQ-1; Fri, 03 Sep 2021 06:00:35 -0400 X-MC-Unique: BTCRU6t5P0Sfvu6pzCWrfQ-1 Received: by mail-ej1-f71.google.com with SMTP id o7-20020a170906288700b005bb05cb6e25so2461298ejd.23 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=KGAbElXay/OFIxsxVwLlTyXgW3nXUk6XeXSPnFoNx72QDLjEkx4xTzHTZ1vxGKH153 L4z2ssuJ8RPO9lzdt6fKgAgZ0sdSy0D2KrbThMoGRr1GjCjsYPvD95wdO6eY0FMqkf09 LgufPNSFueabYCUKA1SatgFrQmRfTrXdGn/LAr41+/v3PgpQmSFUuYQDYiFcjLP8QiFk ns8QyTHaFa8dgmWrynlr0IGAEvM3sYi3ujJmX0q4HL5Xe0OAv8aqcMJj6Q9aK4GMOP2T cnCMriF0eSRAjFuSLA8xVVLHKWIKhCpSDaMDwSZlKN5/eZhSyQeEFl/aG9eqfGD+lWmK veHA== X-Gm-Message-State: AOAM533WRkXkR7Aciy2F1fdKAUFZZVEVtJy5uX+lXKeMTXTKgGs6NjVk AOw4xLY80kWcyDMteFk6xJM03nW3yQ4zpwArMcTy5A/rQFBrgOiL1CayBFpzqX4C15WBy5klmX+ 9Lx33+TnjV6iNQVvP4Vnyemmf X-Received: by 2002:a05:6402:158f:: with SMTP id c15mr3048054edv.253.1630663234149; 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 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 In-Reply-To: <20210901211412.4171835-11-rananta@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Cc: kvm@vger.kernel.org, Marc Zyngier , Peter Shier , linux-kernel@vger.kernel.org, Will Deacon , Catalin Marinas , 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 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 _______________________________________________ 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=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 42CB5C433EF for ; Fri, 3 Sep 2021 10:04:39 +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 EEB6261057 for ; Fri, 3 Sep 2021 10:04:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EEB6261057 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=d6hEwkwSOl9RirzqwC4bRs8rUbxSA9nRZZg43LlHOPw=; b=ElVKDCAbwuz/VL 5Y4GTV+rvmyiGplPiqck/q02b818VI6wBHNSoDwFw9GcZuDFUB12qEIpO2aOrnzfDF9nkie5q+bls 2EDUyW7C412CC6a+WEvR7klGxYozFKzoYNYdrrKdvUc1uZB/5k3pzzCMFVIbsBsHevL62LsJyDeQe RYT4cOOygPyjSadw4PfYR6p5yqs63pXERi8uzSi1iYIzO8LNb9SdC9YNntpkoakoa90atMRcBzNiz 9wEcy5n26lGODvc7OrKm3LC0rsmAlhlWBn6qwd19L7rQ46o2Oc34YKbILXkcMKb7lA/GaDlaPjaRs P0jsy3834Cx7etmojkyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mM603-00BbqC-PC; Fri, 03 Sep 2021 10:00:43 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mM5zz-00Bbow-Gf for linux-arm-kernel@lists.infradead.org; Fri, 03 Sep 2021 10:00:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630663236; 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=diVxGNX0UN8lnWsf9G9P0i0XL6AyU9SiawhPm4DzAk0a2R3aA0XuyXxyI3+gVu486ujqWa PeHc0zWla8+B2wYzS9dI3pjlrQdCGT0iI0OSNgP59y1xxRGhyfFm0kfYLqqLpyjZ7eIuQ6 huFfKYm8qSDDKUL4WpEt/GqhfykJLeg= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-un_CRgruNdG6EPlyU_FYkg-1; Fri, 03 Sep 2021 06:00:35 -0400 X-MC-Unique: un_CRgruNdG6EPlyU_FYkg-1 Received: by mail-ej1-f72.google.com with SMTP id x6-20020a170906710600b005c980192a39so2464133ejj.9 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=WO7AC3fPxp5A5/ZWIBA8laR/9Mo1vBnF919Lk8lmYMgsFrtVgxJ30wOPRLjhTqYIIP 0eyy+aADfIdpNzfSdbrVBa2ixKhLhgQuWt6TzmLfiL5kFt7urSQ3sh5KLw8oLd/nOd1R Mhn1GOervlqnVZXPR1x3wJHldqVJSOl7pGAbVTs9zPelNVzskcTJ4Pxo5oOrABvngjsr u/uQiLotf2I9e/UzXeY+D3+MP+mWfi/fauIxQ/uK7oin/h0El83PfKuOQGF749/9sbzT /WQntUdhexwB/9TRkomckGYUrZqYVYXb+bp5Zz/+Y8nX6BCqH0jFMkSX1cOtmPlrqfGi 3XpA== X-Gm-Message-State: AOAM533Tjwzmz2NMutSdhjNrAjS8tE7VxUTnW4u0oqoEbID+T/J48Zdt vzRyOA7wm8DiJgGjDOq5xRz4fsu82NnbG2dBnyZzys4HPgW4VLQiEgfdKmm6hVZsP5rfzX6Pdfc QH4HMloeAOkcX/94grk2FPchSnkFDSHDYVCE= X-Received: by 2002:a05:6402:158f:: with SMTP id c15mr3048042edv.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 In-Reply-To: <20210901211412.4171835-11-rananta@google.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=drjones@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210903_030039_697284_55A6B794 X-CRM114-Status: GOOD ( 25.73 ) 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 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel