| Message ID | 20200220104020.5343-11-borntraeger@de.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: s390: Add support for protected VMs | expand |
On 20.02.20 11:39, Christian Borntraeger wrote: > From: Janosch Frank <frankja@linux.ibm.com> > > Add documentation for KVM_CAP_S390_PROTECTED capability and the > KVM_S390_PV_COMMAND and KVM_S390_PV_COMMAND_VCPU ioctls. Outdated. I suggest moving this after "[PATCH v3 37/37] KVM: s390: protvirt: introduce and enable KVM_CAP_S390_PROTECTED" or even squashing it into that one. > > Signed-off-by: Janosch Frank <frankja@linux.ibm.com> > [borntraeger@de.ibm.com: patch merging, splitting, fixing] > Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > Documentation/virt/kvm/api.rst | 52 ++++++++++++++++++++++++++++++++++ > 1 file changed, 52 insertions(+) > > diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst > index 97a72a53fa4b..77e1edfe5d4c 100644 > --- a/Documentation/virt/kvm/api.rst > +++ b/Documentation/virt/kvm/api.rst > @@ -4646,6 +4646,51 @@ the clear cpu reset definition in the POP. However, the cpu is not put > into ESA mode. This reset is a superset of the initial reset. > > > +4.125 KVM_S390_PV_COMMAND > +------------------------- > + > +:Capability: KVM_CAP_S390_PROTECTED > +:Architectures: s390 > +:Type: vm ioctl > +:Parameters: struct kvm_pv_cmd > +:Returns: 0 on success, < 0 on error > + > +:: > + > + struct kvm_pv_cmd { > + __u32 cmd; /* Command to be executed */ > + __u16 rc; /* Ultravisor return code */ > + __u16 rrc; /* Ultravisor return reason code */ > + __u64 data; /* Data or address */ > + __u32 flags; /* flags for future extensions. Must be 0 for now */ > + __u32 reserved[3]; > + }; > + > +cmd values: > + > +KVM_PV_ENABLE > + Allocate memory and register the VM with the Ultravisor, thereby > + donating memory to the Ultravisor making it inaccessible to KVM. > + Also converts all existing CPUs to protected ones. Future hotplug > + CPUs will become protected during creation. > + > +KVM_PV_DISABLE > + Deregisters the VM from the Ultravisor and frees memory that was > + donated, so the kernel can use it again. All registered VCPUs are > + converted back to non-protected ones. > + > +KVM_PV_VM_SET_SEC_PARMS > + Pass the image header from VM memory to the Ultravisor in > + preparation of image unpacking and verification. > + > +KVM_PV_VM_UNPACK > + Unpack (protect and decrypt) a page of the encrypted boot image. > + > +KVM_PV_VM_VERIFY > + Verify the integrity of the unpacked image. Only if this succeeds, > + KVM is allowed to start protected VCPUs. > + > + > 5. The kvm_run structure > ======================== > > @@ -6024,3 +6069,10 @@ Architectures: s390 > > This capability indicates that the KVM_S390_NORMAL_RESET and > KVM_S390_CLEAR_RESET ioctls are available. > + > +8.23 KVM_CAP_S390_PROTECTED > + > +Architecture: s390 > + > +This capability indicates that KVM can start protected VMs and the > +Ultravisor has therefore been initialized. > Maybe document that KVM_S390_PV_COMMAND and the new MP is available. Also maybe that MP commands can now fail.
On 20.02.20 14:05, David Hildenbrand wrote: > On 20.02.20 11:39, Christian Borntraeger wrote: >> From: Janosch Frank <frankja@linux.ibm.com> >> >> Add documentation for KVM_CAP_S390_PROTECTED capability and the >> KVM_S390_PV_COMMAND and KVM_S390_PV_COMMAND_VCPU ioctls. > > Outdated. ACK. > > I suggest moving this after "[PATCH v3 37/37] KVM: s390: protvirt: > introduce and enable KVM_CAP_S390_PROTECTED" or even squashing it into > that one. Will move at the end. [...] >> +8.23 KVM_CAP_S390_PROTECTED >> + >> +Architecture: s390 >> + >> +This capability indicates that KVM can start protected VMs and the >> +Ultravisor has therefore been initialized. >> > > Maybe document that KVM_S390_PV_COMMAND and the new MP is available. > Also maybe that MP commands can now fail. diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index faca9977cbe7..7faf32b92d8c 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -6081,3 +6081,6 @@ Architecture: s390 This capability indicates that KVM can start protected VMs and the Ultravisor has therefore been initialized. +This will provide the new KVM_S390_PV_COMMAND ioctl and it will allow +KVM_MP_STATE_LOAD as new MP_STATE. KVM_SET_MP_STATE can now fail for +protected guests when the state change is invalid.
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 97a72a53fa4b..77e1edfe5d4c 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -4646,6 +4646,51 @@ the clear cpu reset definition in the POP. However, the cpu is not put into ESA mode. This reset is a superset of the initial reset. +4.125 KVM_S390_PV_COMMAND +------------------------- + +:Capability: KVM_CAP_S390_PROTECTED +:Architectures: s390 +:Type: vm ioctl +:Parameters: struct kvm_pv_cmd +:Returns: 0 on success, < 0 on error + +:: + + struct kvm_pv_cmd { + __u32 cmd; /* Command to be executed */ + __u16 rc; /* Ultravisor return code */ + __u16 rrc; /* Ultravisor return reason code */ + __u64 data; /* Data or address */ + __u32 flags; /* flags for future extensions. Must be 0 for now */ + __u32 reserved[3]; + }; + +cmd values: + +KVM_PV_ENABLE + Allocate memory and register the VM with the Ultravisor, thereby + donating memory to the Ultravisor making it inaccessible to KVM. + Also converts all existing CPUs to protected ones. Future hotplug + CPUs will become protected during creation. + +KVM_PV_DISABLE + Deregisters the VM from the Ultravisor and frees memory that was + donated, so the kernel can use it again. All registered VCPUs are + converted back to non-protected ones. + +KVM_PV_VM_SET_SEC_PARMS + Pass the image header from VM memory to the Ultravisor in + preparation of image unpacking and verification. + +KVM_PV_VM_UNPACK + Unpack (protect and decrypt) a page of the encrypted boot image. + +KVM_PV_VM_VERIFY + Verify the integrity of the unpacked image. Only if this succeeds, + KVM is allowed to start protected VCPUs. + + 5. The kvm_run structure ======================== @@ -6024,3 +6069,10 @@ Architectures: s390 This capability indicates that the KVM_S390_NORMAL_RESET and KVM_S390_CLEAR_RESET ioctls are available. + +8.23 KVM_CAP_S390_PROTECTED + +Architecture: s390 + +This capability indicates that KVM can start protected VMs and the +Ultravisor has therefore been initialized.