arm64: Stolen time support
Subsystems (9)
v4 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.
It doesn't implement support for Live Physical Time (LPT) as there are some concerns about the overheads and approach in the above specification, and I expect an updated version of the specification to be released soon with just the stolen time parts.
NOTE: Patches 8 and 9 will conflict with Mark Rutland's series[1] cleaning up the SMCCC conduit. I do feel that the addition of an _invoke() call makes a number of call sites cleaner and it should be possible to integrate both this and Mark's other cleanups.
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Also available as a git tree:git://linux-arm.org/linux-sp.git stolen_time/v4
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
Documentation/virt/kvm/arm/pvtime.txt | 64 ++++++++++ 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/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 +- 29 files changed, 699 insertions(+), 154 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 v4 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 | 64 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 78 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txt
Documentation/virt/kvm/arm/pvtime.txt new file +64 -0
@@ -0,0 +1,64 @@ +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) : Either PV_TIME_LPT or PV_TIME_ST + 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_SET_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 v4 01/10] KVM: arm64: Document PV-time interface
Quoted 42 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 | 64 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 78 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txtDocumentation/virt/kvm/arm/pvtime.txt new file +15
-0@@ -0,0 +1,64 @@ +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
Documentation/virt/kvm/arm/pvtime.txt line 25
Quoted 10 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-0+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) : Either PV_TIME_LPT or PV_TIME_ST
PV_TIME_LPT doesn't exist
Quoted 15 lines
Documentation/virt/kvm/arm/pvtime.txt new file +15
-0+ 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.
Documentation/virt/kvm/arm/pvtime.txt line 50
Quoted 10 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-0+ +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
The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Documentation/virt/kvm/arm/pvtime.txt line 60
Quoted 10 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-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.
Should we provide a recommendation as to how that reserved memory is provided? One memslot divided into NR_VCPUS subregions? Should the reserved region be described to the guest kernel with DT/ACPI? Or should userspace ensure the region is not within any DT/ACPI described regions?
Quoted 29 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0+ +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_SET_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 v4 01/10] KVM: arm64: Document PV-time interface
Quoted 47 lines · Andrew Jones
Quoted 46 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 | 64 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 78 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txtDocumentation/virt/kvm/arm/pvtime.txt new file +19
-0@@ -0,0 +1,64 @@ +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
Quoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt line 25
Quoted 6 lines
Documentation/virt/kvm/arm/pvtime.txt new file +6
-0+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) : Either PV_TIME_LPT or PV_TIME_ST
PV_TIME_LPTdoesn't exist
Thanks, will remove.
Quoted 21 lines
Quoted 21 lines
Documentation/virt/kvm/arm/pvtime.txt new file +21
-0+ 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: +
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.1 + Attributes | 4 | 4 | Must be 0The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Interesting question. User space does have access to them now it is providing the memory, but it's not exactly an easy method. In particular user space has no (simple) way of probing the kernel's supported version.
I guess one solution would be to add an extra attribute on the VCPU which would provide the revision information. The current kernel would then reject any revision other than 0, but this could then be extended to support other revision numbers in the future.
Although there's some logic in saying we could add the extra attribute when(/if) there is a new version. Future kernels would then be expected to use the current version unless user space explicitly set the new attribute.
Do you feel this is something that needs to be addressed now, or can it be deferred until another version is proposed?
Quoted 8 lines
Quoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt new file +8
-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
Quoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt line 60
Quoted 2 lines
Documentation/virt/kvm/arm/pvtime.txt new file +2
-0+guest. The guest should not attempt to write into this memory. There is a +structure per VCPU of the guest.Should we provide a recommendation as to how that reserved memory is provided? One memslot divided into
NR_VCPUSsubregions? Should the reserved region be described to the guest kernel with DT/ACPI? Or should userspace ensure the region is not within any DT/ACPI described regions?
I'm open to providing a recommendation, but I'm not entirely sure I know enough here to provide one.
There is an obvious efficiency argument for minimizing memslots with the current code. But if someone has a reason for using multiple memslots then that's probably a good argument for implementing a memslot-caching kvm_put_user() rather than to be dis-recommended.
My assumption (and testing) has been with a single memslot divided into NR_VCPUS (or more accurately the number of VCPUs in the VM) subregions.
For testing DT I've tested both methods: an explicit reserved region or just ensuring it's not in any DT described region. Both seem reasonable, but it might be easier to integrate into existing migration mechanisms if it's simply a reserved region (then the memory block of the guest is just as it always was).
For ACPI the situation should be similar, but my testing has been with DT.
Thanks,
Steve
Quoted 38 lines
Quoted 29 lines
Documentation/virt/kvm/arm/pvtime.txt new file +4
-0+ +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_SET_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_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v4 01/10] KVM: arm64: Document PV-time interface
Quoted 98 lines · Steven Price
Quoted 47 lines · Andrew Jones
Quoted 46 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 | 64 +++++++++++++++++++++++++ Documentation/virt/kvm/devices/vcpu.txt | 14 ++++++ 2 files changed, 78 insertions(+) create mode 100644 Documentation/virt/kvm/arm/pvtime.txtDocumentation/virt/kvm/arm/pvtime.txt new file +19
-0@@ -0,0 +1,64 @@ +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 ofQuoted 8 lines
Documentation/virt/kvm/arm/pvtime.txt line 25
Quoted 6 lines
Documentation/virt/kvm/arm/pvtime.txt new file +6
-0+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) : Either PV_TIME_LPT or PV_TIME_ST
PV_TIME_LPTdoesn't existThanks, will remove.
Quoted 21 lines
Quoted 21 lines
Documentation/virt/kvm/arm/pvtime.txt new file +21
-0+ 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: +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.1 + Attributes | 4 | 4 | Must be 0The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Interesting question. User space does have access to them now it is providing the memory, but it's not exactly an easy method. In particular user space has no (simple) way of probing the kernel's supported version.
I guess one solution would be to add an extra attribute on the VCPU which would provide the revision information. The current kernel would then reject any revision other than 0, but this could then be extended to support other revision numbers in the future.
Quoted 7 lines
Although there's some logic in saying we could add the extra attribute when(/if) there is a new version. Future kernels would then be expected to use the current version unless user space explicitly set the new attribute.
Do you feel this is something that needs to be addressed now, or can it be deferred until another version is proposed?
Assuming we'll want userspace to have the option of choosing version=0, and that we're fine with version=0 being the implicit choice, when nothing is selected, then I guess it can be left as is for now. If, OTOH, we just want migration to fail when attempting to migrate to another host with an incompatible stolen-time structure (i.e. version=0 is not selectable on hosts that implement later versions), then we should expose the version in some way now. Perhaps a VCPU's "PV config" should be described in a set of pseudo registers?
Quoted 18 lines
Quoted 17 lines
Documentation/virt/kvm/arm/pvtime.txt line 60
Quoted 11 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-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.Should we provide a recommendation as to how that reserved memory is provided? One memslot divided into
NR_VCPUSsubregions? Should the reserved region be described to the guest kernel with DT/ACPI? Or should userspace ensure the region is not within any DT/ACPI described regions?
Quoted 7 lines
I'm open to providing a recommendation, but I'm not entirely sure I know enough here to provide one.
There is an obvious efficiency argument for minimizing memslots with the current code. But if someone has a reason for using multiple memslots then that's probably a good argument for implementing a memslot-caching
kvm_put_user()rather than to be dis-recommended.
Actually even if a single memslot is used for all the PV structures for all VCPUs, but it's separate from the slot(s) used for main memory, then we'll likely see performance issues with memslot searches (even though it's a binary search). This is because memslots already have caching. The last used slot is stored in the memslots' lru_slot member (the "lru" name is confusing, but it means "last used" somehow). This means we could get thrashing on that slot cache if we're searching for the PV structure memslot on each vcpu load after searching for the main memory slot on each page fault.
Quoted 11 lines
My assumption (and testing) has been with a single memslot divided into
NR_VCPUS(or more accurately the number of VCPUs in the VM) subregions.For testing DT I've tested both methods: an explicit reserved region or just ensuring it's not in any DT described region. Both seem reasonable, but it might be easier to integrate into existing migration mechanisms if it's simply a reserved region (then the memory block of the guest is just as it always was).
For ACPI the situation should be similar, but my testing has been with DT.
I also can't think of any reason why we'd have to describe it in DT/ACPI, but I get this feeling that if we don't, then we'll hit some issue that will make us wish we had...
Thanks,
drew
Re: [PATCH v4 01/10] KVM: arm64: Document PV-time interface
Quoted 3 lines · Andrew Jones
Quoted 2 lines · Steven Price
Quoted 1 line · Andrew Jones
On Fri, Aug 30, 2019 at 09:42:46AM +0100, Steven Price wrote:
[...]
Quoted 47 lines
Quoted 39 lines
Quoted 21 lines
Quoted 21 lines
Documentation/virt/kvm/arm/pvtime.txt new file +21
-0+ 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: +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.1 + Attributes | 4 | 4 | Must be 0The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Interesting question. User space does have access to them now it is providing the memory, but it's not exactly an easy method. In particular user space has no (simple) way of probing the kernel's supported version.
I guess one solution would be to add an extra attribute on the VCPU which would provide the revision information. The current kernel would then reject any revision other than 0, but this could then be extended to support other revision numbers in the future.
Quoted 7 lines
Although there's some logic in saying we could add the extra attribute when(/if) there is a new version. Future kernels would then be expected to use the current version unless user space explicitly set the new attribute.
Do you feel this is something that needs to be addressed now, or can it be deferred until another version is proposed?
Quoted 8 lines
Assuming we'll want userspace to have the option of choosing version=0, and that we're fine with version=0 being the implicit choice, when nothing is selected, then I guess it can be left as is for now. If, OTOH, we just want migration to fail when attempting to migrate to another host with an incompatible stolen-time structure (i.e. version=0 is not selectable on hosts that implement later versions), then we should expose the version in some way now. Perhaps a VCPU's "PV config" should be described in a set of pseudo registers?
I wouldn't have thought making migration fail if/when the host upgrades to a new version would be particularly helpful - we'd want to provide backwards compatibility. In particular for the suspend/resume case (I want to be able to save my VM to disk, upgrade the host kernel and then resume the VM).
The only potential issue I see is the implicit "version=0 if not specified". That seems solvable by rejecting setting the stolen time base address if no version has been specified and the host kernel doesn't support version=0.
Quoted 26 lines
Quoted 18 lines
Quoted 17 lines
Documentation/virt/kvm/arm/pvtime.txt line 60
Quoted 11 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-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.Should we provide a recommendation as to how that reserved memory is provided? One memslot divided into
NR_VCPUSsubregions? Should the reserved region be described to the guest kernel with DT/ACPI? Or should userspace ensure the region is not within any DT/ACPI described regions?Quoted 7 lines
I'm open to providing a recommendation, but I'm not entirely sure I know enough here to provide one.
There is an obvious efficiency argument for minimizing memslots with the current code. But if someone has a reason for using multiple memslots then that's probably a good argument for implementing a memslot-caching
kvm_put_user()rather than to be dis-recommended.
Quoted 9 lines
Actually even if a single memslot is used for all the PV structures for all VCPUs, but it's separate from the slot(s) used for main memory, then we'll likely see performance issues with memslot searches (even though it's a binary search). This is because memslots already have caching. The last used slot is stored in the memslots'
lru_slotmember (the "lru" name is confusing, but it means "last used" somehow). This means we could get thrashing on that slot cache if we're searching for the PV structure memslot on each vcpu load after searching for the main memory slot on each page fault.
True - a dedicated memslot for stolen time wouldn't be great if a VM is needing to fault pages (which would obviously be in a different memslot). I don't have a good idea of the overhead of missing in the lru_slot cache. The main reason I stopped using a dedicated cache was because I discovered that my initial implementation using kvm_write_guest_offset_cached() (which wasn't single-copy atomic safe) was actually failing to use the cache because the buffer crossed a page boundary (see __kvm_gfn_to_hva_cache_init()). So switching away from the "_cached" variant was actually avoiding the extra walks of the memslots.
I can look at reintroducing the caching for kvm_put_guest().
Quoted 10 lines
Quoted 10 lines
My assumption (and testing) has been with a single memslot divided into
NR_VCPUS(or more accurately the number of VCPUs in the VM) subregions.For testing DT I've tested both methods: an explicit reserved region or just ensuring it's not in any DT described region. Both seem reasonable, but it might be easier to integrate into existing migration mechanisms if it's simply a reserved region (then the memory block of the guest is just as it always was).
Quoted 5 lines
Quoted 1 line
For ACPI the situation should be similar, but my testing has been with DT.
I also can't think of any reason why we'd have to describe it in DT/ACPI, but I get this feeling that if we don't, then we'll hit some issue that will make us wish we had...
Without knowing why we need it it's hard to justify what should go in the bindings. But the idea of having the hypercalls is that the description is returned via hypercalls rather than explicitly in DT/ACPI. In theory we wouldn't need the hypercalls if it was fully described in DT/ACPI.
Steve
Re: [PATCH v4 01/10] KVM: arm64: Document PV-time interface
Quoted 67 lines · Steven Price
Quoted 3 lines · Andrew Jones
Quoted 2 lines · Steven Price
Quoted 1 line · Andrew Jones
On Fri, Aug 30, 2019 at 09:42:46AM +0100, Steven Price wrote:
[...]
Quoted 47 lines
Quoted 39 lines
Quoted 21 lines
Quoted 21 lines
Documentation/virt/kvm/arm/pvtime.txt new file +21
-0+ 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: +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.1 + Attributes | 4 | 4 | Must be 0The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Interesting question. User space does have access to them now it is providing the memory, but it's not exactly an easy method. In particular user space has no (simple) way of probing the kernel's supported version.
I guess one solution would be to add an extra attribute on the VCPU which would provide the revision information. The current kernel would then reject any revision other than 0, but this could then be extended to support other revision numbers in the future.
Quoted 7 lines
Although there's some logic in saying we could add the extra attribute when(/if) there is a new version. Future kernels would then be expected to use the current version unless user space explicitly set the new attribute.
Do you feel this is something that needs to be addressed now, or can it be deferred until another version is proposed?
Quoted 8 lines
Assuming we'll want userspace to have the option of choosing version=0, and that we're fine with version=0 being the implicit choice, when nothing is selected, then I guess it can be left as is for now. If, OTOH, we just want migration to fail when attempting to migrate to another host with an incompatible stolen-time structure (i.e. version=0 is not selectable on hosts that implement later versions), then we should expose the version in some way now. Perhaps a VCPU's "PV config" should be described in a set of pseudo registers?
I wouldn't have thought making migration fail if/when the host upgrades to a new version would be particularly helpful - we'd want to provide backwards compatibility. In particular for the suspend/resume case (I want to be able to save my VM to disk, upgrade the host kernel and then resume the VM).
Quoted 4 lines
The only potential issue I see is the implicit "version=0 if not specified". That seems solvable by rejecting setting the stolen time base address if no version has been specified and the host kernel doesn't support version=0.
I think that's the same failure I was trying avoid by failing the migration instead. Maybe it's equivalent to fail at this vcpu-ioctl time though?
Quoted 65 lines
Quoted 27 lines
Quoted 19 lines
Quoted 18 lines
Documentation/virt/kvm/arm/pvtime.txt line 60
Quoted 12 lines
Documentation/virt/kvm/arm/pvtime.txt new file +10
-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.Should we provide a recommendation as to how that reserved memory is provided? One memslot divided into
NR_VCPUSsubregions? Should the reserved region be described to the guest kernel with DT/ACPI? Or should userspace ensure the region is not within any DT/ACPI described regions?Quoted 7 lines
I'm open to providing a recommendation, but I'm not entirely sure I know enough here to provide one.
There is an obvious efficiency argument for minimizing memslots with the current code. But if someone has a reason for using multiple memslots then that's probably a good argument for implementing a memslot-caching
kvm_put_user()rather than to be dis-recommended.Quoted 9 lines
Actually even if a single memslot is used for all the PV structures for all VCPUs, but it's separate from the slot(s) used for main memory, then we'll likely see performance issues with memslot searches (even though it's a binary search). This is because memslots already have caching. The last used slot is stored in the memslots'
lru_slotmember (the "lru" name is confusing, but it means "last used" somehow). This means we could get thrashing on that slot cache if we're searching for the PV structure memslot on each vcpu load after searching for the main memory slot on each page fault.True - a dedicated memslot for stolen time wouldn't be great if a VM is needing to fault pages (which would obviously be in a different memslot). I don't have a good idea of the overhead of missing in the
lru_slotcache. The main reason I stopped using a dedicated cache was because I discovered that my initial implementation usingkvm_write_guest_offset_cached()(which wasn't single-copy atomic safe) was actually failing to use the cache because the buffer crossed a page boundary (see__kvm_gfn_to_hva_cache_init()). So switching away from the "_cached" variant was actually avoiding the extra walks of the memslots.I can look at reintroducing the caching for
kvm_put_guest().Quoted 10 lines
Quoted 10 lines
My assumption (and testing) has been with a single memslot divided into
NR_VCPUS(or more accurately the number of VCPUs in the VM) subregions.For testing DT I've tested both methods: an explicit reserved region or just ensuring it's not in any DT described region. Both seem reasonable, but it might be easier to integrate into existing migration mechanisms if it's simply a reserved region (then the memory block of the guest is just as it always was).
Quoted 5 lines
Quoted 1 line
For ACPI the situation should be similar, but my testing has been with DT.
I also can't think of any reason why we'd have to describe it in DT/ACPI, but I get this feeling that if we don't, then we'll hit some issue that will make us wish we had...
Quoted 6 lines
Without knowing why we need it it's hard to justify what should go in the bindings. But the idea of having the hypercalls is that the description is returned via hypercalls rather than explicitly in DT/ACPI. In theory we wouldn't need the hypercalls if it was fully described in DT/ACPI.
Fair enough
Thanks,
drew
Re: [PATCH v4 01/10] KVM: arm64: Document PV-time interface
Quoted 68 lines · Andrew Jones
Quoted 67 lines · Steven Price
Quoted 3 lines · Andrew Jones
Quoted 2 lines · Steven Price
Quoted 1 line · Andrew Jones
On Fri, Aug 30, 2019 at 09:42:46AM +0100, Steven Price wrote:
[...]
Quoted 47 lines
Quoted 39 lines
Quoted 21 lines
Quoted 21 lines
Documentation/virt/kvm/arm/pvtime.txt new file +21
-0+ 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: +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.1 + Attributes | 4 | 4 | Must be 0The above fields don't appear to be exposed to userspace in anyway. How will we handle migration from one KVM with one version of the structure to another?
Interesting question. User space does have access to them now it is providing the memory, but it's not exactly an easy method. In particular user space has no (simple) way of probing the kernel's supported version.
I guess one solution would be to add an extra attribute on the VCPU which would provide the revision information. The current kernel would then reject any revision other than 0, but this could then be extended to support other revision numbers in the future.
Quoted 7 lines
Although there's some logic in saying we could add the extra attribute when(/if) there is a new version. Future kernels would then be expected to use the current version unless user space explicitly set the new attribute.
Do you feel this is something that needs to be addressed now, or can it be deferred until another version is proposed?
Quoted 8 lines
Assuming we'll want userspace to have the option of choosing version=0, and that we're fine with version=0 being the implicit choice, when nothing is selected, then I guess it can be left as is for now. If, OTOH, we just want migration to fail when attempting to migrate to another host with an incompatible stolen-time structure (i.e. version=0 is not selectable on hosts that implement later versions), then we should expose the version in some way now. Perhaps a VCPU's "PV config" should be described in a set of pseudo registers?
I wouldn't have thought making migration fail if/when the host upgrades to a new version would be particularly helpful - we'd want to provide backwards compatibility. In particular for the suspend/resume case (I want to be able to save my VM to disk, upgrade the host kernel and then resume the VM).
Quoted 8 lines
Quoted 4 lines
The only potential issue I see is the implicit "version=0 if not specified". That seems solvable by rejecting setting the stolen time base address if no version has been specified and the host kernel doesn't support version=0.
I think that's the same failure I was trying avoid by failing the migration instead. Maybe it's equivalent to fail at this vcpu-ioctl time though?
Yes this is effectively the same failure. But since we require the vcpu-ioctl to enable stolen time this gives an appropriate place to fail. Indeed this is the failure if migrating from a host with these patches to one running an existing kernel with no stolen time support.
Steve
PATCH v4 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/kvm/arm_hypercalls.h | 43 ++++++++++++++++++ include/kvm/arm_psci.h | 2 +- virt/kvm/arm/hypercalls.c | 59 +++++++++++++++++++++++++ virt/kvm/arm/psci.c | 84 +----------------------------------- 8 files changed, 110 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
@@ -23,7 +23,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/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
kbuild test robot
build botRe: [PATCH v4 02/10] KVM: arm/arm64: Factor out hypercall handling from PSCI code
Thank you for the patch! Yet something to improve:
Hi Steven,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190830]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Steven-Price/arm64-Stolen-time-support/20190901-185152
config: i386-randconfig-a002-201935 (attached as .config)
compiler: gcc-7 (Debian 7.4.0-11) 7.4.0 reproduce:
# save the attached .config to linux build tree
make ARCH=i386 If you fix the issue, kindly add following tag
All error/warnings (new ones prefixed by >>):
In file included from include/kvm/arm_hypercalls.h:7:0,
from <command-line>:0:
>> arch/x86/include/asm/kvm_emulate.h:349:22: error: 'NR_VCPU_REGS' undeclared here (not in a function)
unsigned long _regs[NR_VCPU_REGS];
^~~~~~~~~~~~
In file included from <command-line>:0:0:
>> include/kvm/arm_hypercalls.h:9:33: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
int kvm_hvc_call_handler(struct kvm_vcpu *vcpu);
^~~~~~~~
include/kvm/arm_hypercalls.h:11:45: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
static inline u32 smccc_get_function(struct kvm_vcpu *vcpu)
^~~~~~~~
include/kvm/arm_hypercalls.h: In function 'smccc_get_function':
>> include/kvm/arm_hypercalls.h:13:9: error: implicit declaration of function 'vcpu_get_reg' [-Werror=implicit-function-declaration]
return vcpu_get_reg(vcpu, 0);
^~~~~~~~~~~~
include/kvm/arm_hypercalls.h: At top level:
include/kvm/arm_hypercalls.h:16:51: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
static inline unsigned long smccc_get_arg1(struct kvm_vcpu *vcpu)
^~~~~~~~
include/kvm/arm_hypercalls.h:21:51: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
static inline unsigned long smccc_get_arg2(struct kvm_vcpu *vcpu)
^~~~~~~~
include/kvm/arm_hypercalls.h:26:51: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
static inline unsigned long smccc_get_arg3(struct kvm_vcpu *vcpu)
^~~~~~~~
include/kvm/arm_hypercalls.h:31:44: warning: 'struct kvm_vcpu' declared inside parameter list will not be visible outside of this definition or declaration
static inline void smccc_set_retval(struct kvm_vcpu *vcpu,
^~~~~~~~
include/kvm/arm_hypercalls.h: In function 'smccc_set_retval':
>> include/kvm/arm_hypercalls.h:37:2: error: implicit declaration of function 'vcpu_set_reg'; did you mean 'smccc_set_retval'? [-Werror=implicit-function-declaration]
vcpu_set_reg(vcpu, 0, a0);
^~~~~~~~~~~~
smccc_set_retvalcc1: some warnings being treated as errors
vim +/NR_VCPU_REGS +349 arch/x86/include/asm/kvm_emulate.h
a584539b24b87d arch/x86/include/asm/kvm_emulate.h Paolo Bonzini 2015-04-01 290
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 291 struct x86_emulate_ctxt {
0225fb509d51fc arch/x86/include/asm/kvm_emulate.h Mathias Krause 2012-08-30 292 const struct x86_emulate_ops *ops;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 293
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 294 /* Register state before/after emulation. */
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 295 unsigned long eflags;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 296 unsigned long eip; /* eip before instruction emulation */
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 297 /* Emulated execution mode, represented by an X86EMUL_MODE value. */
9d1b39a967871b arch/x86/include/asm/kvm_emulate.h Gleb Natapov 2012-09-03 298 enum x86emul_mode mode;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 299
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 300 /* interruptibility state, as a result of execution of STI or MOV SS */
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 301 int interruptibility;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 302
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 303 bool perm_ok; /* do not check permissions if true */
b51e974fcdabd0 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 304 bool ud; /* inject an #UD if host doesn't support insn */
c8401dda2f0a00 arch/x86/include/asm/kvm_emulate.h Paolo Bonzini 2017-06-07 305 bool tf; /* TF value before instruction (after for syscall/sysret) */
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 306
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 307 bool have_exception;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 308 struct x86_exception exception;
9dac77fa4011bd arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 309
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 310 /*
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 311 * decode cache
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 312 */
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 313
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 314 /* current opcode length in bytes */
1ce19dc16ce913 arch/x86/include/asm/kvm_emulate.h Borislav Petkov 2013-09-22 315 u8 opcode_len;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 316 u8 b;
c4f035c60dad45 arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-04-04 317 u8 intercept;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 318 u8 op_bytes;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 319 u8 ad_bytes;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 320 struct operand src;
0dc8d10f7d848b arch/x86/include/asm/kvm_x86_emulate.h Guillaume Thouvenin 2008-12-04 321 struct operand src2;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 322 struct operand dst;
ef65c88912cafe arch/x86/include/asm/kvm_emulate.h Avi Kivity 2010-07-29 323 int (*execute)(struct x86_emulate_ctxt *ctxt);
d09beabd7cd4cf arch/x86/include/asm/kvm_emulate.h Joerg Roedel 2011-04-04 324 int (*check_perm)(struct x86_emulate_ctxt *ctxt);
41061cdb98a0be arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 325 /*
41061cdb98a0be arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 326 * The following six fields are cleared together,
41061cdb98a0be arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 327 * the rest are initialized unconditionally in x86_decode_insn
41061cdb98a0be arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 328 * or elsewhere
41061cdb98a0be arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 329 */
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 330 bool rip_relative;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 331 u8 rex_prefix;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 332 u8 lock_prefix;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 333 u8 rep_prefix;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 334 /* bitmaps of registers in _regs[] that can be read */
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 335 u32 regs_valid;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 336 /* bitmaps of registers in _regs[] that have been written */
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 337 u32 regs_dirty;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 338 /* modrm */
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 339 u8 modrm;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 340 u8 modrm_mod;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 341 u8 modrm_reg;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 342 u8 modrm_rm;
09ee57cdae3156 arch/x86/include/asm/kvm_emulate.h Avi Kivity 2010-08-01 343 u8 modrm_seg;
573e80fe04db1a arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 344 u8 seg_override;
c44b4c6ab80eef arch/x86/include/asm/kvm_emulate.h Bandan Das 2014-04-16 345 u64 d;
36dd9bb5ce32bc arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-06-01 346 unsigned long _eip;
cbd27ee783f1e5 arch/x86/include/asm/kvm_emulate.h Avi Kivity 2012-06-10 347 struct operand memop;
b5c9ff731f3cee arch/x86/include/asm/kvm_emulate.h Takuya Yoshikawa 2011-05-25 348 /* Fields above regs are cleared together. */
dd856efafe6097 arch/x86/include/asm/kvm_emulate.h Avi Kivity 2012-08-27 @349 unsigned long _regs[NR_VCPU_REGS];
f09ed83e211d25 arch/x86/include/asm/kvm_emulate.h Avi Kivity 2011-09-13 350 struct operand *memopp;
6226686954c4cc drivers/kvm/x86_emulate.h Avi Kivity 2007-11-20 351 struct fetch_cache fetch;
7b262e90fc20a4 arch/x86/include/asm/kvm_emulate.h Gleb Natapov 2010-03-18 352 struct read_cache io_read;
9de41573675cba arch/x86/include/asm/kvm_emulate.h Gleb Natapov 2010-04-28 353 struct read_cache mem_read;
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 354 };
e4e03deda83b1f drivers/kvm/x86_emulate.h Laurent Vivier 2007-09-18 355 :::::: The code at line 349 was first introduced by commit
:::::: dd856efafe6097a5c9104725c2bca74430423db8 KVM: x86 emulator: access GPRs on demand
:::::: TO: Avi Kivity <[email protected]>
:::::: CC: Marcelo Tosatti <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCH v4 02/10] KVM: arm/arm64: Factor out hypercall handling from PSCI code
Quoted 18 lines · kbuild test robot
Hi Steven,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190830]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Steven-Price/arm64-Stolen-time-support/20190901-185152
config: i386-randconfig-a002-201935 (attached as .config)
compiler: gcc-7 (Debian 7.4.0-11) 7.4.0 reproduce:# save the attached .config to linux build tree make ARCH=i386If you fix the issue, kindly add following tag
Reported-by kbuild test robot <[email protected]>
Quoted 7 lines
All error/warnings (new ones prefixed by >>):
In file included from
include/kvm/arm_hypercalls.h:7:0,from <command-line>:0:Quoted 1 line
Quoted 1 line
arch/x86/include/asm/kvm_emulate.h:349:22: error: 'NR_VCPU_REGS' undeclared here (not in a function)unsigned long _regs[NR_VCPU_REGS]; ^~~~~~~~~~~~
This is because x86's asm/kvm_emulate.h can't be included by itself (and doesn't even exist on other architectures). This new header file doesn't make sense to include on x86, so I'll squash in the following to prevent building the header file except on arm/arm64.
Steve
----8<----
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
kbuild test robot
build botRe: [PATCH v4 02/10] KVM: arm/arm64: Factor out hypercall handling from PSCI code
In reply to Steven PriceThank you for the patch! Yet something to improve:
Hi Steven,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[cannot apply to v5.3-rc6 next-20190830]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Steven-Price/arm64-Stolen-time-support/20190901-185152
config: c6x-allyesconfig (attached as .config)
compiler: c6x-elf-gcc (GCC) 7.4.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=c6x
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
In file included from <command-line>:0:0:
>> include/kvm/arm_hypercalls.h:7:10: fatal error: asm/kvm_emulate.h: No such file or directory
#include <asm/kvm_emulate.h>
^~~~~~~~~~~~~~~~~~~compilation terminated.
vim +7 include/kvm/arm_hypercalls.h
6
> 7 #include <asm/kvm_emulate.h>
8 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
PATCH v4 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 v4 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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 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.
The hypervisor allocates memory which is placed at an IPA 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
@@ -350,6 +354,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); }
@@ -379,6 +385,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);
@@ -644,6 +652,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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 226 lines · Steven Price
Implement 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.
The hypervisor allocates memory which is placed at an IPA 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_infostructure maintained by the Linux scheduler code. We enable SCHEDSTATS when selecting KVMKconfigto ensure this value is meaningful.Signed-off-by Steven Price <[email protected]>--- 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 multipleinclude/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 @@ -350,6 +354,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); }@@ -379,6 +385,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);@@ -644,6 +652,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 +22
-0@@ -3,8 +3,45 @@#include <linux/arm-smccc.h> +#include <asm/pvclock-abi.h> +#include <kvm/arm_hypercalls.h> +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; + + steal_le =cpu_to_le64 (steal); + idx =srcu_read_lock (&kvm->srcu);
virt/kvm/arm/pvtime.c line 39
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+if (init) { +struct pvclock_vcpu_stolen_time init_values = { + .revision =0 , + .attributes =0 + }; +kvm_write_guest (kvm, base, &init_values, +sizeof (init_values)); + } + offset = offsetof(struct pvclock_vcpu_stolen_time , stolen_time); +kvm_put_guest (kvm, base + offset, steal_le, u64);
Let's hope we don't have thousands of memslots through which we have to do a linear scan on every vcpu load after this. If that were the case, I think the memslot search path would have to be updated anyhow.
Otherwise looks reasonable to me.
Thanks,
Christoffer
Quoted 45 lines
virt/kvm/arm/pvtime.c +24
-0+srcu_read_unlock (&kvm->srcu, idx); + +return 0 ; +} +long kvm_hypercall_pv_features (struct kvm_vcpu *vcpu) {u32 feature =smccc_get_arg1 (vcpu);@@ -12,6 +49,7 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu)switch (feature) {case ARM_SMCCC_HV_PV_FEATURES : +case ARM_SMCCC_HV_PV_TIME_ST : val =SMCCC_RET_SUCCESS ;break ; }@@ -19,3 +57,21 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu)return val; } +long kvm_hypercall_stolen_time (struct kvm_vcpu *vcpu) +{ +int err; + +/* +* Start counting stolen time from the time the guest requests +* the feature enabled. +*/ + vcpu->arch.steal.steal =0 ; + vcpu->arch.steal.last_steal = current->sched_info.run_delay; + + err =kvm_update_stolen_time (vcpu, true); + +if (err) +return SMCCC_RET_NOT_SUPPORTED ; + +return vcpu->arch.steal.base; +}Signature · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 18 lines · Christoffer Dall
Quoted 17 lines · Steven Price
Implement 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.
The hypervisor allocates memory which is placed at an IPA 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_infostructure maintained by the Linux scheduler code. We enable SCHEDSTATS when selecting KVMKconfigto ensure this value is meaningful.Signed-off-by Steven Price <[email protected]>
[...]
Quoted 26 lines
Quoted 26 lines
virt/kvm/arm/pvtime.c +26
-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; + + steal_le =cpu_to_le64 (steal); + idx =srcu_read_lock (&kvm->srcu); +if (init) { +struct pvclock_vcpu_stolen_time init_values = { + .revision =0 , + .attributes =0 + }; + kvm_write_guest(kvm, base, &init_values,
Quoted 8 lines
virt/kvm/arm/pvtime.c line 39
Quoted 4 lines
virt/kvm/arm/pvtime.c +4
-0+ sizeof(init_values)); + } + offset = offsetof(struct pvclock_vcpu_stolen_time , stolen_time); +kvm_put_guest (kvm, base + offset, steal_le, u64);Let's hope we don't have thousands of memslots through which we have to do a linear scan on every vcpu load after this. If that were the case, I think the memslot search path would have to be updated anyhow.
Yes I'm not sure with the current memslot implementation it is actually beneficial to split up the stolen time structures into separate memslots. But there's nothing requiring the use of so many memslots.
If this is really a problem it would be possible to implement a memslot-caching kvm_put_guest(), but I'd want to wait until someone shows there's actually a problem first.
Quoted 1 line
Otherwise looks reasonable to me.
Great, thanks for the review.
Steve
Zenghui Yu
reviewerRe: [PATCH v4 05/10] KVM: arm64: Support stolen time reporting via shared structure
In reply to Steven PriceQuoted 6 lines · Steven Price
Implement 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.
The hypervisor allocates memory which is placed at an IPA chosen by user space.
It seems that no allocation happens in the hypervisor code. User space will do it instead?
Quoted 4 lines
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.
Quoted 8 lines
Whenever stolen time is enabled by the guest, the stolen time counter is reset.
The stolen time itself is retrieved from the
sched_infostructure maintained by the Linux scheduler code. We enable SCHEDSTATS when selecting KVMKconfigto ensure this value is meaningful.Signed-off-by Steven Price <[email protected]>
Thanks,
zenghui
Re: [PATCH v4 05/10] KVM: arm64: Support stolen time reporting via shared structure
Quoted 10 lines · Zenghui Yu
Quoted 6 lines · Steven Price
Implement 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.
The hypervisor allocates memory which is placed at an IPA chosen by user space.
It seems that no allocation happens in the hypervisor code. User space will do it instead?
Ah, yes I should update the commit message. User space does now allocate the memory. Thanks for spotting that.
Steve
Quoted 16 lines
Quoted 4 lines
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.Quoted 8 lines
Whenever stolen time is enabled by the guest, the stolen time counter is reset.
The stolen time itself is retrieved from the
sched_infostructure maintained by the Linux scheduler code. We enable SCHEDSTATS when selecting KVMKconfigto ensure this value is meaningful.Signed-off-by Steven Price <[email protected]>Thanks,
zenghui
PATCH v4 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
@@ -3046,14 +3046,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 ;
@@ -3074,7 +3074,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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 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_SET_IPA 0/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24
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
@@ -1222,6 +1222,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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Marc Zyngier
maintainerRe: [PATCH v4 07/10] KVM: arm64: Provide VCPU attributes for stolen time
Quoted 119 lines · Steven Price
Allow 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.
Signed-off-by Steven Price <[email protected]>--- 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_SET_IPA 0/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24arch/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@@ -1222,6 +1222,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 +5
-0@@ -2,7 +2,9 @@// Copyright (C) 2019 Arm Ltd. #include <linux/arm-smccc.h> +#include <linux/kvm_host.h> +#include <asm/kvm_mmu.h> #include <asm/pvclock-abi.h> #include <kvm/arm_hypercalls.h> @@ -75,3 +77,48 @@ long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu)return vcpu->arch.steal.base; } + +int kvm_arm_pvtime_set_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr)
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 92
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+{ +u64 __user *user = (u64 __user *)attr->addr; +u64 ipa; + +if (attr->attr !=KVM_ARM_VCPU_PVTIME_SET_IPA ) +return -ENXIO ; + +if (get_user (ipa, user)) +return -EFAULT ; +if (ipa &63 )
nit: Please express this as !IS_ALIGNED(ipa, 64) instead.
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 96
Quoted 4 lines
virt/kvm/arm/pvtime.c +4
-0+return -EINVAL ; +if (vcpu->arch.steal.base !=GPA_INVALID ) +return -EEXIST ; + vcpu->arch.steal.base = ipa;
I'm still worried that you end-up not knowing whether the IPA is valid or not at this stage, nor that we check about overlapping vcpus. How do we validate that?
I also share Christoffer's concern that the memslot parsing may be expensive on a system with multiple memslots. But maybe that can be solved by adding some caching capabilities to your kvm_put_guest(), should this become a problem.
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 106
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+return 0 ; +} + +int kvm_arm_pvtime_get_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr) +{ +u64 __user *user = (u64 __user *)attr->addr; +u64 ipa; + +if (attr->attr !=KVM_ARM_VCPU_PVTIME_SET_IPA )
It is a bit odd that this is using "SET_IPA" as a way to GET it.
Quoted 9 lines
virt/kvm/arm/pvtime.c +8
-0+return -ENXIO ; + + ipa = vcpu->arch.steal.base; + +if (put_user (ipa, user)) +return -EFAULT ; +return 0 ; +}
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 124
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+ +int kvm_arm_pvtime_has_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr) +{ +switch (attr->attr) { +case KVM_ARM_VCPU_PVTIME_SET_IPA : +return 0 ; + } +return -ENXIO ; +}
Thanks,
M.
Signature · 1 line
Jazz is not dead, it just smells funny...
Re: [PATCH v4 07/10] KVM: arm64: Provide VCPU attributes for stolen time
Quoted 124 lines · Marc Zyngier
Quoted 123 lines · Steven Price
Allow 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.
Signed-off-by Steven Price <[email protected]>--- 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_SET_IPA 0/* KVM_IRQ_LINE irq field index values */ #define KVM_ARM_IRQ_TYPE_SHIFT 24arch/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@@ -1222,6 +1222,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 +9
-0@@ -2,7 +2,9 @@// Copyright (C) 2019 Arm Ltd. #include <linux/arm-smccc.h> +#include <linux/kvm_host.h> +#include <asm/kvm_mmu.h> #include <asm/pvclock-abi.h> #include <kvm/arm_hypercalls.h> @@ -75,3 +77,48 @@ long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu)return vcpu->arch.steal.base; } + +int kvm_arm_pvtime_set_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr) +{ +u64 __user *user = (u64 __user *)attr->addr; +u64 ipa; +
Quoted 8 lines
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 92
Quoted 6 lines
virt/kvm/arm/pvtime.c +6
-0+if (attr->attr !=KVM_ARM_VCPU_PVTIME_SET_IPA ) +return -ENXIO ; + +if (get_user (ipa, user)) +return -EFAULT ; +if (ipa &63 )nit: Please express this as !IS_ALIGNED(ipa, 64) instead.
Sure
Quoted 8 lines
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 96
Quoted 4 lines
virt/kvm/arm/pvtime.c +4
-0+return -EINVAL ; +if (vcpu->arch.steal.base !=GPA_INVALID ) +return -EEXIST ; + vcpu->arch.steal.base = ipa;I'm still worried that you end-up not knowing whether the IPA is valid or not at this stage, nor that we check about overlapping vcpus. How do we validate that?
Considering we really can't reasonably validate IPA overlapping with guest memory (how is the host to know what is 'guest memory'), I'm not convinced it's worth the code to detect overlapping vcpus. Nothing bad will happen to the host in this case (the kvm_put_guest() calls will just clobber each other).
In terms of checking the IPA is valid - again this is something that can change in the lifetime of the VM, so the check at setup time isn't particularly useful. Currently it's also possible to create the vcpus (including setting up the stolen time) before the memory is assigned to the guest as long as the vcpus are not started. This seems like a useful level of flexibility.
Quoted 4 lines
I also share Christoffer's concern that the memslot parsing may be expensive on a system with multiple memslots. But maybe that can be solved by adding some caching capabilities to your
kvm_put_guest(), should this become a problem.
Yes it should be possible to add it - I'd like to wait to see whether user actually want to use multiple memslots though - it's quite possible to use a single memslot for both guest memory and stolen time structures.
Quoted 4 lines
Quoted 4 lines
virt/kvm/arm/pvtime.c +4
-0+return 0 ; +} + +int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu,
Quoted 8 lines
virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 87
Quoted 6 lines
virt/kvm/arm/pvtime.c +6
-0+ struct kvm_device_attr *attr) +{ +u64 __user *user = (u64 __user *)attr->addr; +u64 ipa; + +if (attr->attr !=KVM_ARM_VCPU_PVTIME_SET_IPA )It is a bit odd that this is using "
SET_IPA" as a way to GET it.
Yes that does look weird. I'll drop the "SET_" part from the symbol. I'm not sure what I was thinking when I named that.
Thanks,
Steve
Quoted 24 lines
Quoted 9 lines
virt/kvm/arm/pvtime.c +8
-0+return -ENXIO ; + + ipa = vcpu->arch.steal.base; + +if (put_user (ipa, user)) +return -EFAULT ; +return 0 ; +}virt/kvm/arm/pvtime.c long kvm_hypercall_stolen_time(struct kvm_vcpu *vcpu) · line 124
Quoted 10 lines
virt/kvm/arm/pvtime.c +10
-0+ +int kvm_arm_pvtime_has_attr (struct kvm_vcpu *vcpu, +struct kvm_device_attr *attr) +{ +switch (attr->attr) { +case KVM_ARM_VCPU_PVTIME_SET_IPA : +return 0 ; + } +return -ENXIO ; +}Thanks,
M.
PATCH v4 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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
PATCH v4 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 v4 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.
--- arch/arm64/include/asm/paravirt.h | 9 +- arch/arm64/kernel/paravirt.c | 148 ++++++++++++++++++++++++++++++ arch/arm64/kernel/time.c | 3 + include/linux/cpuhotplug.h | 1 + 4 files changed, 160 insertions(+), 1 deletion(-)
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 · 6 lines
2.20.1 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Re: [PATCH v4 10/10] arm64: Retrieve stolen time as paravirtualized guest
Quoted 73 lines · Steven Price
Enable paravirtualization features when running under a hypervisor supporting the
PV_TIME_SThypercall.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_opsto the stolen time function which simply reads the stolen value from the shared page for a VCPU. We guarantee single-copy atomicity usingREAD_ONCEwhich 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.Signed-off-by Steven Price <[email protected]>--- arch/arm64/include/asm/paravirt.h | 9 +- arch/arm64/kernel/paravirt.c | 148 ++++++++++++++++++++++++++++++ arch/arm64/kernel/time.c | 3 + include/linux/cpuhotplug.h | 1 + 4 files changed, 160 insertions(+), 1 deletion(-)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 +17
-0@@ -6,13 +6,161 @@* Author: Stefano Stabellini <[email protected]> */ +#define pr_fmt (fmt) "kvmarm-pv: " fmt + +#include <linux/arm-smccc.h> +#include <linux/cpuhotplug.h> #include <linux/export.h> +#include <linux/io.h> #include <linux/jump_label.h> +#include <linux/printk.h> +#include <linux/psci.h> +#include <linux/reboot.h> +#include <linux/slab.h> #include <linux/types.h> +#include <asm/paravirt.h> +#include <asm/pvclock-abi.h> +#include <asm/smp_plat.h> struct static_key paravirt_steal_enabled;struct static_key paravirt_steal_rq_enabled;struct paravirt_patch_template pv_ops;EXPORT_SYMBOL_GPL (pv_ops); + +struct kvmarm_stolen_time_region { +struct pvclock_vcpu_stolen_time *kaddr; +}; +
arch/arm64/kernel/paravirt.c line 45
Quoted 10 lines
arch/arm64/kernel/paravirt.c +10
-0+static DEFINE_PER_CPU(struct kvmarm_stolen_time_region, stolen_time_region); + +static bool steal_acc = true; +static int __init parse_no_stealacc (char *arg) +{ + steal_acc = false; +return 0 ; +} + +early_param ("no-steal-acc" , parse_no_stealacc);
Need to also add an 'ARM64' to the Documentation/admin-guide/kernel-parameters.txt entry for this.
Thanks,
drew
Re: [PATCH v4 10/10] arm64: Retrieve stolen time as paravirtualized guest
Quoted 79 lines · Andrew Jones
Quoted 78 lines · Steven Price
Enable paravirtualization features when running under a hypervisor supporting the
PV_TIME_SThypercall.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_opsto the stolen time function which simply reads the stolen value from the shared page for a VCPU. We guarantee single-copy atomicity usingREAD_ONCEwhich 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.Signed-off-by Steven Price <[email protected]>--- arch/arm64/include/asm/paravirt.h | 9 +- arch/arm64/kernel/paravirt.c | 148 ++++++++++++++++++++++++++++++ arch/arm64/kernel/time.c | 3 + include/linux/cpuhotplug.h | 1 + 4 files changed, 160 insertions(+), 1 deletion(-)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 +22
-0@@ -6,13 +6,161 @@* Author: Stefano Stabellini <[email protected]> */ +#define pr_fmt (fmt) "kvmarm-pv: " fmt + +#include <linux/arm-smccc.h> +#include <linux/cpuhotplug.h> #include <linux/export.h> +#include <linux/io.h> #include <linux/jump_label.h> +#include <linux/printk.h> +#include <linux/psci.h> +#include <linux/reboot.h> +#include <linux/slab.h> #include <linux/types.h> +#include <asm/paravirt.h> +#include <asm/pvclock-abi.h> +#include <asm/smp_plat.h> struct static_key paravirt_steal_enabled;struct static_key paravirt_steal_rq_enabled;struct paravirt_patch_template pv_ops;EXPORT_SYMBOL_GPL (pv_ops); + +struct kvmarm_stolen_time_region { +struct pvclock_vcpu_stolen_time *kaddr; +}; + +static DEFINE_PER_CPU(struct kvmarm_stolen_time_region, stolen_time_region); + +static bool steal_acc = true; +static int __init parse_no_stealacc (char *arg) +{
Quoted 8 lines
arch/arm64/kernel/paravirt.c line 45
Quoted 5 lines
arch/arm64/kernel/paravirt.c +5
-0+ steal_acc = false; +return 0 ; +} + +early_param ("no-steal-acc" , parse_no_stealacc);Need to also add an 'ARM64' to the
Documentation/admin-guide/kernel-parameters.txtentry for this.
Good point, thanks for the pointer.
Steve
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 95 lines · Steven Price
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.
It doesn't implement support for Live Physical Time (LPT) as there are some concerns about the overheads and approach in the above specification, and I expect an updated version of the specification to be released soon with just the stolen time parts.
NOTE: Patches 8 and 9 will conflict with Mark Rutland's series[1] cleaning up the SMCCC conduit. I do feel that the addition of an
_invoke()call makes a number of call sites cleaner and it should be possible to integrate both this and Mark's other cleanups.[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/
Also available as a git tree:
git://linux-arm.org/linux-sp.gitstolen_time/v4Changes from v3:
https://lore.kernel.org/lkml/[email protected]/
* There's no longer aPV_TIMEdevice, 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 intChanges from v2:
https://lore.kernel.org/lkml/[email protected]/
* Switched from usinggfn_to_hva_cacheto a new macrokvm_put_guest()that can provide the single-copy atomicity required (on arm64). This macro is added in patch 4.
* Tidied up the locking forkvm_update_stolen_time().pagefault_disable()was unnecessary and the caller didn't need to takekvm->srcuas the function does it itself.
* Removed structkvm_arch_pvtimefrom 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 fixesChristoffer Dall (1):
KVM: arm/arm64: Factor out hypercall handling from PSCI codeSteven Price (9):
KVM: arm64: Document PV-time interface
KVM: arm64: ImplementPV_FEATUREScall
KVM: Implementkvm_put_guest()
KVM: arm64: Support stolen time reporting via shared structure
KVM: Allowkvm_device_opsto 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 guestDocumentation/virt/kvm/arm/pvtime.txt | 64 ++++++++++ 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/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 +-------------
Quoted 12 lines
virt/kvm/arm/pvtime.c | 124 ++++++++++++++++++++ virt/kvm/kvm_main.c | 6 +- 29 files changed, 699 insertions(+), 154 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.cSignature · 1 line
2.20.1
Hi Steven,
I had some fun testing this series with the KVM selftests framework. It looks like it works to me, so you may add
if you like. And below is the test I came up with.
Thanks,
drew
From: Andrew Jones <[email protected]>
Date: Tue, 3 Sep 2019 03:45:08 -0400
Subject: [PATCH] selftests: kvm: aarch64 stolen-time test
--- tools/testing/selftests/kvm/Makefile | 1 + .../selftests/kvm/aarch64/stolen-time.c | 208 ++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 tools/testing/selftests/kvm/aarch64/stolen-time.c
tools/testing/selftests/kvm/Makefile +1 -0
@@ -28,6 +28,7 @@ TEST_GEN_PROGS_x86_64 += clear_dirty_log_test TEST_GEN_PROGS_x86_64 += dirty_log_test TEST_GEN_PROGS_x86_64 += kvm_create_max_vcpus +TEST_GEN_PROGS_aarch64 += aarch64/stolen-time TEST_GEN_PROGS_aarch64 += clear_dirty_log_test TEST_GEN_PROGS_aarch64 += dirty_log_test TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
tools/testing/selftests/kvm/aarch64/stolen-time.c new file +208 -0
208 lines not on this page · raw message
Signature · 1 line
2.18.1
Quoted 7 lines · Andrew Jones
Hi Steven,
I had some fun testing this series with the KVM selftests framework. It looks like it works to me, so you may add
Tested-by Andrew Jones <[email protected]>
Actually, I probably shouldn't be quite so generous with this tag yet, because I haven't yet tested the guest-side changes. To do that I'll need to start prototyping something for QEMU. I need to finish some other stuff first, but then I can do that.
Thanks,
drew
Quoted 6 lines · Andrew Jones
Quoted 5 lines · Andrew Jones
Hi Steven,
I had some fun testing this series with the KVM selftests framework. It looks like it works to me, so you may add
Quoted 7 lines
Quoted 2 lines
Tested-by Andrew Jones <[email protected]>Actually, I probably shouldn't be quite so generous with this tag yet, because I haven't yet tested the guest-side changes. To do that I'll need to start prototyping something for QEMU. I need to finish some other stuff first, but then I can do that.
Thanks for the testing, I'll wait for your other testing before adding your Tested-by tag.
Steve
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm