From: "Singh, Brijesh" <brijesh.singh@amd.com> To: Borislav Petkov <bp@alien8.de> Cc: "Singh, Brijesh" <brijesh.singh@amd.com>, "kvm@vger.kernel.org" <kvm@vger.kernel.org>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Ingo Molnar" <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Joerg Roedel" <joro@8bytes.org>, "Lendacky, Thomas" <Thomas.Lendacky@amd.com>, "x86@kernel.org" <x86@kernel.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: Re: [Qemu-devel] [RFC PATCH v1 01/10] KVM: SVM: Add KVM_SEV SEND_START command Date: Fri, 26 Apr 2019 14:29:31 +0000 [thread overview] Message-ID: <e6f8da38-b8dd-a9c5-a358-5f33b6ea7b37@amd.com> (raw) In-Reply-To: <20190426141042.GF4608@zn.tnic> On 4/26/19 9:10 AM, Borislav Petkov wrote: > On Wed, Apr 24, 2019 at 04:09:59PM +0000, Singh, Brijesh wrote: >> The command is used to create an outgoing SEV guest encryption context. >> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: "H. Peter Anvin" <hpa@zytor.com> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: "Radim Krčmář" <rkrcmar@redhat.com> >> Cc: Joerg Roedel <joro@8bytes.org> >> Cc: Borislav Petkov <bp@suse.de> >> Cc: Tom Lendacky <thomas.lendacky@amd.com> >> Cc: x86@kernel.org >> Cc: kvm@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> >> --- >> .../virtual/kvm/amd-memory-encryption.rst | 24 +++++ >> arch/x86/kvm/svm.c | 101 ++++++++++++++++++ >> include/uapi/linux/kvm.h | 12 +++ >> 3 files changed, 137 insertions(+) >> >> diff --git a/Documentation/virtual/kvm/amd-memory-encryption.rst b/Documentation/virtual/kvm/amd-memory-encryption.rst >> index 659bbc093b52..340ac4f87321 100644 >> --- a/Documentation/virtual/kvm/amd-memory-encryption.rst >> +++ b/Documentation/virtual/kvm/amd-memory-encryption.rst >> @@ -238,6 +238,30 @@ Returns: 0 on success, -negative on error >> __u32 trans_len; >> }; >> >> +10. KVM_SEV_SEND_START >> +---------------------- >> + >> +The KVM_SEV_SEND_START command can be used by the hypervisor to create an >> +outgoing guest encryption context. >> + >> +Parameters (in): struct kvm_sev_send_start >> + >> +Returns: 0 on success, -negative on error >> + >> +:: >> + struct kvm_sev_send_start { >> + __u32 policy; /* guest policy */ >> + >> + __u64 pdh_cert_uaddr; /* platform Diffie-Hellman certificate */ >> + __u32 pdh_cert_len; >> + >> + __u64 plat_cert_uaddr; /* platform certificate chain */ >> + __u32 plat_cert_len; >> + >> + __u64 amd_cert_uaddr; /* AMD certificate */ >> + __u32 amd_cert_len; > > __u64 session_uaddr; > __u32 session_len; > > too, right? Ah good catch, I will fix in next rev. thanks > >> + }; >> + >> References >> ========== >> >> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c >> index 406b558abfef..4c2a225ba546 100644 >> --- a/arch/x86/kvm/svm.c >> +++ b/arch/x86/kvm/svm.c >> @@ -6955,6 +6955,104 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp) >> return ret; >> } >> >> +static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp) >> +{ >> + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; >> + void *amd_cert = NULL, *session_data = NULL; >> + void *pdh_cert = NULL, *plat_cert = NULL; >> + struct sev_data_send_start *data = NULL; >> + struct kvm_sev_send_start params; >> + int ret; >> + >> + if (!sev_guest(kvm)) >> + return -ENOTTY; >> + >> + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, >> + sizeof(struct kvm_sev_send_start))) >> + return -EFAULT; >> + >> + data = kzalloc(sizeof(*data), GFP_KERNEL); >> + if (!data) >> + return -ENOMEM; >> + >> + /* userspace wants to query the session length */ >> + if (!params.session_len) >> + goto cmd; >> + >> + if (!params.pdh_cert_uaddr || !params.pdh_cert_len || >> + !params.session_uaddr) >> + return -EINVAL; >> + >> + /* copy the certificate blobs from userspace */ >> + pdh_cert = psp_copy_user_blob(params.pdh_cert_uaddr, params.pdh_cert_len); >> + if (IS_ERR(pdh_cert)) { >> + ret = PTR_ERR(pdh_cert); >> + goto e_free; >> + } >> + >> + data->pdh_cert_address = __psp_pa(pdh_cert); >> + data->pdh_cert_len = params.pdh_cert_len; >> + >> + plat_cert = psp_copy_user_blob(params.plat_cert_uaddr, params.plat_cert_len); >> + if (IS_ERR(plat_cert)) { >> + ret = PTR_ERR(plat_cert); >> + goto e_free_pdh; >> + } >> + >> + data->plat_cert_address = __psp_pa(plat_cert); >> + data->plat_cert_len = params.plat_cert_len; >> + >> + amd_cert = psp_copy_user_blob(params.amd_cert_uaddr, params.amd_cert_len); >> + if (IS_ERR(amd_cert)) { >> + ret = PTR_ERR(amd_cert); >> + goto e_free_plat_cert; >> + } >> + >> + data->amd_cert_address = __psp_pa(amd_cert); >> + data->amd_cert_len = params.amd_cert_len; >> + >> + ret = -ENOMEM; >> + session_data = kmalloc(params.session_len, GFP_KERNEL); > > If the user is supposed to query the session length first, you could > save it in a global variable perhaps and use that value instead of > trusting the user to give you the correct one in params.session_len for > the allocation... > Yes that's doable but I am afraid that caching the value may lead us to wrong path and also divergence from the SEV API spec. The spec says the returned length is a minimum length but its possible that caller can give a bigger buffer and FW will still work with it. >> + if (!session_data) >> + goto e_free_amd_cert; >> + >> + data->session_address = __psp_pa(session_data); >> + data->session_len = params.session_len; >> +cmd: >> + data->handle = sev->handle; >> + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, data, &argp->error); >> + >> + /* if we queried the session length, FW responded with expected data */ > > <--- ... here you have the session length from the fw. >
WARNING: multiple messages have this Message-ID (diff)
From: "Singh, Brijesh" <brijesh.singh@amd.com> To: Borislav Petkov <bp@alien8.de> Cc: "Lendacky, Thomas" <Thomas.Lendacky@amd.com>, "Singh, Brijesh" <brijesh.singh@amd.com>, "kvm@vger.kernel.org" <kvm@vger.kernel.org>, "Radim Krčmář" <rkrcmar@redhat.com>, "Joerg Roedel" <joro@8bytes.org>, "x86@kernel.org" <x86@kernel.org>, "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "Ingo Molnar" <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Thomas Gleixner" <tglx@linutronix.de> Subject: Re: [Qemu-devel] [RFC PATCH v1 01/10] KVM: SVM: Add KVM_SEV SEND_START command Date: Fri, 26 Apr 2019 14:29:31 +0000 [thread overview] Message-ID: <e6f8da38-b8dd-a9c5-a358-5f33b6ea7b37@amd.com> (raw) Message-ID: <20190426142931.EN8Nmk1TFewAJwVwQrJthNUizoCY6huVccrCweN-87M@z> (raw) In-Reply-To: <20190426141042.GF4608@zn.tnic> On 4/26/19 9:10 AM, Borislav Petkov wrote: > On Wed, Apr 24, 2019 at 04:09:59PM +0000, Singh, Brijesh wrote: >> The command is used to create an outgoing SEV guest encryption context. >> >> Cc: Thomas Gleixner <tglx@linutronix.de> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: "H. Peter Anvin" <hpa@zytor.com> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: "Radim Krčmář" <rkrcmar@redhat.com> >> Cc: Joerg Roedel <joro@8bytes.org> >> Cc: Borislav Petkov <bp@suse.de> >> Cc: Tom Lendacky <thomas.lendacky@amd.com> >> Cc: x86@kernel.org >> Cc: kvm@vger.kernel.org >> Cc: linux-kernel@vger.kernel.org >> Signed-off-by: Brijesh Singh <brijesh.singh@amd.com> >> --- >> .../virtual/kvm/amd-memory-encryption.rst | 24 +++++ >> arch/x86/kvm/svm.c | 101 ++++++++++++++++++ >> include/uapi/linux/kvm.h | 12 +++ >> 3 files changed, 137 insertions(+) >> >> diff --git a/Documentation/virtual/kvm/amd-memory-encryption.rst b/Documentation/virtual/kvm/amd-memory-encryption.rst >> index 659bbc093b52..340ac4f87321 100644 >> --- a/Documentation/virtual/kvm/amd-memory-encryption.rst >> +++ b/Documentation/virtual/kvm/amd-memory-encryption.rst >> @@ -238,6 +238,30 @@ Returns: 0 on success, -negative on error >> __u32 trans_len; >> }; >> >> +10. KVM_SEV_SEND_START >> +---------------------- >> + >> +The KVM_SEV_SEND_START command can be used by the hypervisor to create an >> +outgoing guest encryption context. >> + >> +Parameters (in): struct kvm_sev_send_start >> + >> +Returns: 0 on success, -negative on error >> + >> +:: >> + struct kvm_sev_send_start { >> + __u32 policy; /* guest policy */ >> + >> + __u64 pdh_cert_uaddr; /* platform Diffie-Hellman certificate */ >> + __u32 pdh_cert_len; >> + >> + __u64 plat_cert_uaddr; /* platform certificate chain */ >> + __u32 plat_cert_len; >> + >> + __u64 amd_cert_uaddr; /* AMD certificate */ >> + __u32 amd_cert_len; > > __u64 session_uaddr; > __u32 session_len; > > too, right? Ah good catch, I will fix in next rev. thanks > >> + }; >> + >> References >> ========== >> >> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c >> index 406b558abfef..4c2a225ba546 100644 >> --- a/arch/x86/kvm/svm.c >> +++ b/arch/x86/kvm/svm.c >> @@ -6955,6 +6955,104 @@ static int sev_launch_secret(struct kvm *kvm, struct kvm_sev_cmd *argp) >> return ret; >> } >> >> +static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp) >> +{ >> + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; >> + void *amd_cert = NULL, *session_data = NULL; >> + void *pdh_cert = NULL, *plat_cert = NULL; >> + struct sev_data_send_start *data = NULL; >> + struct kvm_sev_send_start params; >> + int ret; >> + >> + if (!sev_guest(kvm)) >> + return -ENOTTY; >> + >> + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, >> + sizeof(struct kvm_sev_send_start))) >> + return -EFAULT; >> + >> + data = kzalloc(sizeof(*data), GFP_KERNEL); >> + if (!data) >> + return -ENOMEM; >> + >> + /* userspace wants to query the session length */ >> + if (!params.session_len) >> + goto cmd; >> + >> + if (!params.pdh_cert_uaddr || !params.pdh_cert_len || >> + !params.session_uaddr) >> + return -EINVAL; >> + >> + /* copy the certificate blobs from userspace */ >> + pdh_cert = psp_copy_user_blob(params.pdh_cert_uaddr, params.pdh_cert_len); >> + if (IS_ERR(pdh_cert)) { >> + ret = PTR_ERR(pdh_cert); >> + goto e_free; >> + } >> + >> + data->pdh_cert_address = __psp_pa(pdh_cert); >> + data->pdh_cert_len = params.pdh_cert_len; >> + >> + plat_cert = psp_copy_user_blob(params.plat_cert_uaddr, params.plat_cert_len); >> + if (IS_ERR(plat_cert)) { >> + ret = PTR_ERR(plat_cert); >> + goto e_free_pdh; >> + } >> + >> + data->plat_cert_address = __psp_pa(plat_cert); >> + data->plat_cert_len = params.plat_cert_len; >> + >> + amd_cert = psp_copy_user_blob(params.amd_cert_uaddr, params.amd_cert_len); >> + if (IS_ERR(amd_cert)) { >> + ret = PTR_ERR(amd_cert); >> + goto e_free_plat_cert; >> + } >> + >> + data->amd_cert_address = __psp_pa(amd_cert); >> + data->amd_cert_len = params.amd_cert_len; >> + >> + ret = -ENOMEM; >> + session_data = kmalloc(params.session_len, GFP_KERNEL); > > If the user is supposed to query the session length first, you could > save it in a global variable perhaps and use that value instead of > trusting the user to give you the correct one in params.session_len for > the allocation... > Yes that's doable but I am afraid that caching the value may lead us to wrong path and also divergence from the SEV API spec. The spec says the returned length is a minimum length but its possible that caller can give a bigger buffer and FW will still work with it. >> + if (!session_data) >> + goto e_free_amd_cert; >> + >> + data->session_address = __psp_pa(session_data); >> + data->session_len = params.session_len; >> +cmd: >> + data->handle = sev->handle; >> + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, data, &argp->error); >> + >> + /* if we queried the session length, FW responded with expected data */ > > <--- ... here you have the session length from the fw. >
next prev parent reply other threads:[~2019-04-26 14:29 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-24 16:09 [Qemu-devel] [RFC PATCH v1 00/10] Add AMD SEV guest live migration support Singh, Brijesh 2019-04-24 16:09 ` Singh, Brijesh 2019-04-24 16:09 ` [Qemu-devel] [RFC PATCH v1 01/10] KVM: SVM: Add KVM_SEV SEND_START command Singh, Brijesh 2019-04-24 16:09 ` Singh, Brijesh 2019-04-26 14:10 ` Borislav Petkov 2019-04-26 14:10 ` Borislav Petkov 2019-04-26 14:29 ` Singh, Brijesh [this message] 2019-04-26 14:29 ` Singh, Brijesh 2019-04-26 20:43 ` Borislav Petkov 2019-04-26 20:43 ` Borislav Petkov 2019-04-29 15:01 ` Singh, Brijesh 2019-04-29 15:01 ` Singh, Brijesh 2019-04-29 16:36 ` Borislav Petkov 2019-04-29 16:36 ` Borislav Petkov 2019-04-29 16:43 ` Singh, Brijesh 2019-04-29 16:43 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 02/10] KVM: SVM: Add KVM_SEND_UPDATE_DATA command Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-26 20:31 ` Lendacky, Thomas 2019-04-26 20:31 ` Lendacky, Thomas 2019-04-29 16:54 ` Singh, Brijesh 2019-04-29 16:54 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 03/10] KVM: SVM: Add KVM_SEV_SEND_FINISH command Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 04/10] KVM: SVM: Add support for KVM_SEV_RECEIVE_START command Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-26 21:08 ` Lendacky, Thomas 2019-04-26 21:08 ` Lendacky, Thomas 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 05/10] KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-26 21:11 ` Lendacky, Thomas 2019-04-26 21:11 ` Lendacky, Thomas 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 06/10] KVM: SVM: Add KVM_SEV_RECEIVE_FINISH command Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-26 21:11 ` Lendacky, Thomas 2019-04-26 21:11 ` Lendacky, Thomas 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 07/10] KVM: x86: Add AMD SEV specific Hypercall3 Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 08/10] KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-26 21:39 ` Lendacky, Thomas 2019-04-26 21:39 ` Lendacky, Thomas 2019-05-03 14:25 ` Singh, Brijesh 2019-05-03 14:25 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 09/10] KVM: x86: Introduce KVM_GET_PAGE_ENC_BITMAP ioctl Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-24 16:10 ` [Qemu-devel] [RFC PATCH v1 10/10] mm: x86: Invoke hypercall when page encryption status is changed Singh, Brijesh 2019-04-24 16:10 ` Singh, Brijesh 2019-04-24 19:15 ` [Qemu-devel] [RFC PATCH v1 00/10] Add AMD SEV guest live migration support Steve Rutherford 2019-04-24 19:15 ` Steve Rutherford via Qemu-devel 2019-04-24 21:32 ` Singh, Brijesh 2019-04-24 21:32 ` Singh, Brijesh 2019-04-25 0:18 ` Steve Rutherford 2019-04-25 0:18 ` Steve Rutherford via Qemu-devel 2019-04-25 2:15 ` Singh, Brijesh 2019-04-25 2:15 ` Singh, Brijesh
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e6f8da38-b8dd-a9c5-a358-5f33b6ea7b37@amd.com \ --to=brijesh.singh@amd.com \ --cc=Thomas.Lendacky@amd.com \ --cc=bp@alien8.de \ --cc=hpa@zytor.com \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=rkrcmar@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).