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 A67C3C83028 for ; Thu, 2 Sep 2021 17:28:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 90572610E5 for ; Thu, 2 Sep 2021 17:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346610AbhIBR3a (ORCPT ); Thu, 2 Sep 2021 13:29:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346499AbhIBR30 (ORCPT ); Thu, 2 Sep 2021 13:29:26 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1837C061757 for ; Thu, 2 Sep 2021 10:28:27 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id f129so2717703pgc.1 for ; Thu, 02 Sep 2021 10:28:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=tlkTv+QSdLj89BzEW2jIvlFhKPTJ8DlZMmZCRyVz7HU=; b=FdhRZcEWHVic1uoYs4TxzGQx1jBnt1hu2TuteTVmM94eqGRGZmxlpH8weXG9NzPdm8 tYqEi+kWRTsI71W8XqcbUIp2yrmpQMlCGd14tG8xzhA6l316CJVtXXu6uT+nu/3DSrAO SJy5ZJ56FflBwtg/FD5juUH50ILwZ0fTONMn2+aC+RyBePbxmsc8ACTBT9JvAzzxgpA2 pzO49NwrYqWUcPWHkqgqWAT8HzIaKxJ7MAu3uVGspflY2pkTPuQrxnxlunyiabvyVPiv XPumM07kxeu2lg5IabzOiSzMFS2MKX73GQM1Hiz93FAtHXC3RILOo2Rbrhz6jRRynvc9 iavw== 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=tlkTv+QSdLj89BzEW2jIvlFhKPTJ8DlZMmZCRyVz7HU=; b=peKy+K8LXYWcLMwGllD/pVYGgor3jQG2HrjKMriMDjafTY/yZzqewnGh35TCFmGi4+ XFlVoP7CsJZaeQdV9+vzyeF+DoeTBzleOf6ayHRRUN1g85m5oHRPO/XyRK70KP/2V8IH NjsUlJjDnGsfwoIMMdvtWMA4jSwfxTmWWeGtbL+6TR/DF1jtkkGAFpXvEEQPpSVTnX7T tdzU8g+Mm2ljOh3lWObFEavOXoNmLaiqdizK1rJpmwa/XcELBEsyKlm8IQb+Rx6ezBzu TjQGl2D7ulZ9qV1Mjz7cVeu9btWhOKrGozI1xlMU5xO6S+PBYs0b7OIQyJTCqKFVBV8b NyXw== X-Gm-Message-State: AOAM530ypLPMY8cHkrvEXU3FuGgq82DU96p3wu4sHmjCifXv0I6Fm9zu hNQkO5ceDkQrputGbvLzP6jp4Q== X-Google-Smtp-Source: ABdhPJz8r/7UkdfmCJP3knKikFIB42/rNdTHUUWLp90TllbLBlgVZbxCg0hV5rMB9wjHmZi6tgMQ8w== X-Received: by 2002:a63:b47:: with SMTP id a7mr4251871pgl.181.1630603707200; Thu, 02 Sep 2021 10:28:27 -0700 (PDT) Received: from google.com (150.12.83.34.bc.googleusercontent.com. [34.83.12.150]) by smtp.gmail.com with ESMTPSA id e8sm3736647pgg.31.2021.09.02.10.28.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 10:28:26 -0700 (PDT) Date: Thu, 2 Sep 2021 10:28:23 -0700 From: Ricardo Koller To: Raghavendra Rao Ananta Cc: Paolo Bonzini , Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon , Peter Shier , 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 Subject: Re: [PATCH v3 10/12] KVM: arm64: selftests: Add host support for vGIC Message-ID: 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 > setup from a host of view. 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) > + > +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); > + > + gic_fd = kvm_create_device(vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); Nit: you can return early if gic_fd is bad. > + > + 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); vgic_v3_map() implies that it's doing something vgic specific, when it's just converting bytes to pages. What about something like the following? virt_map(vm, addr, addr, VM_BYTES_TO_PAGES(vm, VGIC_V3_GICD_SZ)); and you add a VM_BYTES_TO_PAGES macro to include/kvm_util.h? I think this macro can be useful to others. > + > + 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 >