From patchwork Mon Jan 10 06:04:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirong Hao X-Patchwork-Id: 12708249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30F85C433EF for ; Mon, 10 Jan 2022 06:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238887AbiAJGFK (ORCPT ); Mon, 10 Jan 2022 01:05:10 -0500 Received: from out30-57.freemail.mail.aliyun.com ([115.124.30.57]:37454 "EHLO out30-57.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238871AbiAJGFI (ORCPT ); Mon, 10 Jan 2022 01:05:08 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R291e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04395;MF=shirong@linux.alibaba.com;NM=1;PH=DS;RN=25;SR=0;TI=SMTPD_---0V1LvBNz_1641794698; Received: from localhost.localdomain(mailfrom:shirong@linux.alibaba.com fp:SMTPD_---0V1LvBNz_1641794698) by smtp.aliyun-inc.com(127.0.0.1); Mon, 10 Jan 2022 14:05:04 +0800 From: Shirong Hao To: pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.co, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, brijesh.singh@amd.com, thomas.lendacky@amd.com, john.allen@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net, srutherford@google.com, ashish.kalra@amd.com, natet@google.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, zhang.jia@linux.alibaba.com, Shirong Hao Subject: [PATCH 1/3] KVM: X86: Introduce KVM_HC_VM_HANDLE hypercall Date: Mon, 10 Jan 2022 14:04:43 +0800 Message-Id: <20220110060445.549800-2-shirong@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220110060445.549800-1-shirong@linux.alibaba.com> References: <20220110060445.549800-1-shirong@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This hypercall is used by the SEV guest to get the firmware handle. Signed-off-by: Shirong Hao --- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/svm/svm.c | 11 +++++++++++ arch/x86/kvm/x86.c | 7 ++++++- include/uapi/linux/kvm_para.h | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 2164b9f4c7b0..fe745f4e6954 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1493,6 +1493,7 @@ struct kvm_x86_ops { int (*complete_emulated_msr)(struct kvm_vcpu *vcpu, int err); void (*vcpu_deliver_sipi_vector)(struct kvm_vcpu *vcpu, u8 vector); + int (*vm_handle)(struct kvm *kvm); }; struct kvm_x86_nested_ops { diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d0f68d11ec70..c0eb310cb4c3 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4576,6 +4576,16 @@ static int svm_vm_init(struct kvm *kvm) return 0; } +static int sev_vm_handle(struct kvm *kvm) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + + if (!sev_guest(kvm)) + return -ENOTTY; + + return sev->handle; +} + static struct kvm_x86_ops svm_x86_ops __initdata = { .name = "kvm_amd", @@ -4705,6 +4715,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .complete_emulated_msr = svm_complete_emulated_msr, .vcpu_deliver_sipi_vector = svm_vcpu_deliver_sipi_vector, + .vm_handle = sev_vm_handle, }; static struct kvm_x86_init_ops svm_init_ops __initdata = { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0cf1082455df..24acf0f2a539 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8906,7 +8906,7 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) a3 &= 0xFFFFFFFF; } - if (static_call(kvm_x86_get_cpl)(vcpu) != 0) { + if (static_call(kvm_x86_get_cpl)(vcpu) != 0 && nr != KVM_HC_VM_HANDLE) { ret = -KVM_EPERM; goto out; } @@ -8965,6 +8965,11 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) vcpu->arch.complete_userspace_io = complete_hypercall_exit; return 0; } + case KVM_HC_VM_HANDLE: + ret = -KVM_ENOSYS; + if (kvm_x86_ops.vm_handle) + ret = kvm_x86_ops.vm_handle(vcpu->kvm); + break; default: ret = -KVM_ENOSYS; break; diff --git a/include/uapi/linux/kvm_para.h b/include/uapi/linux/kvm_para.h index 960c7e93d1a9..b64469a12707 100644 --- a/include/uapi/linux/kvm_para.h +++ b/include/uapi/linux/kvm_para.h @@ -30,6 +30,7 @@ #define KVM_HC_SEND_IPI 10 #define KVM_HC_SCHED_YIELD 11 #define KVM_HC_MAP_GPA_RANGE 12 +#define KVM_HC_VM_HANDLE 13 /* * hypercalls use architecture specific From patchwork Mon Jan 10 06:04:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirong Hao X-Patchwork-Id: 12708250 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 481EFC433EF for ; Mon, 10 Jan 2022 06:05:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238877AbiAJGFP (ORCPT ); Mon, 10 Jan 2022 01:05:15 -0500 Received: from out30-42.freemail.mail.aliyun.com ([115.124.30.42]:57473 "EHLO out30-42.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238891AbiAJGFL (ORCPT ); Mon, 10 Jan 2022 01:05:11 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=shirong@linux.alibaba.com;NM=1;PH=DS;RN=25;SR=0;TI=SMTPD_---0V1LvBNz_1641794698; Received: from localhost.localdomain(mailfrom:shirong@linux.alibaba.com fp:SMTPD_---0V1LvBNz_1641794698) by smtp.aliyun-inc.com(127.0.0.1); Mon, 10 Jan 2022 14:05:07 +0800 From: Shirong Hao To: pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.co, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, brijesh.singh@amd.com, thomas.lendacky@amd.com, john.allen@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net, srutherford@google.com, ashish.kalra@amd.com, natet@google.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, zhang.jia@linux.alibaba.com, Shirong Hao Subject: [PATCH 2/3] KVM/SVM: move the implementation of sev_get_attestation_report to ccp driver Date: Mon, 10 Jan 2022 14:04:44 +0800 Message-Id: <20220110060445.549800-3-shirong@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220110060445.549800-1-shirong@linux.alibaba.com> References: <20220110060445.549800-1-shirong@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The sev_get_attestation_report is called by qemu-kvm to get sev attestation report. However, getting the sev attestation report is a general function, the need for host program to get the sev attestation report by interacting with /dev/sev device exists. Considering this need, it is more reasonable to move the main implementation of sev_get_attestation_report into sev_do_get_report defined in the ccp driver. Any host program getting the guest firmware handle can directly interact with the sev device based on sev_do_get_report to get the sev attestation report. In addition, after moving the general code of sev_get_attestation_report to the ccp, move the check for sev fd in __sev_issue_cmd to the sev_get_attestation_report function is necessary. Signed-off-by: Shirong Hao --- arch/x86/kvm/svm/sev.c | 49 ++++--------------------------- drivers/crypto/ccp/sev-dev.c | 56 ++++++++++++++++++++++++++++++++++++ include/linux/psp-sev.h | 7 +++++ 3 files changed, 69 insertions(+), 43 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 7656a2c5662a..016acc96c5dc 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1066,10 +1066,8 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp) { void __user *report = (void __user *)(uintptr_t)argp->data; struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; - struct sev_data_attestation_report data; struct kvm_sev_attestation_report params; - void __user *p; - void *blob = NULL; + struct fd f; int ret; if (!sev_guest(kvm)) @@ -1078,48 +1076,13 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp) if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, sizeof(params))) return -EFAULT; - memset(&data, 0, sizeof(data)); - - /* User wants to query the blob length */ - if (!params.len) - goto cmd; - - p = (void __user *)(uintptr_t)params.uaddr; - if (p) { - if (params.len > SEV_FW_BLOB_MAX_SIZE) - return -EINVAL; - - blob = kmalloc(params.len, GFP_KERNEL_ACCOUNT); - if (!blob) - return -ENOMEM; - - data.address = __psp_pa(blob); - data.len = params.len; - memcpy(data.mnonce, params.mnonce, sizeof(params.mnonce)); - } -cmd: - data.handle = sev->handle; - ret = sev_issue_cmd(kvm, SEV_CMD_ATTESTATION_REPORT, &data, &argp->error); - /* - * If we query the session length, FW responded with expected data. - */ - if (!params.len) - goto done; - - if (ret) - goto e_free_blob; + f = fdget(sev->fd); + if (!f.file) + return -EBADF; - if (blob) { - if (copy_to_user(p, blob, params.len)) - ret = -EFAULT; - } + ret = sev_do_get_report(report, ¶ms, f.file, sev->handle, &argp->error); -done: - params.len = data.len; - if (copy_to_user(report, ¶ms, sizeof(params))) - ret = -EFAULT; -e_free_blob: - kfree(blob); + fdput(f); return ret; } diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index e09925d86bf3..2f6b81742d28 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -22,6 +22,7 @@ #include #include #include +#include #include @@ -384,6 +385,61 @@ static int sev_ioctl_do_platform_status(struct sev_issue_cmd *argp) return ret; } +int sev_do_get_report(void __user *report, struct kvm_sev_attestation_report *input, + struct file *filep, u32 handle, u32 *error) +{ + struct sev_data_attestation_report data; + void __user *p; + void *blob = NULL; + int ret; + + memset(&data, 0, sizeof(data)); + + /* User wants to query the blob length */ + if (!input->len) + goto cmd; + + p = (void __user *)(uintptr_t)input->uaddr; + if (p) { + if (input->len > SEV_FW_BLOB_MAX_SIZE) + return -EINVAL; + + blob = kmalloc(input->len, GFP_KERNEL_ACCOUNT); + if (!blob) + return -ENOMEM; + + data.address = __psp_pa(blob); + data.len = input->len; + memcpy(data.mnonce, input->mnonce, sizeof(input->mnonce)); + } +cmd: + data.handle = handle; + ret = sev_issue_cmd_external_user(filep, SEV_CMD_ATTESTATION_REPORT, &data, error); + + /* + * If we query the session length, FW responded with expected data. + */ + if (!input->len) + goto done; + + if (ret) + goto e_free_blob; + + if (blob) { + if (copy_to_user(p, blob, input->len)) + ret = -EFAULT; + } + +done: + input->len = data.len; + if (copy_to_user(report, input, sizeof(*input))) + ret = -EFAULT; +e_free_blob: + kfree(blob); + return ret; +} +EXPORT_SYMBOL_GPL(sev_do_get_report); + static int sev_ioctl_do_pek_pdh_gen(int cmd, struct sev_issue_cmd *argp, bool writable) { struct sev_device *sev = psp_master->sev_data; diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index d48a7192e881..0cbf39a7d116 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -541,6 +541,9 @@ int sev_platform_init(int *error); */ int sev_platform_status(struct sev_user_data_status *status, int *error); +int sev_do_get_report(void __user *report, struct kvm_sev_attestation_report *input, + struct file *filep, u32 handle, u32 *error); + /** * sev_issue_cmd_external_user - issue SEV command by other driver with a file * handle. @@ -649,6 +652,10 @@ sev_issue_cmd_external_user(struct file *filep, unsigned int id, void *data, int static inline void *psp_copy_user_blob(u64 __user uaddr, u32 len) { return ERR_PTR(-EINVAL); } +static inline int +sev_do_get_report(void __user *report, struct kvm_sev_attestation_report *input, + struct file *filep, u32 handle, u32 *error) { return -ENODEV; } + #endif /* CONFIG_CRYPTO_DEV_SP_PSP */ #endif /* __PSP_SEV_H__ */ From patchwork Mon Jan 10 06:04:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shirong Hao X-Patchwork-Id: 12708251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5707C433EF for ; Mon, 10 Jan 2022 06:05:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238891AbiAJGFX (ORCPT ); Mon, 10 Jan 2022 01:05:23 -0500 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]:42379 "EHLO out30-132.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238912AbiAJGFQ (ORCPT ); Mon, 10 Jan 2022 01:05:16 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04426;MF=shirong@linux.alibaba.com;NM=1;PH=DS;RN=25;SR=0;TI=SMTPD_---0V1LvBNz_1641794698; Received: from localhost.localdomain(mailfrom:shirong@linux.alibaba.com fp:SMTPD_---0V1LvBNz_1641794698) by smtp.aliyun-inc.com(127.0.0.1); Mon, 10 Jan 2022 14:05:11 +0800 From: Shirong Hao To: pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, tglx@linutronix.de, mingo@redhat.co, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, brijesh.singh@amd.com, thomas.lendacky@amd.com, john.allen@amd.com, herbert@gondor.apana.org.au, davem@davemloft.net, srutherford@google.com, ashish.kalra@amd.com, natet@google.com Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, zhang.jia@linux.alibaba.com, Shirong Hao Subject: [PATCH 3/3] crypto: ccp: Implement SEV_GET_REPORT ioctl command Date: Mon, 10 Jan 2022 14:04:45 +0800 Message-Id: <20220110060445.549800-4-shirong@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220110060445.549800-1-shirong@linux.alibaba.com> References: <20220110060445.549800-1-shirong@linux.alibaba.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The SEV_GET_REPORT command can be used by host service with guest firmware handle to query the attestation report. Signed-off-by: Shirong Hao --- drivers/crypto/ccp/sev-dev.c | 20 +++++++++++++++++++- include/uapi/linux/psp-sev.h | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 2f6b81742d28..2e479b88aa29 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -414,7 +414,10 @@ int sev_do_get_report(void __user *report, struct kvm_sev_attestation_report *in } cmd: data.handle = handle; - ret = sev_issue_cmd_external_user(filep, SEV_CMD_ATTESTATION_REPORT, &data, error); + if (!filep) + ret = __sev_do_cmd_locked(SEV_CMD_ATTESTATION_REPORT, &data, error); + else + ret = sev_issue_cmd_external_user(filep, SEV_CMD_ATTESTATION_REPORT, &data, error); /* * If we query the session length, FW responded with expected data. @@ -440,6 +443,18 @@ int sev_do_get_report(void __user *report, struct kvm_sev_attestation_report *in } EXPORT_SYMBOL_GPL(sev_do_get_report); +static int sev_ioctl_do_get_report(struct sev_issue_cmd *argp) +{ + void __user *report = (void __user *)(uintptr_t)argp->data; + struct sev_user_data_attestation_report input; + + if (copy_from_user(&input, (void __user *)argp->data, sizeof(input))) + return -EFAULT; + + return sev_do_get_report(report, (struct kvm_sev_attestation_report *)&input, + NULL, input.handle, &argp->error); +} + static int sev_ioctl_do_pek_pdh_gen(int cmd, struct sev_issue_cmd *argp, bool writable) { struct sev_device *sev = psp_master->sev_data; @@ -926,6 +941,9 @@ static long sev_ioctl(struct file *file, unsigned int ioctl, unsigned long arg) case SEV_GET_ID2: ret = sev_ioctl_do_get_id2(&input); break; + case SEV_GET_REPORT: + ret = sev_ioctl_do_get_report(&input); + break; default: ret = -EINVAL; goto out; diff --git a/include/uapi/linux/psp-sev.h b/include/uapi/linux/psp-sev.h index 91b4c63d5cbf..c7d70fc0ac1e 100644 --- a/include/uapi/linux/psp-sev.h +++ b/include/uapi/linux/psp-sev.h @@ -28,6 +28,7 @@ enum { SEV_PEK_CERT_IMPORT, SEV_GET_ID, /* This command is deprecated, use SEV_GET_ID2 */ SEV_GET_ID2, + SEV_GET_REPORT, SEV_MAX, }; @@ -147,6 +148,22 @@ struct sev_user_data_get_id2 { __u32 length; /* In/Out */ } __packed; +/** + * struct sev_user_data_attestation_report - ATTESTATION command parameters + * + * @mnonce: mnonce to compute HMAC + * @uaddr: physical address containing the attestation report + * @len: length of attestation report + * @handle: handle of the VM to process + */ + +struct sev_user_data_attestation_report { + __u8 mnonce[16]; /* In */ + __u64 uaddr; /* In */ + __u32 len; /* In/Out */ + __u32 handle; /* In */ +}; + /** * struct sev_issue_cmd - SEV ioctl parameters *