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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66C96C433FE for ; Mon, 7 Mar 2022 14:43:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243342AbiCGOo0 (ORCPT ); Mon, 7 Mar 2022 09:44:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243338AbiCGOoY (ORCPT ); Mon, 7 Mar 2022 09:44:24 -0500 Received: from mail-wm1-x34a.google.com (mail-wm1-x34a.google.com [IPv6:2a00:1450:4864:20::34a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 753D5694A3 for ; Mon, 7 Mar 2022 06:43:29 -0800 (PST) Received: by mail-wm1-x34a.google.com with SMTP id d8-20020a05600c34c800b0037e3cd6225eso5307659wmq.6 for ; Mon, 07 Mar 2022 06:43:29 -0800 (PST) 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=BPLSEd5vKtbkzEK9habtqdbPyPr/HgsM+iLEMQGNjss=; b=V31MiLE3JI9/9lLfelscATWeSlG592DyNF/TaH1eWcngYG7J3qdSWTIp7udl5505jC TO/fC6+Zht++kYCfAiF8NV/zbQCMYTQCRz2ntUpDAvTlFiKitWow5eUIR9DjyOfKrc40 8JBj3DH75B9VHHF9CxKu3HmfY/tbeRJaZ3mlSAz1il22ge4+KgQBUYvKxvdL2PwZ+ld/ RRhwOkvv232ThBe8+H0MlIU5bRcq24AjL1tuCy+zIAbsDKawYwGmx0RAeLrtugQCq4nO rEF3iCoA+9U4Xn49z5t0xYuBsfeYk7ajTKnOM+XB6W6E9bxgOpegfnlFUQ7jUAWv5xTZ FSeg== 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=BPLSEd5vKtbkzEK9habtqdbPyPr/HgsM+iLEMQGNjss=; b=JsCM7QTBeS4105Dn5Y//RCFreUHfZoLv8RI55re9uMYD4+pnj2eoziq6G7zORTgMQG a89Wvmf12V+YR4KhjBWqwOw/OWW6QTau3ve+jn0JRxFuez1NGEx+/E5HK2bGWkwj6pM0 J2DtCZyOQz5AjWM4M6imbaCVVMKrZJlWOxAFuCr2ySx03eNhOehAQf8NavhKTHU8p2Gh R1O/D2gIOFF0sWi2MEFdDoD9IQN/M3MHroNTQLs4fu+r7DXmR4t73XDijiGYPEFS9xJG s8S5sou03V6GN4sxdCaMhGu1h6pcDz+K5pw6mRjgJkxL98fH+HeBOOul1gwv+prFFlZi DHCg== X-Gm-Message-State: AOAM531/4LKUUK0KGBgpVNKewa0b+ZRrTk2c8e7FCUJJkfTpcNj6LU3K yvV4FJKk2k/ObBYzF6UbAthtZPgDCI5rrsROdWp2hrKjLAJzWKVPN526VQ9TaCTnt2091c+y3TJ 8fgfcx3cCP/iCAEjbDAFGoJ2uE0cAw0VCPIyhA0ZVaBbn2iNTcJAAQdDP0LSDwUcLUKxmp4nPkA == X-Google-Smtp-Source: ABdhPJyeNg4evhrqmKMBSdSihuu+I6XNyXhd1vjMRxV0BSn52VRRZMKXBNpGQG4hgx1hJeepKb74/sR49zpfYso7bXg= X-Received: from sene.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:27c4]) (user=sebastianene job=sendgmr) by 2002:a05:6000:1d85:b0:1f2:197:60fc with SMTP id bk5-20020a0560001d8500b001f2019760fcmr2458619wrb.316.1646664207897; Mon, 07 Mar 2022 06:43:27 -0800 (PST) Date: Mon, 7 Mar 2022 14:42:43 +0000 In-Reply-To: <20220307144243.2039409-1-sebastianene@google.com> Message-Id: <20220307144243.2039409-3-sebastianene@google.com> Mime-Version: 1.0 References: <20220307144243.2039409-1-sebastianene@google.com> X-Mailer: git-send-email 2.35.1.616.g0bdcbb4464-goog Subject: [PATCH kvmtool v8 2/3] aarch64: Add stolen time support From: Sebastian Ene To: kvm@vger.kernel.org Cc: qperret@google.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, will@kernel.org, julien.thierry.kdev@gmail.com, Sebastian Ene Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch adds support for stolen time by sharing a memory region with the guest which will be used by the hypervisor to store the stolen time information. Reserve a 64kb MMIO memory region after the RTC peripheral to be used by pvtime. The exact format of the structure stored by the hypervisor is described in the ARM DEN0057A document. Signed-off-by: Sebastian Ene --- Makefile | 1 + arm/aarch64/arm-cpu.c | 2 +- arm/aarch64/include/kvm/kvm-cpu-arch.h | 2 + arm/aarch64/pvtime.c | 108 +++++++++++++++++++++++++ arm/include/arm-common/kvm-arch.h | 6 +- arm/kvm-cpu.c | 1 + include/kvm/kvm-config.h | 1 + 7 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 arm/aarch64/pvtime.c diff --git a/Makefile b/Makefile index f251147..e9121dc 100644 --- a/Makefile +++ b/Makefile @@ -182,6 +182,7 @@ ifeq ($(ARCH), arm64) OBJS += arm/aarch64/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o OBJS += arm/aarch64/kvm.o + OBJS += arm/aarch64/pvtime.o ARCH_INCLUDE := $(HDRS_ARM_COMMON) ARCH_INCLUDE += -Iarm/aarch64/include diff --git a/arm/aarch64/arm-cpu.c b/arm/aarch64/arm-cpu.c index d7572b7..7e4a3c1 100644 --- a/arm/aarch64/arm-cpu.c +++ b/arm/aarch64/arm-cpu.c @@ -22,7 +22,7 @@ static void generate_fdt_nodes(void *fdt, struct kvm *kvm) static int arm_cpu__vcpu_init(struct kvm_cpu *vcpu) { vcpu->generate_fdt_nodes = generate_fdt_nodes; - return 0; + return kvm_cpu__setup_pvtime(vcpu); } static struct kvm_arm_target target_generic_v8 = { diff --git a/arm/aarch64/include/kvm/kvm-cpu-arch.h b/arm/aarch64/include/kvm/kvm-cpu-arch.h index 8dfb82e..35996dc 100644 --- a/arm/aarch64/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch64/include/kvm/kvm-cpu-arch.h @@ -19,5 +19,7 @@ void kvm_cpu__select_features(struct kvm *kvm, struct kvm_vcpu_init *init); int kvm_cpu__configure_features(struct kvm_cpu *vcpu); +int kvm_cpu__setup_pvtime(struct kvm_cpu *vcpu); +int kvm_cpu__teardown_pvtime(struct kvm *kvm); #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/pvtime.c b/arm/aarch64/pvtime.c new file mode 100644 index 0000000..4db2e9f --- /dev/null +++ b/arm/aarch64/pvtime.c @@ -0,0 +1,108 @@ +#include "kvm/kvm.h" +#include "kvm/kvm-cpu.h" +#include "kvm/util.h" + +#include +#include + +#define ARM_PVTIME_STRUCT_SIZE (64) + +struct pvtime_data_priv { + bool is_failed_cfg; + void *usr_mem; +}; + +static struct pvtime_data_priv pvtime_data = { + .is_failed_cfg = true, + .usr_mem = NULL +}; + +static int pvtime__alloc_region(struct kvm *kvm) +{ + char *mem; + int ret = 0; + + mem = mmap(NULL, ARM_PVTIME_BASE, PROT_RW, + MAP_ANON_NORESERVE, -1, 0); + if (mem == MAP_FAILED) + return -errno; + + ret = kvm__register_ram(kvm, ARM_PVTIME_BASE, + ARM_PVTIME_BASE, mem); + if (ret) { + munmap(mem, ARM_PVTIME_BASE); + return ret; + } + + pvtime_data.usr_mem = mem; + return ret; +} + +static int pvtime__teardown_region(struct kvm *kvm) +{ + if (pvtime_data.usr_mem == NULL) + return 0; + + kvm__destroy_mem(kvm, ARM_PVTIME_BASE, + ARM_PVTIME_BASE, pvtime_data.usr_mem); + munmap(pvtime_data.usr_mem, ARM_PVTIME_BASE); + pvtime_data.usr_mem = NULL; + return 0; +} + +int kvm_cpu__setup_pvtime(struct kvm_cpu *vcpu) +{ + int ret; + bool has_stolen_time; + u64 pvtime_guest_addr = ARM_PVTIME_BASE + vcpu->cpu_id * + ARM_PVTIME_STRUCT_SIZE; + struct kvm_config *kvm_cfg = NULL; + struct kvm_device_attr pvtime_attr = (struct kvm_device_attr) { + .group = KVM_ARM_VCPU_PVTIME_CTRL, + .addr = KVM_ARM_VCPU_PVTIME_IPA + }; + + kvm_cfg = &vcpu->kvm->cfg; + if (kvm_cfg->no_pvtime) + return 0; + + if (!pvtime_data.is_failed_cfg) + return -ENOTSUP; + + has_stolen_time = kvm__supports_extension(vcpu->kvm, + KVM_CAP_STEAL_TIME); + if (!has_stolen_time) { + kvm_cfg->no_pvtime = true; + return 0; + } + + ret = ioctl(vcpu->vcpu_fd, KVM_HAS_DEVICE_ATTR, &pvtime_attr); + if (ret) { + perror("KVM_HAS_DEVICE_ATTR failed\n"); + goto out_err; + } + + if (!pvtime_data.usr_mem) { + ret = pvtime__alloc_region(vcpu->kvm); + if (ret) { + perror("Failed allocating pvtime region\n"); + goto out_err; + } + } + + pvtime_attr.addr = (u64)&pvtime_guest_addr; + ret = ioctl(vcpu->vcpu_fd, KVM_SET_DEVICE_ATTR, &pvtime_attr); + if (!ret) + return 0; + + perror("KVM_SET_DEVICE_ATTR failed\n"); + pvtime__teardown_region(vcpu->kvm); +out_err: + pvtime_data.is_failed_cfg = false; + return ret; +} + +int kvm_cpu__teardown_pvtime(struct kvm *kvm) +{ + return pvtime__teardown_region(kvm); +} diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h index c645ac0..43b1f77 100644 --- a/arm/include/arm-common/kvm-arch.h +++ b/arm/include/arm-common/kvm-arch.h @@ -15,7 +15,8 @@ * | PCI |////| plat | | | | | * | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM * | space |////| UART, | | MMIO | | (AXI) | - * | |////| RTC | | | | | + * | |////| RTC, | | | | | + * | |////| PVTIME| | | | | * +-------+----+-------+-------+--------+-----+---------+---...... */ @@ -34,6 +35,9 @@ #define ARM_RTC_MMIO_BASE (ARM_UART_MMIO_BASE + ARM_UART_MMIO_SIZE) #define ARM_RTC_MMIO_SIZE 0x10000 +#define ARM_PVTIME_BASE (ARM_RTC_MMIO_BASE + ARM_RTC_MMIO_SIZE) +#define ARM_PVTIME_SIZE SZ_64K + #define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000) #define KVM_FLASH_MAX_SIZE 0x1000000 diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 84ac1e9..00660d6 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -144,6 +144,7 @@ void kvm_cpu__arch_nmi(struct kvm_cpu *cpu) void kvm_cpu__delete(struct kvm_cpu *vcpu) { + kvm_cpu__teardown_pvtime(vcpu->kvm); free(vcpu); } diff --git a/include/kvm/kvm-config.h b/include/kvm/kvm-config.h index 6a5720c..48adf27 100644 --- a/include/kvm/kvm-config.h +++ b/include/kvm/kvm-config.h @@ -62,6 +62,7 @@ struct kvm_config { bool no_dhcp; bool ioport_debug; bool mmio_debug; + bool no_pvtime; }; #endif -- 2.35.1.616.g0bdcbb4464-goog