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 3494FC433F5 for ; Thu, 17 Feb 2022 15:18:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B03EF48F9C; Thu, 17 Feb 2022 10:17:59 -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 RfZkZxS26wgl; Thu, 17 Feb 2022 10:17:58 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 731D249EBE; Thu, 17 Feb 2022 10:17:56 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id DD3FC49E37 for ; Thu, 17 Feb 2022 10:08: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 m8dwuK4C45DP for ; Thu, 17 Feb 2022 10:08:56 -0500 (EST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 58EB940BBF for ; Thu, 17 Feb 2022 10:08:56 -0500 (EST) Received: by mail-wr1-f42.google.com with SMTP id e3so9646120wra.0 for ; Thu, 17 Feb 2022 07:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=dw8y6DfT8cItFc3E/kYZhNuuPrxIuu5ppiDVXPQI9PM=; b=RPga9ENDDVsX0nUL9MeUD6OCRUXtY6eTIR9Nx7W4jwjItwWGTU6qYN+Qsox/VlEn0v gHeXZXAcSX+XNy1IOR/6POncTjxFeeXiea3gLQfe0XbT6IcBvElmZWQ+p4wdbWLeTdvL 0mf4Z1Km/tI5+BM3BXUD9sgNr+yVOoQgqtqDYhRDHXaH3kE8nHG6yQDGYR410zxgMlXG wWVt1/FePzBOPglwMOWyHJU8PBB/37C9sZjsFK1ekGVshBNQ691vO2cyySnIdjaxRN2d AuFhq5WUHv7qO70hyTUrEqfJg6x4jW+2KIqU48OLKCskJf5f0WfAdKvsC20lEbppGgik Hr7A== 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:mime-version :content-disposition; bh=dw8y6DfT8cItFc3E/kYZhNuuPrxIuu5ppiDVXPQI9PM=; b=ryd/joF+8ymb87tmhwMIenU6UmLnDIYNkiLuaq1VX2OU2B1go2HPH6xF/pcY2dx+mm x7SXiiuJqqL+zwQAfwFWr0Ao0HuFM4Hasb8wM8LHwBXo7mNP9xTHweU7cL+jwt1fbhc2 Eknn4TBZJjH6ZX0yiQVXwHTOAyQwulDVFGg1lXf4+c+WcjCy6Gyef82C/YkCzuGPkH5U d+sSbb/Fx+qpeOaby51dFKVfrlO2MPXBkmA7QTsrvOaBmImrdyMBHkXeazbmDsR/97Me iZVTMAQUmKb2JYhU5YtEyi39N3SCiOBEdGrX1YZFZZDDBdQ4QwX79WqeRdroQ2hv//dM B9xA== X-Gm-Message-State: AOAM531jQEIR/ACBnD8aROPSXPGjW/BvuqzzcF+Ax+VXI2CEOcPwikJp eVIGpQg7MV7xs4P8pmqejW3nqQ== X-Google-Smtp-Source: ABdhPJyPfwzZ6cBtMVwCB06BbpZOA8F8BzClb4YWNjfADnbr827x/j4WYyCREkHYuI/nZLJRmR82Pw== X-Received: by 2002:a5d:584b:0:b0:1e8:b478:ca0 with SMTP id i11-20020a5d584b000000b001e8b4780ca0mr2542777wrf.377.1645110535027; Thu, 17 Feb 2022 07:08:55 -0800 (PST) Received: from google.com (203.75.199.104.bc.googleusercontent.com. [104.199.75.203]) by smtp.gmail.com with ESMTPSA id n20sm1610984wmq.42.2022.02.17.07.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Feb 2022 07:08:54 -0800 (PST) Date: Thu, 17 Feb 2022 15:08:53 +0000 From: Sebastian Ene To: kvm@vger.kernel.org Subject: [PATCH kvmtool v2] aarch64: Add stolen time support Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Mailman-Approved-At: Thu, 17 Feb 2022 10:17:55 -0500 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. 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 | 1 + arm/aarch64/include/kvm/kvm-cpu-arch.h | 1 + arm/aarch64/pvtime.c | 84 ++++++++++++++++++++++++++ arm/include/arm-common/kvm-arch.h | 4 ++ arm/kvm-cpu.c | 14 ++--- 6 files changed, 98 insertions(+), 7 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..326fb20 100644 --- a/arm/aarch64/arm-cpu.c +++ b/arm/aarch64/arm-cpu.c @@ -22,6 +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; + kvm_cpu__setup_pvtime(vcpu); return 0; } diff --git a/arm/aarch64/include/kvm/kvm-cpu-arch.h b/arm/aarch64/include/kvm/kvm-cpu-arch.h index 8dfb82e..b57d6e6 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); +void 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..c09fd89 --- /dev/null +++ b/arm/aarch64/pvtime.c @@ -0,0 +1,84 @@ +#include "kvm/kvm.h" +#include "kvm/kvm-cpu.h" +#include "kvm/util.h" + +#include +#include + +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, AARCH64_PVTIME_IPA_MAX_SIZE, PROT_RW, + MAP_ANON_NORESERVE, -1, 0); + if (mem == MAP_FAILED) + return -ENOMEM; + + ret = kvm__register_dev_mem(kvm, AARCH64_PVTIME_IPA_START, + AARCH64_PVTIME_IPA_MAX_SIZE, mem); + if (ret) { + munmap(mem, AARCH64_PVTIME_IPA_MAX_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, AARCH64_PVTIME_IPA_START, + AARCH64_PVTIME_IPA_MAX_SIZE, pvtime_data.usr_mem); + munmap(pvtime_data.usr_mem, AARCH64_PVTIME_IPA_MAX_SIZE); + pvtime_data.usr_mem = NULL; + return 0; +} + +void kvm_cpu__setup_pvtime(struct kvm_cpu *vcpu) +{ + int ret; + u64 pvtime_guest_addr = AARCH64_PVTIME_IPA_START + vcpu->cpu_id * + AARCH64_PVTIME_SIZE; + struct kvm_device_attr pvtime_attr = (struct kvm_device_attr) { + .group = KVM_ARM_VCPU_PVTIME_CTRL, + .addr = KVM_ARM_VCPU_PVTIME_IPA + }; + + if (!pvtime_data.is_supported) + return; + + 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; + + pvtime__teardown_region(vcpu->kvm); +out_err: + pvtime_data.is_supported = false; +} + +dev_exit(pvtime__teardown_region); diff --git a/arm/include/arm-common/kvm-arch.h b/arm/include/arm-common/kvm-arch.h index c645ac0..865bd68 100644 --- a/arm/include/arm-common/kvm-arch.h +++ b/arm/include/arm-common/kvm-arch.h @@ -54,6 +54,10 @@ #define ARM_PCI_MMIO_SIZE (ARM_MEMORY_AREA - \ (ARM_AXI_AREA + ARM_PCI_CFG_SIZE)) +#define AARCH64_PVTIME_IPA_MAX_SIZE SZ_64K +#define AARCH64_PVTIME_IPA_START (ARM_MEMORY_AREA - \ + AARCH64_PVTIME_IPA_MAX_SIZE) +#define AARCH64_PVTIME_SIZE (64) #define ARM_LOMAP_MAX_MEMORY ((1ULL << 32) - ARM_MEMORY_AREA) #define ARM_HIMAP_MAX_MEMORY ((1ULL << 40) - ARM_MEMORY_AREA) diff --git a/arm/kvm-cpu.c b/arm/kvm-cpu.c index 6a2408c..84ac1e9 100644 --- a/arm/kvm-cpu.c +++ b/arm/kvm-cpu.c @@ -116,6 +116,13 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) die("Unable to find matching target"); } + /* Populate the vcpu structure. */ + vcpu->kvm = kvm; + vcpu->cpu_id = cpu_id; + vcpu->cpu_type = vcpu_init.target; + vcpu->cpu_compatible = target->compatible; + vcpu->is_running = true; + if (err || target->init(vcpu)) die("Unable to initialise vcpu"); @@ -125,13 +132,6 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) vcpu->ring = (void *)vcpu->kvm_run + (coalesced_offset * PAGE_SIZE); - /* Populate the vcpu structure. */ - vcpu->kvm = kvm; - vcpu->cpu_id = cpu_id; - vcpu->cpu_type = vcpu_init.target; - vcpu->cpu_compatible = target->compatible; - vcpu->is_running = true; - if (kvm_cpu__configure_features(vcpu)) die("Unable to configure requested vcpu features"); -- 2.35.1.265.g69c8d7142f-goog _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm