arm64: Stolen time support
Subsystems (8)
v5 cover arm64: Stolen time support
This series add support for paravirtualized time for arm64 guests and KVM hosts following the specification in Arm's document DEN 0057A:
https://developer.arm.com/docs/den0057/a
It implements support for stolen time, allowing the guest to identify time when it is forcibly not executing.
Note that Live Physical Time (LPT) which was previously part of the above specification has now been removed.
Also available as a git tree:git://linux-arm.org/linux-sp.git stolen_time/v5
Changes from v4:
https://lore.kernel.org/kvm/[email protected]/
* Rebased to v5.4-rc1
* Renamed KVM_ARM_VCPU_PVTIME_SET_IPA to remove _SET as it is used for both set/get operations
* Added kvm/arm_hypercalls.h to header-test-$(CONFIG_ARM{,64}) as it is only buildable on arm/arm64
* Documented no-steal-acc kernel parameter
Changes from v3:
https://lore.kernel.org/lkml/[email protected]/
* There's no longer a PV_TIME device, instead there are attributes on the VCPU. This allows the stolen time structures to be places arbitrarily by user space (subject to 64 byte alignment).
* Split documentation between information on the hypercalls and the attributes on the VCPU
* Fixed the type of SMCCC functions to return long not int
Changes from v2:
https://lore.kernel.org/lkml/[email protected]/
* Switched from using gfn_to_hva_cache to a new macro kvm_put_guest() that can provide the single-copy atomicity required (on arm64). This macro is added in patch 4.
* Tidied up the locking for kvm_update_stolen_time(). pagefault_disable() was unnecessary and the caller didn't need to take kvm->srcu as the function does it itself.
* Removed struct kvm_arch_pvtime from the arm implementation, replaced instead with inline static functions which are empty for arm.
* Fixed a few checkpatch --strict warnings.
Changes from v1:
https://lore.kernel.org/lkml/[email protected]/
* Host kernel no longer allocates the stolen time structure, instead it is allocated by user space. This means the save/restore functionality can be removed.
* Refactored the code so arm has stub implementations and to avoid initcall
* Rebased to pick up Documentation/{virt->virtual} change
* Bunch of typo fixes
Christoffer Dall (1):
KVM: arm/arm64: Factor out hypercall handling from PSCI code
Steven Price (9):
KVM: arm64: Document PV-time interface
KVM: arm64: Implement PV_FEATURES call
KVM: Implement kvm_put_guest()
KVM: arm64: Support stolen time reporting via shared structure
KVM: Allow kvm_device_ops to be const
KVM: arm64: Provide VCPU attributes for stolen time arm/arm64: Provide a wrapper for SMCCC 1.1 calls arm/arm64: Make use of the SMCCC 1.1 wrapper
arm64: Retrieve stolen time as paravirtualized guest
.../admin-guide/kernel-parameters.txt | 6 +- Documentation/virt/kvm/arm/pvtime.txt | 65 ++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++ arch/arm/include/asm/kvm_host.h | 26 +++ arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm/mm/proc-v7-bugs.c | 13 +- arch/arm64/include/asm/kvm_host.h | 30 +++- arch/arm64/include/asm/paravirt.h | 9 +- arch/arm64/include/asm/pvclock-abi.h | 17 ++ arch/arm64/include/uapi/asm/kvm.h | 2 + arch/arm64/kernel/cpu_errata.c | 80 ++++------ arch/arm64/kernel/paravirt.c | 148 ++++++++++++++++++ arch/arm64/kernel/time.c | 3 + arch/arm64/kvm/Kconfig | 1 + arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/guest.c | 9 ++ arch/arm64/kvm/handle_exit.c | 4 +- include/Kbuild | 2 + include/kvm/arm_hypercalls.h | 43 +++++ include/kvm/arm_psci.h | 2 +- include/linux/arm-smccc.h | 58 +++++++ include/linux/cpuhotplug.h | 1 + include/linux/kvm_host.h | 26 ++- include/linux/kvm_types.h | 2 + include/uapi/linux/kvm.h | 2 + virt/kvm/arm/arm.c | 11 ++ virt/kvm/arm/hypercalls.c | 68 ++++++++ virt/kvm/arm/psci.c | 84 +--------- virt/kvm/arm/pvtime.c | 124 +++++++++++++++ virt/kvm/kvm_main.c | 6 +- 31 files changed, 705 insertions(+), 157 deletions(-) create mode 100644 Documentation/virt/kvm/arm/pvtime.txt create mode 100644 arch/arm64/include/asm/pvclock-abi.h create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c create mode 100644 virt/kvm/arm/pvtime.c
Signature · 1 line
2.20.1
PATCH v5 1/10 KVM: arm64: Document PV-time interface
Introduce a paravirtualization interface for KVM/arm64 based on the "Arm Paravirtualized Time for Arm-Base Systems" specification DEN 0057A.
This only adds the details about "Stolen Time" as the details of "Live Physical Time" have not been fully agreed.
User space can specify a reserved area of memory for the guest and inform KVM to populate the memory with information on time that the host kernel has stolen from the guest.
A hypercall interface is provided for the guest to interrogate the hypervisor's support for this interface and the location of the shared memory structures.
--- Documentation/virt/kvm/arm/pvtime.txt | 65 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 79 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txt
Documentation/virt/kvm/arm/pvtime.txt new file +65 -0
@@ -0,0 +1,65 @@ +Paravirtualized time support for arm64 +====================================== + +Arm specification DEN0057/A defined a standard for paravirtualised time +support for AArch64 guests: + +https://developer.arm.com/docs/den0057/a + +KVM/arm64 implements the stolen time part of this specification by providing +some hypervisor service calls to support a paravirtualized guest obtaining a +view of the amount of time stolen from its execution. + +Two new SMCCC compatible hypercalls are defined: + +PV_FEATURES 0xC5000020 +PV_TIME_ST 0xC5000022 + +These are only available in the SMC64/HVC64 calling convention as +paravirtualized time is not available to 32 bit Arm guests. The existence of +the PV_FEATURES hypercall should be probed using the SMCCC 1.1 ARCH_FEATURES +mechanism before calling it. + +PV_FEATURES + Function ID: (uint32) : 0xC5000020 + PV_func_id: (uint32) : The function to query for support. + Currently only PV_TIME_ST is supported. + Return value: (int32) : NOT_SUPPORTED (-1) or SUCCESS (0) if the relevant + PV-time feature is supported by the hypervisor. + +PV_TIME_ST + Function ID: (uint32) : 0xC5000022 + Return value: (int64) : IPA of the stolen time data structure for this + VCPU. On failure: + NOT_SUPPORTED (-1) + +The IPA returned by PV_TIME_ST should be mapped by the guest as normal memory +with inner and outer write back caching attributes, in the inner shareable +domain. A total of 16 bytes from the IPA returned are guaranteed to be +meaningfully filled by the hypervisor (see structure below). + +PV_TIME_ST returns the structure for the calling VCPU. + +Stolen Time +----------- + +The structure pointed to by the PV_TIME_ST hypercall is as follows: + + Field | Byte Length | Byte Offset | Description + ----------- | ----------- | ----------- | -------------------------- + Revision | 4 | 0 | Must be 0 for version 0.1 + Attributes | 4 | 4 | Must be 0 + Stolen time | 8 | 8 | Stolen time in unsigned + | | | nanoseconds indicating how + | | | much time this VCPU thread + | | | was involuntarily not + | | | running on a physical CPU. + +The structure will be updated by the hypervisor prior to scheduling a VCPU. It +will be present within a reserved region of the normal memory given to the +guest. The guest should not attempt to write into this memory. There is a +structure per VCPU of the guest. + +For the user space interface see Documentation/virt/kvm/devices/vcpu.txt +section "3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL". +
Documentation/virt/kvm/devices/vcpu.txt +14 -0
@@ -60,3 +60,17 @@ time to use the number provided for a given timer, overwriting any previously configured values on other VCPUs. Userspace should configure the interrupt numbers on at least one VCPU after creating all VCPUs and before running any VCPUs. + +3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL +Architectures: ARM64 + +3.1 ATTRIBUTE: KVM_ARM_VCPU_PVTIME_IPA +Parameters: 64-bit base address +Returns: -ENXIO: Stolen time not implemented + -EEXIST: Base address already set for this VCPU + -EINVAL: Base address not 64 byte aligned + +Specifies the base address of the stolen time structure for this VCPU. The +base address must be 64 byte aligned and exist within a valid guest memory +region. See Documentation/virt/kvm/arm/pvtime.txt for more information +including the layout of the stolen time structure.
Signature · 1 line
2.20.1
Re: [PATCH v5 01/10] KVM: arm64: Document PV-time interface
Documentation/virt/kvm/arm/pvtime.txt
Quoted 26 lines · Steven Price
Introduce a paravirtualization interface for KVM/arm64 based on the "Arm Paravirtualized Time for Arm-Base Systems" specification DEN 0057A.
This only adds the details about "Stolen Time" as the details of "Live Physical Time" have not been fully agreed.
User space can specify a reserved area of memory for the guest and inform KVM to populate the memory with information on time that the host kernel has stolen from the guest.
A hypercall interface is provided for the guest to interrogate the hypervisor's support for this interface and the location of the shared memory structures.
Signed-off-by Steven Price <[email protected]>--- Documentation/virt/kvm/arm/pvtime.txt | 65 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 79 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txtDocumentation/virt/kvm/arm/pvtime.txt new file +0
-0
Maybe use .rst instead of .txt?
Documentation/virt/kvm/arm/pvtime.txt line 4
Quoted 5 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0@@ -0,0 +1,65 @@ +Paravirtualized time support for arm64 +====================================== + +Arm specification DEN0057/A defined a standard for paravirtualised time
s/defined/defines/ ?
Documentation/virt/kvm/arm/pvtime.txt line 15
Quoted 11 lines
Documentation/virt/kvm/arm/pvtime.txt new file +11
-0+support for AArch64 guests: + +https://developer.arm.com/docs/den0057/a + +KVM/arm64 implements the stolen time part of this specification by providing +some hypervisor service calls to support a paravirtualized guest obtaining a +view of the amount of time stolen from its execution. + +Two new SMCCC compatible hypercalls are defined: + +PV_FEATURES 0xC5000020
The spec calls this PV_TIME_FEATURES.
Documentation/virt/kvm/arm/pvtime.txt line 16
Quoted 1 line
Documentation/virt/kvm/arm/pvtime.txt new file +1
-0+PV_TIME_ST 0xC5000022
This is 0xC5000021 in the spec.
Documentation/virt/kvm/arm/pvtime.txt line 26
Quoted 10 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-0+ +These are only available in the SMC64/HVC64 calling convention as +paravirtualized time is not available to 32 bit Arm guests. The existence of +the PV_FEATURES hypercall should be probed using the SMCCC 1.1 ARCH_FEATURES +mechanism before calling it. + +PV_FEATURES + Function ID: (uint32) : 0xC5000020 + PV_func_id: (uint32) : The function to query for support. + Currently only PV_TIME_ST is supported.
The spec calls this PV_call_id, but maybe PV_func_id would have been better.
Documentation/virt/kvm/arm/pvtime.txt line 28
Quoted 2 lines
Documentation/virt/kvm/arm/pvtime.txt new file +2
-0+ Return value: (int32) : NOT_SUPPORTED (-1) or SUCCESS (0) if the relevant + PV-time feature is supported by the hypervisor.
This is an int64 in the spec.
Quoted 12 lines
Documentation/virt/kvm/arm/pvtime.txt new file +12
-0+ +PV_TIME_ST + Function ID: (uint32) : 0xC5000022 + Return value: (int64) : IPA of the stolen time data structure for this + VCPU. On failure: + NOT_SUPPORTED (-1) + +The IPA returned by PV_TIME_ST should be mapped by the guest as normal memory +with inner and outer write back caching attributes, in the inner shareable +domain. A total of 16 bytes from the IPA returned are guaranteed to be +meaningfully filled by the hypervisor (see structure below). +
Documentation/virt/kvm/arm/pvtime.txt line 50
Quoted 10 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-0+PV_TIME_ST returns the structure for the calling VCPU. + +Stolen Time +----------- + +The structure pointed to by the PV_TIME_ST hypercall is as follows: + + Field | Byte Length | Byte Offset | Description + ----------- | ----------- | ----------- | -------------------------- + Revision | 4 | 0 | Must be 0 for version 0.1
The spec version is 1.0 and Table 1 says "For implementations compliant with this revision of the specification...". So I think this description should be "Must be 0 for version 1.0".
Quoted 40 lines
Documentation/virt/kvm/arm/pvtime.txt new file +15
-0+ Attributes | 4 | 4 | Must be 0 + Stolen time | 8 | 8 | Stolen time in unsigned + | | | nanoseconds indicating how + | | | much time this VCPU thread + | | | was involuntarily not + | | | running on a physical CPU. + +The structure will be updated by the hypervisor prior to scheduling a VCPU. It +will be present within a reserved region of the normal memory given to the +guest. The guest should not attempt to write into this memory. There is a +structure per VCPU of the guest. + +For the user space interface see Documentation/virt/kvm/devices/vcpu.txt +section "3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL". +Documentation/virt/kvm/devices/vcpu.txt +14
-0@@ -60,3 +60,17 @@ time to use the number provided for a given timer, overwriting any previously configured values on other VCPUs. Userspace should configure the interrupt numbers on at least one VCPU after creating all VCPUs and before running any VCPUs. + +3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL +Architectures: ARM64 + +3.1 ATTRIBUTE: KVM_ARM_VCPU_PVTIME_IPA +Parameters: 64-bit base address +Returns: -ENXIO: Stolen time not implemented + -EEXIST: Base address already set for this VCPU + -EINVAL: Base address not 64 byte aligned + +Specifies the base address of the stolen time structure for this VCPU. The +base address must be 64 byte aligned and exist within a valid guest memory +region. See Documentation/virt/kvm/arm/pvtime.txt for more information +including the layout of the stolen time structure.Signature · 1 line
2.20.1
Thanks,
drew
Re: [PATCH v5 01/10] KVM: arm64: Document PV-time interface
Quoted 22 lines · Andrew Jones
Quoted 21 lines · Steven Price
Introduce a paravirtualization interface for KVM/arm64 based on the "Arm Paravirtualized Time for Arm-Base Systems" specification DEN 0057A.
This only adds the details about "Stolen Time" as the details of "Live Physical Time" have not been fully agreed.
User space can specify a reserved area of memory for the guest and inform KVM to populate the memory with information on time that the host kernel has stolen from the guest.
A hypercall interface is provided for the guest to interrogate the hypervisor's support for this interface and the location of the shared memory structures.
Signed-off-by Steven Price <[email protected]>--- Documentation/virt/kvm/arm/pvtime.txt | 65 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 79 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txt
Quoted 7 lines
Documentation/virt/kvm/arm/pvtime.txt
Quoted 5 lines
Documentation/virt/kvm/arm/pvtime.txt new file +0
-0Maybe use .rst instead of .txt?
Fair point - I guess .rst is the way of the future!
Quoted 22 lines
Documentation/virt/kvm/arm/pvtime.txt line 4
Quoted 5 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0@@ -0,0 +1,65 @@ +Paravirtualized time support for arm64 +====================================== + +Arm specification DEN0057/A defined a standard for paravirtualised times/defined/defines/ ?
Documentation/virt/kvm/arm/pvtime.txt line 15
Quoted 11 lines
Documentation/virt/kvm/arm/pvtime.txt new file +11
-0+support for AArch64 guests: + +https://developer.arm.com/docs/den0057/a + +KVM/arm64 implements the stolen time part of this specification by providing +some hypervisor service calls to support a paravirtualized guest obtaining a +view of the amount of time stolen from its execution. + +Two new SMCCC compatible hypercalls are defined: + +PV_FEATURES 0xC5000020The spec calls this
PV_TIME_FEATURES.
Quoted 3 lines
Documentation/virt/kvm/arm/pvtime.txt line 16
Quoted 1 line
Documentation/virt/kvm/arm/pvtime.txt new file +1
-0+PV_TIME_ST 0xC5000022This is
0xC5000021in the spec.
This is somewhat embarrassing. Apparently when I was reviewing the new specification I didn't notice these (subtle) changes. Thanks for pointing it out to me! I'll update the code to match.
Quoted 4 lines
Quoted 4 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0+ +These are only available in the SMC64/HVC64 calling convention as +paravirtualized time is not available to 32 bit Arm guests. The existence of +the PV_FEATURES hypercall should be probed using the SMCCC 1.1 ARCH_FEATURES
Quoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt line 26
Quoted 6 lines
Documentation/virt/kvm/arm/pvtime.txt new file +6
-0+mechanism before calling it. + +PV_FEATURES + Function ID: (uint32) : 0xC5000020 + PV_func_id: (uint32) : The function to query for support. + Currently only PV_TIME_ST is supported.The spec calls this
PV_call_id, but maybePV_func_idwould have been better.
I guess they are generally called "hypercalls" not "hyperfunctions" - so I'll match the spec here.
Quoted 4 lines
Documentation/virt/kvm/arm/pvtime.txt line 28
Quoted 2 lines
Documentation/virt/kvm/arm/pvtime.txt new file +2
-0+ Return value: (int32) : NOT_SUPPORTED (-1) or SUCCESS (0) if the relevant + PV-time feature is supported by the hypervisor.This is an int64 in the spec.
True - although the values easily fit in int32 too! But I'll update to be consistent with the spec.
Quoted 18 lines
Quoted 18 lines
Documentation/virt/kvm/arm/pvtime.txt new file +18
-0+ +PV_TIME_ST + Function ID: (uint32) : 0xC5000022 + Return value: (int64) : IPA of the stolen time data structure for this + VCPU. On failure: + NOT_SUPPORTED (-1) + +The IPA returned by PV_TIME_ST should be mapped by the guest as normal memory +with inner and outer write back caching attributes, in the inner shareable +domain. A total of 16 bytes from the IPA returned are guaranteed to be +meaningfully filled by the hypervisor (see structure below). + +PV_TIME_ST returns the structure for the calling VCPU. + +Stolen Time +----------- + +The structure pointed to by the PV_TIME_ST hypercall is as follows:
Quoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt line 50
Quoted 4 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0+ + Field | Byte Length | Byte Offset | Description + ----------- | ----------- | ----------- | -------------------------- + Revision | 4 | 0 | Must be 0 for version 0.1The spec version is 1.0 and Table 1 says "For implementations compliant with this revision of the specification...". So I think this description should be "Must be 0 for version 1.0".
Will update.
Thanks,
Steve
Quoted 44 lines
Quoted 40 lines
Documentation/virt/kvm/arm/pvtime.txt new file +15
-0+ Attributes | 4 | 4 | Must be 0 + Stolen time | 8 | 8 | Stolen time in unsigned + | | | nanoseconds indicating how + | | | much time this VCPU thread + | | | was involuntarily not + | | | running on a physical CPU. + +The structure will be updated by the hypervisor prior to scheduling a VCPU. It +will be present within a reserved region of the normal memory given to the +guest. The guest should not attempt to write into this memory. There is a +structure per VCPU of the guest. + +For the user space interface see Documentation/virt/kvm/devices/vcpu.txt +section "3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL". +Documentation/virt/kvm/devices/vcpu.txt +14
-0@@ -60,3 +60,17 @@ time to use the number provided for a given timer, overwriting any previously configured values on other VCPUs. Userspace should configure the interrupt numbers on at least one VCPU after creating all VCPUs and before running any VCPUs. + +3. GROUP: KVM_ARM_VCPU_PVTIME_CTRL +Architectures: ARM64 + +3.1 ATTRIBUTE: KVM_ARM_VCPU_PVTIME_IPA +Parameters: 64-bit base address +Returns: -ENXIO: Stolen time not implemented + -EEXIST: Base address already set for this VCPU + -EINVAL: Base address not 64 byte aligned + +Specifies the base address of the stolen time structure for this VCPU. The +base address must be 64 byte aligned and exist within a valid guest memory +region. See Documentation/virt/kvm/arm/pvtime.txt for more information +including the layout of the stolen time structure.Signature · 1 line
2.20.1Thanks,
drew
PATCH v5 2/10 KVM: arm/arm64: Factor out hypercall handling from PSCI code
In reply to Steven PriceFrom: Christoffer Dall <[email protected]>
We currently intertwine the KVM PSCI implementation with the general dispatch of hypercall handling, which makes perfect sense because PSCI is the only category of hypercalls we support.
However, as we are about to support additional hypercalls, factor out this functionality into a separate hypercall handler file.
--- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/handle_exit.c | 4 +- include/Kbuild | 2 + include/kvm/arm_hypercalls.h | 43 ++++++++++++++++++ include/kvm/arm_psci.h | 2 +- virt/kvm/arm/hypercalls.c | 59 +++++++++++++++++++++++++ virt/kvm/arm/psci.c | 84 +----------------------------------- 9 files changed, 112 insertions(+), 87 deletions(-) create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c
arch/arm/kvm/Makefile +1 -1
@@ -24,7 +24,7 @@ obj-y += kvm-arm.o init.o interrupts.o obj-y += handle_exit.o guest.o emulate.o reset.o obj-y += coproc.o coproc_a15.o coproc_a7.o vgic-v3-coproc.o obj-y += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o -obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o +obj-y += $(KVM)/arm/psci.o $(KVM)/arm/perf.o $(KVM)/arm/hypercalls.o obj-y += $(KVM)/arm/aarch32.o obj-y += $(KVM)/arm/vgic/vgic.o
arch/arm/kvm/handle_exit.c +1 -1
@@ -9,7 +9,7 @@#include <asm/kvm_emulate.h> #include <asm/kvm_coproc.h> #include <asm/kvm_mmu.h> -#include <kvm/arm_psci.h> +#include <kvm/arm_hypercalls.h> #include <trace/events/kvm.h> #include "trace.h"
arch/arm64/kvm/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp/ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/eventfd.o $(KVM)/vfio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o +kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hypercalls.o kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
arch/arm64/kvm/handle_exit.c +2 -2
@@ -11,8 +11,6 @@#include <linux/kvm.h> #include <linux/kvm_host.h> -#include <kvm/arm_psci.h> -#include <asm/esr.h> #include <asm/exception.h> #include <asm/kvm_asm.h>
@@ -22,6 +20,8 @@#include <asm/debug-monitors.h> #include <asm/traps.h> +#include <kvm/arm_hypercalls.h> +#define CREATE_TRACE_POINTS #include "trace.h"
include/Kbuild +2 -0
@@ -67,6 +67,8 @@ header-test- += keys/big_key-type.h header-test- += keys/request_key_auth-type.h header-test- += keys/trusted.h header-test- += kvm/arm_arch_timer.h +header-test-$(CONFIG_ARM) += kvm/arm_hypercalls.h +header-test-$(CONFIG_ARM64) += kvm/arm_hypercalls.h header-test- += kvm/arm_pmu.h header-test-$(CONFIG_ARM) += kvm/arm_psci.h header-test-$(CONFIG_ARM64) += kvm/arm_psci.h
include/kvm/arm_hypercalls.h new file +43 -0
43 lines not on this page · raw message
include/kvm/arm_psci.h +1 -1
@@ -40,7 +40,7 @@ static inline int kvm_psci_version(struct kvm_vcpu *vcpu, struct kvm *kvm) } -int kvm_hvc_call_handler (struct kvm_vcpu *vcpu); +int kvm_psci_call (struct kvm_vcpu *vcpu);struct kvm_one_reg ;
virt/kvm/arm/hypercalls.c new file +59 -0
59 lines not on this page · raw message
virt/kvm/arm/psci.c +2 -82
108 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v5 02/10] KVM: arm/arm64: Factor out hypercall handling from PSCI code
Quoted 12 lines · Steven Price
From: Christoffer Dall <[email protected]>
We currently intertwine the KVM PSCI implementation with the general dispatch of hypercall handling, which makes perfect sense because PSCI is the only category of hypercalls we support.
However, as we are about to support additional hypercalls, factor out this functionality into a separate hypercall handler file.
Signed-off-by Christoffer Dall <[email protected]>[[email protected]: rebased]Signed-off-by Steven Price <[email protected]>
Quoted 14 lines
--- arch/arm/kvm/Makefile | 2 +- arch/arm/kvm/handle_exit.c | 2 +- arch/arm64/kvm/Makefile | 1 + arch/arm64/kvm/handle_exit.c | 4 +- include/Kbuild | 2 + include/kvm/arm_hypercalls.h | 43 ++++++++++++++++++ include/kvm/arm_psci.h | 2 +- virt/kvm/arm/hypercalls.c | 59 +++++++++++++++++++++++++ virt/kvm/arm/psci.c | 84 +----------------------------------- 9 files changed, 112 insertions(+), 87 deletions(-) create mode 100644 include/kvm/arm_hypercalls.h create mode 100644 virt/kvm/arm/hypercalls.c
PATCH v5 3/10 KVM: arm64: Implement PV_FEATURES call
In reply to Steven PriceThis provides a mechanism for querying which paravirtualized features are available in this hypervisor.
Also add the header file which defines the ABI for the paravirtualized clock features we're about to add.
--- arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/include/asm/pvclock-abi.h | 17 +++++++++++++++++ arch/arm64/kvm/Makefile | 1 + include/linux/arm-smccc.h | 14 ++++++++++++++ virt/kvm/arm/hypercalls.c | 8 +++++++- virt/kvm/arm/pvtime.c | 21 +++++++++++++++++++++ 7 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/include/asm/pvclock-abi.h create mode 100644 virt/kvm/arm/pvtime.c
arch/arm/include/asm/kvm_host.h +6 -0
@@ -7,6 +7,7 @@#ifndef __ARM_KVM_HOST_H__#define __ARM_KVM_HOST_H__ +#include <linux/arm-smccc.h> #include <linux/errno.h> #include <linux/types.h> #include <linux/kvm_types.h>
@@ -323,6 +324,11 @@ static inline int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext)int kvm_perf_init (void );int kvm_perf_teardown (void ); +static inline long kvm_hypercall_pv_features (struct kvm_vcpu *vcpu) +{ +return SMCCC_RET_NOT_SUPPORTED ; +} +void kvm_mmu_wp_memory_region (struct kvm *kvm,int slot);struct kvm_vcpu *kvm_mpidr_to_vcpu (struct kvm *kvm,unsigned long mpidr);
arch/arm64/include/asm/kvm_host.h +2 -0
@@ -478,6 +478,8 @@ void handle_exit_early(struct kvm_vcpu *vcpu, struct kvm_run *run,int kvm_perf_init (void );int kvm_perf_teardown (void ); +long kvm_hypercall_pv_features (struct kvm_vcpu *vcpu); +void kvm_set_sei_esr (struct kvm_vcpu *vcpu,u64 syndrome);struct kvm_vcpu *kvm_mpidr_to_vcpu (struct kvm *kvm,unsigned long mpidr);
arch/arm64/include/asm/pvclock-abi.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2019 Arm Ltd. */ + +#ifndef __ASM_PVCLOCK_ABI_H +#define __ASM_PVCLOCK_ABI_H + +/* The below structure is defined in ARM DEN0057A */ + +struct pvclock_vcpu_stolen_time { +__le32 revision; +__le32 attributes; +__le64 stolen_time; +/* Structure must be 64 byte aligned, pad to that size */ +u8 padding[48 ]; +} __packed; + +#endif
arch/arm64/kvm/Makefile +1 -0
@@ -14,6 +14,7 @@ kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/kvm_main.o $(KVM)/coalesced_mmio.o $(KVM)/e kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/arm.o $(KVM)/arm/mmu.o $(KVM)/arm/mmio.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/psci.o $(KVM)/arm/perf.o kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hypercalls.o +kvm-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/pvtime.o kvm-$(CONFIG_KVM_ARM_HOST) += inject_fault.o regmap.o va_layout.o kvm-$(CONFIG_KVM_ARM_HOST) += hyp.o hyp-init.o handle_exit.o
include/linux/arm-smccc.h +14 -0
@@ -45,6 +45,7 @@#define ARM_SMCCC_OWNER_SIP 2#define ARM_SMCCC_OWNER_OEM 3#define ARM_SMCCC_OWNER_STANDARD 4 +#define ARM_SMCCC_OWNER_STANDARD_HYP 5#define ARM_SMCCC_OWNER_TRUSTED_APP 48#define ARM_SMCCC_OWNER_TRUSTED_APP_END 49#define ARM_SMCCC_OWNER_TRUSTED_OS 50
@@ -302,5 +303,18 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,#define SMCCC_RET_NOT_SUPPORTED -1#define SMCCC_RET_NOT_REQUIRED -2 +/* Paravirtualised time calls (defined by ARM DEN0057A) */ +#define ARM_SMCCC_HV_PV_FEATURES \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_STANDARD_HYP, \ + 0x20) + +#define ARM_SMCCC_HV_PV_TIME_ST \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_STANDARD_HYP, \ + 0x22) +#endif /*__ASSEMBLY__*/ #endif /*__LINUX_ARM_SMCCC_H*/
virt/kvm/arm/hypercalls.c +7 -1
@@ -12,7 +12,7 @@int kvm_hvc_call_handler (struct kvm_vcpu *vcpu) {u32 func_id =smccc_get_function (vcpu); -u32 val =SMCCC_RET_NOT_SUPPORTED ; +long val =SMCCC_RET_NOT_SUPPORTED ;u32 feature;switch (func_id) {
@@ -48,8 +48,14 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)break ; }break ; +case ARM_SMCCC_HV_PV_FEATURES : + val =SMCCC_RET_SUCCESS ; +break ; }break ; +case ARM_SMCCC_HV_PV_FEATURES : + val =kvm_hypercall_pv_features (vcpu); +break ;default :return kvm_psci_call (vcpu); }
virt/kvm/arm/pvtime.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +// Copyright (C) 2019 Arm Ltd. + +#include <linux/arm-smccc.h> + +#include <kvm/arm_hypercalls.h> + +long kvm_hypercall_pv_features (struct kvm_vcpu *vcpu) +{ +u32 feature =smccc_get_arg1 (vcpu); +long val =SMCCC_RET_NOT_SUPPORTED ; + +switch (feature) { +case ARM_SMCCC_HV_PV_FEATURES : + val =SMCCC_RET_SUCCESS ; +break ; + } + +return val; +} +
Signature · 1 line
2.20.1
PATCH v5 4/10 KVM: Implement kvm_put_guest()
In reply to Steven Pricekvm_put_guest() is analogous to put_user() - it writes a single value to the guest physical address. The implementation is built upon put_user() and so it has the same single copy atomic properties.
--- include/linux/kvm_host.h | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
include/linux/kvm_host.h +22 -0
@@ -746,6 +746,28 @@ int kvm_write_guest_offset_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc, unsigned long len);int kvm_gfn_to_hva_cache_init (struct kvm *kvm,struct gfn_to_hva_cache *ghc,gpa_t gpa,unsigned long len); + +#define __kvm_put_guest (kvm, gfn, offset, value, type) \ +({ \ + unsigned long __addr = gfn_to_hva(kvm, gfn); \ + type __user *__uaddr = (type __user *)(__addr + offset); \ + int __ret = -EFAULT; \ + \ + if (!kvm_is_error_hva(__addr)) \ + __ret = put_user(value, __uaddr); \ + if (!__ret) \ + mark_page_dirty(kvm, gfn); \ + __ret; \ +}) + +#define kvm_put_guest (kvm, gpa, value, type) \ +({ \ + gpa_t __gpa = gpa; \ + struct kvm *__kvm = kvm; \ + __kvm_put_guest(__kvm, __gpa >> PAGE_SHIFT, \ + offset_in_page(__gpa), (value), type); \ +}) +int kvm_clear_guest_page (struct kvm *kvm,gfn_t gfn,int offset,int len);int kvm_clear_guest (struct kvm *kvm,gpa_t gpa,unsigned long len);struct kvm_memory_slot *gfn_to_memslot (struct kvm *kvm,gfn_t gfn);
Signature · 1 line
2.20.1
PATCH v5 5/10 KVM: arm64: Support stolen time reporting via shared structure
In reply to Steven PriceImplement the service call for configuring a shared structure between a VCPU and the hypervisor in which the hypervisor can write the time stolen from the VCPU's execution time by other tasks on the host.
User space allocates memory which is placed at an IPA also chosen by user space. The hypervisor then updates the shared structure using kvm_put_guest() to ensure single copy atomicity of the 64-bit value reporting the stolen time in nanoseconds.
Whenever stolen time is enabled by the guest, the stolen time counter is reset.
The stolen time itself is retrieved from the sched_info structure maintained by the Linux scheduler code. We enable SCHEDSTATS when selecting KVM Kconfig to ensure this value is meaningful.
--- arch/arm/include/asm/kvm_host.h | 20 +++++++++++ arch/arm64/include/asm/kvm_host.h | 21 +++++++++++- arch/arm64/kvm/Kconfig | 1 + include/linux/kvm_types.h | 2 ++ virt/kvm/arm/arm.c | 11 ++++++ virt/kvm/arm/hypercalls.c | 3 ++ virt/kvm/arm/pvtime.c | 56 +++++++++++++++++++++++++++++++ 7 files changed, 113 insertions(+), 1 deletion(-)
arch/arm/include/asm/kvm_host.h +20 -0
@@ -39,6 +39,7 @@ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1)#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2) +#define KVM_REQ_RECORD_STEAL KVM_ARCH_REQ(3)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
@@ -329,6 +330,25 @@ static inline long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu)return SMCCC_RET_NOT_SUPPORTED ; } +static inline long kvm_hypercall_stolen_time (struct kvm_vcpu *vcpu) +{ +return SMCCC_RET_NOT_SUPPORTED ; +} + +static inline int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init) +{ +return -ENOTSUPP ; +} + +static inline void kvm_arm_pvtime_vcpu_init (struct kvm_vcpu_arch *vcpu_arch) +{ +} + +static inline bool kvm_arm_is_pvtime_enabled (struct kvm_vcpu_arch *vcpu_arch) +{ +return false; +} +void kvm_mmu_wp_memory_region (struct kvm *kvm,int slot);struct kvm_vcpu *kvm_mpidr_to_vcpu (struct kvm *kvm,unsigned long mpidr);
arch/arm64/include/asm/kvm_host.h +20 -1
@@ -44,6 +44,7 @@ KVM_ARCH_REQ_FLAGS(0, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1)#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2) +#define KVM_REQ_RECORD_STEAL KVM_ARCH_REQ(3)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
@@ -338,8 +339,14 @@ struct kvm_vcpu_arch {/* True when deferrable sysregs are loaded on the physical CPU, * see kvm_vcpu_load_sysregs and kvm_vcpu_put_sysregs. */ bool sysregs_loaded_on_cpu; -}; +/* Guest PV state */ +struct { +u64 steal; +u64 last_steal; +gpa_t base; + } steal; +};/* Pointer to the vcpu's SVE FFR for sve_{save,load}_state() */ #define vcpu_sve_pffr (vcpu) ((void *)((char *)((vcpu)->arch.sve_state) + \ sve_ffr_offset((vcpu)->arch.sve_max_vl)))
@@ -479,6 +486,18 @@ int kvm_perf_init(void);int kvm_perf_teardown (void );long kvm_hypercall_pv_features (struct kvm_vcpu *vcpu); +long kvm_hypercall_stolen_time (struct kvm_vcpu *vcpu); +int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init); + +static inline void kvm_arm_pvtime_vcpu_init (struct kvm_vcpu_arch *vcpu_arch) +{ + vcpu_arch->steal.base =GPA_INVALID ; +} + +static inline bool kvm_arm_is_pvtime_enabled (struct kvm_vcpu_arch *vcpu_arch) +{ +return (vcpu_arch->steal.base !=GPA_INVALID ); +}void kvm_set_sei_esr (struct kvm_vcpu *vcpu,u64 syndrome);
arch/arm64/kvm/Kconfig +1 -0
@@ -39,6 +39,7 @@ config KVM select IRQ_BYPASS_MANAGER select HAVE_KVM_IRQ_BYPASS select HAVE_KVM_VCPU_RUN_PID_CHANGE + select SCHEDSTATS ---help--- Support hosting virtualized guest machines. We don't support KVM with 16K page tables yet, due to the multiple
include/linux/kvm_types.h +2 -0
@@ -35,6 +35,8 @@ typedef unsigned long gva_t;typedef u64 gpa_t ;typedef u64 gfn_t ; +#define GPA_INVALID (~(gpa_t)0) +typedef unsigned long hva_t ;typedef u64 hpa_t ;typedef u64 hfn_t ;
virt/kvm/arm/arm.c +11 -0
@@ -40,6 +40,10 @@#include <asm/kvm_coproc.h> #include <asm/sections.h> +#include <kvm/arm_hypercalls.h> +#include <kvm/arm_pmu.h> +#include <kvm/arm_psci.h> +#ifdef REQUIRES_VIRT __asm__(".arch_extension virt" );#endif
@@ -351,6 +355,8 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)kvm_arm_reset_debug_ptr (vcpu); +kvm_arm_pvtime_vcpu_init (&vcpu->arch); +return kvm_vgic_vcpu_init (vcpu); }
@@ -380,6 +386,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)kvm_vcpu_load_sysregs (vcpu);kvm_arch_vcpu_load_fp (vcpu);kvm_vcpu_pmu_restore_guest (vcpu); +if (kvm_arm_is_pvtime_enabled (&vcpu->arch)) +kvm_make_request (KVM_REQ_RECORD_STEAL , vcpu);if (single_task_running ())vcpu_clear_wfe_traps (vcpu);
@@ -645,6 +653,9 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)* that a VCPU sees new virtual interrupts. */ kvm_check_request (KVM_REQ_IRQ_PENDING , vcpu); + +if (kvm_check_request (KVM_REQ_RECORD_STEAL , vcpu)) +kvm_update_stolen_time (vcpu, false); } }
virt/kvm/arm/hypercalls.c +3 -0
@@ -56,6 +56,9 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu)case ARM_SMCCC_HV_PV_FEATURES : val =kvm_hypercall_pv_features (vcpu);break ; +case ARM_SMCCC_HV_PV_TIME_ST : + val =kvm_hypercall_stolen_time (vcpu); +break ;default :return kvm_psci_call (vcpu); }
virt/kvm/arm/pvtime.c +56 -0
73 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v5 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 9 lines · Steven Price
virt/kvm/arm/pvtime.c +9
-0+int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init) +{ +struct kvm *kvm = vcpu->kvm; +u64 steal; +u64 steal_le; +u64 offset; +int idx; +u64 base = vcpu->arch.steal.base; +
virt/kvm/arm/pvtime.c line 28
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+if (base ==GPA_INVALID ) +return -ENOTSUPP ; + +/* Let's do the local bookkeeping */ + steal = vcpu->arch.steal.steal; + steal += current->sched_info.run_delay - vcpu->arch.steal.last_steal; + vcpu->arch.steal.last_steal = current->sched_info.run_delay; + vcpu->arch.steal.steal = steal; + + steal_le =cpu_to_le64 (steal);
Agreeing on a byte order for this interface makes sense, but I don't see it documented anywhere. Is this an SMCCC thing? Because I skimmed some of those specs and other users too but didn't see anything obvious. Anyway even if everybody but me knows that all data returned from SMCCC calls should be LE, it might be nice to document that in the pvtime doc.
Thanks,
drew
Re: [PATCH v5 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 18 lines · Andrew Jones
Quoted 17 lines · Steven Price
virt/kvm/arm/pvtime.c +17
-0+int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init) +{ +struct kvm *kvm = vcpu->kvm; +u64 steal; +u64 steal_le; +u64 offset; +int idx; +u64 base = vcpu->arch.steal.base; + +if (base ==GPA_INVALID ) +return -ENOTSUPP ; + +/* Let's do the local bookkeeping */ + steal = vcpu->arch.steal.steal; + steal += current->sched_info.run_delay - vcpu->arch.steal.last_steal; + vcpu->arch.steal.last_steal = current->sched_info.run_delay; + vcpu->arch.steal.steal = steal;
Quoted 9 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + steal_le = cpu_to_le64(steal);Agreeing on a byte order for this interface makes sense, but I don't see it documented anywhere. Is this an SMCCC thing? Because I skimmed some of those specs and other users too but didn't see anything obvious. Anyway even if everybody but me knows that all data returned from SMCCC calls should be LE, it might be nice to document that in the pvtime doc.
I have another [potentially dumb] SMCCC byte order question. If we need to worry about using LE for the members of this structure, then why don't we need to worry about the actual return values of the SMCCC calls? Like the IPA of the structure?
Thanks,
drew
Re: [PATCH v5 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 19 lines · Andrew Jones
Quoted 18 lines · Andrew Jones
Quoted 17 lines · Steven Price
virt/kvm/arm/pvtime.c +17
-0+int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init) +{ +struct kvm *kvm = vcpu->kvm; +u64 steal; +u64 steal_le; +u64 offset; +int idx; +u64 base = vcpu->arch.steal.base; + +if (base ==GPA_INVALID ) +return -ENOTSUPP ; + +/* Let's do the local bookkeeping */ + steal = vcpu->arch.steal.steal; + steal += current->sched_info.run_delay - vcpu->arch.steal.last_steal; + vcpu->arch.steal.last_steal = current->sched_info.run_delay; + vcpu->arch.steal.steal = steal;
Quoted 8 lines
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + steal_le = cpu_to_le64(steal);Agreeing on a byte order for this interface makes sense, but I don't see it documented anywhere. Is this an SMCCC thing? Because I skimmed some of those specs and other users too but didn't see anything obvious. Anyway even if everybody but me knows that all data returned from SMCCC calls should be LE, it might be nice to document that in the pvtime doc.
A very good point - I'll document this in the Linux document and feed that back for DEN0057A.
Quoted 5 lines
I have another [potentially dumb] SMCCC byte order question. If we need to worry about using LE for the members of this structure, then why don't we need to worry about the actual return values of the SMCCC calls? Like the IPA of the structure?
The SMCCC calls pass values in registers. It's only when reading/writing these values from/to memory that the endianness actually has any meaning.
Steve
Re: [PATCH v5 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 33 lines · Steven Price
Quoted 19 lines · Andrew Jones
Quoted 18 lines · Andrew Jones
Quoted 17 lines · Steven Price
virt/kvm/arm/pvtime.c +17
-0+int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init) +{ +struct kvm *kvm = vcpu->kvm; +u64 steal; +u64 steal_le; +u64 offset; +int idx; +u64 base = vcpu->arch.steal.base; + +if (base ==GPA_INVALID ) +return -ENOTSUPP ; + +/* Let's do the local bookkeeping */ + steal = vcpu->arch.steal.steal; + steal += current->sched_info.run_delay - vcpu->arch.steal.last_steal; + vcpu->arch.steal.last_steal = current->sched_info.run_delay; + vcpu->arch.steal.steal = steal;Quoted 8 lines
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + steal_le = cpu_to_le64(steal);Agreeing on a byte order for this interface makes sense, but I don't see it documented anywhere. Is this an SMCCC thing? Because I skimmed some of those specs and other users too but didn't see anything obvious. Anyway even if everybody but me knows that all data returned from SMCCC calls should be LE, it might be nice to document that in the pvtime doc.
A very good point - I'll document this in the Linux document and feed that back for DEN0057A.
Quoted 1 line
Quoted 8 lines
Quoted 4 lines
I have another [potentially dumb] SMCCC byte order question. If we need to worry about using LE for the members of this structure, then why don't we need to worry about the actual return values of the SMCCC calls? Like the IPA of the structure?
The SMCCC calls pass values in registers. It's only when reading/writing these values from/to memory that the endianness actually has any meaning.
Ah yes, of course.
Thanks,
drew
PATCH v5 6/10 KVM: Allow kvm_device_ops to be const
In reply to Steven PriceCurrently a kvm_device_ops structure cannot be const without triggering compiler warnings. However the structure doesn't need to be written to and, by marking it const, it can be read-only in memory. Add some more const keywords to allow this.
--- include/linux/kvm_host.h | 4 ++-- virt/kvm/kvm_main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
include/linux/kvm_host.h +2 -2
@@ -1260,7 +1260,7 @@ extern unsigned int halt_poll_ns_grow_start;extern unsigned int halt_poll_ns_shrink;struct kvm_device { -struct kvm_device_ops *ops; +const struct kvm_device_ops *ops;struct kvm *kvm;void *private;struct list_head vm_node;
@@ -1313,7 +1313,7 @@ struct kvm_device_ops {void kvm_device_get (struct kvm_device *dev);void kvm_device_put (struct kvm_device *dev);struct kvm_device *kvm_device_from_filp (struct file *filp); -int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type); +int kvm_register_device_ops (const struct kvm_device_ops *ops,u32 type);void kvm_unregister_device_ops (u32 type);extern struct kvm_device_ops kvm_mpic_ops;
virt/kvm/kvm_main.c +3 -3
@@ -3045,14 +3045,14 @@ struct kvm_device *kvm_device_from_filp(struct file *filp)return filp->private_data; } -static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX ] = { +static const struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX ] = { #ifdef CONFIG_KVM_MPIC [KVM_DEV_TYPE_FSL_MPIC_20 ] = &kvm_mpic_ops, [KVM_DEV_TYPE_FSL_MPIC_42 ] = &kvm_mpic_ops, #endif }; -int kvm_register_device_ops (struct kvm_device_ops *ops,u32 type) +int kvm_register_device_ops (const struct kvm_device_ops *ops,u32 type) {if (type >=ARRAY_SIZE (kvm_device_ops_table))return -ENOSPC ;
@@ -3073,7 +3073,7 @@ void kvm_unregister_device_ops(u32 type)static int kvm_ioctl_create_device (struct kvm *kvm,struct kvm_create_device *cd) { -struct kvm_device_ops *ops =NULL ; +const struct kvm_device_ops *ops =NULL ;struct kvm_device *dev;bool test = cd->flags &KVM_CREATE_DEVICE_TEST ;int type;
Signature · 1 line
2.20.1
Re: [PATCH v5 06/10] KVM: Allow kvm_device_ops to be const
Quoted 11 lines · Steven Price
Currently a
kvm_device_opsstructure cannot be const without triggering compiler warnings. However the structure doesn't need to be written to and, by marking it const, it can be read-only in memory. Add some more const keywords to allow this.Signed-off-by Steven Price <[email protected]>--- include/linux/kvm_host.h | 4 ++-- virt/kvm/kvm_main.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
PATCH v5 7/10 KVM: arm64: Provide VCPU attributes for stolen time
In reply to Steven PriceAllow user space to inform the KVM host where in the physical memory map the paravirtualized time structures should be located.
User space can set an attribute on the VCPU providing the IPA base address of the stolen time structure for that VCPU. This must be repeated for every VCPU in the VM.
The address is given in terms of the physical address visible to the guest and must be 64 byte aligned. The guest will discover the address via a hypercall.
--- arch/arm64/include/asm/kvm_host.h | 7 +++++ arch/arm64/include/uapi/asm/kvm.h | 2 ++ arch/arm64/kvm/guest.c | 9 ++++++ include/uapi/linux/kvm.h | 2 ++ virt/kvm/arm/pvtime.c | 47 +++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+)
arch/arm64/include/asm/kvm_host.h +7 -0
@@ -489,6 +489,13 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu);long kvm_hypercall_stolen_time (struct kvm_vcpu *vcpu);int kvm_update_stolen_time (struct kvm_vcpu *vcpu,bool init); +int kvm_arm_pvtime_set_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr); +int kvm_arm_pvtime_get_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr); +int kvm_arm_pvtime_has_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr); +static inline void kvm_arm_pvtime_vcpu_init (struct kvm_vcpu_arch *vcpu_arch) { vcpu_arch->steal.base =GPA_INVALID ;
arch/arm64/include/uapi/asm/kvm.h +2 -0
@@ -323,6 +323,8 @@ struct kvm_vcpu_events {#define KVM_ARM_VCPU_TIMER_CTRL 1#define KVM_ARM_VCPU_TIMER_IRQ_VTIMER 0#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1 +#define KVM_ARM_VCPU_PVTIME_CTRL 2 +#define KVM_ARM_VCPU_PVTIME_IPA 0/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_VCPU2_SHIFT 28
arch/arm64/kvm/guest.c +9 -0
@@ -858,6 +858,9 @@ int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,case KVM_ARM_VCPU_TIMER_CTRL : ret =kvm_arm_timer_set_attr (vcpu, attr);break ; +case KVM_ARM_VCPU_PVTIME_CTRL : + ret =kvm_arm_pvtime_set_attr (vcpu, attr); +break ;default : ret = -ENXIO ;break ;
@@ -878,6 +881,9 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu,case KVM_ARM_VCPU_TIMER_CTRL : ret =kvm_arm_timer_get_attr (vcpu, attr);break ; +case KVM_ARM_VCPU_PVTIME_CTRL : + ret =kvm_arm_pvtime_get_attr (vcpu, attr); +break ;default : ret = -ENXIO ;break ;
@@ -898,6 +904,9 @@ int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,case KVM_ARM_VCPU_TIMER_CTRL : ret =kvm_arm_timer_has_attr (vcpu, attr);break ; +case KVM_ARM_VCPU_PVTIME_CTRL : + ret =kvm_arm_pvtime_has_attr (vcpu, attr); +break ;default : ret = -ENXIO ;break ;
include/uapi/linux/kvm.h +2 -0
@@ -1227,6 +1227,8 @@ enum kvm_device_type {#define KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_ARM_VGIC_ITS KVM_DEV_TYPE_XIVE,#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE + KVM_DEV_TYPE_ARM_PV_TIME, +#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_MAX, };
virt/kvm/arm/pvtime.c +47 -0
57 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v5 8/10 arm/arm64: Provide a wrapper for SMCCC 1.1 calls
In reply to Steven PriceSMCCC 1.1 calls may use either HVC or SMC depending on the PSCI conduit. Rather than coding this in every call site provide a macro which uses the correct instruction. The macro also handles the case where no PSCI conduit is configured returning a not supported error in res, along with returning the conduit used for the call.
This allow us to remove some duplicated code and will be useful later when adding paravirtualized time hypervisor calls.
--- include/linux/arm-smccc.h | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
include/linux/arm-smccc.h +44 -0
@@ -303,6 +303,50 @@ asmlinkage void __arm_smccc_hvc(unsigned long a0, unsigned long a1,#define SMCCC_RET_NOT_SUPPORTED -1#define SMCCC_RET_NOT_REQUIRED -2 +/* Like arm_smccc_1_1* but always returns SMCCC_RET_NOT_SUPPORTED. +* Used when the PSCI conduit is not defined. The empty asm statement +* avoids compiler warnings about unused variables. +*/ +#define __fail_smccc_1_1 (...) \ + do { \ + __declare_args(__count_args(__VA_ARGS__), __VA_ARGS__); \ + asm ("" __constraints(__count_args(__VA_ARGS__))); \ + if (___res) \ + ___res->a0 = SMCCC_RET_NOT_SUPPORTED; \ + } while (0) + +/* +* arm_smccc_1_1_invoke() - make an SMCCC v1.1 compliant call +* +* This is a variadic macro taking one to eight source arguments, and +* an optional return structure. +* +* @a0-a7: arguments passed in registers 0 to 7 +* @res: result values from registers 0 to 3 +* +* This macro will make either an HVC call or an SMC call depending on the +* current PSCI conduit. If no valid conduit is available then -1 +* (SMCCC_RET_NOT_SUPPORTED) is returned in @res.a0 (if supplied). +* +* The return value also provides the conduit that was used. +*/ +#define arm_smccc_1_1_invoke (...) ({ \ + int method = psci_ops.conduit; \ + switch (method) { \ + case PSCI_CONDUIT_HVC: \ + arm_smccc_1_1_hvc(__VA_ARGS__); \ + break; \ + case PSCI_CONDUIT_SMC: \ + arm_smccc_1_1_smc(__VA_ARGS__); \ + break; \ + default: \ + __fail_smccc_1_1(__VA_ARGS__); \ + method = PSCI_CONDUIT_NONE; \ + break; \ + } \ + method; \ + }) +/* Paravirtualised time calls (defined by ARM DEN0057A) */ #define ARM_SMCCC_HV_PV_FEATURES \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \
Signature · 1 line
2.20.1
PATCH v5 9/10 arm/arm64: Make use of the SMCCC 1.1 wrapper
In reply to Steven PriceRather than directly choosing which function to use based on psci_ops.conduit, use the new arm_smccc_1_1 wrapper instead.
In some cases we still need to do some operations based on the conduit, but the code duplication is removed.
No functional change.
--- arch/arm/mm/proc-v7-bugs.c | 13 +++--- arch/arm64/kernel/cpu_errata.c | 80 ++++++++++++---------------------- 2 files changed, 33 insertions(+), 60 deletions(-)
arch/arm/mm/proc-v7-bugs.c +5 -8
@@ -78,12 +78,13 @@ static void cpu_v7_spectre_init(void)if (psci_ops.smccc_version ==SMCCC_VERSION_1_0 )break ; +arm_smccc_1_1_invoke (ARM_SMCCC_ARCH_FEATURES_FUNC_ID , +ARM_SMCCC_ARCH_WORKAROUND_1 , &res); +if ((int )res.a0 !=0 ) +return ; +switch (psci_ops.conduit) {case PSCI_CONDUIT_HVC : -arm_smccc_1_1_hvc (ARM_SMCCC_ARCH_FEATURES_FUNC_ID , -ARM_SMCCC_ARCH_WORKAROUND_1 , &res); -if ((int )res.a0 !=0 ) -break ;per_cpu (harden_branch_predictor_fn, cpu) = call_hvc_arch_workaround_1; cpu_do_switch_mm = cpu_v7_hvc_switch_mm;
@@ -91,10 +92,6 @@ static void cpu_v7_spectre_init(void)break ;case PSCI_CONDUIT_SMC : -arm_smccc_1_1_smc (ARM_SMCCC_ARCH_FEATURES_FUNC_ID , -ARM_SMCCC_ARCH_WORKAROUND_1 , &res); -if ((int )res.a0 !=0 ) -break ;per_cpu (harden_branch_predictor_fn, cpu) = call_smc_arch_workaround_1; cpu_do_switch_mm = cpu_v7_smc_switch_mm;
arch/arm64/kernel/cpu_errata.c +28 -52
117 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v5 10/10 arm64: Retrieve stolen time as paravirtualized guest
In reply to Steven PriceEnable paravirtualization features when running under a hypervisor supporting the PV_TIME_ST hypercall.
For each (v)CPU, we ask the hypervisor for the location of a shared page which the hypervisor will use to report stolen time to us. We set pv_time_ops to the stolen time function which simply reads the stolen value from the shared page for a VCPU. We guarantee single-copy atomicity using READ_ONCE which means we can also read the stolen time for another VCPU than the currently running one while it is potentially being updated by the hypervisor.
--- .../admin-guide/kernel-parameters.txt | 6 +- arch/arm64/include/asm/paravirt.h | 9 +- arch/arm64/kernel/paravirt.c | 148 ++++++++++++++++++ arch/arm64/kernel/time.c | 3 + include/linux/cpuhotplug.h | 1 + 5 files changed, 163 insertions(+), 4 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +3 -3
@@ -3083,9 +3083,9 @@ [X86,PV_OPS] Disable paravirtualized VMware scheduler clock and use the default one. - no-steal-acc [X86,KVM] Disable paravirtualized steal time accounting. - steal time is computed, but won't influence scheduler - behaviour + no-steal-acc [X86,KVM,ARM64] Disable paravirtualized steal time + accounting. steal time is computed, but won't + influence scheduler behaviour nolapic [X86-32,APIC] Do not enable or use the local APIC.
arch/arm64/include/asm/paravirt.h +8 -1
@@ -21,6 +21,13 @@ static inline u64 paravirt_steal_clock(int cpu) {return pv_ops.time.steal_clock (cpu); } -#endif + +int __init kvm_guest_init (void ); + +#else + +#define kvm_guest_init () + +#endif // CONFIG_PARAVIRT #endif
arch/arm64/kernel/paravirt.c +148 -0
161 lines not on this page · raw message
arch/arm64/kernel/time.c +3 -0
@@ -30,6 +30,7 @@#include <asm/thread_info.h> #include <asm/stacktrace.h> +#include <asm/paravirt.h> unsigned long profile_pc (struct pt_regs *regs) {
@@ -65,4 +66,6 @@ void __init time_init(void)/* Calibrate the delay loop directly */ lpj_fine = arch_timer_rate /HZ ; + +kvm_guest_init (); }
include/linux/cpuhotplug.h +1 -0
@@ -136,6 +136,7 @@ enum cpuhp_state {/* Must be the last timer callback */ CPUHP_AP_DUMMY_TIMER_STARTING ,CPUHP_AP_ARM_XEN_STARTING , +CPUHP_AP_ARM_KVMPV_STARTING ,CPUHP_AP_ARM_CORESIGHT_STARTING ,CPUHP_AP_ARM64_ISNDEP_STARTING , CPUHP_AP_SMPCFD_DYING,
Signature · 1 line
2.20.1