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 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 1FE49C433F5 for ; Tue, 14 Sep 2021 07:51:38 +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 DBC4E60F58 for ; Tue, 14 Sep 2021 07:51:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DBC4E60F58 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=ImjBxZjkin5gVNYgITIJVzJRTkdqgQ0wkQXSKWQYnX0=; b=XhCSrKilooSD34 n2bfNh/Qx7UATMG3Y/ak/9+6WFhWACtLW7gJaEj9VYkmXzW0T0MpqypbSAW+wKDC/KBVsOUpfvYpg SIZRJb6zC7JJs0K0tlMQiPmr4wnDLImo0Unz38u5gDKzlC5vHcNIPGDz1cncSRLv+rxFu6t0JRpnc eW7+IrpzApgDYuJ7Cs3YzAMTgndBSzPku5no/HfEiUM0BgfAGJ0e39esXzc2HUOaknUS10Bnusm+0 x1++MU1uwHgHw38/FH7mBaIyLTVGzgclyZdf43NylLAz1jNVNTpgnIPkT8C32E5ONkpJEVo2rlkiP w+lrhaxMBOr+EJmIQpqA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mQ3Cg-004ZIV-VR; Tue, 14 Sep 2021 07:50:07 +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 1mQ3Cc-004ZGV-Q8 for linux-arm-kernel@lists.infradead.org; Tue, 14 Sep 2021 07:50:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631605799; 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=R6Z78UAv1kninDvhZD/qhelNjlru3f9bIEDAEEJ+aas=; b=civYtNuqbQXIAvfT52tsD1J3Ww44wDSkPMYFSePm5Bwgul1qmANCIolgjwP76LGepo1Q+2 JeF+Xx6JsKPXbvgFY77iCpVscZdkaZXzbaQb+MKOl9Tr9/YCCr7/t87OzWb4zfpvnKIiHr sD0W5ibmJ3Rfdw6KKnhnjGURhCSAJew= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-23-2ea1IqthOV2aUmIHFrrC-A-1; Tue, 14 Sep 2021 03:49:57 -0400 X-MC-Unique: 2ea1IqthOV2aUmIHFrrC-A-1 Received: by mail-ed1-f70.google.com with SMTP id bf22-20020a0564021a5600b003c86b59e291so6306402edb.18 for ; Tue, 14 Sep 2021 00:49:57 -0700 (PDT) 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=R6Z78UAv1kninDvhZD/qhelNjlru3f9bIEDAEEJ+aas=; b=rK/rg8AwONaGySf/BAqnidVtam+9OYgWHhgu5IWgkaedG4DqNzb8NFREY+ZvmCI/Y/ d3fst4d8UMKkyXsiV/pE3cbpSa6CMplewE24QSDvv2GP48/RAjA8XEaxKmUZBoFqj/Mg 7YOHqpBjJkUe2jWRrEbw1e1oELboTMUdIWzRoLf5g5VcYZgTcIOdCDfOmOwOQojeYzbf RiYBwNyVNQAxJmv2+l+WouLQwLgxOpHcxZO+whEkgAqDyFBM99HxvwruF0uCifEZA+iW kgPmr73uUxdqEldVGoqDZDwngTWKlleviMUslfo8kN4n5CQ8cDDJWe3i0q2W/dU0vhyN dFKA== X-Gm-Message-State: AOAM5303TipMBaERnr0ffADxHEGvEGbTBfSHNw/vSn9rRsOI5fwpmaW5 uc0WzGjXaFyRTl3Lbhwl8y35uwqgeD7yx3cy5eGY4Q4UpE1MS97HdMGlFRpbOFVN8WdhtGDALY+ 0PPkYdzdK39wKujwT/vTWMQmmZjhzVNuqrAA= X-Received: by 2002:a17:906:50d:: with SMTP id j13mr10991456eja.58.1631605796665; Tue, 14 Sep 2021 00:49:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJTsoIi5L3KoB/sC54f49zilK1+Lotlu4FXZaBZwCghtwsY0aj86bOujiop9u3X1CIuwd6VQ== X-Received: by 2002:a17:906:50d:: with SMTP id j13mr10991428eja.58.1631605796384; Tue, 14 Sep 2021 00:49:56 -0700 (PDT) Received: from gator.home (cst2-174-132.cust.vodafone.cz. [31.30.174.132]) by smtp.gmail.com with ESMTPSA id dj8sm3925587edb.53.2021.09.14.00.49.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 00:49:55 -0700 (PDT) Date: Tue, 14 Sep 2021 09:49:53 +0200 From: Andrew Jones To: Raghavendra Rao Ananta 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 Subject: Re: [PATCH v6 12/14] KVM: arm64: selftests: Add host support for vGIC Message-ID: <20210914074953.lijtspubonocwz4u@gator.home> References: <20210913230955.156323-1-rananta@google.com> <20210913230955.156323-13-rananta@google.com> MIME-Version: 1.0 In-Reply-To: <20210913230955.156323-13-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-20210914_005002_983180_4FDDC63E X-CRM114-Status: GOOD ( 28.39 ) 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 Mon, Sep 13, 2021 at 11:09:53PM +0000, Raghavendra Rao Ananta wrote: > Implement a simple library to perform vGIC-v3 setup > from a host point of view. This includes creating a > vGIC device, setting up distributor and redistributor > attributes, and mapping the guest physical addresses. > > The definition of REDIST_REGION_ATTR_ADDR is taken from > aarch64/vgic_init test. Hence, replace the definition > by including vgic.h in the test file. > > Signed-off-by: Raghavendra Rao Ananta > Reviewed-by: Ricardo Koller > --- > tools/testing/selftests/kvm/Makefile | 2 +- > .../testing/selftests/kvm/aarch64/vgic_init.c | 3 +- > .../selftests/kvm/include/aarch64/vgic.h | 20 ++++++ > .../testing/selftests/kvm/lib/aarch64/vgic.c | 70 +++++++++++++++++++ > 4 files changed, 92 insertions(+), 3 deletions(-) > 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/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c > index 623f31a14326..157fc24f39c5 100644 > --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c > +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c > @@ -13,11 +13,10 @@ > #include "test_util.h" > #include "kvm_util.h" > #include "processor.h" > +#include "vgic.h" > > #define NR_VCPUS 4 > > -#define REDIST_REGION_ATTR_ADDR(count, base, flags, index) (((uint64_t)(count) << 52) | \ > - ((uint64_t)((base) >> 16) << 16) | ((uint64_t)(flags) << 12) | index) > #define REG_OFFSET(vcpu, offset) (((uint64_t)vcpu << 32) | offset) > > #define GICR_TYPER 0x8 > 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..0ecfb253893c > --- /dev/null > +++ b/tools/testing/selftests/kvm/include/aarch64/vgic.h > @@ -0,0 +1,20 @@ > +/* 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 > + > +#define REDIST_REGION_ATTR_ADDR(count, base, flags, index) \ > + (((uint64_t)(count) << 52) | \ > + ((uint64_t)((base) >> 16) << 16) | \ > + ((uint64_t)(flags) << 12) | \ > + index) > + > +int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, > + uint64_t gicd_base_gpa, uint64_t gicr_base_gpa); > + > +#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..9880caa8c7db > --- /dev/null > +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c > @@ -0,0 +1,70 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ARM Generic Interrupt Controller (GIC) v3 host support > + */ > + > +#include > +#include > +#include > + > +#include "kvm_util.h" > +#include "../kvm_util_internal.h" > +#include "vgic.h" > + > +/* > + * vGIC-v3 default host setup > + * > + * Input args: > + * vm - KVM VM > + * nr_vcpus - Number of vCPUs supported by 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. Since it depends on the number of > + * vCPUs for the VM, it must be called after all the vCPUs have been created. > + */ > +int vgic_v3_setup(struct kvm_vm *vm, unsigned int nr_vcpus, > + uint64_t gicd_base_gpa, uint64_t gicr_base_gpa) > +{ > + int gic_fd; > + uint64_t redist_attr; > + struct list_head *iter; > + unsigned int nr_gic_pages, nr_vcpus_created = 0; > + > + TEST_ASSERT(nr_vcpus, "Num of vCPUs cannot be empty\n"); nit: I'd rather spell out 'Number' > + > + /* > + * Make sure that the caller is infact calling this > + * function after all the vCPUs are added. > + */ > + list_for_each(iter, &vm->vcpus) > + nr_vcpus_created++; > + TEST_ASSERT(nr_vcpus == nr_vcpus_created, > + "No. of vCPUs requested (%u) doesn't match with the ones created for the VM (%u)\n", nit: Same nit here, s/No./Number/ > + nr_vcpus, nr_vcpus_created); > + > + /* Distributor setup */ > + 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); > + nr_gic_pages = vm_calc_num_guest_pages(vm->mode, KVM_VGIC_V3_DIST_SIZE); > + virt_map(vm, gicd_base_gpa, gicd_base_gpa, nr_gic_pages); > + > + /* Redistributor setup */ > + 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); > + nr_gic_pages = vm_calc_num_guest_pages(vm->mode, > + KVM_VGIC_V3_REDIST_SIZE * nr_vcpus); > + virt_map(vm, gicr_base_gpa, gicr_base_gpa, nr_gic_pages); > + > + 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.309.g3052b89438-goog > Otherwise, Reviewed-by: Andrew Jones _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel