From patchwork Fri Feb 2 20:17:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 10198099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D0FD160362 for ; Fri, 2 Feb 2018 20:17:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B80FC28F0A for ; Fri, 2 Feb 2018 20:17:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC6F728F5F; Fri, 2 Feb 2018 20:17:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8482428F0A for ; Fri, 2 Feb 2018 20:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject: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=2HwuAZ8Lf1JsTNKeQo0C49mLbCJKUtWNpCl+eE9+aGk=; b=b1VMJtrUgWJ3m0 wwUdrzJp5ES54JXGUl7BhwIBZH8micsU/kVAeNfIQ76NGdFex0WmtjuY3BwUPAPg9Xg60Dn2gZ10O CT4s2yJWD+EsU8Ns+6qoUm70z99SneNSV40vhlMYTzzvCpEr54owX3BlymsV1aHUo+DNYxh4qmrFj +Ahvm5Z4SI0bZpFAIy1oCXc9QPWm4bqy43PXMHjGq5mTludakI5YQBe84m2fC5dmaHigQ4IRGcMOi /P2ljtkb/s/ZaXAWAQU22zvXcMM6DkSi6FeOKuHisAIu16u8Q3iAMpNIWIPk/LCeyhEqTOxEZLVah FbiJbBH2+ximUB5uR+/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ehhm6-0000vF-11; Fri, 02 Feb 2018 20:17:30 +0000 Received: from mx1.redhat.com ([209.132.183.28]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ehhm1-0000uL-OL for linux-arm-kernel@lists.infradead.org; Fri, 02 Feb 2018 20:17:28 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 73F64C0AA1; Fri, 2 Feb 2018 20:17:13 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E1B767DFC; Fri, 2 Feb 2018 20:17:09 +0000 (UTC) Date: Fri, 2 Feb 2018 21:17:06 +0100 From: Andrew Jones To: Marc Zyngier Subject: Re: [PATCH v3 08/18] arm/arm64: KVM: Add PSCI version selection API Message-ID: <20180202201706.dj6jmff7lh7bleze@kamzik.brq.redhat.com> References: <20180201114657.7323-1-marc.zyngier@arm.com> <20180201114657.7323-9-marc.zyngier@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180201114657.7323-9-marc.zyngier@arm.com> User-Agent: Mutt/1.6.0.1 (2016-04-01) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 02 Feb 2018 20:17:13 +0000 (UTC) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Peter Maydell , Lorenzo Pieralisi , Jon Masters , Ard Biesheuvel , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, Russell King - ARM Linux , Christoffer Dall , Hanjun Guo , Robin Murphy , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Jayachandran C Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Feb 01, 2018 at 11:46:47AM +0000, Marc Zyngier wrote: > Although we've implemented PSCI 1.0 and 1.1, nothing can select them > Since all the new PSCI versions are backward compatible, we decide to > default to the latest version of the PSCI implementation. This is no > different from doing a firmware upgrade on KVM. > > But in order to give a chance to hypothetical badly implemented guests > that would have a fit by discovering something other than PSCI 0.2, > let's provide a new API that allows userspace to pick one particular > version of the API. > > This is implemented as a new class of "firmware" registers, where > we expose the PSCI version. This allows the PSCI version to be > save/restored as part of a guest migration, and also set to > any supported version if the guest requires it. > > Signed-off-by: Marc Zyngier > --- > Documentation/virtual/kvm/api.txt | 3 +- > Documentation/virtual/kvm/arm/psci.txt | 30 +++++++++++++++ > arch/arm/include/asm/kvm_host.h | 3 ++ > arch/arm/include/uapi/asm/kvm.h | 6 +++ > arch/arm/kvm/guest.c | 13 +++++++ > arch/arm64/include/asm/kvm_host.h | 3 ++ > arch/arm64/include/uapi/asm/kvm.h | 6 +++ > arch/arm64/kvm/guest.c | 14 ++++++- > include/kvm/arm_psci.h | 9 +++++ > virt/kvm/arm/psci.c | 68 +++++++++++++++++++++++++++++++++- > 10 files changed, 151 insertions(+), 4 deletions(-) > create mode 100644 Documentation/virtual/kvm/arm/psci.txt > > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt > index 57d3ee9e4bde..334905202141 100644 > --- a/Documentation/virtual/kvm/api.txt > +++ b/Documentation/virtual/kvm/api.txt > @@ -2493,7 +2493,8 @@ Possible features: > and execute guest code when KVM_RUN is called. > - KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode. > Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only). > - - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU. > + - KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 (or a future revision > + backward compatible with v0.2) for the CPU. > Depends on KVM_CAP_ARM_PSCI_0_2. > - KVM_ARM_VCPU_PMU_V3: Emulate PMUv3 for the CPU. > Depends on KVM_CAP_ARM_PMU_V3. > diff --git a/Documentation/virtual/kvm/arm/psci.txt b/Documentation/virtual/kvm/arm/psci.txt > new file mode 100644 > index 000000000000..aafdab887b04 > --- /dev/null > +++ b/Documentation/virtual/kvm/arm/psci.txt > @@ -0,0 +1,30 @@ > +KVM implements the PSCI (Power State Coordination Interface) > +specification in order to provide services such as CPU on/off, reset > +and power-off to the guest. > + > +The PSCI specification is regularly updated to provide new features, > +and KVM implements these updates if they make sense from a virtualization > +point of view. > + > +This means that a guest booted on two different versions of KVM can > +observe two different "firmware" revisions. This could cause issues if > +a given guest is tied to a particular PSCI revision (unlikely), or if > +a migration causes a different PSCI version to be exposed out of the > +blue to an unsuspecting guest. > + > +In order to remedy this situation, KVM exposes a set of "firmware > +pseudo-registers" that can be manipulated using the GET/SET_ONE_REG > +interface. These registers can be saved/restored by userspace, and set > +to a convenient value if required. > + > +The following register is defined: > + > +* KVM_REG_ARM_PSCI_VERSION: > + > + - Only valid if the vcpu has the KVM_ARM_VCPU_PSCI_0_2 feature set > + (and thus has already been initialized) > + - Returns the current PSCI version on GET_ONE_REG (defaulting to the > + highest PSCI version implemented by KVM and compatible with v0.2) > + - Allows any PSCI version implemented by KVM and compatible with > + v0.2 to be set with SET_ONE_REG > + - Affects the whole VM (even if the register view is per-vcpu) Hi Marc, I've put some more thought and experimentation into this. I think we should change to a vcpu feature bit. The feature bit would be used to force compat mode, v0.2, so KVM would still enable the new PSCI version by default. Below are two tables describing why I think we should switch to something other than a new sysreg, and below those tables are notes as to why I think we should use a vcpu feature. The asterisks in the tables point out behaviors that aren't what we want. While both tables have an asterisk, the sysreg approach's issue is bug. The vcpu feature approach's issue is risk incurred from an unsupported migration, albeit one that is hard to detect without a new machine type. +-----------------------------------------------------------------------+ | sysreg approach | +------------------+-----------+-------+--------------------------------+ | migration | userspace | works | notes | | | change | | | +------------------+-----------+-------+--------------------------------+ | new -> new | NO | YES | Expected | +------------------+-----------+-------+--------------------------------+ | old -> new | NO | YES | PSCI 1.0 is backward compatible| +------------------+-----------+-------+--------------------------------+ | new -> old | NO | NO | Migration fails due to the new | | | | | sysreg. Migration shouldn't | | | | | have been attempted, but no | | | | | way to know without a new | | | | | machine type. | +------------------+-----------+-------+--------------------------------+ | compat -> old | YES | NO* | Even when setting PSCI version | | | | | to 0.2, we add a new sysreg, | | | | | so migration will still fail. | +------------------+-----------+-------+--------------------------------+ | old -> compat | YES | YES | It's OK for the destination to | | | | | support more sysregs than the | | | | | source sends. | +------------------+-----------+-------+--------------------------------+ +-----------------------------------------------------------------------+ | vcpu feature approach | +------------------+-----------+-------+--------------------------------+ | migration | userspace | works | notes | | | change | | | +------------------+-----------+-------+--------------------------------+ | new -> new | NO | YES | Expected | +------------------+-----------+-------+--------------------------------+ | old -> new | NO | YES | PSCI 1.0 is backward compatible| +------------------+-----------+-------+--------------------------------+ | new -> old | NO | YES* | Migrates, but it's not safe | | | | | for the guest kernel, and no | | | | | way to know without a new | | | | | machine type. | +------------------+-----------+-------+--------------------------------+ | compat -> old | YES | YES | Expected | +------------------+-----------+-------+--------------------------------+ | old -> compat | YES | YES | Expected | +------------------+-----------+-------+--------------------------------+ Notes as to why the vcpu feature approach was selected: 1) While this is VM state, and thus a VM control would be a more natural fit, a new vcpu feature bit would be much less new code. We also already have a PSCI vcpu feature bit, so a new one will actually fit quite well. 2) No new state needs to be migrated, as we already migrate the feature bitmap. Unlike, KVM, QEMU doesn't track the max number of features, so bumping it one more in KVM doesn't require a QEMU change. If we switch to a vcpu feature bit, then I think this patch can be replaced with something like this Thanks, drew > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index acbf9ec7b396..e9d57060d88c 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -75,6 +75,9 @@ struct kvm_arch { > /* Interrupt controller */ > struct vgic_dist vgic; > int max_vcpus; > + > + /* Mandated version of PSCI */ > + u32 psci_version; > }; > > #define KVM_NR_MEM_OBJS 40 > diff --git a/arch/arm/include/uapi/asm/kvm.h b/arch/arm/include/uapi/asm/kvm.h > index 6edd177bb1c7..47dfc99f5cd0 100644 > --- a/arch/arm/include/uapi/asm/kvm.h > +++ b/arch/arm/include/uapi/asm/kvm.h > @@ -186,6 +186,12 @@ struct kvm_arch_memory_slot { > #define KVM_REG_ARM_VFP_FPINST 0x1009 > #define KVM_REG_ARM_VFP_FPINST2 0x100A > > +/* KVM-as-firmware specific pseudo-registers */ > +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) > +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM | KVM_REG_SIZE_U64 | \ > + KVM_REG_ARM_FW | ((r) & 0xffff)) > +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) > + > /* Device Control API: ARM VGIC */ > #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 > #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 > diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c > index 1e0784ebbfd6..a18f33edc471 100644 > --- a/arch/arm/kvm/guest.c > +++ b/arch/arm/kvm/guest.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -176,6 +177,7 @@ static unsigned long num_core_regs(void) > unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) > { > return num_core_regs() + kvm_arm_num_coproc_regs(vcpu) > + + kvm_arm_get_fw_num_regs(vcpu) > + NUM_TIMER_REGS; > } > > @@ -196,6 +198,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) > uindices++; > } > > + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); > + if (ret) > + return ret; > + uindices += kvm_arm_get_fw_num_regs(vcpu); > + > ret = copy_timer_indices(vcpu, uindices); > if (ret) > return ret; > @@ -214,6 +221,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) > return get_core_reg(vcpu, reg); > > + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) > + return kvm_arm_get_fw_reg(vcpu, reg); > + > if (is_timer_reg(reg->id)) > return get_timer_reg(vcpu, reg); > > @@ -230,6 +240,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) > return set_core_reg(vcpu, reg); > > + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) > + return kvm_arm_set_fw_reg(vcpu, reg); > + > if (is_timer_reg(reg->id)) > return set_timer_reg(vcpu, reg); > > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 4485ae8e98de..10af386642c6 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -73,6 +73,9 @@ struct kvm_arch { > > /* Interrupt controller */ > struct vgic_dist vgic; > + > + /* Mandated version of PSCI */ > + u32 psci_version; > }; > > #define KVM_NR_MEM_OBJS 40 > diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h > index 9abbf3044654..04b3256f8e6d 100644 > --- a/arch/arm64/include/uapi/asm/kvm.h > +++ b/arch/arm64/include/uapi/asm/kvm.h > @@ -206,6 +206,12 @@ struct kvm_arch_memory_slot { > #define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2) > #define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2) > > +/* KVM-as-firmware specific pseudo-registers */ > +#define KVM_REG_ARM_FW (0x0014 << KVM_REG_ARM_COPROC_SHIFT) > +#define KVM_REG_ARM_FW_REG(r) (KVM_REG_ARM64 | KVM_REG_SIZE_U64 | \ > + KVM_REG_ARM_FW | ((r) & 0xffff)) > +#define KVM_REG_ARM_PSCI_VERSION KVM_REG_ARM_FW_REG(0) > + > /* Device Control API: ARM VGIC */ > #define KVM_DEV_ARM_VGIC_GRP_ADDR 0 > #define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1 > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > index 5c7f657dd207..811f04c5760e 100644 > --- a/arch/arm64/kvm/guest.c > +++ b/arch/arm64/kvm/guest.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -205,7 +206,7 @@ static int get_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu) > { > return num_core_regs() + kvm_arm_num_sys_reg_descs(vcpu) > - + NUM_TIMER_REGS; > + + kvm_arm_get_fw_num_regs(vcpu) + NUM_TIMER_REGS; > } > > /** > @@ -225,6 +226,11 @@ int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) > uindices++; > } > > + ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices); > + if (ret) > + return ret; > + uindices += kvm_arm_get_fw_num_regs(vcpu); > + > ret = copy_timer_indices(vcpu, uindices); > if (ret) > return ret; > @@ -243,6 +249,9 @@ int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) > return get_core_reg(vcpu, reg); > > + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) > + return kvm_arm_get_fw_reg(vcpu, reg); > + > if (is_timer_reg(reg->id)) > return get_timer_reg(vcpu, reg); > > @@ -259,6 +268,9 @@ int kvm_arm_set_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_CORE) > return set_core_reg(vcpu, reg); > > + if ((reg->id & KVM_REG_ARM_COPROC_MASK) == KVM_REG_ARM_FW) > + return kvm_arm_set_fw_reg(vcpu, reg); > + > if (is_timer_reg(reg->id)) > return set_timer_reg(vcpu, reg); > > diff --git a/include/kvm/arm_psci.h b/include/kvm/arm_psci.h > index 5446435457c2..4ee098c39e01 100644 > --- a/include/kvm/arm_psci.h > +++ b/include/kvm/arm_psci.h > @@ -24,7 +24,16 @@ > #define KVM_ARM_PSCI_0_2 PSCI_VERSION(0, 2) > #define KVM_ARM_PSCI_1_0 PSCI_VERSION(1, 0) > > +#define KVM_ARM_PSCI_LATEST KVM_ARM_PSCI_1_0 > + > int kvm_psci_version(struct kvm_vcpu *vcpu); > int kvm_psci_call(struct kvm_vcpu *vcpu); > > +struct kvm_one_reg; > + > +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu); > +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices); > +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); > +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg); > + > #endif /* __KVM_ARM_PSCI_H__ */ > diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c > index 291874cff85e..5c8366b71639 100644 > --- a/virt/kvm/arm/psci.c > +++ b/virt/kvm/arm/psci.c > @@ -17,6 +17,7 @@ > > #include > #include > +#include > #include > > #include > @@ -233,8 +234,19 @@ static void kvm_psci_system_reset(struct kvm_vcpu *vcpu) > > int kvm_psci_version(struct kvm_vcpu *vcpu) > { > - if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) > - return KVM_ARM_PSCI_0_2; > + /* > + * Our PSCI implementation stays the same across versions from > + * v0.2 onward, only adding the few mandatory functions (such > + * as FEATURES with 1.0) that are required by newer > + * revisions. It is thus safe to return the latest, unless > + * userspace has instructed us otherwise. > + */ > + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { > + if (vcpu->kvm->arch.psci_version) > + return vcpu->kvm->arch.psci_version; > + > + return KVM_ARM_PSCI_LATEST; > + } > > return KVM_ARM_PSCI_0_1; > } > @@ -406,3 +418,55 @@ int kvm_psci_call(struct kvm_vcpu *vcpu) > return -EINVAL; > }; > } > + > +int kvm_arm_get_fw_num_regs(struct kvm_vcpu *vcpu) > +{ > + return 1; /* PSCI version */ > +} > + > +int kvm_arm_copy_fw_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices) > +{ > + if (put_user(KVM_REG_ARM_PSCI_VERSION, uindices)) > + return -EFAULT; > + > + return 0; > +} > + > +int kvm_arm_get_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > +{ > + if (reg->id == KVM_REG_ARM_PSCI_VERSION) { > + void __user *uaddr = (void __user *)(long)reg->addr; > + u64 val; > + > + val = kvm_psci_version(vcpu); > + if (val == KVM_ARM_PSCI_0_1) > + return -EINVAL; > + if (copy_to_user(uaddr, &val, KVM_REG_SIZE(reg->id))) > + return -EFAULT; > + > + return 0; > + } > + > + return -EINVAL; > +} > + > +int kvm_arm_set_fw_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) > +{ > + if (reg->id == KVM_REG_ARM_PSCI_VERSION && > + test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { > + void __user *uaddr = (void __user *)(long)reg->addr; > + u64 val; > + > + if (copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id))) > + return -EFAULT; > + > + switch (val) { > + case KVM_ARM_PSCI_0_2: > + case KVM_ARM_PSCI_1_0: > + vcpu->kvm->arch.psci_version = val; > + return 0; > + } > + } > + > + return -EINVAL; > +} > -- > 2.14.2 > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 4485ae8e98de..cde330119fd3 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -42,7 +42,7 @@ #define KVM_MAX_VCPUS VGIC_V3_MAX_CPUS -#define KVM_VCPU_MAX_FEATURES 4 +#define KVM_VCPU_MAX_FEATURES 5 #define KVM_REQ_SLEEP \ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 9abbf3044654..53ac5a633331 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -100,6 +100,7 @@ struct kvm_regs { #define KVM_ARM_VCPU_EL1_32BIT 1 /* CPU running a 32bit VM */ #define KVM_ARM_VCPU_PSCI_0_2 2 /* CPU uses PSCI v0.2 */ #define KVM_ARM_VCPU_PMU_V3 3 /* Support guest PMUv3 */ +#define KVM_ARM_VCPU_FORCE_PSCI_0_2 4 /* PSCI v0.2 only, nothing later */ struct kvm_vcpu_init { __u32 target; diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index 291874cff85e..946f74539727 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -233,9 +233,11 @@ static void kvm_psci_system_reset(struct kvm_vcpu *vcpu) int kvm_psci_version(struct kvm_vcpu *vcpu) { - if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) + if (test_bit(KVM_ARM_VCPU_PSCI_0_2, vcpu->arch.features)) { + if (!test_bit(KVM_ARM_VCPU_FORCE_PSCI_0_2, vcpu->arch.features)) + return KVM_ARM_PSCI_LATEST; return KVM_ARM_PSCI_0_2; - + } return KVM_ARM_PSCI_0_1; }