| Message ID | 20210607110816.25762-9-steven.price@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MTE support for KVM guest | expand |
On Mon, Jun 07, 2021 at 12:08:16PM +0100, Steven Price wrote: > diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst > index 22d077562149..fc6f0cbc30b3 100644 > --- a/Documentation/virt/kvm/api.rst > +++ b/Documentation/virt/kvm/api.rst > @@ -5034,6 +5034,42 @@ see KVM_XEN_VCPU_SET_ATTR above. > The KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST type may not be used > with the KVM_XEN_VCPU_GET_ATTR ioctl. > > +4.130 KVM_ARM_MTE_COPY_TAGS > +--------------------------- > + > +:Capability: KVM_CAP_ARM_MTE > +:Architectures: arm64 > +:Type: vm ioctl > +:Parameters: struct kvm_arm_copy_mte_tags > +:Returns: number of bytes copied, < 0 on error I guess you can be a bit more specific here, -EINVAL on incorrect arguments, -EFAULT if the guest memory cannot be accessed. > + > +:: > + > + struct kvm_arm_copy_mte_tags { > + __u64 guest_ipa; > + __u64 length; > + void __user *addr; > + __u64 flags; > + __u64 reserved[2]; > + }; > + > +Copies Memory Tagging Extension (MTE) tags to/from guest tag memory. The > +``guest_ipa`` and ``length`` fields must be ``PAGE_SIZE`` aligned. The ``addr`` > +fieldmust point to a buffer which the tags will be copied to or from. s/fieldmust/field must/ > + > +``flags`` specifies the direction of copy, either ``KVM_ARM_TAGS_TO_GUEST`` or > +``KVM_ARM_TAGS_FROM_GUEST``. > + > +The size of the buffer to store the tags is ``(length / 16)`` bytes > +(granules in MTE are 16 bytes long). Each byte contains a single tag > +value. This matches the format of ``PTRACE_PEEKMTETAGS`` and > +``PTRACE_POKEMTETAGS``. One difference I think with ptrace() is that iov_len (length here) is the actual buffer size. But for kvm I think this works better since length is tied to the guest_ipa. > + > +If an error occurs before any data is copied then a negative error code is > +returned. If some tags have been copied before an error occurs then the number > +of bytes successfully copied is returned. If the call completes successfully > +then ``length`` is returned. > + > 5. The kvm_run structure > ======================== > > @@ -6362,6 +6398,27 @@ default. > > See Documentation/x86/sgx/2.Kernel-internals.rst for more details. > > +7.26 KVM_CAP_ARM_MTE > +-------------------- > + > +:Architectures: arm64 > +:Parameters: none > + > +This capability indicates that KVM (and the hardware) supports exposing the > +Memory Tagging Extensions (MTE) to the guest. It must also be enabled by the > +VMM before creating any VCPUs to allow the guest access. Note that MTE is only > +available to a guest running in AArch64 mode and enabling this capability will > +cause attempts to create AArch32 VCPUs to fail. > + > +When enabled the guest is able to access tags associated with any memory given > +to the guest. KVM will ensure that the pages are flagged ``PG_mte_tagged`` so > +that the tags are maintained during swap or hibernation of the host; however I'd drop PG_mte_tagged here, that's just how the implementation handles it, not necessary for describing the API. You can just say "KVM will ensure that the tags are maintained during swap or hibernation of the host" > +the VMM needs to manually save/restore the tags as appropriate if the VM is > +migrated. > + > +When enabled the VMM may make use of the ``KVM_ARM_MTE_COPY_TAGS`` ioctl to > +perform a bulk copy of tags to/from the guest. > + > 8. Other capabilities. > ====================== > > -- > 2.20.1 Otherwise, feel free to add: Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
On 07/06/2021 18:32, Catalin Marinas wrote: > On Mon, Jun 07, 2021 at 12:08:16PM +0100, Steven Price wrote: >> diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst >> index 22d077562149..fc6f0cbc30b3 100644 >> --- a/Documentation/virt/kvm/api.rst >> +++ b/Documentation/virt/kvm/api.rst >> @@ -5034,6 +5034,42 @@ see KVM_XEN_VCPU_SET_ATTR above. >> The KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST type may not be used >> with the KVM_XEN_VCPU_GET_ATTR ioctl. >> >> +4.130 KVM_ARM_MTE_COPY_TAGS >> +--------------------------- >> + >> +:Capability: KVM_CAP_ARM_MTE >> +:Architectures: arm64 >> +:Type: vm ioctl >> +:Parameters: struct kvm_arm_copy_mte_tags >> +:Returns: number of bytes copied, < 0 on error > > I guess you can be a bit more specific here, -EINVAL on incorrect > arguments, -EFAULT if the guest memory cannot be accessed. Sure. Note that -EFAULT can also be returned if the VMM's memory cannot be accessed (the other end of the copy). >> + >> +:: >> + >> + struct kvm_arm_copy_mte_tags { >> + __u64 guest_ipa; >> + __u64 length; >> + void __user *addr; >> + __u64 flags; >> + __u64 reserved[2]; >> + }; >> + >> +Copies Memory Tagging Extension (MTE) tags to/from guest tag memory. The >> +``guest_ipa`` and ``length`` fields must be ``PAGE_SIZE`` aligned. The ``addr`` >> +fieldmust point to a buffer which the tags will be copied to or from. > > s/fieldmust/field must/ Thanks - Vim's spell checker missed that apparently because it's syntax highlighter got confused. >> + >> +``flags`` specifies the direction of copy, either ``KVM_ARM_TAGS_TO_GUEST`` or >> +``KVM_ARM_TAGS_FROM_GUEST``. >> + >> +The size of the buffer to store the tags is ``(length / 16)`` bytes >> +(granules in MTE are 16 bytes long). Each byte contains a single tag >> +value. This matches the format of ``PTRACE_PEEKMTETAGS`` and >> +``PTRACE_POKEMTETAGS``. > > One difference I think with ptrace() is that iov_len (length here) is > the actual buffer size. But for kvm I think this works better since > length is tied to the guest_ipa. What I intended to say is that the storage in memory patches ptrace (one byte per tag). In the kernel (e.g. for swap) we store it more compactly (two tags per byte). As you say I think having 'length' match 'guest_ipa' is sensible rather than deducing it from the buffer size. >> + >> +If an error occurs before any data is copied then a negative error code is >> +returned. If some tags have been copied before an error occurs then the number >> +of bytes successfully copied is returned. If the call completes successfully >> +then ``length`` is returned. >> + >> 5. The kvm_run structure >> ======================== >> >> @@ -6362,6 +6398,27 @@ default. >> >> See Documentation/x86/sgx/2.Kernel-internals.rst for more details. >> >> +7.26 KVM_CAP_ARM_MTE >> +-------------------- >> + >> +:Architectures: arm64 >> +:Parameters: none >> + >> +This capability indicates that KVM (and the hardware) supports exposing the >> +Memory Tagging Extensions (MTE) to the guest. It must also be enabled by the >> +VMM before creating any VCPUs to allow the guest access. Note that MTE is only >> +available to a guest running in AArch64 mode and enabling this capability will >> +cause attempts to create AArch32 VCPUs to fail. >> + >> +When enabled the guest is able to access tags associated with any memory given >> +to the guest. KVM will ensure that the pages are flagged ``PG_mte_tagged`` so >> +that the tags are maintained during swap or hibernation of the host; however > > I'd drop PG_mte_tagged here, that's just how the implementation handles > it, not necessary for describing the API. You can just say "KVM will > ensure that the tags are maintained during swap or hibernation of the > host" Good point - will update with your wording. >> +the VMM needs to manually save/restore the tags as appropriate if the VM is >> +migrated. >> + >> +When enabled the VMM may make use of the ``KVM_ARM_MTE_COPY_TAGS`` ioctl to >> +perform a bulk copy of tags to/from the guest. >> + >> 8. Other capabilities. >> ====================== >> >> -- >> 2.20.1 > > Otherwise, feel free to add: > > Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> > Thanks! Steve
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 22d077562149..fc6f0cbc30b3 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -5034,6 +5034,42 @@ see KVM_XEN_VCPU_SET_ATTR above. The KVM_XEN_VCPU_ATTR_TYPE_RUNSTATE_ADJUST type may not be used with the KVM_XEN_VCPU_GET_ATTR ioctl. +4.130 KVM_ARM_MTE_COPY_TAGS +--------------------------- + +:Capability: KVM_CAP_ARM_MTE +:Architectures: arm64 +:Type: vm ioctl +:Parameters: struct kvm_arm_copy_mte_tags +:Returns: number of bytes copied, < 0 on error + +:: + + struct kvm_arm_copy_mte_tags { + __u64 guest_ipa; + __u64 length; + void __user *addr; + __u64 flags; + __u64 reserved[2]; + }; + +Copies Memory Tagging Extension (MTE) tags to/from guest tag memory. The +``guest_ipa`` and ``length`` fields must be ``PAGE_SIZE`` aligned. The ``addr`` +fieldmust point to a buffer which the tags will be copied to or from. + +``flags`` specifies the direction of copy, either ``KVM_ARM_TAGS_TO_GUEST`` or +``KVM_ARM_TAGS_FROM_GUEST``. + +The size of the buffer to store the tags is ``(length / 16)`` bytes +(granules in MTE are 16 bytes long). Each byte contains a single tag +value. This matches the format of ``PTRACE_PEEKMTETAGS`` and +``PTRACE_POKEMTETAGS``. + +If an error occurs before any data is copied then a negative error code is +returned. If some tags have been copied before an error occurs then the number +of bytes successfully copied is returned. If the call completes successfully +then ``length`` is returned. + 5. The kvm_run structure ======================== @@ -6362,6 +6398,27 @@ default. See Documentation/x86/sgx/2.Kernel-internals.rst for more details. +7.26 KVM_CAP_ARM_MTE +-------------------- + +:Architectures: arm64 +:Parameters: none + +This capability indicates that KVM (and the hardware) supports exposing the +Memory Tagging Extensions (MTE) to the guest. It must also be enabled by the +VMM before creating any VCPUs to allow the guest access. Note that MTE is only +available to a guest running in AArch64 mode and enabling this capability will +cause attempts to create AArch32 VCPUs to fail. + +When enabled the guest is able to access tags associated with any memory given +to the guest. KVM will ensure that the pages are flagged ``PG_mte_tagged`` so +that the tags are maintained during swap or hibernation of the host; however +the VMM needs to manually save/restore the tags as appropriate if the VM is +migrated. + +When enabled the VMM may make use of the ``KVM_ARM_MTE_COPY_TAGS`` ioctl to +perform a bulk copy of tags to/from the guest. + 8. Other capabilities. ======================
A new capability (KVM_CAP_ARM_MTE) identifies that the kernel supports granting a guest access to the tags, and provides a mechanism for the VMM to enable it. A new ioctl (KVM_ARM_MTE_COPY_TAGS) provides a simple way for a VMM to access the tags of a guest without having to maintain a PROT_MTE mapping in userspace. The above capability gates access to the ioctl. Signed-off-by: Steven Price <steven.price@arm.com> --- Documentation/virt/kvm/api.rst | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)