From patchwork Thu Sep 9 01:38:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raghavendra Rao Ananta X-Patchwork-Id: 12482245 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=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 34F86C433EF for ; Thu, 9 Sep 2021 01:48:42 +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 0237861167 for ; Thu, 9 Sep 2021 01:48:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0237861167 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:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lCCyC8V1zANth3mCAXGB0ueNrlKrRKNTnQUbqByTk/M=; b=tZagmgz/gHCJfeyAE7IzlAe7tJ KnFBE6ILSKux4iQTvBN3bvW/L9qfKGyLjfC3xnQimDGjOV3qkQDvBZW8NMDiTZ5oBCFVLwKg5MvBn ZKGmVg/ugi9AkOGRvZmlDLa1SfPcVR6zKbsq8oU4fe9vP6s9P66aJRqky9jRPCdzkGWFE2ON3lMet +/6DvdkX+s9PI7gf9l14UiKlwhga+y/S5f/iFxfT9AQpKaGcHRvOQ8xWaabz1G9aMt47thuTJMaI8 nBxi2l05I3673wUOZn9peKiYWVYbXQmjtFLkUq9J6MxNtO9rQyozWkqNUre2TcQsZovGPZDTuKSVp UnztHPXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mO98O-007yPY-OL; Thu, 09 Sep 2021 01:45:50 +0000 Received: from mail-yb1-xb49.google.com ([2607:f8b0:4864:20::b49]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mO91n-007vSq-Ca for linux-arm-kernel@lists.infradead.org; Thu, 09 Sep 2021 01:39:00 +0000 Received: by mail-yb1-xb49.google.com with SMTP id w8-20020a259188000000b0059bf0bed21fso365326ybl.18 for ; Wed, 08 Sep 2021 18:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=dIO3bJcCcsJgj6H+C/RQ54N/wYHZAN3qawTcM2QNEMU=; b=WtlxqIExWluJ+gz3G6WEWAJzwZNCrMqhj5uBzg+xL/0WIZa269+Ew1WjzrCRnky+VI l2fHKBclWRDqYu1p9iZ9x90cpra2Cxsqf2uJ8DF+QDwgjr49JF87QoRS79Xm5b7d8r/G jxdZJLYeyEAFvDE2cXVgoG1gzo48wFTY5bo5OjeZ428FWDEk5b4Dlh4sA9OGeafsBrO5 mtBws12nX15l8HW/5vnVYsxSk1msKZLZP2POGVnXE7bm5MS/fPerK+jPhYug8xUe4550 hBr3NgA+jQ9uCAfH1tuYjzsKTAon8Y7Ou4hFOAQ9UVOZqqgxFp3gU2wNjKuYz3mIHK1q vHvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=dIO3bJcCcsJgj6H+C/RQ54N/wYHZAN3qawTcM2QNEMU=; b=eW49qTbz8V+wczTJV32p/prgEgUea6nlO8mqiAN3Ipt/sVgEfVl2dmIE9aEA0rO5Xz XdRPHg+7x71lfVsWdCfyR+lxG24N51CZIJ2G23Lrvb/DG0ANJwz87cI1fb9bLwVm6oc+ SE9ec1RLgO40TQKBrzel7CE9H6V7MsCBPXiC0t8XaQD+e5uFeCtqCeK1pufMdZ8FMAbq RlOooO748RfM7CpXYpSTOV7H4vsymFFbNAkmAtv8T1hgMjCjViiqwo57yc8WoLMRBUXa nRbd6pamsh0ZjP7ppvNecQCQ/WGPpplfNMWMfegas3vfmhD2V5Ksr0XxbwCmzWeUbVop rPDQ== X-Gm-Message-State: AOAM533BdMHwEe9Gyzi5MqoWQK94M9I3NJPP7eVllOsaUub+mHeldxSn MsrIy/VTZ/uMW90zEDV0z0kQeyaU3XWw X-Google-Smtp-Source: ABdhPJw3lyrZigZ0lyqnRcsV8MPIT9rXCF3qEygV0fl3otkVWKB+0GuwV1S2Fc90Bg6qc71tsxnR6E+M/WtZ X-Received: from rananta-virt.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1bcc]) (user=rananta job=sendgmr) by 2002:a25:c0c1:: with SMTP id c184mr542320ybf.382.1631151538010; Wed, 08 Sep 2021 18:38:58 -0700 (PDT) Date: Thu, 9 Sep 2021 01:38:14 +0000 In-Reply-To: <20210909013818.1191270-1-rananta@google.com> Message-Id: <20210909013818.1191270-15-rananta@google.com> Mime-Version: 1.0 References: <20210909013818.1191270-1-rananta@google.com> X-Mailer: git-send-email 2.33.0.153.gba50c8fa24-goog Subject: [PATCH v4 14/18] KVM: arm64: selftests: Add host support for vGIC From: Raghavendra Rao Ananta To: Paolo Bonzini , Marc Zyngier , Andrew Jones , James Morse , Alexandru Elisei , Suzuki K Poulose Cc: Catalin Marinas , Will Deacon , Peter Shier , Ricardo Koller , Oliver Upton , Reiji Watanabe , Jing Zhang , Raghavendra Rao Anata , 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-20210908_183859_476971_0793F124 X-CRM114-Status: GOOD ( 17.28 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. Signed-off-by: Raghavendra Rao Ananta --- tools/testing/selftests/kvm/Makefile | 2 +- .../selftests/kvm/include/aarch64/vgic.h | 20 +++++++ .../testing/selftests/kvm/lib/aarch64/vgic.c | 60 +++++++++++++++++++ 3 files changed, 81 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..3a776af958a0 --- /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, + 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..2318912ab134 --- /dev/null +++ b/tools/testing/selftests/kvm/lib/aarch64/vgic.c @@ -0,0 +1,60 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ARM Generic Interrupt Controller (GIC) v3 host support + */ + +#include +#include + +#include "kvm_util.h" +#include "vgic.h" + +#define VGIC_V3_GICD_SZ (SZ_64K) +#define VGIC_V3_GICR_SZ (2 * SZ_64K) + +/* + * vGIC-v3 default host setup + * + * Input args: + * vm - KVM 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, + uint64_t gicd_base_gpa, uint64_t gicr_base_gpa) +{ + uint64_t redist_attr; + int gic_fd, nr_vcpus; + unsigned int nr_gic_pages; + + nr_vcpus = vm_get_nr_vcpus(vm); + TEST_ASSERT(nr_vcpus > 0, "Invalid number of CPUs: %u\n", nr_vcpus); + + /* 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_get_mode(vm), VGIC_V3_GICD_SZ); + 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_get_mode(vm), + VGIC_V3_GICR_SZ * 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; +}