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 mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F554C433FE for ; Fri, 25 Feb 2022 13:39:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 21E3C49E48; Fri, 25 Feb 2022 08:39:00 -0500 (EST) 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=@google.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 pRhZ2wVMF31H; Fri, 25 Feb 2022 08:38:58 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 6F1774B973; Fri, 25 Feb 2022 08:38:58 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 668EA40A84 for ; Fri, 25 Feb 2022 08:38:57 -0500 (EST) 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 4G3Bf9OtQdUH for ; Fri, 25 Feb 2022 08:38:55 -0500 (EST) Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 878114086D for ; Fri, 25 Feb 2022 08:38:55 -0500 (EST) Received: by mail-wm1-f74.google.com with SMTP id h206-20020a1c21d7000000b003552c13626cso1578895wmh.3 for ; Fri, 25 Feb 2022 05:38:55 -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=/+SpjgC0jG6CQg21wEvZTm0jszy4sJJM2cqYBg3JRRY=; b=AMtA6rityZk8j6G70XOYUcIP5oA+gjcLP7ze8vZXSY2eTddpJt801PvN25XeKhcSZT SBIhkljjJuFixzzL7zk5zRATW1MhXHIjUF6aUtbq9k6DaSmZnoWzPkPgOASxGmM9M23P m34TaRF+ncXrEj698Z793G/qTBkgxFBalcmMs/2OjFwOX5vb/1nUrA8BwfNaJ1S6jIM/ cBblZZx20B5z2/wsDeqzfLdiNQ6P/YG3VOgj/jmeAFuT8fn61VJjh9TNHarTx8cW4Z/M Ft3Tf2Efbi89ExfUKGKtbjWtn04n6/WLGlFdt/SiqLkKz3YKlIGx3Ze4jnKABRwNp+n2 uACg== 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=/+SpjgC0jG6CQg21wEvZTm0jszy4sJJM2cqYBg3JRRY=; b=41vy094gxNn/QbO2YnYHKo/RMjZUxPLMM+YK4ragFclQg8jyjCRuAjI05BUWMwMMJl R4O41Qaw/1LZewiI3P695OG176Qys0AOk2WrtfXr6vnxsFlx40E/KR3DpE1IezktlEAN sVUfGhyN0yU3gk/KHuJIL9gKT+Jfolapqn5UKVP9WTtcByMEJQqxzfJRtwe3MhUvu/+5 ff4P8FEearfPBzE0VtQ0+nP1Ci4+ZUd5aNGBf2tXzV/jgwyiEdqqIvV/vMouUetmjXFy dnbVL/YeE23nUMALSmAxT3z4nDDI4HcadIU67Wz0YGz2p1KtfiogKiecodiAG4UKeayQ JGqw== X-Gm-Message-State: AOAM531+ImmtESr9G4HgBQmi5lW+XlvJyV7Wjin7G0TJp8yTauV5NcXA LHhfEZWhTECiZjvVgzf2yPxe/k9u8EEEiSYndqo= X-Google-Smtp-Source: ABdhPJza+g3n2x7kQvjeer8sxUnsS+l3v0j61hYHE/p/1RqHjCxH8t3Z32ToW1goHP8iPY4y3B8xlphIu2b3hzI23dE= X-Received: from sene.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:27c4]) (user=sebastianene job=sendgmr) by 2002:a05:600c:42d6:b0:380:ed47:43e8 with SMTP id j22-20020a05600c42d600b00380ed4743e8mr2759182wme.61.1645796334671; Fri, 25 Feb 2022 05:38:54 -0800 (PST) Date: Fri, 25 Feb 2022 13:37:45 +0000 In-Reply-To: <20220225133743.41207-1-sebastianene@google.com> Message-Id: <20220225133743.41207-3-sebastianene@google.com> Mime-Version: 1.0 References: <20220225133743.41207-1-sebastianene@google.com> X-Mailer: git-send-email 2.35.1.574.g5d30c73bfb-goog Subject: [PATCH kvmtool v5 2/3] aarch64: Add stolen time support From: Sebastian Ene To: kvm@vger.kernel.org Cc: maz@kernel.org, will@kernel.org, kvmarm@lists.cs.columbia.edu 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 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 | 1 + arm/aarch64/pvtime.c | 98 ++++++++++++++++++++++++++ arm/include/arm-common/kvm-arch.h | 6 +- include/kvm/kvm-config.h | 1 + 6 files changed, 107 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..2b2c1ff 100644 --- a/arm/aarch64/include/kvm/kvm-cpu-arch.h +++ b/arm/aarch64/include/kvm/kvm-cpu-arch.h @@ -19,5 +19,6 @@ 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); #endif /* KVM__KVM_CPU_ARCH_H */ diff --git a/arm/aarch64/pvtime.c b/arm/aarch64/pvtime.c new file mode 100644 index 0000000..3c78aa7 --- /dev/null +++ b/arm/aarch64/pvtime.c @@ -0,0 +1,98 @@ +#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_supported; + char *usr_mem; +}; + +static struct pvtime_data_priv pvtime_data = { + .is_supported = true, + .usr_mem = NULL +}; + +static int pvtime__alloc_region(struct kvm *kvm) +{ + char *mem; + int ret = 0; + + mem = mmap(NULL, ARM_PVTIME_MMIO_SIZE, PROT_RW, + MAP_ANON_NORESERVE, -1, 0); + if (mem == MAP_FAILED) + return -errno; + + ret = kvm__register_dev_mem(kvm, ARM_PVTIME_MMIO_BASE, + ARM_PVTIME_MMIO_SIZE, mem); + if (ret) { + munmap(mem, ARM_PVTIME_MMIO_SIZE); + 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_MMIO_BASE, + ARM_PVTIME_MMIO_SIZE, pvtime_data.usr_mem); + munmap(pvtime_data.usr_mem, ARM_PVTIME_MMIO_SIZE); + pvtime_data.usr_mem = NULL; + return 0; +} + +dev_exit(pvtime__teardown_region); + +int kvm_cpu__setup_pvtime(struct kvm_cpu *vcpu) +{ + int ret; + bool has_stolen_time; + u64 pvtime_guest_addr = ARM_PVTIME_MMIO_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_supported) + return -ENOTSUP; + + has_stolen_time = kvm__supports_extension(vcpu->kvm, + KVM_CAP_STEAL_TIME); + if (!has_stolen_time) + return -errno; + + ret = ioctl(vcpu->vcpu_fd, KVM_HAS_DEVICE_ATTR, &pvtime_attr); + if (ret) + goto out_err; + + if (!pvtime_data.usr_mem) { + ret = pvtime__alloc_region(vcpu->kvm); + if (ret) + 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; + + pvtime__teardown_region(vcpu->kvm); +out_err: + pvtime_data.is_supported = false; + return ret; +} diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h index c645ac0..3f82663 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_MMIO_BASE (ARM_RTC_MMIO_BASE + ARM_RTC_MMIO_SIZE) +#define ARM_PVTIME_MMIO_SIZE SZ_64K + #define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000) #define KVM_FLASH_MAX_SIZE 0x1000000 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.574.g5d30c73bfb-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm