KVM: SVM: Add support for KVM_SEV_SEND_CANCEL command
Subsystems (4)
PATCH 1/1 KVM: SVM: Add support for KVM_SEV_SEND_CANCEL command
After completion of SEND_START, but before SEND_FINISH, the source VMM can issue the SEND_CANCEL command to stop a migration. This is necessary so that a cancelled migration can restart with a new target later.
--- .../virt/kvm/amd-memory-encryption.rst | 9 +++++++ arch/x86/kvm/svm/sev.c | 24 +++++++++++++++++++ include/linux/psp-sev.h | 10 ++++++++ include/uapi/linux/kvm.h | 2 ++ 4 files changed, 45 insertions(+)
Documentation/virt/kvm/amd-memory-encryption.rst +9 -0
@@ -284,6 +284,15 @@ Returns: 0 on success, -negative on error __u32 len; }; +16. KVM_SEV_SEND_CANCEL +------------------------ + +After completion of SEND_START, but before SEND_FINISH, the source VMM can issue the +SEND_CANCEL command to stop a migration. This is necessary so that a cancelled +migration can restart with a new target later. + +Returns: 0 on success, -negative on error + References ==========
arch/x86/kvm/svm/sev.c +24 -0
@@ -1110,6 +1110,27 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_send_cancel (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_cancel *data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_CANCEL , data, &argp->error); + +kfree (data); +return ret; +} + +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;
@@ -1163,6 +1184,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_GET_ATTESTATION_REPORT : r =sev_get_attestation_report (kvm, &sev_cmd);break ; +case KVM_SEV_SEND_CANCEL : + r =sev_send_cancel (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;
include/linux/psp-sev.h +10 -0
@@ -73,6 +73,7 @@ enum sev_cmd {SEV_CMD_SEND_UPDATE_DATA =0x041 ,SEV_CMD_SEND_UPDATE_VMSA =0x042 ,SEV_CMD_SEND_FINISH =0x043 , +SEV_CMD_SEND_CANCEL =0x044 ,/* Guest migration commands (incoming) */ SEV_CMD_RECEIVE_START = 0x050,
@@ -392,6 +393,15 @@ struct sev_data_send_finish {u32 handle;/* In */ } __packed; +/** +* struct sev_data_send_cancel - SEND_CANCEL command parameters +* +* @handle: handle of the VM to process +*/ +struct sev_data_send_cancel { +u32 handle;/* In */ +} __packed; +/** * struct sev_data_receive_start - RECEIVE_START command parameters *
include/uapi/linux/kvm.h +2 -0
@@ -1671,6 +1671,8 @@ enum sev_cmd_id {KVM_SEV_CERT_EXPORT ,/* Attestation report */ KVM_SEV_GET_ATTESTATION_REPORT , +/* Guest Migration Extension */ +KVM_SEV_SEND_CANCEL , KVM_SEV_NR_MAX, };
Signature · 1 line
2.31.0.208.g409f899ff0-goog
Quoted 117 lines · Steve Rutherford
After completion of
SEND_START, but beforeSEND_FINISH, the source VMM can issue theSEND_CANCELcommand to stop a migration. This is necessary so that a cancelled migration can restart with a new target later.Signed-off-by Steve Rutherford <[email protected]>--- .../virt/kvm/amd-memory-encryption.rst | 9 +++++++ arch/x86/kvm/svm/sev.c | 24 +++++++++++++++++++ include/linux/psp-sev.h | 10 ++++++++ include/uapi/linux/kvm.h | 2 ++ 4 files changed, 45 insertions(+)Documentation/virt/kvm/amd-memory-encryption.rst +9
-0@@ -284,6 +284,15 @@ Returns: 0 on success, -negative on error __u32 len; }; +16. KVM_SEV_SEND_CANCEL +------------------------ + +After completion of SEND_START, but before SEND_FINISH, the source VMM can issue the +SEND_CANCEL command to stop a migration. This is necessary so that a cancelled +migration can restart with a new target later. + +Returns: 0 on success, -negative on error + References ==========arch/x86/kvm/svm/sev.c +24
-0@@ -1110,6 +1110,27 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp)return ret; } +static int sev_send_cancel (struct kvm *kvm,struct kvm_sev_cmd *argp) +{ +struct kvm_sev_info *sev = &to_kvm_svm (kvm)->sev_info; +struct sev_data_send_cancel *data; +int ret; + +if (!sev_guest (kvm)) +return -ENOTTY ; + + data =kzalloc (sizeof (*data),GFP_KERNEL ); +if (!data) +return -ENOMEM ; + + data->handle = sev->handle; + ret =sev_issue_cmd (kvm,SEV_CMD_SEND_CANCEL , data, &argp->error); + +kfree (data); +return ret; +} + +int svm_mem_enc_op (struct kvm *kvm,void __user *argp) {struct kvm_sev_cmd sev_cmd;@@ -1163,6 +1184,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp)case KVM_SEV_GET_ATTESTATION_REPORT : r =sev_get_attestation_report (kvm, &sev_cmd);break ; +case KVM_SEV_SEND_CANCEL : + r =sev_send_cancel (kvm, &sev_cmd); +break ;default : r = -EINVAL ; goto out;include/linux/psp-sev.h +10
-0@@ -73,6 +73,7 @@ enum sev_cmd {SEV_CMD_SEND_UPDATE_DATA =0x041 ,SEV_CMD_SEND_UPDATE_VMSA =0x042 ,SEV_CMD_SEND_FINISH =0x043 , +SEV_CMD_SEND_CANCEL =0x044 ,/* Guest migration commands (incoming) */ SEV_CMD_RECEIVE_START = 0x050,@@ -392,6 +393,15 @@ struct sev_data_send_finish {u32 handle;/* In */ } __packed; +/** +* struct sev_data_send_cancel - SEND_CANCEL command parameters +* +* @handle: handle of the VM to process +*/ +struct sev_data_send_cancel { +u32 handle;/* In */ +} __packed; +/** * struct sev_data_receive_start - RECEIVE_START command parameters * include/uapi/linux/kvm.h +2
-1@@ -1671,6 +1671,8 @@ enum sev_cmd_id {KVM_SEV_CERT_EXPORT ,/* Attestation report */ KVM_SEV_GET_ATTESTATION_REPORT , +/* Guest Migration Extension */ +KVM_SEV_SEND_CANCEL , KVM_SEV_NR_MAX, }; --
Quoted 2 lines
2.31.0.208.g409f899ff0-goog
Quoted 11 lines · Steve Rutherford
After completion of
SEND_START, but beforeSEND_FINISH, the source VMM can issue theSEND_CANCELcommand to stop a migration. This is necessary so that a cancelled migration can restart with a new target later.Signed-off-by Steve Rutherford <[email protected]>--- .../virt/kvm/amd-memory-encryption.rst | 9 +++++++ arch/x86/kvm/svm/sev.c | 24 +++++++++++++++++++ include/linux/psp-sev.h | 10 ++++++++ include/uapi/linux/kvm.h | 2 ++ 4 files changed, 45 insertions(+)
Can we add a new case statement in sev_cmd_buffer_len() [drivers/crypto/ccp/sev-dev.c] for this command ? I understand that the command just contains the handle. I have found dyndbg very helpful. If the command is not added in the sev_cmd_buffer_len() then we don't dump the command buffer.
With that fixed.
Quoted 22 lines · Brijesh Singh
Quoted 11 lines · Steve Rutherford
After completion of
SEND_START, but beforeSEND_FINISH, the source VMM can issue theSEND_CANCELcommand to stop a migration. This is necessary so that a cancelled migration can restart with a new target later.Signed-off-by Steve Rutherford <[email protected]>--- .../virt/kvm/amd-memory-encryption.rst | 9 +++++++ arch/x86/kvm/svm/sev.c | 24 +++++++++++++++++++ include/linux/psp-sev.h | 10 ++++++++ include/uapi/linux/kvm.h | 2 ++ 4 files changed, 45 insertions(+)Can we add a new case statement in
sev_cmd_buffer_len()[drivers/crypto/ccp/sev-dev.c] for this command ? I understand that the command just contains the handle. I have found dyndbg very helpful. If the command is not added in thesev_cmd_buffer_len()then we don't dump the command buffer.
Quoted 3 lines
With that fixed.
Reviewed-by Brijesh Singh <[email protected]>
Nice catch, will follow-up shortly.
Steve