From patchwork Mon Apr 12 19:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74062C433B4 for ; Mon, 12 Apr 2021 19:43:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D44B6121D for ; Mon, 12 Apr 2021 19:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237946AbhDLTn4 (ORCPT ); Mon, 12 Apr 2021 15:43:56 -0400 Received: from mail-bn8nam08on2045.outbound.protection.outlook.com ([40.107.100.45]:21536 "EHLO NAM04-BN8-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237564AbhDLTnz (ORCPT ); Mon, 12 Apr 2021 15:43:55 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PlVDpDbK/34YOmg18pLqQF5aJUnrRxPGHx632YIDq3Vuql1QRU4tWg4D35pNYBhexRjeVNFwqcRgFjAyj8WQiy+dnUhNUVCxevrVgFEgPQToawa2S1rsnr/YC0HAah/9OrK3JMitPBbsDv4zUA20joWxITvXv/RwFyZ7F7X9CELowyo1hp2RAM1O6PIMef5N919GbzmIB3HNfTjKzjbqK2oWLSIfyaUzUc+5HhDIMTRZ1nTceymCmcZkeZupvDbfpyPNPZ5w2HD4pCnX24zWaAIYyTt2ALDp8QwyMhAg8n0xUTAW4XdmXbCzfpin6OZSqmulF8KlUegThyYdo33Xmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p9+vMxeGG/Np/pHxZBLItVNVJH2aLDUxgz42hCBtD2c=; b=Ieyv+cmt8EmMt9/jprDxqWhTVNUbl+a61kd9HpamF2jEvvXTfzQWXHv/22guIlAYT9C0vmjAB4p46pjY/Xsk/XRGGRdkOevUT6PlWpEICT+tThtmTOyQ356aELlows71Z53ywtiqOWcptSIINleaY6+Tz1K5h1y2yI0lj7XyIyX9CLvpBpxIc1FhnfRbkfEypcTO6J2/SW1o2SKzviLg/vO2stLLIxOwuZq7dMWM+hJP8f296UXm50bZ5surWwNkGc75B78kykW1moAdAXIgr5C/+4zOc71caeAtN6LeqBnijOa2Jsjfsv4AeqDqgVkaa0nRHEdDFM/6INFCV9myqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p9+vMxeGG/Np/pHxZBLItVNVJH2aLDUxgz42hCBtD2c=; b=vdOz2wgPBdZhkuOsaquMG/TTR8KZlX0DrtIxM467S0YbH/ZjDNcYzKYuf59PqIel4xd0zU5FPx5FjZvxY6JUwll9eej7Y+0tr6vEEgfM4jG/okNnGZ9tqhHJQy8KYj3qoQeEVG01JOQH5ZA05FovbKpyuiCv8gvkqcVm+Iwf2Ic= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2720.namprd12.prod.outlook.com (2603:10b6:805:70::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16; Mon, 12 Apr 2021 19:43:33 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:43:32 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 01/13] KVM: SVM: Add KVM_SEV SEND_START command Date: Mon, 12 Apr 2021 19:43:22 +0000 Message-Id: <2f1686d0164e0f1b3d6a41d620408393e0a48376.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0028.namprd04.prod.outlook.com (2603:10b6:806:f2::33) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN7PR04CA0028.namprd04.prod.outlook.com (2603:10b6:806:f2::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Mon, 12 Apr 2021 19:43:32 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 426dbf7d-c072-4ca9-a0a5-08d8fdeb412e X-MS-TrafficTypeDiagnostic: SN6PR12MB2720: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ad3pns8phDZVFFm9oLAISKPYYzghdM58clpveeaU9IESQ5M4q5y+TPjbuOuMLZbiRnecUk43hUBgjn2fKEXNBhhtP7yb/vfz8z6NmGenWKPf/eWgCYnafDMSYvdokeiRug8zSXpc3+e9Ct+yUadsOkoPoBk4/NNflhQvE4mNAkiK5Cwr8ggyWYXJeCtbeZ7RyWmc4js7dTGLbIn5ISsCNH6uZstZzwD+iCSQkmEEeDXOxVKw6Zgz/qsXqLqfwCHIzlhJbqBsr/WzdmjCGZ49dNwEXDcnmsDfH2VIpb9+kO0T5OXOj5zRAOqI3DzgoMquFxOcttwBjk8vq9Y4sF8s131dK+WUoJSogaxvXiB08Siu+QMIDwdiNqEt0yJFPerL5qQ3mswFvn72nYfrvVEqYyDXafi3NFF+Rp4ABnN5NvHw8bWGA6mfL+nhwsOg0LfWlw2iDEWFENdPKW7you+rR3huGBrtVGmsNPVekxh9zEruiKhPa+YOUmlIhyMaKr7hfiNT5YMw39LorJ1+cGbPSM/iCjcYhNB/fISdB2PFJ0erT9UbF2SRLGYBygf8/EjuhYZa84B44Cfbp8z4nBFa1PNfL3ayMlLjsWWlxMXPvLi/+gL7DlQE3D4uFYN0yAPu6QHCsfJCmdWC7wbCM4h2Wc0g5VEj8FXsfnVSZ/Xw+es= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(396003)(136003)(346002)(376002)(39860400002)(86362001)(36756003)(83380400001)(38350700002)(38100700002)(4326008)(2906002)(6916009)(956004)(478600001)(316002)(5660300002)(66946007)(52116002)(7696005)(8936002)(8676002)(6486002)(66556008)(66476007)(16526019)(2616005)(26005)(6666004)(186003)(7416002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?1Z2PalwdfpSJlVJr8ondZTCdRsdUXF?= =?utf-8?q?h6hK9b1ZK/nzwgmOSQjN9bIBsmahdBtYEma5MJghmzj0BZYCJRjLWlOkfDIwu2qkW?= =?utf-8?q?IekinKcAMnZSCtQz9ITP/eqDMSMyeFgHlDJc027lcRNbY/mMAsD0scWjit26WFYrF?= =?utf-8?q?7ks/ne1AjtXuUwKvByRxUa+Qou2zgmyJvZj4MBfHTRGL7FASde72H5GnY/C973URp?= =?utf-8?q?24NW5I+3ipxlv954C0DarsHK/+opAYoa/20ikx1r+DiNR3YPFM2+Uqi/1ieIxOH0a?= =?utf-8?q?dSQvk8zauXTpsth6gp2Lz/8x1TG+V30CtEZXseRP1cE9mBAwkNzLTeI5M8DoEVz3j?= =?utf-8?q?JFQnoI6hH0EAEVD2xhSA+bTNevKZ2bDzupa8oWNW2Tn5cuwbApmJThjp8dnKkHSTU?= =?utf-8?q?vZVgLnfMk181JPBHYCgZpLRlvYoxH2kT6dOsAzKu6/8wl5C9oPAt2BarRDQlsf2W6?= =?utf-8?q?XFTp3UExPOYCp4i71OxaIV6FiF3MfLpIdZXsmExxXcvY4TlQDjIMz1uA57WsHNaQc?= =?utf-8?q?KdVZ/ho45EMf5t34BNb154qTDAkn5Tm+KDwdwdhgcDb9E78oFxl49/Lb9nforYUXW?= =?utf-8?q?4Z66kNV3109JOOm2GDkPwL530XIk4XlCoyCgtRIGKzyOBpo+QZ0ulPba9HOFpNi67?= =?utf-8?q?6fCX/R6SqQ/pjOVjN9wsM+Dx6pCtiHtoM0f6zjCQz41V1D93OYVmm7goENbIAA231?= =?utf-8?q?KqBp1H+lWcSC5XG7HB7SicSjwwWyIMDLnWF5oBox8YQvEBTkVSIKbM39JnJV05o3B?= =?utf-8?q?MwBwfGtdE6EZyWNAPEW5W6x80pmb87eSjyHLDtzGTpjV9ttYr7O74yikyPk50fwYF?= =?utf-8?q?UoEvIllwelv0sNIcALTyVu+yq9xEucKn2EkVL4RSmt1WTOey7FnQZTwBst11GNar8?= =?utf-8?q?y7v8Y/oKJuB9U39zcNfRiuLa5H4VjfBq+Y138QHKFNItxr66rowTY8uU+aM+5Cvsc?= =?utf-8?q?2ZZhgNMjGaPMA5XSGeqtR4vFtwRwmvVXzBK/wk2ZNjs0fNo0awyr0mG685lbbDt5i?= =?utf-8?q?TA1vhHIn3mVixlcWdYNnqJvR0OFoHATOM7U4D7HG1sCYfr+a1XSn0BQcGz0Jx5wcO?= =?utf-8?q?raeDavIjkiw8jzOjg5jPse09w3I3byfalLLQDT+NCa8eb967iq6jHqx7WqPvktp1v?= =?utf-8?q?ySmCOZs82Ncp2JvXYBg+OTNT3RxnQb8F+RCainbNVIA3TazAS4K6oCb5cW937TcAA?= =?utf-8?q?gkTN2/gQn9Xkwd7K9IBivn/lf7d2CJYybK8SXZAvXKWY7GTCBBF2s1bgVMBWSGpB9?= =?utf-8?q?cOaRCrkUn0fe2J?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 426dbf7d-c072-4ca9-a0a5-08d8fdeb412e X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:43:32.7960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5NfTr4dWsPpDOFhv2XLn+BdvUfopEGBp2vL0qibOyrORb4Mc6yWiloxpIpE09Lch7i2Rrl12874MUF+j2H6e1Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2720 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command is used to create an outgoing SEV guest encryption context. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Steve Rutherford Reviewed-by: Venu Busireddy Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra --- .../virt/kvm/amd-memory-encryption.rst | 27 ++++ arch/x86/kvm/svm/sev.c | 125 ++++++++++++++++++ include/linux/psp-sev.h | 8 +- include/uapi/linux/kvm.h | 12 ++ 4 files changed, 168 insertions(+), 4 deletions(-) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index 469a6308765b..ac799dd7a618 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -284,6 +284,33 @@ Returns: 0 on success, -negative on error __u32 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_certs_uaddr; /* platform certificate chain */ + __u32 plat_certs_len; + + __u64 amd_certs_uaddr; /* AMD certificate */ + __u32 amd_certs_len; + + __u64 session_uaddr; /* Guest session information */ + __u32 session_len; + }; + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 874ea309279f..2b65900c05d6 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1110,6 +1110,128 @@ static int sev_get_attestation_report(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +/* Userspace wants to query session length. */ +static int +__sev_send_start_query_session_length(struct kvm *kvm, struct kvm_sev_cmd *argp, + struct kvm_sev_send_start *params) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_send_start *data; + int ret; + + data = kzalloc(sizeof(*data), GFP_KERNEL_ACCOUNT); + if (data == NULL) + return -ENOMEM; + + data->handle = sev->handle; + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, data, &argp->error); + + params->session_len = data->session_len; + if (copy_to_user((void __user *)(uintptr_t)argp->data, params, + sizeof(struct kvm_sev_send_start))) + ret = -EFAULT; + + kfree(data); + 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; + struct sev_data_send_start *data; + struct kvm_sev_send_start params; + void *amd_certs, *session_data; + void *pdh_cert, *plat_certs; + 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; + + /* if session_len is zero, userspace wants to query the session length */ + if (!params.session_len) + return __sev_send_start_query_session_length(kvm, argp, + ¶ms); + + /* some sanity checks */ + if (!params.pdh_cert_uaddr || !params.pdh_cert_len || + !params.session_uaddr || params.session_len > SEV_FW_BLOB_MAX_SIZE) + return -EINVAL; + + /* allocate the memory to hold the session data blob */ + session_data = kmalloc(params.session_len, GFP_KERNEL_ACCOUNT); + if (!session_data) + return -ENOMEM; + + /* 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_session; + } + + plat_certs = psp_copy_user_blob(params.plat_certs_uaddr, + params.plat_certs_len); + if (IS_ERR(plat_certs)) { + ret = PTR_ERR(plat_certs); + goto e_free_pdh; + } + + amd_certs = psp_copy_user_blob(params.amd_certs_uaddr, + params.amd_certs_len); + if (IS_ERR(amd_certs)) { + ret = PTR_ERR(amd_certs); + goto e_free_plat_cert; + } + + data = kzalloc(sizeof(*data), GFP_KERNEL_ACCOUNT); + if (data == NULL) { + ret = -ENOMEM; + goto e_free_amd_cert; + } + + /* populate the FW SEND_START field with system physical address */ + data->pdh_cert_address = __psp_pa(pdh_cert); + data->pdh_cert_len = params.pdh_cert_len; + data->plat_certs_address = __psp_pa(plat_certs); + data->plat_certs_len = params.plat_certs_len; + data->amd_certs_address = __psp_pa(amd_certs); + data->amd_certs_len = params.amd_certs_len; + data->session_address = __psp_pa(session_data); + data->session_len = params.session_len; + data->handle = sev->handle; + + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_START, data, &argp->error); + + if (!ret && copy_to_user((void __user *)(uintptr_t)params.session_uaddr, + session_data, params.session_len)) { + ret = -EFAULT; + goto e_free; + } + + params.policy = data->policy; + params.session_len = data->session_len; + if (copy_to_user((void __user *)(uintptr_t)argp->data, ¶ms, + sizeof(struct kvm_sev_send_start))) + ret = -EFAULT; + +e_free: + kfree(data); +e_free_amd_cert: + kfree(amd_certs); +e_free_plat_cert: + kfree(plat_certs); +e_free_pdh: + kfree(pdh_cert); +e_free_session: + kfree(session_data); + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1163,6 +1285,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_START: + r = sev_send_start(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index b801ead1e2bb..73da511b9423 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -326,11 +326,11 @@ struct sev_data_send_start { u64 pdh_cert_address; /* In */ u32 pdh_cert_len; /* In */ u32 reserved1; - u64 plat_cert_address; /* In */ - u32 plat_cert_len; /* In */ + u64 plat_certs_address; /* In */ + u32 plat_certs_len; /* In */ u32 reserved2; - u64 amd_cert_address; /* In */ - u32 amd_cert_len; /* In */ + u64 amd_certs_address; /* In */ + u32 amd_certs_len; /* In */ u32 reserved3; u64 session_address; /* In */ u32 session_len; /* In/Out */ diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index f6afee209620..ac53ad2e7271 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1729,6 +1729,18 @@ struct kvm_sev_attestation_report { __u32 len; }; +struct kvm_sev_send_start { + __u32 policy; + __u64 pdh_cert_uaddr; + __u32 pdh_cert_len; + __u64 plat_certs_uaddr; + __u32 plat_certs_len; + __u64 amd_certs_uaddr; + __u32 amd_certs_len; + __u64 session_uaddr; + __u32 session_len; +}; + #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) #define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) From patchwork Mon Apr 12 19:43:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198725 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52B2AC433ED for ; Mon, 12 Apr 2021 19:44:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24139610FC for ; Mon, 12 Apr 2021 19:44:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245404AbhDLTo3 (ORCPT ); Mon, 12 Apr 2021 15:44:29 -0400 Received: from mail-dm6nam10on2040.outbound.protection.outlook.com ([40.107.93.40]:54113 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237430AbhDLToM (ORCPT ); Mon, 12 Apr 2021 15:44:12 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGop+zWO9or7XLuiVJOYaEyip9/KjAQ7P7jO4nmvNPVj7vNPEG7qIo5LXNeUnLegXNO//Ff5AZQTR+0/y2mRLzYJKaKH6SUs/Y+j64iVxH0oQ9RGoG61DE3zGqDVbhqeKLSAQvU+ITA3JqbFoUXkQp07NXRpqjm4XOMOeoigQAXBqEUjn0mgjtHT295xtJPzjxsaHJ9UDMmW94p76lExUBgqNYMyjaviSI1tVD6tGYajQuvHJZtHsMqNUGeJ2MaSfTqHiCXJbCpVLaYlNMOG1U2tqYm+W967+8YbTMJWcDKWMITPk35BFeUrpe3sE1FzjG+31AC05SVEV9eUhDnr3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TmptNcWrK0Wse7VDXUmUvzb21xGh5dE1N4aXqer08gc=; b=hXQZvX0i9s/6CTLPMGPjw2sI8sqJa1uBzvlpS3Ps60gt/eqA5LseSaDT8LPUzrlb3uNxLB9bZb2S/Wh9GeYihXiu4k6fQXLTo3OhGmVqWPSIR6qTt7zgFHYebo4AuL2CUjKyHxwH8enj467cmarIz9HFz6gAKZ9+j/woQU0HP3P8Lj5UOUtZ0OMI457ozmfRx5p8/Om2vizwXoeasyd6RnNT/i5v6ocTAR3lFvx5yK7H7812KxgAcHxPIQb9xZFkl8sP3fZQzDnFzb3VbN0++jS25tg1EOfgFVFL8ASp9VPtf9Yxcpww1XUwzQ/3ER6/aciJoklzy8Iz1ZiQPdUXTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TmptNcWrK0Wse7VDXUmUvzb21xGh5dE1N4aXqer08gc=; b=MhxAg8oC53ZxWpTlSC6HkwuMQ+3LhpePR9GjnC9ZKaL0oV0gJ+RilHr/ahAULdl9KpoxlgVtBIxIDwIyizFgKF5hNCRKQdWORgwEx+nmDVPMo1/OmQcKZu6Oz4/c4n4aIFPZDv7Q79QrjTe0AGxTnE48PA37HsP8BAXgiRL3jn0= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:43:49 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:43:49 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 02/13] KVM: SVM: Add KVM_SEND_UPDATE_DATA command Date: Mon, 12 Apr 2021 19:43:39 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0151.namprd04.prod.outlook.com (2603:10b6:806:125::6) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN7PR04CA0151.namprd04.prod.outlook.com (2603:10b6:806:125::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 19:43:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1e1dcde7-3406-4f12-7c76-08d8fdeb4b22 X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X9aOZX5Eh6kUSw3otxtP0cmdpPq4BUNhKQNVK4dZqhnMd91u+RKeB8V6Z6MGc9jwU4oosFXk++BUQAfrmH0Abmml7y/WHn2aD6MMlQo0fNLtDZCexSqdYpn21HjRqt8QndC4cTQGrNoVZCKzJPJe7NFiUrIee4Clm9g92FfNV+EdwVqWbo6XE1xRaQvAzGHFp4R46DPvbaYpzCmTEAer9GA2qNDn4SsG01mqnMOmQ1uJY5jRPPSpjwQum/+lp1W2BWsNhSvN9nan1OuNZJFULJVALUfMqQAetp8acSQ9/tZUQ+gN0I141JWVWQLAuHY5lPkCxC5tTOeJ4/1xXH6/s5Yf4M6cq+drT8mQyLhtNAZKAP1p/gnhbh4x+IjLvGkGIyvt97ScRfgDiudpzjACwUzuCsK6GhUoGwnyKj43hZ1VxYi3M/H15+5lE0NHcqLFIzD3454tQrZ/CzxckTrqj2cQcKG7cm+DeyCwtp7d6jgoEcu+BcB88/yV+f4SHqzFpGsEbwLx8RIk/loKABmUbIX238dZRVPlUxzFmXggE00vdY6s2nUU3OjTNHJuoBnPDAo8FY9edo9pAmjJ8mJhj11BrlhrFILO1LhMSsqzNJJLNyZj16Q6wCox01MuFnndSBrwvoDfQy3uY2vTTzBK3Vuffgd+0e5fRI7933ZY4zA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(376002)(39860400002)(366004)(346002)(316002)(6666004)(38350700002)(36756003)(8936002)(38100700002)(478600001)(52116002)(6486002)(16526019)(4326008)(186003)(7696005)(66946007)(66556008)(2906002)(66476007)(956004)(2616005)(5660300002)(83380400001)(86362001)(26005)(6916009)(7416002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?OnKe0YF93Qk6fxTO9t9Fzaicu/4mSl?= =?utf-8?q?2cpd0H7pRp3v+OQV7Q3oBj3ddQvEbHoIAT7VRFxlXSqnD5EGdANrctKe/nsgE4IV6?= =?utf-8?q?J9K6m/MRAm2d+15802TGxcODuU/3HJqVeSjpDlGC2tLeOe+WNN3peXs9fHs42I/1B?= =?utf-8?q?xvbYeah2VXqxFDU0Zp1KA1R5pZiXEkOlbuJ5mRLwx8/Spk/3aB2d6hUxyRXAtZGC3?= =?utf-8?q?YJbKs6MxEUAQzwxzkJdXZb6mtBvR19W2eWHGN3HY0HnyOxq8BdYN1Dp6fvthCR9dJ?= =?utf-8?q?HNou4UrbnHVnhHy55jGfQiPvkgbxte7ERDrXXeDnAcrXz07CDcM84UVEWU/Zia+T5?= =?utf-8?q?3OBTc2KQBoykBV4Pyv5rlC0q4iVx2RnGaNErUTAvgM7BSRQYJixNxaze08vPaY059?= =?utf-8?q?+sTEYx2TVR6wTw2sNx50+NwsZQ0G7jO6aRc5jF5/FoJrZWyy8wFaXMr6gMA2x0WOB?= =?utf-8?q?rChcm/lgu5sOXJRwHJNSn/p4j/EPf8gDnDqByX8E/UbchBwWMt8Aybdqx9Er7RAC8?= =?utf-8?q?owxDz/azhBuAKQBO/SNJFDFlhr2FgB0er9yS7QCAWSRkatAs3Ox7g+Cl07+u262G3?= =?utf-8?q?QoLpwXXHDlg/M/y9m+B1+ckpAwHxDd8pTgHivADw7AHNIAc08EGRCbRYxAL2IF6H5?= =?utf-8?q?JEq8DYXacckzBa9ZzFAPZJddWX8S8m6xYgFdYjpFu6q/KhXlk1srRg50BcYRb475x?= =?utf-8?q?kl2fYNCEZesF0MH3XFolgT8A0O4BtU3B9QCPpTN5HsRdpgYhSkusYtQM2/WD1RcEt?= =?utf-8?q?3B4fskweibeXHUsmVG+VtFvSjUewHIpkBeT/pbm62WSBvoBMAYqq1IHohvQF7578P?= =?utf-8?q?pHdGNfuSSR5FHVksx5pZp+g8E21mXkM8jwXYD81nw5T1wp48jMavtbH/F8MXSYBIG?= =?utf-8?q?wdzbpGOtdg68udIsMbjtkHz4e6Kw5Wol9ZFfrsC+4249NINNC36kT3eJeLum+hgPY?= =?utf-8?q?geM66ZfjMGg/PnIh+B5EOqzPIZFJ0GPxibOS4tsEDLDW6SDnVvImuoBOoJ0OUvfF2?= =?utf-8?q?tPEWIrHXX9h50OcjMLEtpN/8/PfSbAiK1iisQVJQgvvRyJ0QYMGIXeWk9YMPTKgma?= =?utf-8?q?sDkT9/6L7cmz4lVkE18UmK01LsFwnoNxtGvw7MukMl4kaGL9HsI9Kiswq99D86n9r?= =?utf-8?q?sVFKkED9n+hkuz+Y9DsgI2/TpCNKFJMYch/T0z3ys3ohoaFWFbdZdt/BhwtcCQYP6?= =?utf-8?q?Owm+Bmc0RfFjy1LZA8kzFa1XWQQ7alYJZMDFPDpZxXMBfv0LidYYtL4ltYRBUmBJC?= =?utf-8?q?y7oXKw2MXb4d+A?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e1dcde7-3406-4f12-7c76-08d8fdeb4b22 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:43:49.3917 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JHXbVSsrj8VwT1MW6nH0WhlrRkrnaPMy+6LBl8aX4O1tugUQ8I3TqTyGtkVZvuMgvQzolytgh9Z+v+PgKH6MAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command is used for encrypting the guest memory region using the encryption context created with KVM_SEV_SEND_START. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by : Steve Rutherford Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra --- .../virt/kvm/amd-memory-encryption.rst | 24 ++++ arch/x86/kvm/svm/sev.c | 122 ++++++++++++++++++ include/uapi/linux/kvm.h | 9 ++ 3 files changed, 155 insertions(+) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index ac799dd7a618..3c5456e0268a 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -311,6 +311,30 @@ Returns: 0 on success, -negative on error __u32 session_len; }; +11. KVM_SEV_SEND_UPDATE_DATA +---------------------------- + +The KVM_SEV_SEND_UPDATE_DATA command can be used by the hypervisor to encrypt the +outgoing guest memory region with the encryption context creating using +KVM_SEV_SEND_START. + +Parameters (in): struct kvm_sev_send_update_data + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_launch_send_update_data { + __u64 hdr_uaddr; /* userspace address containing the packet header */ + __u32 hdr_len; + + __u64 guest_uaddr; /* the source memory region to be encrypted */ + __u32 guest_len; + + __u64 trans_uaddr; /* the destition memory region */ + __u32 trans_len; + }; + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 2b65900c05d6..30527285a39a 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -34,6 +34,7 @@ static DECLARE_RWSEM(sev_deactivate_lock); static DEFINE_MUTEX(sev_bitmap_lock); unsigned int max_sev_asid; static unsigned int min_sev_asid; +static unsigned long sev_me_mask; static unsigned long *sev_asid_bitmap; static unsigned long *sev_reclaim_asid_bitmap; @@ -1232,6 +1233,123 @@ static int sev_send_start(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +/* Userspace wants to query either header or trans length. */ +static int +__sev_send_update_data_query_lengths(struct kvm *kvm, struct kvm_sev_cmd *argp, + struct kvm_sev_send_update_data *params) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_send_update_data *data; + int ret; + + data = kzalloc(sizeof(*data), GFP_KERNEL_ACCOUNT); + if (!data) + return -ENOMEM; + + data->handle = sev->handle; + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_UPDATE_DATA, data, &argp->error); + + params->hdr_len = data->hdr_len; + params->trans_len = data->trans_len; + + if (copy_to_user((void __user *)(uintptr_t)argp->data, params, + sizeof(struct kvm_sev_send_update_data))) + ret = -EFAULT; + + kfree(data); + return ret; +} + +static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_send_update_data *data; + struct kvm_sev_send_update_data params; + void *hdr, *trans_data; + struct page **guest_page; + unsigned long n; + int ret, offset; + + if (!sev_guest(kvm)) + return -ENOTTY; + + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, + sizeof(struct kvm_sev_send_update_data))) + return -EFAULT; + + /* userspace wants to query either header or trans length */ + if (!params.trans_len || !params.hdr_len) + return __sev_send_update_data_query_lengths(kvm, argp, ¶ms); + + if (!params.trans_uaddr || !params.guest_uaddr || + !params.guest_len || !params.hdr_uaddr) + return -EINVAL; + + /* Check if we are crossing the page boundary */ + offset = params.guest_uaddr & (PAGE_SIZE - 1); + if ((params.guest_len + offset > PAGE_SIZE)) + return -EINVAL; + + /* Pin guest memory */ + guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK, + PAGE_SIZE, &n, 0); + if (!guest_page) + return -EFAULT; + + /* allocate memory for header and transport buffer */ + ret = -ENOMEM; + hdr = kmalloc(params.hdr_len, GFP_KERNEL_ACCOUNT); + if (!hdr) + goto e_unpin; + + trans_data = kmalloc(params.trans_len, GFP_KERNEL_ACCOUNT); + if (!trans_data) + goto e_free_hdr; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + goto e_free_trans_data; + + data->hdr_address = __psp_pa(hdr); + data->hdr_len = params.hdr_len; + data->trans_address = __psp_pa(trans_data); + data->trans_len = params.trans_len; + + /* The SEND_UPDATE_DATA command requires C-bit to be always set. */ + data->guest_address = (page_to_pfn(guest_page[0]) << PAGE_SHIFT) + + offset; + data->guest_address |= sev_me_mask; + data->guest_len = params.guest_len; + data->handle = sev->handle; + + ret = sev_issue_cmd(kvm, SEV_CMD_SEND_UPDATE_DATA, data, &argp->error); + + if (ret) + goto e_free; + + /* copy transport buffer to user space */ + if (copy_to_user((void __user *)(uintptr_t)params.trans_uaddr, + trans_data, params.trans_len)) { + ret = -EFAULT; + goto e_free; + } + + /* Copy packet header to userspace. */ + ret = copy_to_user((void __user *)(uintptr_t)params.hdr_uaddr, hdr, + params.hdr_len); + +e_free: + kfree(data); +e_free_trans_data: + kfree(trans_data); +e_free_hdr: + kfree(hdr); +e_unpin: + sev_unpin_memory(kvm, guest_page, n); + + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1288,6 +1406,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) case KVM_SEV_SEND_START: r = sev_send_start(kvm, &sev_cmd); break; + case KVM_SEV_SEND_UPDATE_DATA: + r = sev_send_update_data(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; @@ -1467,6 +1588,7 @@ void __init sev_hardware_setup(void) /* Minimum ASID value that should be used for SEV guest */ min_sev_asid = edx; + sev_me_mask = 1UL << (ebx & 0x3f); /* Initialize SEV ASID bitmaps */ sev_asid_bitmap = bitmap_zalloc(max_sev_asid, GFP_KERNEL); diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index ac53ad2e7271..d45af34c31be 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1741,6 +1741,15 @@ struct kvm_sev_send_start { __u32 session_len; }; +struct kvm_sev_send_update_data { + __u64 hdr_uaddr; + __u32 hdr_len; + __u64 guest_uaddr; + __u32 guest_len; + __u64 trans_uaddr; + __u32 trans_len; +}; + #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) #define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) From patchwork Mon Apr 12 19:43:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198727 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D881C43461 for ; Mon, 12 Apr 2021 19:44:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BA35610FC for ; Mon, 12 Apr 2021 19:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245473AbhDLToa (ORCPT ); Mon, 12 Apr 2021 15:44:30 -0400 Received: from mail-mw2nam12on2042.outbound.protection.outlook.com ([40.107.244.42]:43809 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S245417AbhDLToZ (ORCPT ); Mon, 12 Apr 2021 15:44:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FroxcO3CLuikkZfZbrgxT5Q/tdQYboGkshpI24ngiwKwdCDc4Dh175S6oBens8vAJlxSc5ZHMNweMel1JP5Hxejwhy/8pjDuai2vobUdcrSGan60xVPwQqty5cTD8cQlq7H4mN/Cf/jTxF8ophva3J1aio3nOvNlAhF81iegl2gWIOes+LnRyDt55PF3il+xqkZ7S01bvcJ6vY65IOotl3+K/StMGeqqhMmT0SxwOSe87EkUqZnrLFfdp6ac6FeLFcxvX+UUDSZ11X2iaehqc8LMxw6/8LhTre/k6ebLPnMIOrppqjUxOw8b7GkyIA39PW/sgI7/p20PRINYBZSmWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MYVNY8BsTybE58fvtY+jcGFOHWn1tynkMK/KKN9NcjU=; b=ZM+SNrTLNrwcqyXkM4clTWdNelqcRpCbpmOrA3uUrLL+jtJQmIsggxBz0cDavCKYRNcWSYG9M6dwjUGTJf+5t5XSwXpbE6adPXudWeJmjG8bp+fM6DUqVMbTJGMu8cxKV0dIeu0mN8mGyXuyypjbOLBXwUFwt77x+DVqc/ltG377M800m8pFeIehQECYiPEFzXEMzrAXvk8JBn5uc1Re4q2Le8V/xyIAqTimYM3d96maKTDyDggb6hj14aeBi0YspPcYto+fGemjqtE1bT8vaLG4Pza00Fu25H23Pe9OaxHgs6z7hMyHQKwqDC83P+fbCtTdPyeYOWmLh+DxWH4ScQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MYVNY8BsTybE58fvtY+jcGFOHWn1tynkMK/KKN9NcjU=; b=LmPcPB/Uelk1ylcU4hBaDFFBHHxcXa+SwDMeM4td8jr7IHjYq15imcQIyhPnwMhjl/lVmlpvGkl41676rS33BoJ0AmbivXBQok8YVwfuGsKgkT8KX6cbNhnG9wZgJdbSJTJRbx0r/vVm/5r3VPQ/or9CcJCwASDf29EXt56nG2U= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2717.namprd12.prod.outlook.com (2603:10b6:805:68::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:44:05 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:44:05 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 03/13] KVM: SVM: Add KVM_SEV_SEND_FINISH command Date: Mon, 12 Apr 2021 19:43:55 +0000 Message-Id: <5082bd6a8539d24bc55a1dd63a1b341245bb168f.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA9PR13CA0080.namprd13.prod.outlook.com (2603:10b6:806:23::25) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SA9PR13CA0080.namprd13.prod.outlook.com (2603:10b6:806:23::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Mon, 12 Apr 2021 19:44:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6c59e801-781f-455b-81c4-08d8fdeb546f X-MS-TrafficTypeDiagnostic: SN6PR12MB2717: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 02EH1EnKDvi7jzfHysP+86yyZMn2dWBBjVH4rfxi0NbSiKvNGtR8pqoV6RRMEkvLLv4GqtInJdc1PP6eFMSK66RlXo5s5dQvhLuWOZ92v1AShmm51XBtj4ecdHdbH9tWRvKow4jHqvvN+eNhtI8zKuHC4CzZZDGsU3LVCCQ6LTcUmNpUB2qOoHERkRJ5bkU6DEvx9AgkNMCWUdxyJ3SzrnA5deNn56gbqVa4ApKfTSGkP311O2TduXu5eKq88gY2Au1MBUaGhYwuHdxY2o0sxxj5ofYQVscScH0HmhKeIpUTwahA3lhzaEhGpmHBSRMvv37VknOAmInSLno5Mm2E86+Ami18BmRUAxBmMMZTXbyy4OnMfLTAZlP6o+JFPoqXsyQPy/UO/AlAdafsbtw4KDYbY6MK44MnWk6G1zdswXyYTyqjfsh65mjJ8CbRksRICDULZCIe2KhFK6de5zeaeThOQSbNuBD2ZnGoNLDZne0chIFjyPHarJ43DDARrKZWjk/sjjvV7WM7iEuYUmkcf5eUkDqR3HFnbDMNckA8X/AENP4xxl33LGQ277MLNhCmHMtHG6KhtrUE3TB8e9TTtZbsaGXuvyu6yxXPj2EQzLXM6mWSdqxCZdpoa5xOy2JamXpYpTXGOla098U3Z7e+QA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(366004)(376002)(396003)(39860400002)(36756003)(8676002)(6916009)(4326008)(316002)(86362001)(2906002)(52116002)(66556008)(2616005)(8936002)(6666004)(83380400001)(38350700002)(956004)(186003)(478600001)(26005)(38100700002)(5660300002)(66476007)(7416002)(66946007)(6486002)(16526019)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?1RXSorpeKK/N+DlfJiuNVCDvnEXE17?= =?utf-8?q?NWbdFoKB+Adj2qxQSExPslqrkCnAgIS6YPfrDjReMQjoFhS7WUYAdyNH3f4Q4/Ig0?= =?utf-8?q?z2CehpUgDgirXOv3+jVSxiu1cN1OAiXshSGewgq7CIhlilrkWsd8xcJMQq7L5gf+k?= =?utf-8?q?TdUQpalbYKfdPXyvRFrgg/0wAQvuopnfuKfltRceYgY+EGDyOezPxD2HhFeL/vYOg?= =?utf-8?q?Hsv0LyjsWRCmYeCYmCHw9mEvUz8hcMhabmUskOToNsvsz99eUA61OL8KDTRfZWsZI?= =?utf-8?q?27bHBSLDeamvFhagkaPo1aQc+uOzf4iWFtTs0XF6SyJx1keXlTeFM5C4g8G9FFuZZ?= =?utf-8?q?skAV2cbW0ybI6EtfTvjl/iQmFXV6UgE5sZ8OxKhKV/mRh9zuCNI+l8dl3iK21ViHj?= =?utf-8?q?toLj5lhUunPbrJX9uXkNkX42vXjf4gLEd0XJGzrETSHBb4e7dWuqS/QZRJQLNstDX?= =?utf-8?q?sZ9MBYqCqpIVRtHnKzX1BcgHp8Qh0KwPsYwhPzm2650gdyGUB9IomMkgiPU5O2d4W?= =?utf-8?q?VqrQtJh6pmIfiQRphbs3Fv+OCPWBf6inlEnv7GOntjUFLe0Eope3C5UKNwU6Vgidh?= =?utf-8?q?CNuyHKugslJCgJTsIUuf019iOUUKw+PU/NwC+VUe7z/gJQyDJ1dUzr8191cPlpvy5?= =?utf-8?q?tkum5MlXibItSPNVKYX8jaVd+cBtRATPWJOrXdylrCcJaeJky+3UGFcjvZtY0hnGT?= =?utf-8?q?wVCfFV8kQJnLQIFSZaVfFIa+llRynM1OhBhmZfkNUBSauA+awjRrl6YI8bMO1N1hg?= =?utf-8?q?a33c2VEoQQPK2d12o8K3lZGAp9Il+Z0Bgb7ehaDU00+3HFXUbf1lWRsFa7K/W7y02?= =?utf-8?q?kX1tC1ByUP9Lzluae4N4FYZlweiJqkvlbzmtFU+iIEHvdAGbBe4UxEZQnVnHzP9+T?= =?utf-8?q?SzbUvWgLD5PG68Y/jzFzFwJesIown5w2wzbhVdQBj4UglSgtkxS5pXqTcMw1XpL4O?= =?utf-8?q?arswtQMA7Vs8BbA6AR3Stdaz1h++/4JWpqO2xLce1yJ6DhQXt9scVvyJBIeIOIiBB?= =?utf-8?q?eyoG9vFJ76GLNBe0mqNz7Dn5TovKoseIrlFkbfBrV3+uSmb3yQte0HbvMNF/rVTxP?= =?utf-8?q?5Ej6tgJd6HCV0tbO/+BLb92K+sNpOBMVQ9mxTwBc6+V3JrM6wzLf4rI6dMsOim4TA?= =?utf-8?q?kpPNUPnkfSj5nSXiur5RzVvT10e2ZgTNtAiT4fVE+93bhpp/UTGkOPeZJ4L+jctij?= =?utf-8?q?eBn8+6VgQFM8KaaWJ+Hp1rL8lIsq1BTRIOTQL33AocYukJ+fdex8hKyVlabw949YU?= =?utf-8?q?OVz8AnEaznVc4X?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6c59e801-781f-455b-81c4-08d8fdeb546f X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:44:05.0779 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wS8UnpC7aPZ1tpKFHskHKWuVAr0Yw1DoVOs7f5STIbrsFXxJINDjU5q9mfwGHGP3qmt7+6kwR8kryyg6b/iAIA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2717 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command is used to finailize the encryption context created with KVM_SEV_SEND_START command. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- .../virt/kvm/amd-memory-encryption.rst | 8 +++++++ arch/x86/kvm/svm/sev.c | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index 3c5456e0268a..26c4e6c83f62 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -335,6 +335,14 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +12. KVM_SEV_SEND_FINISH +------------------------ + +After completion of the migration flow, the KVM_SEV_SEND_FINISH command can be +issued by the hypervisor to delete the encryption context. + +Returns: 0 on success, -negative on error + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 30527285a39a..92325d9527ce 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1350,6 +1350,26 @@ static int sev_send_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +static int sev_send_finish(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_send_finish *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_FINISH, data, &argp->error); + + kfree(data); + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1409,6 +1429,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) case KVM_SEV_SEND_UPDATE_DATA: r = sev_send_update_data(kvm, &sev_cmd); break; + case KVM_SEV_SEND_FINISH: + r = sev_send_finish(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; From patchwork Mon Apr 12 19:44:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198731 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77A86C43460 for ; Mon, 12 Apr 2021 19:44:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 596EC610CB for ; Mon, 12 Apr 2021 19:44:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245490AbhDLTox (ORCPT ); Mon, 12 Apr 2021 15:44:53 -0400 Received: from mail-dm6nam10on2086.outbound.protection.outlook.com ([40.107.93.86]:8691 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237613AbhDLTou (ORCPT ); Mon, 12 Apr 2021 15:44:50 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PF8iiHutLApTnyIz6rqvl9F6O8GZONIiCIj0iz6moBndBu5Cil5oaPi0oi/ZTRDrFjmEX4bMyWYLS3iseGgXFXA1ERS6iZEd8P0BbNUb+PP19jb32jev8dyhNGqgpp9xCoof66sHvRfYcUfm9vvGGFe6PHoBKkD4nQTQcYF9ktjVsDQ9/4xzI33KEyoLMDu1ZVTx8+nI+eucit4IqT0afvZeRyTzd1tUu1OrzFUbE6qzLIWBDuAiPvM/Bm7noIgd6H6HJhc7jYqFg/hRSg2HWnzoDwNtcapjw3O1l1a0/cmC8rHsKu1kHb9cCY6ajVBtCgkO41OgeYwewfYzSZbjOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hoe8sGamNdrTHVOTWOtnEUu268YbmQzoeLNrHgJhv9Q=; b=Sluvd8XOUSd37ZgyseNQhkKBTVn+F3hHtdMvCUXBIUnLfwXLQdXyd6f6KsGCHE7byJQOyopjAU89Wuz2OlOF0WzJOiXNh5Z/FLevujVcuym0BQeD+1p9hW0d8m/lwv9QBSDJGy4FxNbbLP+bHxVc3ORjX5TnRRjM8dRusCvSf3pGglQFFF1ExN/bYnxFLqvYX3FzrT2JrpXwitJdpA2raYBaT2qc/NdDUTNbsBdqs1W2HFQfF64KbBPL+xjXvVgVwNkE3kjEQoYDqdEs3BwXMisvHjJCuS50Gxh4eFQ3zjeYpyo4jb3j/2p00nHGRj4KigyYDTyr3Q6lksjUvYEYAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Hoe8sGamNdrTHVOTWOtnEUu268YbmQzoeLNrHgJhv9Q=; b=vA83hBVq0ikaYNTDyMf2k141J5u/PT1E57bb5M2DmSFDnWQgkD7g/cBde5sa3gIU7MukHnAOkiAfzooGtKFq5sRASqjSn1KAk3MckAgrsT7/3JNGeB5YBrRLko90U1RRftVDj5OBcwKRE7hESUDUYKhVmNsstkUaqbd7AzrmsEk= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:44:21 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:44:21 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 04/13] KVM: SVM: Add support for KVM_SEV_RECEIVE_START command Date: Mon, 12 Apr 2021 19:44:12 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0138.namprd05.prod.outlook.com (2603:10b6:803:2c::16) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN4PR0501CA0138.namprd05.prod.outlook.com (2603:10b6:803:2c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.8 via Frontend Transport; Mon, 12 Apr 2021 19:44:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 12e728c0-aead-4236-4f7c-08d8fdeb5e72 X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zl7cixbs+qkiZbpIVS7/upY5vu2JOM/wzb6SVxY+UIBn6Fl2oCve35EFldUqZ8DBNfvfck6W+8WyfXx0RR89ITcyNeXTFiWNHmi+9nze0PdoVh+vhtHowP/bq5agp5OJZPJaeIhpw3O3cVuTsAcTKr0I1RxXces9xs5eynMtOhUQoGT7kZXPGZiNKCjXwaB3AWeYA4JtrYnimVsFFdbrWvS7KtGP7v05kNTHM5yPuS2c6fwMtTjdXbvXgOZKMlIx6sQU5UB4p8vKOhpfDjmqtASLrTG4KZnlWcNDINBvsUprAhrq8Bb4NVPoUIXw96lsidyccSOgQTvT22O21qC3CFF0VmOLidcIt/ldmwU00zyz1R7lcf1LGL0HZa3VRIVKejpn3OvhNGY0mCIVd+0qz5Dbltg9Gc3EgVmGOOu7aarItL1ax+vHUiPq1bJYCHML1YukWiGng+uCtbbhyYeBkW4IWtvyGFv2SBaKEwEkUoTxL/z6mSJvbgS9Bpw+dRiQ2oCHiFVOvoqb0zQ6333lIQxPNbwR1IEnBi9LyMWI6nBTcHgI8uWaNzpfPiHW+7pBGMEbNjTlOjEppOiC4hQ3vN7MOcPaqmeTX1Hax6sTLPauaoAYhx7hz3BxJnrPxfCqJ/NIMTg4IIzlUop3T8rb/OZozCYOasdRWwGZ59xxcJs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(376002)(39860400002)(366004)(346002)(316002)(6666004)(38350700002)(36756003)(8936002)(38100700002)(478600001)(52116002)(6486002)(16526019)(4326008)(186003)(7696005)(66946007)(66556008)(2906002)(66476007)(956004)(2616005)(5660300002)(83380400001)(86362001)(26005)(6916009)(7416002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?+xcDicNCVl6IVP/oAmjACk8bjJp0h/?= =?utf-8?q?nqQlno6MmmaJHupMEarks6rgYJY/jxlxnFxuFI4EgwHhE0jgULeWWmdgSTt7gHnXe?= =?utf-8?q?kuDHXnCdY4lhNP3HJlE2vQFvIpges96xzTWHzdInU6P7leN5uNaHDAhfDdEnmVT5U?= =?utf-8?q?QsKBD3wNGH6oUZBp2rBqlFZ8zM1oPjfbVomCcMpeUgmx0OASetKi7INO/txQ2zchn?= =?utf-8?q?u/oPY/DIP19kBrsM2Dgjig4yjhgqF4hDAWn+7WLg65WpsUzpDHM2q29v20A83LsXY?= =?utf-8?q?vmSlpHT4Mg20JD2zKQaLl4EJAOUIDvXGyBZoWh4PUdVwftqR+8zAR1a+EtPUXQB69?= =?utf-8?q?VCp8QBY5FVJucj+S0iVXyZ8fBl++gApZLdQQ45buUeEysPT+wB1N7/cdWc4cLtA01?= =?utf-8?q?7k7dAbPrxkUEHQlt3Lhy5I79inQcGm4reyJgnTM/ZUL7u1eiYUjT8r7iwTaGd/8WM?= =?utf-8?q?gKftE+ZXyEB4GqFixq8UJ3kt6tl/XTlBOHAGM8yoJ0I8gp863r0ggat9YBTzw9JZi?= =?utf-8?q?i5mT0WWnp3l1QDNDQlWGZaGqmeD0xBYyUm8rnya3xbeIgYQ2iLfzY0Usxs9qN9/Yk?= =?utf-8?q?Gind1F5H6Q2NgIWzApfqitadf/sH7lPhuuM2YfT31j+yh93qoAux/i0r44TxedTOp?= =?utf-8?q?Nq/L686UZ0lxpoat9M2y8xNoVDzqlDLUVnLWTim+Q4GGVjo9eBNhul/XUGfNvfz8r?= =?utf-8?q?oZAoWJpkPaZ7Hn/sWen/pLUiz3Al44BsiPos2IVar6mHilLCKV/SPeZk34LTm9qdK?= =?utf-8?q?Q75uWFdfUE3uF0SWB8Zaz9JzcdUPsUVF15U1E+qoHHFpducyrxGR2jetTC/z1WMdw?= =?utf-8?q?AIQp63tCmN+Z13O4pptWZhiSEmHADEYygv/ZO6S3MbVy/Fy38ZX+jfdY5CWKa2uB6?= =?utf-8?q?TtQdbmBBkSVWxJLApmQtN+OiUPTy/ZqmDDGBZ9UhLJuZ3cYJ/C4wHzyOh+My6fYI3?= =?utf-8?q?UshIApwYJWWmA7ajKrbt5eBbVI00ofRNAVO/gRbJp2hnyJKxiPl4vQR7tF8+PtNlK?= =?utf-8?q?7czXh6I2gReWJ9r/Zpl0lTfsDcqaNAc8SBvfH5sU0j52FwmvVUyI1GsI3n0+EHuIu?= =?utf-8?q?tR6tzAW9Hl/6uUROOdm7xisSpxjMtKTLI9UQrLA/sZ5eE1e7ArJyNJ6FtOgG54SpM?= =?utf-8?q?9Grw5X6zHE+4jdfCqm/TGkVBlyzE8G6wbpvoZo2OCgrwv0WvwdkUE0IDHPVfiAXwf?= =?utf-8?q?hcj6OgKMoD9sU2IpyvDJMsGPAaaubw5NPRbkj4YpYT+0NusK3DLUOCfF4DJDztSkR?= =?utf-8?q?BrZzWFJCWTXiOe?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12e728c0-aead-4236-4f7c-08d8fdeb5e72 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:44:21.7976 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: S6KLzer+DZbplsMh8uK4ovsBTIGyAp4rx3wGtFHjofG3MrJfb6S5rEPdwm97gAvI/4BdFNDa+1SmYRcZJixvZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command is used to create the encryption context for an incoming SEV guest. The encryption context can be later used by the hypervisor to import the incoming data into the SEV guest memory space. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- .../virt/kvm/amd-memory-encryption.rst | 29 +++++++ arch/x86/kvm/svm/sev.c | 81 +++++++++++++++++++ include/uapi/linux/kvm.h | 9 +++ 3 files changed, 119 insertions(+) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index 26c4e6c83f62..c86c1ded8dd8 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -343,6 +343,35 @@ issued by the hypervisor to delete the encryption context. Returns: 0 on success, -negative on error +13. KVM_SEV_RECEIVE_START +------------------------ + +The KVM_SEV_RECEIVE_START command is used for creating the memory encryption +context for an incoming SEV guest. To create the encryption context, the user must +provide a guest policy, the platform public Diffie-Hellman (PDH) key and session +information. + +Parameters: struct kvm_sev_receive_start (in/out) + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_receive_start { + __u32 handle; /* if zero then firmware creates a new handle */ + __u32 policy; /* guest's policy */ + + __u64 pdh_uaddr; /* userspace address pointing to the PDH key */ + __u32 pdh_len; + + __u64 session_uaddr; /* userspace address which points to the guest session information */ + __u32 session_len; + }; + +On success, the 'handle' field contains a new handle and on error, a negative value. + +For more details, see SEV spec Section 6.12. + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 92325d9527ce..e530c2b34b5e 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1370,6 +1370,84 @@ static int sev_send_finish(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_receive_start *start; + struct kvm_sev_receive_start params; + int *error = &argp->error; + void *session_data; + void *pdh_data; + int ret; + + if (!sev_guest(kvm)) + return -ENOTTY; + + /* Get parameter from the userspace */ + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, + sizeof(struct kvm_sev_receive_start))) + return -EFAULT; + + /* some sanity checks */ + if (!params.pdh_uaddr || !params.pdh_len || + !params.session_uaddr || !params.session_len) + return -EINVAL; + + pdh_data = psp_copy_user_blob(params.pdh_uaddr, params.pdh_len); + if (IS_ERR(pdh_data)) + return PTR_ERR(pdh_data); + + session_data = psp_copy_user_blob(params.session_uaddr, + params.session_len); + if (IS_ERR(session_data)) { + ret = PTR_ERR(session_data); + goto e_free_pdh; + } + + ret = -ENOMEM; + start = kzalloc(sizeof(*start), GFP_KERNEL); + if (!start) + goto e_free_session; + + start->handle = params.handle; + start->policy = params.policy; + start->pdh_cert_address = __psp_pa(pdh_data); + start->pdh_cert_len = params.pdh_len; + start->session_address = __psp_pa(session_data); + start->session_len = params.session_len; + + /* create memory encryption context */ + ret = __sev_issue_cmd(argp->sev_fd, SEV_CMD_RECEIVE_START, start, + error); + if (ret) + goto e_free; + + /* Bind ASID to this guest */ + ret = sev_bind_asid(kvm, start->handle, error); + if (ret) + goto e_free; + + params.handle = start->handle; + if (copy_to_user((void __user *)(uintptr_t)argp->data, + ¶ms, sizeof(struct kvm_sev_receive_start))) { + ret = -EFAULT; + sev_unbind_asid(kvm, start->handle); + goto e_free; + } + + sev->handle = start->handle; + sev->fd = argp->sev_fd; + +e_free: + kfree(start); +e_free_session: + kfree(session_data); +e_free_pdh: + kfree(pdh_data); + + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1432,6 +1510,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) case KVM_SEV_SEND_FINISH: r = sev_send_finish(kvm, &sev_cmd); break; + case KVM_SEV_RECEIVE_START: + r = sev_receive_start(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index d45af34c31be..29c25e641a0c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1750,6 +1750,15 @@ struct kvm_sev_send_update_data { __u32 trans_len; }; +struct kvm_sev_receive_start { + __u32 handle; + __u32 policy; + __u64 pdh_uaddr; + __u32 pdh_len; + __u64 session_uaddr; + __u32 session_len; +}; + #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) #define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) From patchwork Mon Apr 12 19:44:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198733 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB519C433B4 for ; Mon, 12 Apr 2021 19:44:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 72FC7610CE for ; Mon, 12 Apr 2021 19:44:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237613AbhDLTpB (ORCPT ); Mon, 12 Apr 2021 15:45:01 -0400 Received: from mail-dm6nam10on2080.outbound.protection.outlook.com ([40.107.93.80]:25824 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238234AbhDLTpB (ORCPT ); Mon, 12 Apr 2021 15:45:01 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mJTHc5VjI7koyJV1mX4wgpzfCX2oQ6y06akYW82/BaMxTMtDhWTza2Nq7wG7ZXPIrYaX8g5TUec4TEPJmTajmwlJ5hXE1UOWUJ8Yz1WgiBbmBHbriHx/jDUeU9Qjs1nUdSCGnCZ8gajMNbdn0Ax99UDknoo9ir/uAd+zVCPLMjwET6gdz8YDeoYARzOUwrYtTS/mflc3xK4ypKH4ze3Dq8dpO4DsXru1sCrv6nZRyC94oVkRWhmm4YeCrf7tTELfYh008EkuFAji7vM7XXCohOTxV3VXdH1/vjHXdmvdWOvqPxMc8w52vMrg4xo7d3O0Q1lpvL0wVq5rWz7VlRnAtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OAR4TeFg0Nlu/8iO2BhJJHdmuEIITuF8bwy+t8L0m98=; b=Em7L3yuBV+anNgQnwdrwjxANyOEbAnjO9oIEfx3PTrZlyYjWUIjFkacYc2CPcNdNyJVwnmEEdmZvMa0/9g0+kKwZohikR8sxVnMAGSXMa+a0D4zL47WUvkSeBY07pOrt6Y8TaSFaWl8xljSdmvTr7oIzlFd/azF9SDZBfRhrWgHfVOBv8Iz5pjyIsU1UFw7wsp41+BDcfKplTaK0YlZHNH2Facq4j39JnGhti/IWLHbe0HBpTHJ2PX8UC+xIboK0X+MX4/g4LP4g2KyD9Rt3H4kX9Hee1GpQLuYoVrLAH/Iie+MJadTOZOhyG0JYqeTu+CIBO9QGeaYOeZlBRJ0aRA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OAR4TeFg0Nlu/8iO2BhJJHdmuEIITuF8bwy+t8L0m98=; b=egu/rKsdO4x5Yw28+7f/inrVfJW0dBHqXr0ucBTJodgCHqMMDg8TMWVaeACecT+e57mT3BaKYh23BhD4wTE577C0XzoJoYvjKZJ+SVSmmhqfnb1plfJKcxYMmCvSMH5GDxzjXozNiu26/QKZCVugPd4j4Bq6oWcZogGX1k/1/14= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2685.namprd12.prod.outlook.com (2603:10b6:805:67::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:44:39 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:44:39 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 05/13] KVM: SVM: Add KVM_SEV_RECEIVE_UPDATE_DATA command Date: Mon, 12 Apr 2021 19:44:29 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0010.namprd04.prod.outlook.com (2603:10b6:806:f2::15) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN7PR04CA0010.namprd04.prod.outlook.com (2603:10b6:806:f2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 19:44:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3f654217-9d71-424a-ba22-08d8fdeb68a9 X-MS-TrafficTypeDiagnostic: SN6PR12MB2685: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yT5v3qr4BWVViWNAfqnEIn+V5CNiEZowI6eMuaWWs2sLzHfNnBfTkWB5hvKwp6rT371brlWa3ZKCwsnk3CSgydY39CWnZaTaWDV6pk62ToAMsWDt7VX8AEZuDS25fjGUpQjlIXACCyAxwaXU+fa7jjI4WPa4AeoM9/31xCqI25mV5sOlPovmfbhTfGOdWwC+W2cGpPb0tMODBrOc8ckSqcKRJIoisruAicBXVGzBQqCBxaT8GON0uu9QFhcyAQpUfBX7lJG24aLANPlK6mHt0KCdhdxEuFWYoUzBarQXB7CPMn/IFGl3C8I29JzjBVeMfXAxrpGAFBAGPnhy2WuanM1fpSxuOIsLq5s4bYsSFn/WKkNsrKCzbE2GwBBNJxlKdZIJyy7jX06YP2TmeQELn9TXiOCqWUxsFnjtxZyWCuRC62vfHPteTBGjHvSyP2TSWFUY4SmOj6UMzmsnOM3z1cK0oUUC0PdzMO6H+wuVQLXDGC6+XSO1AEVEoC3XBf3QJRFzuSCxbI8oDi4n55CXb9giU2gX4MbVs83eSxMlN9uBs0zl5xPSC6NhAZi71wifIlO8VLWCWYwJe+U2EZFuOTV/K3n5PmsdQB5+j4ETRogVXv8nrFGBY0AK6yR1TjgNTeF/5KAHiFXno+S8iHMI4FdmIctGBqFzQbZ1l+bIkFM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(136003)(376002)(39860400002)(366004)(346002)(316002)(6666004)(38350700002)(36756003)(8936002)(38100700002)(478600001)(52116002)(6486002)(16526019)(4326008)(186003)(7696005)(66946007)(66556008)(2906002)(66476007)(956004)(2616005)(5660300002)(83380400001)(86362001)(26005)(6916009)(7416002)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?9h5a4qhTYyGSt5k09NCx+sviiFqM7v?= =?utf-8?q?VbQbA0lixzOi32zzvuQJBdH4xqgB+XnzsRhrBK7IThMRDs7VoLkHpj6MBSjA5FKMd?= =?utf-8?q?Q1qPVjYrgFmdtCdMXT3KSsQ+awyrenpQsommrzXbVUVb234nroCkRSSKMMpaccqao?= =?utf-8?q?qP+A5tF6Pw4JfFYqW0Gz6nsZzzO6Sxgjp1yhEJmWjeW2Zv4syUYVfaSkUgJeoggjk?= =?utf-8?q?ZD6CDwd7uXbIyVHSuHfu+QaMaCtLpybAHyyL0e4GX1VbFHadXI0CILz7WA2P9urEk?= =?utf-8?q?T9mr57mwo2oinUJFZ5XANGmsDQHH02V0o2H130kJfpau1Luwv39d342DW4QTy7k9V?= =?utf-8?q?hJdf3Qljcf8NmP1EKatTUnF1sljbtfFXPM/ymkTMxMbJFNlepUVd+z0x+nXR84mmB?= =?utf-8?q?VWGCQNwWnZGkTDamgHeNuJxDv+yn6IyoFUg0xLSCOCbynvOjyeXIzSlnXXPtVNpC4?= =?utf-8?q?tYw7v7Q7t0lTrIIePjKUUD+s3MQP0CSI8iccoFBwQplD8nHMH8GyTMxymIbm/4JW7?= =?utf-8?q?nBuSjWm98KoFwxyYg5djvuUwNYgh+QuTZgXIGZJZFifObMEXbqcb/dA54334ehqW6?= =?utf-8?q?h0ixNOlYOjJJUb1uo12oOcyx2PPbUxXJnB3JVbl8YiYJYi/FSOZ5gO7mhVE7nQSqP?= =?utf-8?q?7vRy8nuRVMEztrsYbYvtN/RpjuROcfTrpyP2xpr0k6vPI8bNOMCOb5E+RW/d/Uwur?= =?utf-8?q?a08Jl0X0iMETsMhlQCQVc2vMzw9bNR4VELY+dVjV8g/F8aMIi9LpcbjCDjFzw3chS?= =?utf-8?q?Bc5c2MsD3U+4xvyTPASoBj99/5qBM8Fo0INzFfw2wtulhnZ09qE5fUbLfjhPyvXc+?= =?utf-8?q?mVcl93FcbOzf2PvVpkbGDxWb/plg0bnHstjZVwTgS5Io/7b+EnA/jhUVmZq6YmjWd?= =?utf-8?q?s1l3OuSNNHVeXbf5h4pmkDGxEYXKFv9HiELjj+Ml0zO+fPcK1xcdY7aTPnNPGSNWE?= =?utf-8?q?G5nFBvKvFnxlrCJL5ddXkUMETugg1qh67yZm0b/fOTNWGXwQVC+fcoislpYXoJIoX?= =?utf-8?q?wsd+pir3Bk1sNg4XMR5gqvkOeAOTyQPc4iulrT1of7ljn2NS4ZqUMWAmF9SqFVfFH?= =?utf-8?q?9YUwC+vELRPEQZcYiBMEe+t4u4bLPnkKGiJm8u0QuuLcnRpOkhPsKOpkbZYbqTFtA?= =?utf-8?q?KON8SJqk1sCcZ2pYa9H60nLNL490EFNjhYB60W7Ma+HdwgcrP9Uvch2M7hG8nTcGZ?= =?utf-8?q?gdMcVZpiDbK8m00IRoIbjqi6+Dr3qLAQiPMrthI5nnoFhfD36qa2pHKfUR7GQwhLG?= =?utf-8?q?KmRM69i1ejEwZJ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f654217-9d71-424a-ba22-08d8fdeb68a9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:44:38.9220 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MfIHtT+fSmrE1LPkD1lar8kqJBwa8MbYTig9Ah6M5Pj54EqxOQy0G2XOvB44FpBJpY4IREa8faK+MqESGfEDng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2685 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command is used for copying the incoming buffer into the SEV guest memory space. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- .../virt/kvm/amd-memory-encryption.rst | 24 ++++++ arch/x86/kvm/svm/sev.c | 79 +++++++++++++++++++ include/uapi/linux/kvm.h | 9 +++ 3 files changed, 112 insertions(+) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index c86c1ded8dd8..c6ed5b26d841 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -372,6 +372,30 @@ On success, the 'handle' field contains a new handle and on error, a negative va For more details, see SEV spec Section 6.12. +14. KVM_SEV_RECEIVE_UPDATE_DATA +---------------------------- + +The KVM_SEV_RECEIVE_UPDATE_DATA command can be used by the hypervisor to copy +the incoming buffers into the guest memory region with encryption context +created during the KVM_SEV_RECEIVE_START. + +Parameters (in): struct kvm_sev_receive_update_data + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_launch_receive_update_data { + __u64 hdr_uaddr; /* userspace address containing the packet header */ + __u32 hdr_len; + + __u64 guest_uaddr; /* the destination guest memory region */ + __u32 guest_len; + + __u64 trans_uaddr; /* the incoming buffer memory region */ + __u32 trans_len; + }; + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index e530c2b34b5e..2c95657cc9bf 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1448,6 +1448,82 @@ static int sev_receive_start(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +static int sev_receive_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct kvm_sev_receive_update_data params; + struct sev_data_receive_update_data *data; + void *hdr = NULL, *trans = NULL; + struct page **guest_page; + unsigned long n; + int ret, offset; + + if (!sev_guest(kvm)) + return -EINVAL; + + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, + sizeof(struct kvm_sev_receive_update_data))) + return -EFAULT; + + if (!params.hdr_uaddr || !params.hdr_len || + !params.guest_uaddr || !params.guest_len || + !params.trans_uaddr || !params.trans_len) + return -EINVAL; + + /* Check if we are crossing the page boundary */ + offset = params.guest_uaddr & (PAGE_SIZE - 1); + if ((params.guest_len + offset > PAGE_SIZE)) + return -EINVAL; + + hdr = psp_copy_user_blob(params.hdr_uaddr, params.hdr_len); + if (IS_ERR(hdr)) + return PTR_ERR(hdr); + + trans = psp_copy_user_blob(params.trans_uaddr, params.trans_len); + if (IS_ERR(trans)) { + ret = PTR_ERR(trans); + goto e_free_hdr; + } + + ret = -ENOMEM; + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + goto e_free_trans; + + data->hdr_address = __psp_pa(hdr); + data->hdr_len = params.hdr_len; + data->trans_address = __psp_pa(trans); + data->trans_len = params.trans_len; + + /* Pin guest memory */ + ret = -EFAULT; + guest_page = sev_pin_memory(kvm, params.guest_uaddr & PAGE_MASK, + PAGE_SIZE, &n, 0); + if (!guest_page) + goto e_free; + + /* The RECEIVE_UPDATE_DATA command requires C-bit to be always set. */ + data->guest_address = (page_to_pfn(guest_page[0]) << PAGE_SHIFT) + + offset; + data->guest_address |= sev_me_mask; + data->guest_len = params.guest_len; + data->handle = sev->handle; + + ret = sev_issue_cmd(kvm, SEV_CMD_RECEIVE_UPDATE_DATA, data, + &argp->error); + + sev_unpin_memory(kvm, guest_page, n); + +e_free: + kfree(data); +e_free_trans: + kfree(trans); +e_free_hdr: + kfree(hdr); + + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1513,6 +1589,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) case KVM_SEV_RECEIVE_START: r = sev_receive_start(kvm, &sev_cmd); break; + case KVM_SEV_RECEIVE_UPDATE_DATA: + r = sev_receive_update_data(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 29c25e641a0c..3a656d43fc6c 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1759,6 +1759,15 @@ struct kvm_sev_receive_start { __u32 session_len; }; +struct kvm_sev_receive_update_data { + __u64 hdr_uaddr; + __u32 hdr_len; + __u64 guest_uaddr; + __u32 guest_len; + __u64 trans_uaddr; + __u32 trans_len; +}; + #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) #define KVM_DEV_ASSIGN_PCI_2_3 (1 << 1) #define KVM_DEV_ASSIGN_MASK_INTX (1 << 2) From patchwork Mon Apr 12 19:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198735 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7FAE2C433B4 for ; Mon, 12 Apr 2021 19:45:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D13A610CE for ; Mon, 12 Apr 2021 19:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245521AbhDLTpU (ORCPT ); Mon, 12 Apr 2021 15:45:20 -0400 Received: from mail-mw2nam10on2080.outbound.protection.outlook.com ([40.107.94.80]:12992 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S245517AbhDLTpT (ORCPT ); Mon, 12 Apr 2021 15:45:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N1FX+9odyShplHX1MeBIRcJqMaPlHW1TmKkRhfjUFJTLphNBLMjAF2n5CU21QA7B/h+5SNwEZE6bRdZIc3Jgu9dIPaK3nBtvaXPq/H8oo6+L757GHrJ0mv5VxdEHXFxYlR7+Csn59IluhQfwb80DN0AdUJevwdlp42UBT/AH3LIfGSqVNpTJBgJWFH6lhLzjlX2UeR+oNMRAEu5u6pJZrBrGfv9Za1fl6hnICcTXNJU9kdIBWib8mGkGTzuMhGKGWK70ogm2dB4VScJ5K9ciGJipPnfNuBvtgOkP6kjSqdeYFiPwfKRbtppZw+IxTOrr2MfEeeG8bdl5GW+hxHVCvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ecWJetWk79BG8nSoPDpZq7XRRwLaEAjNQ7SI2nOsNIA=; b=bWFU1qpy1VrOJj/zpRwwiCw2e2dQ3W8Q2Pige1fPEjdbrsOFS2/stvxwc6UPHFDeoJDbivbRtNu42lVxrWy/sbqQ0nAXiAD2AeNZWybhC2cugadzqN5XGekpov4iywEJo+WG8GxsG6t3dzsDXF5SlTyRa0nAQPMail51CRmzSnp4lUMAemsOX+W4WXFN+1Xh/Dv7R3f8CY5zW+jLtGS7p64emNPOOb03+IozpnT7ASWyx+xHBeJ5zoRhlGwGMCmve0XM3NhpIw9idVzWVm3IzULc/rrURpRPBJg4EkstyOaCMc3H282GFAJSLi0bvSEhp3aicRiaLLxIOcVuwCmbBQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ecWJetWk79BG8nSoPDpZq7XRRwLaEAjNQ7SI2nOsNIA=; b=BHLcaikyGfvI2HuZAXPbbc379R2S9+N5JriJHjiV66t9jOTkHOo5e6rWr6+UtgBpt93tMSOydunHYaJJZoB1YHPQ+DltPNt1YOPstp4tWfbre+3bhdeB3N+6+uBTYT5NbJPy2JLF1+5t2AMml/CGN2kCUfqE4r1ppS4pBDYaQwE= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2717.namprd12.prod.outlook.com (2603:10b6:805:68::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:44:56 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:44:56 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 06/13] KVM: SVM: Add KVM_SEV_RECEIVE_FINISH command Date: Mon, 12 Apr 2021 19:44:46 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN6PR04CA0078.namprd04.prod.outlook.com (2603:10b6:805:f2::19) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN6PR04CA0078.namprd04.prod.outlook.com (2603:10b6:805:f2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Mon, 12 Apr 2021 19:44:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1ca071ca-fa0b-4e91-0e66-08d8fdeb72eb X-MS-TrafficTypeDiagnostic: SN6PR12MB2717: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FAXRYMNVw+pO2jg3N5R6G9o2wZWUbMw2E1qB/Tqo1k3NDmQlZ7PisGMa45cPqal/OsNMHWhNHEXZ4niuL2I4Aj3n9cUs7bx8BXvXgDXN+7hxuB6vGTzHb9JunUXdVOemYXQQbAa+3nPEgF6zHIEzltPPvpksV/OPcVDopZIoEMU1jahXNBCBC5fu1fys9TK2bGp3zURijn0c92DD+1afPfDp3Zwg15T3QOfraZOpnU3VGAYtZJ26ijsa3CQQFohRvEcc8zpWfFvAZ7ssCTtnif8WrxaQ55Caj/9ZZwIDXfSkDC7l91880Jd/RCnW5eERC9/hstXDuWwtIfzY3m/TinIaGVSS9koQPae/vtpeOj0l974yrZvKrRLEgEcqqWuPNyYV3+0semXoryQ+got79tznOkmVCEwUMVOhorwHgxY0Nj2xnfOwu5Rfl0blXEI6sJ/Xtx7jwabTzTRw+m37fpUhc+cm6ar2gEwWl3CHGNebQkWhPVqLUMDh6cf/97l5yDhkVnqHyr5u0VE1bpueGpAZc2OGYAxhQcBzNeXSbmi6BUJSIBaQiTH5eBGAi/C2BbBWa+y3R4i6R+wBylxWLP+9IhUJU1XTgQ0cEZiK/RkJFD+DsQyFGAY48dSY2NSewrBubQNzlhJSLh7J9pvumQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(366004)(376002)(396003)(39860400002)(36756003)(8676002)(6916009)(4326008)(316002)(86362001)(2906002)(52116002)(66556008)(2616005)(8936002)(6666004)(83380400001)(38350700002)(956004)(186003)(478600001)(26005)(38100700002)(5660300002)(66476007)(7416002)(66946007)(6486002)(16526019)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?inmOJp+KTwpnypDmg2wpLhhF1lKr6n?= =?utf-8?q?DvKkb/AmegvZtoEOazD42rOB4HLB+GYPyM23TT+te6IJRTPYbZtG59tLJybjehgh+?= =?utf-8?q?aHqxB8O6uzRxI5Qzc9u5qdSZfJijfTXNFgDVeenIIaujli1DD/kiytJ5W2ird3Ela?= =?utf-8?q?XG2ZBmlaGIiq+tXNmcO7UXY0RC/KOyPQHp8KFz7383NyJeV4GLCxy54gi48gFC0Xw?= =?utf-8?q?cfSpvKjZ+UqwtooXSfFtGhPtz63VecX8+1JJhUCwMqRc+a9UZJwCoLZF2EDz21Fsd?= =?utf-8?q?FQvZlUdEEf//KCxCph1ib58CP/vCwiDftLQ6Q6KRPEmYkHK91SkHmxfGMBgcZJAzC?= =?utf-8?q?DZDNZuZKTUUgemmn6Opw7OkXfTveDFhbOgaMeWVbv+zbEtg+AoyhbggvJb29PFCE1?= =?utf-8?q?3G1wzpXh692Ox36Rnpr7rSuqB2JU/huunxTrVIDk0W7wOcmAhsP9HSWzTX7m2mPFY?= =?utf-8?q?O/nVf3pAuZhS3x+R69pSG41TqQpcTF3dU/BFKIEFl/8TN4dLpB2F2er7zg0HtMmal?= =?utf-8?q?msRLaXi1/0z2if5S0JVyEaKzLaBZ6m53Hg4omQHG+XhMAb4kZnZi2yerUroeKmMRr?= =?utf-8?q?s7Kd3Grn9AvGIOvHoruweK7noWAB59Ul8TSTkZl6hfMvGwindmqlFMj7NWSF9ZtMG?= =?utf-8?q?IuQZ5Ha/PTlwp0INBnVgYgmIjA0U2JzHIuT1W9hXRKC7xarolhwVyp3WViU8Sbo2o?= =?utf-8?q?NuNc78yWqOFTl4APhgK1q2S7O+fIw1iVtlFV0Lwgnki1IK2haXJpP0/8NbDUS4olK?= =?utf-8?q?YTlW4tpU9kzR2eweYSzAIIV/YH82ctGwibtxOOn/CXCF2YEjQIma0KedS8coKTdIc?= =?utf-8?q?Zwg8xSsFC5fEassswyNvqcfuLveaIW7PFKVhMJOml27g4DIPSXqouhEp2OxpeEmTm?= =?utf-8?q?nw8ZE/h6OhIF/qUNJqRvjwmj16EwECnjb6JpfJJbqSDJD9O0+5g9pxhVjLzr3YWVL?= =?utf-8?q?+HkYzk/S0jfHzy+YVKRbXnFpjClj4QFbbJB/xlnaGHbFbUfKx4Sgpucx2yIGInLIX?= =?utf-8?q?0+snf99tD+iNoPBnXIHoet/1ek265+jAOzCvnBENjnypIJycyfg3NUSnh2Ty2aXBU?= =?utf-8?q?julOUZA7CQpwSd0x27UL3oF5QnJISIt11NVamn8NhpDac8ddjTadE7/9li7UtdqtP?= =?utf-8?q?Vp++VRjrp73SB3cCTMMOBjwCGXrTKD9w0xtcFKtw2HGFdcDD8Su/54lZbMkf8Go+Y?= =?utf-8?q?I2eT1ngv0OFkV7P1IdcgM+mJzzWWLRTad/4H5MUnKwaTDxWDIH040oX+H5Y3G3fJ1?= =?utf-8?q?MyX5lZTxRRIaNR?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1ca071ca-fa0b-4e91-0e66-08d8fdeb72eb X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:44:56.1223 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: shD2rpUpEzdDwf/nXW2BX7NbQ0ZYa5iWXTEDpz3gGqyOFytBzFjC98zkB9+mcXiWiPqBFGZ4HqzULhuileMbwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2717 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh The command finalize the guest receiving process and make the SEV guest ready for the execution. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Steve Rutherford Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- .../virt/kvm/amd-memory-encryption.rst | 8 +++++++ arch/x86/kvm/svm/sev.c | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Documentation/virt/kvm/amd-memory-encryption.rst b/Documentation/virt/kvm/amd-memory-encryption.rst index c6ed5b26d841..0466c0febff9 100644 --- a/Documentation/virt/kvm/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/amd-memory-encryption.rst @@ -396,6 +396,14 @@ Returns: 0 on success, -negative on error __u32 trans_len; }; +15. KVM_SEV_RECEIVE_FINISH +------------------------ + +After completion of the migration flow, the KVM_SEV_RECEIVE_FINISH command can be +issued by the hypervisor to make the guest ready for execution. + +Returns: 0 on success, -negative on error + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 2c95657cc9bf..c9795a22e502 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -1524,6 +1524,26 @@ static int sev_receive_update_data(struct kvm *kvm, struct kvm_sev_cmd *argp) return ret; } +static int sev_receive_finish(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct sev_data_receive_finish *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_RECEIVE_FINISH, data, &argp->error); + + kfree(data); + return ret; +} + int svm_mem_enc_op(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -1592,6 +1612,9 @@ int svm_mem_enc_op(struct kvm *kvm, void __user *argp) case KVM_SEV_RECEIVE_UPDATE_DATA: r = sev_receive_update_data(kvm, &sev_cmd); break; + case KVM_SEV_RECEIVE_FINISH: + r = sev_receive_finish(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; From patchwork Mon Apr 12 19:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198737 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1C80C433B4 for ; Mon, 12 Apr 2021 19:45:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 844856121D for ; Mon, 12 Apr 2021 19:45:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237832AbhDLTph (ORCPT ); Mon, 12 Apr 2021 15:45:37 -0400 Received: from mail-mw2nam10on2071.outbound.protection.outlook.com ([40.107.94.71]:31040 "EHLO NAM10-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237455AbhDLTpf (ORCPT ); Mon, 12 Apr 2021 15:45:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bSBD70xoNPP29ZLhsTkbl8yXq9QUJUcP/DnmXcyGD97QHX9utW2nz7XR+egzr7LTOjH+4/Al/SK/eaHBnKva3p3FcpweqTVZheNtjuW0VjIYveeFj/X2cEh1ePQDkoGnjo7c2LJVhfYO1hcYMm8CKtg0GBN7LWqDOK7hguTbwHq0qpmZJOdS76BaBBFjV8LBJxSHGXHqYuDrr5bfgQWZOStBZ3lyv3ElCqmSm0qvE1KWij4cmnqa4MFkZ3EoU2046CZQSxCgeW4B5eaq71Gr4wu+ZFm7lipY155HiUJtRCY8G3WIMsVO/n441vM5z/37UQ9QTN+MkRBaD1QtrBxxyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CLNAo19buTg3Yb1D6/ZVJBYv5MP2n7HijI3gYDV3fvM=; b=D5E4q9WgKbuucfLowpHhHU7cS8cf8NpLe/pvPAdMunI+oz87phadao4OD6/5E8ZVekNtxhLo/ISgMrF0B/iaoQnQh9ayduj+721LEjf028kI39Gnn6JbTPxlcd73BvceNkPhjmBtSYyaV15E4Vousr6XT/P1b0ZN2kOAHpaXEC2jHgIFZI7IGEHHl2ukpv8R7n1Rr079UBXAfXxz1wO4Nv+vA+fVrAtqmsmJ3hNcawOMvG/jxFEteCPVAawEDKhNvEJRHnBQF+5mz1gpgQjOxb2QHaIDKaZih4lz43vKJxCSDWyRRpF1oHC8ep1kODw4+0LYP0LhF7ME1hwAaBA+Gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CLNAo19buTg3Yb1D6/ZVJBYv5MP2n7HijI3gYDV3fvM=; b=mS40p0Nh7t7iVZxHhAGKc8KtmOrUxrgZDp1t2nJlQoSr2NBibFiBxHReWksyIHCqO0mWt6Nxg9WWouItOe3XwVVyaanA5sIGgwnT72UDrgOAvkyjPz5Y8TVZZYYZHBDcHqDY/uxNX6ys9oNm2eNZCwdSD3zB5B2aBufr7EZfBzI= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2717.namprd12.prod.outlook.com (2603:10b6:805:68::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.22; Mon, 12 Apr 2021 19:45:15 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:45:15 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 07/13] KVM: x86: Add AMD SEV specific Hypercall3 Date: Mon, 12 Apr 2021 19:45:06 +0000 Message-Id: <999bdd6f4e9e2d7f4bdc20cea9459182327f505b.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA9PR13CA0087.namprd13.prod.outlook.com (2603:10b6:806:23::32) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SA9PR13CA0087.namprd13.prod.outlook.com (2603:10b6:806:23::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Mon, 12 Apr 2021 19:45:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3220036f-1663-4134-f981-08d8fdeb7e3d X-MS-TrafficTypeDiagnostic: SN6PR12MB2717: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BkpWVGZXibayCtbHDCslx3/fV3IBmwoT849hrjb+N5adUtsi1ydBKETJxlmX8Tcw8sGytOX2JLNMDP23w80PNrhsNoZKh0eOr9tDq9IpUJIAcNWVj8KtnkUZT8NbF1NO8g49qVdCuqusQY2nqhel9gSQKzSr1o8Se/nhrGyPLYnnbRtMyMu6+nboETu1cMiKeHxqMwsK55Nhxcz9HoCulRTT2WY8ZnDNWXFeYOUqEvMd0GC+yPGZ6jOSIW7aIlzAx07zJlxppQLZCXK6reVB4igJSb1QNyCMpcBDRC/N7kNdKJfbk5zCy11TFwoWFcB5rjDfs63ah7gifNAWKh/YfHQ6y1475Md2f4bL0Gp3PsuE7nzArexliYu2pW2P4Aulh4Gf/zDwgU8n5Ic2G1qtfO30vsO0Se9hkqoMnErdvsabGGZp513+QwnP0nBSO5MDiofhnrSEGuiDtLLTWgh5/EWrBw3RNacVtDHHf78Zr7wfOhGY7EYqTHh6UOl4nChTZKEnZSF/wMGu4WnwAIZbupQ4ukrXPIPrmIfZ9RBijUNaOp1CG5QyvKkFOcInIyPsCKDLYSIWLmbEKx8iN533mutY0ZErXrTM0EdQ/6d53xceWe++C4sTLbx/aocPZbtRenGuVQJ/8pd/ygXumEVhPTu7nqKd3kxmYbrHRE+m47k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(366004)(376002)(396003)(39860400002)(36756003)(8676002)(6916009)(4326008)(316002)(86362001)(2906002)(52116002)(66556008)(2616005)(8936002)(6666004)(38350700002)(956004)(186003)(478600001)(26005)(38100700002)(5660300002)(66476007)(7416002)(66946007)(6486002)(16526019)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?/s0I5W9NWgR3TkRw2so3Rg3dfApHGL?= =?utf-8?q?da3scgqaTip0ZuJc8NKFxPjaL8G3BSevxD/TnOIlF7lmA6acEZedYUYUb8UJ5bM3l?= =?utf-8?q?RWc3V32d5DYGtCQ1ltZPUT3gN6IB3EaDnyCCM5wA73jVSIsSLLITwP/UBgE6u2EBf?= =?utf-8?q?afFDAU8tDanHu9UJkRS9K0p7NJdNuUnIhtLZden35xIGq/BT1A5RopjB3VPxlOzcF?= =?utf-8?q?D0ox/n2yrZxd9n7GY+F/0vnplj5rwcID7Mgdxn4EDTOuZ98LqBcvAqlxuTcPtkWOk?= =?utf-8?q?qz7OmSTxg/svUJ1wAnxMcXNRN6vYaUQJkCGi/ECwzw7vQE79TUZ5Mv8MVBDGa9/DK?= =?utf-8?q?d41g61KPfYHhP+MlOWeUuxowiCeLSKc0EVU3yZ3lucD03+tQ7ikzbeg3q/vGHfZ4q?= =?utf-8?q?aUG6TuIU1UgARIuZ7SXqQhXvHUCj2gjEgH3gk6xaGkunQfXaw/FfoRi5myaBJ/VH2?= =?utf-8?q?ECRxuIII3wmYtdwPgem4gTet3aLPmB8eOj0aB58nxIT0mZyg6n9rYCkskLEuKqRsf?= =?utf-8?q?Wv/OeWYW+PSMmJr1aS8tKkhBLJV8TByJg8xpmMkxlNNJ4kffgKWdi9RYj8UPBztHv?= =?utf-8?q?2H/gyg9njF5fTP3jJINb89SjCkpu6o0PUuNblEkG3hHmCT1yOpdSTaiiBLO2bGbs1?= =?utf-8?q?ZQ6lhhyn06aDDJzVjLTb8a9zedntiMizRUKx1MRgfHIiHhbqXivT49Wr1hPBzx6F5?= =?utf-8?q?lcLD0k48ls3cP7u4/qN6rBZ8E9J8vp0/HjcFbZTamBy+YBfbbGwivUdMhrqyDhlx5?= =?utf-8?q?aJ2bGeg37fPxRASKQJGZECIEvQ4mKid4hmh2We4HtA5hiIG0KoFuea/0uyrXleVcM?= =?utf-8?q?l8MOZv5CbBMb1HRexJF8lUj3nht7uuTJN5HCB3JVNNMV+3L8MJ9XXbba0mhumjAkS?= =?utf-8?q?NQ7Y8ViDr3wxsuZd30wyzr3EvpFs9Cy5pCxAXOmadhrVEBstRuKrEChxh1wKhtXRz?= =?utf-8?q?SarNB9h1nFNgPKcrzWQsX+0jUjZGDClu1AjPFGWjg6PEXDmeQx9aRRjOjexifFLgY?= =?utf-8?q?j68D98YSRjlqBgUZZsxbu1+IbhCA9erqJlBGAtAhGtNorgV1akqrPXMnIVZAMhLt4?= =?utf-8?q?DOTv5+Gbf62VueNF690LXFvr9myRtmpDlsbqa+SfBsaN9kade5ObJqwOoS13HV82G?= =?utf-8?q?t9y2dOOFDeZ0jdEZyxIZdUneBbwynT8PqQclrlVKQAZ52+amyxRAsReu2lOj/6Aoj?= =?utf-8?q?EkZac1/cdGgVqyseZ9ip0l5aOu1xHr6OudiUo7H0yj7xHb/oAGxtZpb6o9w30o/bz?= =?utf-8?q?H98wFhcpIblllH?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3220036f-1663-4134-f981-08d8fdeb7e3d X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:45:15.1327 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2QseD/rwfJJjbsjUxQPNQrIEZFGP5SaUH0T8l+aDbVWam3Do3tPfbHiZlfkW20sHjq1vrG+/er8ywGjVoaFgzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2717 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh KVM hypercall framework relies on alternative framework to patch the VMCALL -> VMMCALL on AMD platform. If a hypercall is made before apply_alternative() is called then it defaults to VMCALL. The approach works fine on non SEV guest. A VMCALL would causes #UD, and hypervisor will be able to decode the instruction and do the right things. But when SEV is active, guest memory is encrypted with guest key and hypervisor will not be able to decode the instruction bytes. Add SEV specific hypercall3, it unconditionally uses VMMCALL. The hypercall will be used by the SEV guest to notify encrypted pages to the hypervisor. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Steve Rutherford Reviewed-by: Venu Busireddy Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra --- arch/x86/include/asm/kvm_para.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h index 338119852512..bc1b11d057fc 100644 --- a/arch/x86/include/asm/kvm_para.h +++ b/arch/x86/include/asm/kvm_para.h @@ -85,6 +85,18 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1, return ret; } +static inline long kvm_sev_hypercall3(unsigned int nr, unsigned long p1, + unsigned long p2, unsigned long p3) +{ + long ret; + + asm volatile("vmmcall" + : "=a"(ret) + : "a"(nr), "b"(p1), "c"(p2), "d"(p3) + : "memory"); + return ret; +} + #ifdef CONFIG_KVM_GUEST bool kvm_para_available(void); unsigned int kvm_arch_para_features(void); From patchwork Mon Apr 12 19:45:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198739 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98416C433ED for ; Mon, 12 Apr 2021 19:45:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53D3C610FC for ; Mon, 12 Apr 2021 19:45:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238043AbhDLTpy (ORCPT ); Mon, 12 Apr 2021 15:45:54 -0400 Received: from mail-dm6nam10on2086.outbound.protection.outlook.com ([40.107.93.86]:2017 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237676AbhDLTpy (ORCPT ); Mon, 12 Apr 2021 15:45:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jqjb2/MNJBfbsym00SuXeQ/xCotGEfRtjdltsBv00/IZuzQ5Ylg1Fb82/ebAt7K/Zx+FIR+USnZkC19AixjOFNFer/ozkYpuhtalNKCQTPc4ObMuM/eoFiNhybSuXVHFcZF4x/DAhkqp5+Zf5/bssS7nuk3fmVAEskO5EVbNKZoClbmvhqc6P4BUU231ZM9SOLWVfFBwF7XgXBhOoI1iHCa5hkg+lksttXcRRobA58f+pfBCOz067h1NqrK3oqaGXSxErNRC3Md1WIpP51Z/St1uqmQCivLWOgqE6287Yu63kpYs6SYbGP8e1Fq+9d0lEvR8PZB21w+NhUz4fIX/Qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JGtdcGrqVZU6Laq+07FKKoBBCHS3Yn7tXVpLwRGk73Y=; b=jE4V/+dDmo71bMy9yyhi0NFRDWqt1Gu8vTt7zinSP+mYz75cw0mV5SDYu3rdNNdL7p+ddp3IbHbKDZqkSmihSOVt/NypJLI/JDWc8QbFgEWWRB1UsozxfaoTKXh5oR28GCE9JN7BcGNy95Bn8x2MmRQiKBPT0hH/Fgz0ogNabj737jsWFgx4JQUWQRTpV2D0LjSbMeEVjEorJiASYZNrtjCNSr71C6OUhWPYy1h7rKPUoIxiTxs9/ghRBRKQ60ov9dZtO9frEnnII8ZKBkG0jeH2LyQc2xYZ4sxl2ohHeh9HDRlx6guGMuTSyUjYk2EWnA4Wm+Hlw6x4XFzeqA8RDg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JGtdcGrqVZU6Laq+07FKKoBBCHS3Yn7tXVpLwRGk73Y=; b=I96m8/M4n2/7lbHvhfLg7fhg+uV4TaPJorY0yAdfh/55zMyGV5zTqrQfS+w7dgroGxLJ+WI68pIfZPmO8jp1r9f6KyR//gFz5WEkzZowbx4gp2SH5vjB6VYeejUzEyA9EwwFbHUYqsUfMtspyTh5AUF+iwpfeeESM6g+TPqbQIw= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2367.namprd12.prod.outlook.com (2603:10b6:802:26::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Mon, 12 Apr 2021 19:45:31 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:45:31 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 08/13] KVM: X86: Introduce KVM_HC_PAGE_ENC_STATUS hypercall Date: Mon, 12 Apr 2021 19:45:22 +0000 Message-Id: <93d7f2c2888315adc48905722574d89699edde33.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0002.namprd05.prod.outlook.com (2603:10b6:803:40::15) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN4PR0501CA0002.namprd05.prod.outlook.com (2603:10b6:803:40::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.6 via Frontend Transport; Mon, 12 Apr 2021 19:45:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a9eebfb9-dcb9-4fe5-a225-08d8fdeb87df X-MS-TrafficTypeDiagnostic: SN1PR12MB2367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uQkNUiE9+SbCdU3vyGJLUHLOqLLtl3YYydvKFDxR3pyR8C0xHkvJOI4N1IQwHHqIQovhx1/9FC3bQUFpskW3/PjXNfuLtbQbVzGnSpWN9vSdp3jabObhG2MYlC8qr3NHFnXJygWN98CDl0IZKNJboR8DHByzoTlTp6+jfM5sKEIvo4MyH+aC/4Vbq5JMr3MBQnUpMvU9OFnMmiok/rosQQu9QHFyhlQN+COUV658bowFxJLRNIici6GDeF1W7JenX5OksiU6jd51wWUWy1wIiJnU8mLN1AUr09jhxm4Kx6opv3TgkRf6itZPUPBKqFPzVp1g5gkAmQ5es4g5HBQVLL0mOYLvHzlbZUcVshFW9eXvPQrc4ArlX34yD56O6vF7Ux6elh84+xwd2XgksHdu5TEJVgo3CkSPUs0p76+aOrzTvdBPujY9woHtaocMlaA0YleZLAmmqzxwf4a1aHpya+wylJUrgcZXYeDgziCEygF5OKBb16ykvcxjPWaJNf1F1ie/HzAFEqa1GSSPoKVzm2FUtP+66IxjBGiQ737X3unv86Upx8JPvW/IUDTZZatLLqmZ6mwSJeV4635AZScNnGPg8sC0J88Wu0mMW11n+ACNZkLQEAdVB4OZEzsSPxfHf9GB1luh0ND4iF1jrKHSdg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(346002)(366004)(136003)(39860400002)(6666004)(36756003)(16526019)(7416002)(38100700002)(6916009)(956004)(38350700002)(2616005)(8676002)(8936002)(2906002)(26005)(478600001)(5660300002)(52116002)(86362001)(316002)(4326008)(83380400001)(66556008)(66476007)(186003)(6486002)(66946007)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: apu41oKSP7yW3N9qNouSQ9Z6EPISesSfR9cZ+87+JD1JRNWBHd/utdUlVBwLkWgRdlA63VHTXT9t7kV+WcrC4DyXMiicBtP0avwYwRDEReUDNx6cAAh9UtSQj0eqK0KHdMhIII15gbvQ0NDyclAe7RVy4/WHxwz5yEy6P+qMTEoOGh0LrI+t6Sw2lxm25jMDFlOijUjhVy0vTCzSL4jbeI8HBqSZxw9DtmMrjbXvOZ1oCvL9K3vlzK38HHQZQSMsV/qoI0uAvwclEDA+h4W1dTMmnDhVCZAxBhD6X9REwATRuW4uTa8fV81X5MpMHZcRgeGQsgfmGzWlSIesC+RyurN4NgFZwkIQ0yX4u8TpOl/C7Hrtrij3TgdDEOisBjBIYy/+7ggslEemiy+CDJ1g54z7GEeJjW0nIt8AXypJ5TLe1ww2/36vdEg7p6at91Kw//XAy07GLvSFUWcmvZRF/DhdWadbExfeowoKYseSY1D+SyVOo3GKkuov5z7lAd4bCdIdLBnWP1+2o82ufWm9UXh79IQGsL1iBkG/sSegq+xzbaXSgBCT+Z448rha8MfHoEz12oDIJQZTDlqZiAustCMXOTAKvoBT8ZUgjRJPCpcpfIUBlG98MXPQAoQdppsSPg+Fw5LFpm0KmtxZayvE4lwGNvqMr466gZg9AX8pbxTI2ideWvZEyacWjmrDEQcMQBvjGdob/JMo3viNs4d1uosijb3f4pq9/aJTZWfsXM5atkGfWtE13bKt2WxPD5KsFTzWXdNeNn8NIrXfygPD9LivLs1clXKtHzqipDhdnAcOj2MzAGV5ozMd+Q7QyhAYkFr1P5wvBnMDFqySiGng22P/d+GXolsVPWrh0B7X83wJ4MqfEPrTSvqgEpREN0p3eXbtX5fErZOi7797bEQMtAzDSdPzPvP4Pu+Yma3U1HEUABzq6Mfc/t/9+jj4OiPnL2yM+yamdibteJCMLHnlMMWxh1lZy47GZsT+ko2iCB+Cy5OUHkHZHeCrK7keecl8SxypMkCpX6MNQzshOk6+WHWwGNznAL7TJGwOwl2Vo6cvrJL82YzK5QENH/Et1VPsb55yjvG6D7cgWcUBFmQ1mA4N33NBBALO/YB+s7tlTi/DaLlmBogPnFNIic2G9VYmijon7yZPwOcB8O/EHmF4sdFYL3e732TMoPOiwDSEi0CrXOz1Kq2t76RxuKepAn3DATpqFry2aBwzCWiCd5wg09yY5rvrnR5igxAaUXuUE8I+0pZUj9zSmAN254SDOJbqRwOKPoXkIIW79w/5OlPn1NylFiQcKjrReByT8kHkaf0XFNCQvZ9hwEggXqZ3lnDr X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: a9eebfb9-dcb9-4fe5-a225-08d8fdeb87df X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:45:31.2866 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uyIF0MexV81iVkK9XyC1TCOGufek/f0YkQ5PaIRBdmJFi2jftoxpRQGmHtxWwwMlXKyaWIGqUYC2f6235Exv6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2367 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Ashish Kalra This hypercall is used by the SEV guest to notify a change in the page encryption status to the hypervisor. The hypercall should be invoked only when the encryption attribute is changed from encrypted -> decrypted and vice versa. By default all guest pages are considered encrypted. The hypercall exits to userspace to manage the guest shared regions and integrate with the userspace VMM's migration code. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Co-developed-by: Sean Christopherson Signed-off-by: Sean Christopherson Reviewed-by: Steve Rutherford --- Documentation/virt/kvm/hypercalls.rst | 15 ++++++++++++++ arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/svm/sev.c | 1 + arch/x86/kvm/x86.c | 29 +++++++++++++++++++++++++++ include/uapi/linux/kvm_para.h | 1 + 5 files changed, 48 insertions(+) diff --git a/Documentation/virt/kvm/hypercalls.rst b/Documentation/virt/kvm/hypercalls.rst index ed4fddd364ea..7aff0cebab7c 100644 --- a/Documentation/virt/kvm/hypercalls.rst +++ b/Documentation/virt/kvm/hypercalls.rst @@ -169,3 +169,18 @@ a0: destination APIC ID :Usage example: When sending a call-function IPI-many to vCPUs, yield if any of the IPI target vCPUs was preempted. + + +8. KVM_HC_PAGE_ENC_STATUS +------------------------- +:Architecture: x86 +:Status: active +:Purpose: Notify the encryption status changes in guest page table (SEV guest) + +a0: the guest physical address of the start page +a1: the number of pages +a2: encryption attribute + + Where: + * 1: Encryption attribute is set + * 0: Encryption attribute is cleared diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 3768819693e5..42eb0fe3df5d 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1050,6 +1050,8 @@ struct kvm_arch { bool bus_lock_detection_enabled; + bool page_enc_hc_enable; + /* Deflect RDMSR and WRMSR to user space when they trigger a #GP */ u32 user_space_msr_mask; struct kvm_x86_msr_filter __rcu *msr_filter; diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index c9795a22e502..5184a0c0131a 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -197,6 +197,7 @@ static int sev_guest_init(struct kvm *kvm, struct kvm_sev_cmd *argp) sev->active = true; sev->asid = asid; INIT_LIST_HEAD(&sev->regions_list); + kvm->arch.page_enc_hc_enable = true; return 0; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f7d12fca397b..e8986478b653 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8208,6 +8208,13 @@ static void kvm_sched_yield(struct kvm *kvm, unsigned long dest_id) kvm_vcpu_yield_to(target); } +static int complete_hypercall_exit(struct kvm_vcpu *vcpu) +{ + kvm_rax_write(vcpu, vcpu->run->hypercall.ret); + ++vcpu->stat.hypercalls; + return kvm_skip_emulated_instruction(vcpu); +} + int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) { unsigned long nr, a0, a1, a2, a3, ret; @@ -8273,6 +8280,28 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu) kvm_sched_yield(vcpu->kvm, a0); ret = 0; break; + case KVM_HC_PAGE_ENC_STATUS: { + u64 gpa = a0, npages = a1, enc = a2; + + ret = -KVM_ENOSYS; + if (!vcpu->kvm->arch.page_enc_hc_enable) + break; + + if (!PAGE_ALIGNED(gpa) || !npages || + gpa_to_gfn(gpa) + npages <= gpa_to_gfn(gpa)) { + ret = -EINVAL; + break; + } + + vcpu->run->exit_reason = KVM_EXIT_HYPERCALL; + vcpu->run->hypercall.nr = KVM_HC_PAGE_ENC_STATUS; + vcpu->run->hypercall.args[0] = gpa; + vcpu->run->hypercall.args[1] = npages; + vcpu->run->hypercall.args[2] = enc; + vcpu->run->hypercall.longmode = op_64_bit; + vcpu->arch.complete_userspace_io = complete_hypercall_exit; + return 0; + } default: ret = -KVM_ENOSYS; break; diff --git a/include/uapi/linux/kvm_para.h b/include/uapi/linux/kvm_para.h index 8b86609849b9..847b83b75dc8 100644 --- a/include/uapi/linux/kvm_para.h +++ b/include/uapi/linux/kvm_para.h @@ -29,6 +29,7 @@ #define KVM_HC_CLOCK_PAIRING 9 #define KVM_HC_SEND_IPI 10 #define KVM_HC_SCHED_YIELD 11 +#define KVM_HC_PAGE_ENC_STATUS 12 /* * hypercalls use architecture specific From patchwork Mon Apr 12 19:45:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198741 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 295B1C433B4 for ; Mon, 12 Apr 2021 19:45:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E1687610FC for ; Mon, 12 Apr 2021 19:45:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238180AbhDLTqI (ORCPT ); Mon, 12 Apr 2021 15:46:08 -0400 Received: from mail-dm6nam10on2077.outbound.protection.outlook.com ([40.107.93.77]:39626 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237514AbhDLTqH (ORCPT ); Mon, 12 Apr 2021 15:46:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EQpaWcyyiS8MQr5T8qSLK3DXRj1Y9EzOeajwCslyWer1tmNriSnDDkF4grPb00vTqdFRvLY7hK31Lk1aj67dFrHy/cXZyBT4eBDct6N1+sjY+UtjSHMzkt0RwIFfPJ2IZKgkPddxlhwdxIlGWd4eeFeD1OzzDygXvgTSH9lm+F5j/XDEt1TR+I25MQ+jFz+m8USbBjTgxga+M4oDZrEjqR1rvj9psUMyI1wT5poXHqLjX9keonjGvVU8eJGhsa/VWCbqiYs+z8PKIlgmTZz/Nqckn9NQ3WTjucZaVTDWUjdcUWHl/lZmkY4fDkNRYJ/GW/CaEQLBYYFv01sqcVxOZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ptwi1W+4zT0Cz1ubGqqSi1V3I2VOGialOuW68ChkUDM=; b=Licoaht6c0lQCqHxjFI+ORp9gBmh3jxwzrdZUssunfBLT1O/OvJc/DB+HdqOaUR0xdFbqO5NW10FaDP8lpuL9xmLix8ZszYqV+uwnGDo8/ImVwu/tvvNpEdBYfZ4IoKWfMgWHr5rkoyTjrgR3vUTOvfLAmwnznvK8MCU3vQ0zIf2U2bB5VY0z9y+4DKM58h/2fy09rp5b7T85jltZfmylbuF1hE+szSXKIa9FWMk5YmU6bajdHQ7fbO+kE8zfJ7KeW+bq9+0sX34h2LFWF/krFSDJt+Tx4Pz44lFC5PuDDf0zQ04znWG5JOhsm32ZogqOZrwYld1yyXSai6F4sqoJw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ptwi1W+4zT0Cz1ubGqqSi1V3I2VOGialOuW68ChkUDM=; b=3qOnAm1xbCSYykEgeFT0YGDpL1Kgah4Zra5rFAJi78hIhkbLdbl/AedEQjS5kZ0vukv+Xota8nplBKOk+X+hZvohlbJRGU8yHSLGr8uvFIqAU8Qh+/e1cksMfkdKDfHloPOtKvzLZwYigYC1W8bSI8KoCIMUqmwdwNIUZFOsC+0= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2367.namprd12.prod.outlook.com (2603:10b6:802:26::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Mon, 12 Apr 2021 19:45:47 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:45:47 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 09/13] mm: x86: Invoke hypercall when page encryption status is changed Date: Mon, 12 Apr 2021 19:45:38 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0501CA0139.namprd05.prod.outlook.com (2603:10b6:803:2c::17) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN4PR0501CA0139.namprd05.prod.outlook.com (2603:10b6:803:2c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.8 via Frontend Transport; Mon, 12 Apr 2021 19:45:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad0a17d8-f80a-4282-899c-08d8fdeb91a2 X-MS-TrafficTypeDiagnostic: SN1PR12MB2367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iFzTQEY4Iq6czYzSzb+innCJ4FJmGkmySJUmYH6mL2oD+VAxcum00vcJ0Xtg8dOU4lalYH13fMra5Z0Mb+wAj+4MDeneSHqKHF2qQ97qKroDtVjS8HiXiP8AvplYO05C4G+6LroozWJr+755HLFzQf96xvg7J67XgC3O2Gu7Cb4+Cl4auUE8sDT5mUgUbUSE5olAQQUnEF9scEOXvn4Qm+owF4SV3tpP8TwndngCKJI6ZBe6kWAf53tsDxLL1zAX7Rr3a1qVpfdwbZYwkfrlt7oTHJkSvxs2f50qzw0J9Lqr0NOT6hJ83Rwi3tUYUd5XUOG12HyKHoaX5kYq55A88D0pDKgo+Ia37EVBOh1bLxssU7Yp10upTVx9F3Wm5aNFMDMMwGOCb+Jck+5Gau5EvsW0LtXjxuorPHDkHOFpX9hs/KOBkBGxQMAWPmfqqRrXn85aqsRsh4LXfHgSRYv42onpf3xiRe0K9IxmC4RdiZDuw9Br95dw1VWS5x76QnvykIhqMYHi1wpOISf3goJkGH1o4ABSjNtUl7tKPWF9wFDPAAbMX34d1akvCgBUqVhkNYOK5ZcPBJN7OcQ0KTTUhz79IcMviusTe9ONKlpwjAAeHTIJjjua5v5Ua5IR8M8KVXOyekVGyX3aFN089ibIz5KAM5xI08GvEC4Ubgx+DT0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(346002)(366004)(136003)(39860400002)(6666004)(36756003)(16526019)(7416002)(38100700002)(6916009)(956004)(38350700002)(2616005)(8676002)(8936002)(2906002)(26005)(478600001)(5660300002)(52116002)(86362001)(316002)(4326008)(83380400001)(66556008)(66476007)(186003)(6486002)(66946007)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: hloCLHp9WhxaRiJ+0dfxJ47npvolmSiXkKjbJSP3ogjgU8UqPeJfIb2dhzWg/uk+i9COPV2xsYQdpsDDWIn7JAFo+zSZh/D+4Udx927KumFpKVoNUPDHrfz03SxlDLUlGaQ3FHqikiNPf1lM0uzNsgcVUVavCch2nDqnjkKMIUDnuAOY2SJYGN5eYqoyICw4LcvW8VfbY7Gg4XjxzpHbd1KeVa0ScD/kXKgzHlnsdZ985pWgYX1SrrqW41+HuxUKi0ydBF6vrRzcq+gw6m4xSG2dcznNuF4pWNnYAkL56pCa8U8GL6tSBO/ww8f5HlitYTkqCpOXbUX3HcB16WTcCU1uNj00lkHmuo8YzdF+Jik3YbsXfYtDK9tAoHlD97Ba6PRHnAeHpVqzOSHP+9/Fs+CYs+PkWYcALcXPUCMoV8wdLGbMpj7XBX5adUqrIDT0UFjdJCHZpNWnWzVtFnSpaOwMsUHmTBmRMBtBx0aT2YNUm8tW7xM3eeLy5mrs/9R43S5Oklxq0lzFU8YXYqbecEnFvnGwK3sXh4VwKWN6exwffCfYy1ql1QMJ/aRA8SkM55oxjvxfHQxxjgyhknUVqoBLOcOIWkW3xjIFt1u8aDLXH1qTMQ5sMBduyh9dqYpIbyzb9xOUy0u5Ca4XO7M8ggO8mca7Afb9XJWYve5Kse+xqG6aByjGXW/Gc3oYu+Pu6E7Fcv1OsoLKVaDZHwfnhLUXjOUvx62/2s3c6pr/V1vQXosRHT5xJiVCqXgTzePrqil3S7F3HT1ac/A7o0VIkBTMpNI1PwTbnxiNLewVM+riUj7Ybyo3x9mp1de0tvD3c1GMxCpIq6ShyCa7FoW64PvyUAqNzoVpkXG/F93Hsf7ARZqnR0IKm0L6odDuMFWgfVutbaDp1CuIdD7wtcx7WpgTgYI9WMzGW4fz2Sz3txRyZS3fnAMRh/tYqHxiamt4HxU2gOh0Ge94W5gKbcaXyqMHB5MawkSfJJSsy2wO4dIw8yI8vpTY9Vr8nPRRXIjyIvfCJ4I1wO0DaijQycKiKam11AXKYbEHWhqU52FT+vYEKtUSNFroK8RBkrJJ0sQuJl+aCFrYyHAZ/1wl/2CU+wJtFOcPLojas5NsSKfeN6tqiLNR+z2swrC3YqtREj2PhmKqRgY7YzFRHNWBNGCkPuNTUsgbQY6pTcDY7QNM3me998JouvxWA5fNbsygOhykzRBuT3SyAYXjgZiZm0e4oLeFgH7ni8wqJK5v65rprhstXxHfHoaJruuFrLcGoYsMy2lEJmuO8h1muLKlWPptXCuZW1aBrof/lG3w0OHQ1k4q60xjdvVGDV8HaDU7hUjA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad0a17d8-f80a-4282-899c-08d8fdeb91a2 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:45:47.6484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 19InP0NEXtSZcxpTQLLr2N8o3JvcNPH8JsFzxvniEi2z6hWEDjc1ervExJ7Wkj98YUHQMGpUqLlgHNjQwjpKZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2367 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Brijesh Singh Invoke a hypercall when a memory region is changed from encrypted -> decrypted and vice versa. Hypervisor needs to know the page encryption status during the guest migration. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Paolo Bonzini Cc: Joerg Roedel Cc: Borislav Petkov Cc: Tom Lendacky Cc: x86@kernel.org Cc: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Reviewed-by: Venu Busireddy Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- arch/x86/include/asm/paravirt.h | 10 +++++ arch/x86/include/asm/paravirt_types.h | 2 + arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/mem_encrypt.c | 57 ++++++++++++++++++++++++++- arch/x86/mm/pat/set_memory.c | 7 ++++ 5 files changed, 76 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index 4abf110e2243..efaa3e628967 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -84,6 +84,12 @@ static inline void paravirt_arch_exit_mmap(struct mm_struct *mm) PVOP_VCALL1(mmu.exit_mmap, mm); } +static inline void page_encryption_changed(unsigned long vaddr, int npages, + bool enc) +{ + PVOP_VCALL3(mmu.page_encryption_changed, vaddr, npages, enc); +} + #ifdef CONFIG_PARAVIRT_XXL static inline void load_sp0(unsigned long sp0) { @@ -799,6 +805,10 @@ static inline void paravirt_arch_dup_mmap(struct mm_struct *oldmm, static inline void paravirt_arch_exit_mmap(struct mm_struct *mm) { } + +static inline void page_encryption_changed(unsigned long vaddr, int npages, bool enc) +{ +} #endif #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PARAVIRT_H */ diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index de87087d3bde..69ef9c207b38 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -195,6 +195,8 @@ struct pv_mmu_ops { /* Hook for intercepting the destruction of an mm_struct. */ void (*exit_mmap)(struct mm_struct *mm); + void (*page_encryption_changed)(unsigned long vaddr, int npages, + bool enc); #ifdef CONFIG_PARAVIRT_XXL struct paravirt_callee_save read_cr2; diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index c60222ab8ab9..9f206e192f6b 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c @@ -335,6 +335,7 @@ struct paravirt_patch_template pv_ops = { (void (*)(struct mmu_gather *, void *))tlb_remove_page, .mmu.exit_mmap = paravirt_nop, + .mmu.page_encryption_changed = paravirt_nop, #ifdef CONFIG_PARAVIRT_XXL .mmu.read_cr2 = __PV_IS_CALLEE_SAVE(native_read_cr2), diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index ae78cef79980..fae9ccbd0da7 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -29,6 +30,7 @@ #include #include #include +#include #include "mm_internal.h" @@ -229,6 +231,47 @@ void __init sev_setup_arch(void) swiotlb_adjust_size(size); } +static void set_memory_enc_dec_hypercall(unsigned long vaddr, int npages, + bool enc) +{ + unsigned long sz = npages << PAGE_SHIFT; + unsigned long vaddr_end, vaddr_next; + + vaddr_end = vaddr + sz; + + for (; vaddr < vaddr_end; vaddr = vaddr_next) { + int psize, pmask, level; + unsigned long pfn; + pte_t *kpte; + + kpte = lookup_address(vaddr, &level); + if (!kpte || pte_none(*kpte)) + return; + + switch (level) { + case PG_LEVEL_4K: + pfn = pte_pfn(*kpte); + break; + case PG_LEVEL_2M: + pfn = pmd_pfn(*(pmd_t *)kpte); + break; + case PG_LEVEL_1G: + pfn = pud_pfn(*(pud_t *)kpte); + break; + default: + return; + } + + psize = page_level_size(level); + pmask = page_level_mask(level); + + kvm_sev_hypercall3(KVM_HC_PAGE_ENC_STATUS, + pfn << PAGE_SHIFT, psize >> PAGE_SHIFT, enc); + + vaddr_next = (vaddr & pmask) + psize; + } +} + static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc) { pgprot_t old_prot, new_prot; @@ -286,12 +329,13 @@ static void __init __set_clr_pte_enc(pte_t *kpte, int level, bool enc) static int __init early_set_memory_enc_dec(unsigned long vaddr, unsigned long size, bool enc) { - unsigned long vaddr_end, vaddr_next; + unsigned long vaddr_end, vaddr_next, start; unsigned long psize, pmask; int split_page_size_mask; int level, ret; pte_t *kpte; + start = vaddr; vaddr_next = vaddr; vaddr_end = vaddr + size; @@ -346,6 +390,8 @@ static int __init early_set_memory_enc_dec(unsigned long vaddr, ret = 0; + set_memory_enc_dec_hypercall(start, PAGE_ALIGN(size) >> PAGE_SHIFT, + enc); out: __flush_tlb_all(); return ret; @@ -481,6 +527,15 @@ void __init mem_encrypt_init(void) if (sev_active() && !sev_es_active()) static_branch_enable(&sev_enable_key); +#ifdef CONFIG_PARAVIRT + /* + * With SEV, we need to make a hypercall when page encryption state is + * changed. + */ + if (sev_active()) + pv_ops.mmu.page_encryption_changed = set_memory_enc_dec_hypercall; +#endif + print_mem_encrypt_feature_info(); } diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 16f878c26667..3576b583ac65 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "../mm_internal.h" @@ -2012,6 +2013,12 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) */ cpa_flush(&cpa, 0); + /* Notify hypervisor that a given memory range is mapped encrypted + * or decrypted. The hypervisor will use this information during the + * VM migration. + */ + page_encryption_changed(addr, numpages, enc); + return ret; } From patchwork Mon Apr 12 19:45:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198743 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B909C433ED for ; Mon, 12 Apr 2021 19:46:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F12C8610FC for ; Mon, 12 Apr 2021 19:46:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237455AbhDLTq1 (ORCPT ); Mon, 12 Apr 2021 15:46:27 -0400 Received: from mail-dm6nam10on2083.outbound.protection.outlook.com ([40.107.93.83]:64737 "EHLO NAM10-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237515AbhDLTq0 (ORCPT ); Mon, 12 Apr 2021 15:46:26 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H6cap3g4O9SZFpLBQ+AGHHQ2bC44H0W19fks0XPYhGHD02DmD92nELDJy5wom1OjukfEnAOfM09SL6oLDQB6GjhXcpdhkveFSurypHVqATlMdWbCMWBIZUGZRSo4GlRyEPtY0jgVSJnir4tCkIstJ8Es0lgaaSgeJKKi8bs/Rcvpbyw5Luxqx5fjGZ9zH/4onqb+ftjFHwPqRcHj/PBK/O6/vHooIhtsVoB9NtKNfkO/AFUl/4neBhR2Oao0sB8lIjzYfL4Qvvb1S2fnWPRJ1TuPKoPVlAMvVBeidY7oFGOFnBkHpomvLW0XTpZRPmENy11sfrvQ9P7GnhpBewqQRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eQn0+bSotS0+VZNtBbAJ47s7Za1zmwlIygtFu6yEZhg=; b=jEBP+PTWt+bhWi8eVuJ2zQsPdRMFV54cLcUu492yx4zISQmRD/oXfXAmQidMU4mlkmfsAPXJJ5gP5J74SI5UNl65u5V49jz9968ymcEjuoPuhajsCIiwUK8xMsn7jJWgWSjY5tcvNFA0b5JXxl70j5myhDTKEdAQ3ybV0pO5CaST9wsBhqrbQKZ5mL1xTiMMzW+ENRrI66axrgLvtSB0AqOmLsFl7ehfTQHZi3mEwko1ghjxQOvhn0VOORLxa3lC/7iZhd5wjqMDRNLabWQ/jHc3wJThyKcmcCUEVYSxxga/nttvaigg7WRaCZKyk2S6mvxxH/TyirssVFkS89h7Og== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eQn0+bSotS0+VZNtBbAJ47s7Za1zmwlIygtFu6yEZhg=; b=PqgparjvADPwayhAg92ffC6XnKVKm+Rr+uW7iw0P1R2fhqqVu2j3vIvBWkEYO7o2CY/klx8t4UT85OlvPqh1tr0zXHBRQZs3fEbLAsvf2eAlPqqPsZi+XSDdAKGmTx9gfBgH+HGNgNn2v957WwB8aI4+ogxQK4QNvt9AC5MSKfg= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2367.namprd12.prod.outlook.com (2603:10b6:802:26::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Mon, 12 Apr 2021 19:46:06 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:46:06 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 10/13] KVM: x86: Introduce new KVM_FEATURE_SEV_LIVE_MIGRATION feature & Custom MSR. Date: Mon, 12 Apr 2021 19:45:57 +0000 Message-Id: <3232806199b2f4b307d28f6fd4f756d487b4e482.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SA0PR11CA0185.namprd11.prod.outlook.com (2603:10b6:806:1bc::10) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SA0PR11CA0185.namprd11.prod.outlook.com (2603:10b6:806:1bc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.19 via Frontend Transport; Mon, 12 Apr 2021 19:46:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3312096b-1410-40e9-25ae-08d8fdeb9cc1 X-MS-TrafficTypeDiagnostic: SN1PR12MB2367: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O7v9qiNLnY5P4ZaqmbomOY0HAEZzV24cI16qLxv5mvC7aEW/gHGA+n0mKSuC2MT0XqMNPZRrs5MtflTmPp0DQmJmIKR47Bl7CjESuZTjIPszv5RodfrzNs4G/BcEFL2nQzrd/HdHDutsuPnCkDP5vDIbGblwar3xyNBrhNneXL98zROdGT6gsRORhGxUcZLISBgXZVfap+CnwWtTmLY1oEHraifFmGFFiw92TNoQ3qr+cie0GNOl4HrO9jTVBUeYLj4WM7j4TkxxQEYPJstGJ3h6j3DcSViEW01z0smeAOrk8woRthLjgXSmFHjHFbjD4dIG/O9af1exSKqlPHc5FHd4+C0Wf20LHHyHXjeZcl0yfniKsM2T4TJhxH6u/qd454ARLAudBHow4X3zmKYjMTX7F6KhIWUrcoieXsqNg92uG4nThmN9JTMOqn2LGZlpkekNR0+hyeIEdezf7Br3fN4nzeS8gRoZowcU7S5ZmAQ8u5DS/pC7FzYtEbeyjIoSz3ktQiUwU5gcUV8ag3yntlzveFN4clSWSqwFtZQvntUc1w/CzxWBQIILkLZv5hhg4y6tzHLvXUtBWkDOCOUg9JjVJw3UoNzxQY1rHLPKo3fESCig0IPJFMpfTJdHOpzIAmClEEY3HrtCV1z3mPdOq/K8lGipG77bvXkKAydvX4s= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(396003)(346002)(366004)(136003)(39860400002)(6666004)(36756003)(16526019)(7416002)(38100700002)(6916009)(956004)(38350700002)(2616005)(8676002)(8936002)(2906002)(26005)(478600001)(5660300002)(52116002)(86362001)(316002)(4326008)(83380400001)(66556008)(66476007)(186003)(6486002)(66946007)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: LhvKwSIg3kpWmnJWGhphmWiU5PoecXv2sY3/vVITPYAVWlw3Ape3/00pi/y4M7TLlidcKMZhGOvtmDCmUvIALBi4Ap9aeLrVobKk3BYYjY/qRCXoLMH/9lwtqkoWGWRkL5cKKr1inoOOw5lyq9swEi3YaANVwLFIt8suW40jwrCx16UBExZXLugRjCS6tS5dCWd9t+YrPwunL18JnL5m2vQ//aedV9mcsARHttlgtmm9MZ/yEEqzjAsXdx3vgf7tP0suLU09swYRpAZjfvhzHjpNcrdKxgp8PKIPAPMFIo47iImCkz/3B9qpr63Pxh9kjZv9SOhX5XG9CS3wBrjZu6Xh3JfQQ/y2xprNtgYfzOy/EKfKPr7V5udyYq/AKaCPthutvLjefyI6B5PHUraHYP5Nv8gIf3gRYXFqr/V1OOyD1gfa3k7AeQQKtmR45aK2yiYQ/tdn2LTe1mMwiDnBQ89J23rKUvUBWAZcBhTaz5xKT48+v1OxJlV7cmFrE/Bjw/qUyrccpofu19z0kEi65+tBnvLFv/CEDZRVOUx93ijjrsUxl5G54m3xB4FmfyOaU0Ao7PLftTi/Fgk77iCJkk/RtQZZJ1FSmFEn6n5Bd4rGaXDS8PKv6E8nRjmsj6Ke1g6eIaRKMMb354cE5K/1uXw83GPIMr7KuDd018UB1jKgnuaw1MpNCsYrwgIFaPKMbCCfPcUiA6qHmKdP8pJ7lsBLB0N5Wuau+crJQbpSJHbSNXPsrltFaV9D0RrCFJpItM4CNuKE1cBZd/k1tETVXv2KoWPQRORDfl4tEzmt7PAnTbaKcKZ2JdbWcqueH3s5DKpnYedsd+gzuq82GycCfBMjCB/MzSEK/Jsf6EZB3XmkVDFaJYNaIBN1KSgJk1HIt5eYF7JzTuyhaGtVUGs4PpPiA5hi+J6zYjPuzGFOSj27P3+Ewf3zBQgLdKb/w60Ua4o9w53EJB6KjquI4E+K5LUGA0OJIb1U6Gq701/VOyTNJ1nDUQ3S8/d5DUGmL17B/mCUahEMFtO0po2tGVgRiWKCLDS2pULLcFKdf8JlG2+0TmsbylD9VYUr9caV3g/j0dyYoQCilx+16hRJpIAWl3LOV8T5GeqiG7LaYhnGR9vybiP6TAtMTBaGvgUI7YyM27nw6I/Lbaph+FdrC53TinqTo/USOItTbMmG3vcIAQoN6onBVyrxlVPBrY0j5p7NIdcbhneMMIUrhZ3kRNcPf7Q4o7Ap/kER9+RXO+tP7fbLBUpDz+PA/lBtrb/jI9Su2pTPRq/fFdXDbxL9hJ/lpN65xqAOd307bYn3nylonQ6UG/UL2XoEgh3NNRovYhSt X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3312096b-1410-40e9-25ae-08d8fdeb9cc1 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:46:06.3140 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2P8ynhwPBbFiNRIhF2TQre15nm7XnOgEH2BSF0KaSau5QNeGOu5nKEzsHS+oOf53mEa+/+27UJesbDPg53D4AQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2367 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Ashish Kalra Add new KVM_FEATURE_SEV_LIVE_MIGRATION feature for guest to check for host-side support for SEV live migration. Also add a new custom MSR_KVM_SEV_LIVE_MIGRATION for guest to enable the SEV live migration feature. MSR is handled by userspace using MSR filters. Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- Documentation/virt/kvm/cpuid.rst | 5 +++++ Documentation/virt/kvm/msr.rst | 12 ++++++++++++ arch/x86/include/uapi/asm/kvm_para.h | 4 ++++ arch/x86/kvm/cpuid.c | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Documentation/virt/kvm/cpuid.rst b/Documentation/virt/kvm/cpuid.rst index cf62162d4be2..0bdb6cdb12d3 100644 --- a/Documentation/virt/kvm/cpuid.rst +++ b/Documentation/virt/kvm/cpuid.rst @@ -96,6 +96,11 @@ KVM_FEATURE_MSI_EXT_DEST_ID 15 guest checks this feature bit before using extended destination ID bits in MSI address bits 11-5. +KVM_FEATURE_SEV_LIVE_MIGRATION 16 guest checks this feature bit before + using the page encryption state + hypercall to notify the page state + change + KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 24 host will warn if no guest-side per-cpu warps are expected in kvmclock diff --git a/Documentation/virt/kvm/msr.rst b/Documentation/virt/kvm/msr.rst index e37a14c323d2..020245d16087 100644 --- a/Documentation/virt/kvm/msr.rst +++ b/Documentation/virt/kvm/msr.rst @@ -376,3 +376,15 @@ data: write '1' to bit 0 of the MSR, this causes the host to re-scan its queue and check if there are more notifications pending. The MSR is available if KVM_FEATURE_ASYNC_PF_INT is present in CPUID. + +MSR_KVM_SEV_LIVE_MIGRATION: + 0x4b564d08 + + Control SEV Live Migration features. + +data: + Bit 0 enables (1) or disables (0) host-side SEV Live Migration feature, + in other words, this is guest->host communication that it's properly + handling the shared pages list. + + All other bits are reserved. diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h index 950afebfba88..f6bfa138874f 100644 --- a/arch/x86/include/uapi/asm/kvm_para.h +++ b/arch/x86/include/uapi/asm/kvm_para.h @@ -33,6 +33,7 @@ #define KVM_FEATURE_PV_SCHED_YIELD 13 #define KVM_FEATURE_ASYNC_PF_INT 14 #define KVM_FEATURE_MSI_EXT_DEST_ID 15 +#define KVM_FEATURE_SEV_LIVE_MIGRATION 16 #define KVM_HINTS_REALTIME 0 @@ -54,6 +55,7 @@ #define MSR_KVM_POLL_CONTROL 0x4b564d05 #define MSR_KVM_ASYNC_PF_INT 0x4b564d06 #define MSR_KVM_ASYNC_PF_ACK 0x4b564d07 +#define MSR_KVM_SEV_LIVE_MIGRATION 0x4b564d08 struct kvm_steal_time { __u64 steal; @@ -136,4 +138,6 @@ struct kvm_vcpu_pv_apf_data { #define KVM_PV_EOI_ENABLED KVM_PV_EOI_MASK #define KVM_PV_EOI_DISABLED 0x0 +#define KVM_SEV_LIVE_MIGRATION_ENABLED BIT_ULL(0) + #endif /* _UAPI_ASM_X86_KVM_PARA_H */ diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 6bd2f8b830e4..4e2e69a692aa 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -812,7 +812,8 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) (1 << KVM_FEATURE_PV_SEND_IPI) | (1 << KVM_FEATURE_POLL_CONTROL) | (1 << KVM_FEATURE_PV_SCHED_YIELD) | - (1 << KVM_FEATURE_ASYNC_PF_INT); + (1 << KVM_FEATURE_ASYNC_PF_INT) | + (1 << KVM_FEATURE_SEV_LIVE_MIGRATION); if (sched_info_on()) entry->eax |= (1 << KVM_FEATURE_STEAL_TIME); From patchwork Mon Apr 12 19:46:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16204C433ED for ; Mon, 12 Apr 2021 19:46:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC50C610CE for ; Mon, 12 Apr 2021 19:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245325AbhDLTqo (ORCPT ); Mon, 12 Apr 2021 15:46:44 -0400 Received: from mail-dm6nam12on2089.outbound.protection.outlook.com ([40.107.243.89]:45536 "EHLO NAM12-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S238648AbhDLTql (ORCPT ); Mon, 12 Apr 2021 15:46:41 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DkoSOCJrCXh0ECM7H/nl+Et+6aEW7hQ22I6zQhhhDN4qmUPbfZ9SYZf7PvOiAF5n+NFHmMU8EaoNtXh02nYtHEfPd3YZFkWHGIB6xrwM+odo8etKCG0dQ2r8a8tOoaMrsGvOHE24NDOvfv4wTJScL+lP6nhin5ZGi5FiiSZBsjrdO4143v1zHbOXfIoRWMi6QheAVMYkUVOkQNvLG6mkJ5+6wGJxkWoVIkdzo4Sn8zjcxJ8gEXtjlIkBBfOyYPBvfu5PHwlzus6Fanu6H7hSem49KeAu/zR8d+SOPfWV7HUBGDjq4LAglrp4tL1ZYMHKGww+vCcpBcQfqQtldNg0nA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YQJQQaTWARObKBfzmviOopLOxzSz7S7p/w3nsNWbJwQ=; b=Pg2BAQ6OAfMjoP6xenl+gNKNhwqINJvDfPdm06HiQ+OWAiDgcGJI97yLzXo9h+HH/TWSh8l7+QdHxOwMUek7cqCjv4gmOyxoqh3yI+auklLpM0yc86xVwXhMLGPV3WUXVVQN4a0inycj+c0DaxmT8bbmxdamhD5W5oo8/LbJRQ9vtEfxXPv34mm0dMzSWpMOR0IO6xSeFX6WnolTl+FPzEKqk5I8kXc5fTLJyOlxS/3On7yJ3GzN9OeQD4DW24Mffsx9XiVrYtMcfqAzH5zGjYTX6No7TkZTpm0VLoUh1JzNEp7KongPqlwYgYflsO9aMtwKLePQevPhlBoNnBrv7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YQJQQaTWARObKBfzmviOopLOxzSz7S7p/w3nsNWbJwQ=; b=bGnareZ6Hm9nOAk5RBM7K3BDTNHW4dRQrEiQ4xDo9q/SUMN8kfsFq+7elVzVl6dq+dZ8G+paWXtYNntYRjADbFXvKWv7bGME1zWIzX6hxOLJkxEy6XuPYufO7NE8VzgSGPH54YCf0emHNdEA3LqlB3IpjEXL8OY9ocescUYR2X4= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SA0PR12MB4432.namprd12.prod.outlook.com (2603:10b6:806:98::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Mon, 12 Apr 2021 19:46:22 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:46:22 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 11/13] EFI: Introduce the new AMD Memory Encryption GUID. Date: Mon, 12 Apr 2021 19:46:13 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0201CA0049.namprd02.prod.outlook.com (2603:10b6:803:20::11) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN4PR0201CA0049.namprd02.prod.outlook.com (2603:10b6:803:20::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 19:46:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8c0fe57e-1d10-444e-5a11-08d8fdeba613 X-MS-TrafficTypeDiagnostic: SA0PR12MB4432: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GY68t9F2ZK5HMKuDqsX+5CCB5uNuOEkARrft6dpVkmC34r772JRt4jpJMw7TlHqxjjJV90CKpJ125Hza5gnzeIq2cFf3508WllIdlBQZL/0nGZydevaLgfdtQGub6Sjw9EpS5sbLBQl+6WjPFfnx9IVPCQINnmLRlcj5VSWTlkvZml/vbOcHZ0ms1VbuHqvwuc6QApf/z+YKvYKFCAKD+TMb0dYYGk7b9X5M/+vtOq7MmfL07K+m+L1iCHVY3txpAGLsmvnI8agM3sECGyZE5UpU0ZRlQMFAhJV7/MeOF88rVRJK5KFGLzrktxgMmIGpPe+3ORZkLL+/TImOuj0yVRoRwNSF7RCIN1vBSekoehF/dX/m7BAeqd4R7E6ydzYVRShk976LaDiTbf5R8EMgUNwtS9uPyVyFaylpCN8V56XWv73g4enChlmpkuauLeSpihWCB5zAk6nC3TwhQgcp8lrzlsg0Ra2mPQn1O7l/4kb03jqcN2tjqo1r0Fd4+JDdFlf898D8LA9knpIS8zk9pO+0dAXUVJdkgBw0SluHlJh7z4BknNQ/beDDTVWbGfWvbRjrb2WpscSjDUFJvfQsz6mlD48Fz+rfknQdncGXjqblF/IP1ij1Tnjo51uVxVwEjHFqU31PPgolOKEfc1X746eM4rjEP3l+NnbTwUuHTWE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39860400002)(366004)(136003)(396003)(376002)(38100700002)(478600001)(86362001)(38350700002)(66556008)(8936002)(6666004)(7416002)(316002)(956004)(16526019)(52116002)(6486002)(2616005)(66946007)(36756003)(4326008)(186003)(26005)(8676002)(2906002)(83380400001)(66476007)(6916009)(5660300002)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ox96hqA39dcaQow5RgNfAtXwWb6V4KyBCY6rK0PCEC/t8e3UsFSp/FGFmo58unrmUxEtPJFKVi6OvJG3Ur/8PJUMKEoPUUX7fTbqOOR7efxGt78Q161SXjFWU36HOiTzeMW6PXw9VzqOt7MsOEzu6F/ftXicRF5NBBqsugf1hvJmpJRmNomX2ru44p3dKSS1aZlQK0PseZmLXVc4nS3CJcFX/gEs1ASGQ5aDomFpXj5U7dGoC/lWWBuSmU4MTQLc1PbitkXodApRmVOfryRyvrODN/Dget926Lts4mru/zxowz+olxi2e/Q+XDEs4wrSu/a+9wiNN4syAtzWlv9V3fxykcllxG+qNVU44HuxNZ1EijATaI1vtAxT6D8RivI/vOrPMyFEvcn4jI90lcGVgsAjr9xX+5rprLijk2gZdu3Z3EzXh//oECrTVLSc9LvfkZM9eFCZYJM8ze1wYGZx/NNnjoZ1w9UIeAHgTTXgcX0DcsNSmVdtIrVeJmoSeQ7o53hztjo82NhFp8+xtn8XBzdEBrom91+teE9TOPM5hZg58L2eLh55qOAcDSn6DngZqgOwZewDSlfOBKdpf/7nS1rt/6CKlFUCg/pTkfXtvwLfqyE/fuCsPkJAkfpthb43CHtuCxLWTyjytRxFQ/rwTR9j43jKmui980rj4bPx/U05p11Jymgy0+lSqwzDTfPryxuuQXJ4kPClrepECdhvEU/AoX5PpXd/Ej/IhCcu9DBTvZe2DRhJnML8meLHTy9btwLI6DkgRIw5AFd2yR+cLxlFaDylOYr5jpZeLphSn9C6eBUEZYh8/E7qioAIPXdEBy7uJmWynvypi5Ko2UAuIdBlHi6tLSmm5j+6HjvDk2E+esQBv935+2r0itALeW+CbMavA1pp5lsaAIsawTQhlXIqC9yikpIYcf9MYpeI8yb35dE+/kUeRhtH3ZUZ+JYhwMQ2ZQvR5PAltY8HyY4HsPsM+87iW9AujfNqGrekOsoVl2DV10o0DfAfRAskMlLdEvPQz8GlZC+H2D280AkAXDS8qZ47cmXFMGqAIJFmE8JIRm7IXF+stbuwTkgx+knVvBC3GX4HYvCTrTdnLvDdVgOr0YzMdnZyYrXPufShR25/couG814+ozHtahRzaREM3KJkHTQ8PuKh6aseepkPjeqIJDkAoN29H65IlPkaekd9ym6bhk2xGPXDEOD2sZpXirJ6Z2cppJd27IIIUSjdmSHQG5OvEqE67BxSwTS/upYbaRJpL/c3U0qHKqxRl/jfoMx5P22zTO10deEVhOzGphU/3aJ2coYkHoocqPt1CpfCnzXIwc7hqpEcSDpzuaJ/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c0fe57e-1d10-444e-5a11-08d8fdeba613 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:46:21.9512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: txLAOhu9TeSiW6m1U1U3Ab6GGqQTxCh4UmtCIbYKvdzvzQDr8YViqBhgK7QrY9eAtSj4qzUQWO6v+G5IhpVEMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4432 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Ashish Kalra Introduce a new AMD Memory Encryption GUID which is currently used for defining a new UEFI environment variable which indicates UEFI/OVMF support for the SEV live migration feature. This variable is setup when UEFI/OVMF detects host/hypervisor support for SEV live migration and later this variable is read by the kernel using EFI runtime services to verify if OVMF supports the live migration feature. Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- include/linux/efi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/efi.h b/include/linux/efi.h index 6b5d36babfcc..6f364ace82cb 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -362,6 +362,7 @@ void efi_native_runtime_setup(void); /* OEM GUIDs */ #define DELLEMC_EFI_RCI2_TABLE_GUID EFI_GUID(0x2d9f28a2, 0xa886, 0x456a, 0x97, 0xa8, 0xf1, 0x1e, 0xf2, 0x4f, 0xf4, 0x55) +#define MEM_ENCRYPT_GUID EFI_GUID(0x0cf29b71, 0x9e51, 0x433a, 0xa3, 0xb7, 0x81, 0xf3, 0xab, 0x16, 0xb8, 0x75) typedef struct { efi_guid_t guid; From patchwork Mon Apr 12 19:46:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16D17C433B4 for ; Mon, 12 Apr 2021 19:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E0462610FC for ; Mon, 12 Apr 2021 19:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238633AbhDLTrC (ORCPT ); Mon, 12 Apr 2021 15:47:02 -0400 Received: from mail-mw2nam12on2050.outbound.protection.outlook.com ([40.107.244.50]:63232 "EHLO NAM12-MW2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237760AbhDLTrC (ORCPT ); Mon, 12 Apr 2021 15:47:02 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PNCKQRGtuD4nxfN+3a3iQ1ZkjyUqY/YfooTFPFvUeiFzzvPPejFZgg99QpSxJ7l/YNe+lmh8UnYid/uGJxVLuCz1nrk2J4EmxTW5EYm8eCbmg7pHFwx4sglaajGsN+/2S+kp0Ub3dmLbUAG8nF5UzsVEukVe7LOK76dnH/FS+zOBYy5zx6ErJus3UwHeftANhYLZDrck4snPGuIwqI1lNSa67AiRCU6UnSO5/5ZxmEoXrV5cjzTfnw5SN5SUsaJ/ZyrQkbF3JPnGFWEf4L5Sj7icqg/8e5opQFobWT+QxVW3cmBekVUFV7yAQg5EyP4q4CnQ0MaDrSfw8ivh9ciV9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JvcQs5qLrU5in+oRyqaqqedPuuiSJAyZl7IgwhgRMKA=; b=YUILK7NMV+H3wJsufA/Z9CAH+wHJSzbNdN6W2y8Km1u0Mf+rS30vf5efjZF4Uos5OwwQsVJz3k/klSbeZP6P1rMUIzw+ikyVtiTWPV47+o7goGR5wlFEjpIwos5MsM0Nvep/4sJn1rIbVPRvUEQatwgSW4IIIXr0VpzE75xIo3YkgxWblmd4v/b5fzGaX2tPTwDj1YZwQm51174hRfLxJn2kmgjbDcdDVlnUUuk6DMe4W5ZoFCwaSEh3/40TjtSkCdZvUsYYerWlnMkSPrPWuzOB8SKR4VO0M6hjVMcaIDoShS1vtx3BitkZ/qP30dHqwCu9hVDHW5wsOB59wKQ9vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JvcQs5qLrU5in+oRyqaqqedPuuiSJAyZl7IgwhgRMKA=; b=jIch4kp3MliMqLsOQAq/LgtfiCcQYpcE1LNDH8ZWaGiz0RQqZpSBDSycbfdAYYzz8vFAiRlgLVlDhyo1oeaLI33NPPLNU5tkkwZ/f1r4AfiyynlhYglJxKtVvTXgdJS6JnecCmS+TSc/uoIjRQ/FXkKz+Ra0YwhusN3uA+RxBy4= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SA0PR12MB4432.namprd12.prod.outlook.com (2603:10b6:806:98::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Mon, 12 Apr 2021 19:46:41 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:46:41 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com Subject: [PATCH v12 12/13] x86/kvm: Add guest support for detecting and enabling SEV Live Migration feature. Date: Mon, 12 Apr 2021 19:46:31 +0000 Message-Id: <4ca573363fb8fcd970add90fad4b51d43f1c5d84.1618254007.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN4PR0701CA0030.namprd07.prod.outlook.com (2603:10b6:803:2d::23) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN4PR0701CA0030.namprd07.prod.outlook.com (2603:10b6:803:2d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 19:46:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c01d153e-f5eb-417b-eb87-08d8fdebb18d X-MS-TrafficTypeDiagnostic: SA0PR12MB4432: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:257; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hGvBebs3VqyLpYo77wmLRwW+K5FGy8JdEP3XAYRiZD2TZWxk9wfpHZdJ3oFrpT9xuRR/9CpUmM3pA/m5xaAxCGoVABlWUDdvt8U5GfuG/8WHh+WtFMV71PEibiJhIZtX6s9ofNY+MzH0goRSI4WOA35dFDFfP+ZFjDofPivn/sJNgHjBahIrY828RqIgah+1crsKG/2lUl4PH1B8A7wDeC/CNEdh/P2t5d0r9Bla5W3+ZMUuCwXZhkHmF1A93Gce+fc3wKXH7VMsTkvpr6fNPUTqqI8B6Lj1sMoiczIH5dbIlmredGZbv6bAyKsYz0UtCrndHIDhjKdNduBEaT+gEMyTT9oa+GfAwNm0WYEFMXI5x8zxEkgeBuVxr6pdXsvj/GJy+m9d4IP0u0V9RAa66NrEKwtL/om5/Z0Xs32mNmgcDhTnDUGWOxnBQSvMBSmlsCTwToHl/yTpS7ObIzNjzfpuQIyNV32Al9J3PXQQbafupS+ZiED8MRhyeygM7fpMwZ7yO2VZ0OX/KoeZIfORkX7Sk5NDb/82Lxbf2AqVcKnfMMvF8LOl0HObb6wOWswcXI3ITE3cZJZYlG2v17TOd4esEVlhFVNJEUQCoZCxLbgHuCbThpvXmvg8kck5J1dvy6U9mwjCO7kTZofe+FOZlg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39860400002)(366004)(136003)(396003)(376002)(38100700002)(478600001)(86362001)(38350700002)(66556008)(8936002)(6666004)(7416002)(316002)(956004)(16526019)(52116002)(6486002)(2616005)(66946007)(36756003)(4326008)(186003)(26005)(8676002)(2906002)(83380400001)(66476007)(6916009)(5660300002)(7696005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: u36Qb1e2tiGbAJB4+WD6175U8VFGgQIHj5JIBD9AZ/SukqRxJ5DC0RkdK4GGzamWob5D1AcGMe6T4fRoyWIUOy3Ac6NHbQ3s7Gc1hC9ACthOC9AmB1hdXBLLRzFWdHmxq/+FSJjLbxYa6BAdNQtme+rByCnl0fzlH40Lhhgv8dol00tcchzA0aGBvhvMs/0PFvv4YB6OJceJyXHqxk8TPiRZ6V7kFAgci5E+WACMR/wVKiEGh7KG5zL0s2gt+M+qHi5bII30R5iFkLSWuX2tBwgcf4GDpZrEV+wLwDS3gb2Xe/Bpg0Hy46Sf2dT8qfDbWGyH6oaJgvm4CiIoWMgxTVeusCbYrOuBIcEwHTCqNH/Co/kHndk3moyU53tv1Whe5a2raDVoq7X03pHTIUiNcMosbRTtvojqUXan60s4l4VVEHxjetgCi9oCzGBkUkY+bOYszVpLEjil7AWEtR4YnlZZkpZuEKElC2LM9jnppENJ1iXsQnKBpTHwDwmgXNxjRRpo/UnwdmhWuOxzq9vQRyNzi8LarCrF8p/ntQL7V0R/iKrZ2jhyZ2mJqHQtEYsf7p1Kx4uVaC/JZcDbSnQQR0qzyEdUU6fIZKRrJw17RLgiKX/dFU+xDLVKqxHv5n+9ManjaFxMsr+Y3hdt8sg/26MnOfN5of6RkEIrqSdOb4j0aM69kafW5j4y1MOuCIQw6OGdE0JOXX/skyu++3vyIsgODSH0S2VH8qzdGD8EUh2X0oNTZw3qxr2ukrVzQtGB/SPCGP2fSUxJcYLoCfgP0wT7Ey9MmvUXVb+AX3ZMvkouFzn6GFufoaBqS1hr6x59ZAkTa039CcdGuydUSCo2kg9L17HzFw3P5IB/4jFSjOZ1tzEjphJFWKMNABfjXSbYuyiGM5KjYFxgilgCQzWTwEuiGaVh6eU4n6RSgkQGpQppTymH8XPNgPo1w4oAOnYIYNDLoH/e6aE4GN9Ji6EJRHp8fup2HLj/VBK975qitOXyshtNnLdqERSddaoLoK+KQZ04BVuAJtodSkwXUxaVX0oCjh3VbQ6EtvZ5QS1csrQAae6qwZLp9oIcLbPlo8gf3VC1iGbzyhE+IkqIRAL6E0zQdObQ1omeNWgiqgCj7qeIXp8B1a5AhGnGz2DPKvH62DYtnrOOR3ken372kJArux3e8bBOJ5ibPypmoCLWJdc6v49HYc7fQbmrH/1Au4wt02JYhAiTNraqjQjK+oXB/OdoXuohAZzC8gCLTxvNJI+O7h883T2oqMXtpTXsAyfiT3oe8fKqlx0nIWzZpdUbaSikbsmp+1gpKUwl0tGLu6iqraCxMgYai2YfP+1VpxcA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: c01d153e-f5eb-417b-eb87-08d8fdebb18d X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:46:41.2054 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4D4YFE82cmykLSPPTn7cJH/HcRbPfC+uWUzmWExOyw+15aErt+y9ezfI2BnObgPRuvvBvQiDd6+2/A1ATr2h1w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4432 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Ashish Kalra The guest support for detecting and enabling SEV Live migration feature uses the following logic : - kvm_init_plaform() invokes check_kvm_sev_migration() which checks if its booted under the EFI - If not EFI, i) check for the KVM_FEATURE_CPUID ii) if CPUID reports that migration is supported, issue a wrmsrl() to enable the SEV live migration support - If EFI, i) check for the KVM_FEATURE_CPUID ii) If CPUID reports that migration is supported, read the UEFI variable which indicates OVMF support for live migration iii) the variable indicates live migration is supported, issue a wrmsrl() to enable the SEV live migration support The EFI live migration check is done using a late_initcall() callback. Also, ensure that _bss_decrypted section is marked as decrypted in the shared pages list. Signed-off-by: Ashish Kalra Reviewed-by: Steve Rutherford --- arch/x86/include/asm/mem_encrypt.h | 8 +++++ arch/x86/kernel/kvm.c | 52 ++++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt.c | 41 +++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index 31c4df123aa0..19b77f3a62dc 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -21,6 +21,7 @@ extern u64 sme_me_mask; extern u64 sev_status; extern bool sev_enabled; +extern bool sev_live_migration_enabled; void sme_encrypt_execute(unsigned long encrypted_kernel_vaddr, unsigned long decrypted_kernel_vaddr, @@ -44,8 +45,11 @@ void __init sme_enable(struct boot_params *bp); int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size); int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size); +void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, + bool enc); void __init mem_encrypt_free_decrypted_mem(void); +void __init check_kvm_sev_migration(void); /* Architecture __weak replacement functions */ void __init mem_encrypt_init(void); @@ -60,6 +64,7 @@ bool sev_es_active(void); #else /* !CONFIG_AMD_MEM_ENCRYPT */ #define sme_me_mask 0ULL +#define sev_live_migration_enabled false static inline void __init sme_early_encrypt(resource_size_t paddr, unsigned long size) { } @@ -84,8 +89,11 @@ static inline int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0; } static inline int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size) { return 0; } +static inline void __init +early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, bool enc) {} static inline void mem_encrypt_free_decrypted_mem(void) { } +static inline void check_kvm_sev_migration(void) { } #define __bss_decrypted diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 78bb0fae3982..bcc82e0c9779 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -429,6 +430,56 @@ static inline void __set_percpu_decrypted(void *ptr, unsigned long size) early_set_memory_decrypted((unsigned long) ptr, size); } +static int __init setup_kvm_sev_migration(void) +{ + efi_char16_t efi_sev_live_migration_enabled[] = L"SevLiveMigrationEnabled"; + efi_guid_t efi_variable_guid = MEM_ENCRYPT_GUID; + efi_status_t status; + unsigned long size; + bool enabled; + + /* + * check_kvm_sev_migration() invoked via kvm_init_platform() before + * this callback would have setup the indicator that live migration + * feature is supported/enabled. + */ + if (!sev_live_migration_enabled) + return 0; + + if (!efi_enabled(EFI_RUNTIME_SERVICES)) { + pr_info("%s : EFI runtime services are not enabled\n", __func__); + return 0; + } + + size = sizeof(enabled); + + /* Get variable contents into buffer */ + status = efi.get_variable(efi_sev_live_migration_enabled, + &efi_variable_guid, NULL, &size, &enabled); + + if (status == EFI_NOT_FOUND) { + pr_info("%s : EFI live migration variable not found\n", __func__); + return 0; + } + + if (status != EFI_SUCCESS) { + pr_info("%s : EFI variable retrieval failed\n", __func__); + return 0; + } + + if (enabled == 0) { + pr_info("%s: live migration disabled in EFI\n", __func__); + return 0; + } + + pr_info("%s : live migration enabled in EFI\n", __func__); + wrmsrl(MSR_KVM_SEV_LIVE_MIGRATION, KVM_SEV_LIVE_MIGRATION_ENABLED); + + return true; +} + +late_initcall(setup_kvm_sev_migration); + /* * Iterate through all possible CPUs and map the memory region pointed * by apf_reason, steal_time and kvm_apic_eoi as decrypted at once. @@ -747,6 +798,7 @@ static bool __init kvm_msi_ext_dest_id(void) static void __init kvm_init_platform(void) { + check_kvm_sev_migration(); kvmclock_init(); x86_platform.apic_post_init = kvm_apic_init; } diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index fae9ccbd0da7..4de417333c09 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -48,6 +49,8 @@ EXPORT_SYMBOL_GPL(sev_enable_key); bool sev_enabled __section(".data"); +bool sev_live_migration_enabled __section(".data"); + /* Buffer used for early in-place encryption by BSP, no locking needed */ static char sme_early_buffer[PAGE_SIZE] __initdata __aligned(PAGE_SIZE); @@ -237,6 +240,9 @@ static void set_memory_enc_dec_hypercall(unsigned long vaddr, int npages, unsigned long sz = npages << PAGE_SHIFT; unsigned long vaddr_end, vaddr_next; + if (!sev_live_migration_enabled) + return; + vaddr_end = vaddr + sz; for (; vaddr < vaddr_end; vaddr = vaddr_next) { @@ -407,6 +413,12 @@ int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size) return early_set_memory_enc_dec(vaddr, size, true); } +void __init early_set_mem_enc_dec_hypercall(unsigned long vaddr, int npages, + bool enc) +{ + set_memory_enc_dec_hypercall(vaddr, npages, enc); +} + /* * SME and SEV are very similar but they are not the same, so there are * times that the kernel will need to distinguish between SME and SEV. The @@ -462,6 +474,35 @@ bool force_dma_unencrypted(struct device *dev) return false; } +void __init check_kvm_sev_migration(void) +{ + if (sev_active() && + kvm_para_has_feature(KVM_FEATURE_SEV_LIVE_MIGRATION)) { + unsigned long nr_pages; + + pr_info("KVM enable live migration\n"); + sev_live_migration_enabled = true; + + /* + * Ensure that _bss_decrypted section is marked as decrypted in the + * shared pages list. + */ + nr_pages = DIV_ROUND_UP(__end_bss_decrypted - __start_bss_decrypted, + PAGE_SIZE); + early_set_mem_enc_dec_hypercall((unsigned long)__start_bss_decrypted, + nr_pages, 0); + + /* + * If not booted using EFI, enable Live migration support. + */ + if (!efi_enabled(EFI_BOOT)) + wrmsrl(MSR_KVM_SEV_LIVE_MIGRATION, + KVM_SEV_LIVE_MIGRATION_ENABLED); + } else { + pr_info("KVM enable live migration feature unsupported\n"); + } +} + void __init mem_encrypt_free_decrypted_mem(void) { unsigned long vaddr, vaddr_end, npages; From patchwork Mon Apr 12 19:47:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 12198759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38720C433B4 for ; Mon, 12 Apr 2021 19:48:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13D06610FC for ; Mon, 12 Apr 2021 19:48:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238688AbhDLTsZ (ORCPT ); Mon, 12 Apr 2021 15:48:25 -0400 Received: from mail-eopbgr770083.outbound.protection.outlook.com ([40.107.77.83]:40064 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S237406AbhDLTsZ (ORCPT ); Mon, 12 Apr 2021 15:48:25 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=As6UZPsoAolH82Hsih2BwuSbGGE0ntQyEANPYnVa3+ZRDjeC+JGUX3iTgaQQjB5QsamrXdJUfjntLqSDiejQH8qd1gMfH/vk+b3PlAtk0cjmFML7sNdzLGwjUhKG+yi304FIuo75To69VUJKgqo62nyfbFKjKlXl+tmLmNQWkCFDZEOtx5XATaTW2vZInzH35dcG+h6MB/NJyW+3K7rRVcfEEtRrlojtr4e2DK9Dqsr8Lo9zKWeGGhkstQgPmbgHx5ly9mjaRZDph2EJAyEdd6DImL7ekwFUjCuVXvd+2hsCjAPEAJkJ1gIR142v8eweso9mPPmcomBJmlBSX+6Xkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vMFsE5kyHk8b/BTrnc+Jh1LeIka8vWE7qzvszbJdnIY=; b=mjlG+107amHOhvRAlhj5suxm7CaglliuMqzny0+S9OLLX8W/hwNq1+sXjUrT/JLNKCmThgilWHB+bpngqka2BjLMm253PrqGhSY16kpg7vymuUWKvRFBaSkeIxoAYWhUXDndEmplTLPp8MPeHCq+a2hor6CzlN/u15OfwGjOHUedUlj3ylvPCnRbQav95eXxXLqCXkQ27nMqcq/7Ouu9WsfRNvbrfqupnFJRXYtGXuG5FGczY7Shg1RMYb7dfUJtK5M4BfzDESakz5lub+4MJ47XzQ8WYJPZ35RQdulEblz6VDkbzEtOqm5k0emWQuSwMNmEBjAVPCPQHPc4xbBJ+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vMFsE5kyHk8b/BTrnc+Jh1LeIka8vWE7qzvszbJdnIY=; b=elfZ7EUZl4sofAtDITy+IJAt8x6JXpMJMlAlpQ37MiDUPYpahWeXRqBC2927+ib1dNN8LMj7bvbDhjdXrb183x0aOabrNNAPcmcFY+Ue12JnK9yq5Hu+GAQzyHsqj6ifC2F5EvsKh3m4vDEh1a/RqP0VqGzh3Z2RxBZ9cKpjIPo= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN1PR12MB2415.namprd12.prod.outlook.com (2603:10b6:802:26::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.21; Mon, 12 Apr 2021 19:47:59 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::1fb:7d59:2c24:615e%6]) with mapi id 15.20.4020.022; Mon, 12 Apr 2021 19:47:59 +0000 From: Ashish Kalra To: pbonzini@redhat.com Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, joro@8bytes.org, bp@suse.de, thomas.lendacky@amd.com, x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, srutherford@google.com, seanjc@google.com, venu.busireddy@oracle.com, brijesh.singh@amd.com, kexec@lists.infradead.org Subject: [PATCH v12 13/13] x86/kvm: Add kexec support for SEV Live Migration. Date: Mon, 12 Apr 2021 19:47:49 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: SN7PR04CA0004.namprd04.prod.outlook.com (2603:10b6:806:f2::9) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by SN7PR04CA0004.namprd04.prod.outlook.com (2603:10b6:806:f2::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Mon, 12 Apr 2021 19:47:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c70c258-1d23-4b85-27b7-08d8fdebdfc2 X-MS-TrafficTypeDiagnostic: SN1PR12MB2415: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: X97w1zOsn8k9dPw44sHZLVej/MdKKH++6KhTGngXkMoHKuBwwCwdlJTq/L2Q8rn5RW2Zt/SiDIaAeOWdzLjE2tzl5y8QGg4atcV118zSfkbYM2n5BuY35yQTAmc09o3V5kv6olBQfyHgc/hTAc0M4HMTgVbbafH0UsaECs4XcfSibPDM2gm2nCEaHMLbdSBlXoyc5HfjMBTuYkBrd6p4bSg0b2jFSJOaCmWjGPk4Vps7TYxVpmFq6TzDfo17sF0xQEavh3RzFGKRHcLQd3W5qL5BanelE74S8QGClSCJoWFw6C4F/OfcVjoG48YScKYFIm3uEYK+VBbVV37MquG7PHbrQkKf4oWNR8HdySjHQASs4CJS9+Vpn4vxUnJ9a8LYuUlunUaVWgN94APw4EjKJ1wrJ+RZ7SCIit8Z+bu1uC4TvXWmjibR4i9/QSWlnomyW4aRhZNKdN9ldJVJcYB/k6c7jHd4MxcJWfwLBV/oh5iHKohtE1UlJb0+QPkw1RieELjzcd2adv49Ud4oP9g27lMwBNPdWksspi1iz/I3dbmbUHoWpqrlbygx0K4PQ7mC+dszjOFf0c+nsyw70iTZOjuReaDQsNYvqkBAf87xc/W3i6U9Efk06vLq+xQm585bvjQZdVHyES5xmu0uOrOjIDWOJCZv7DwGHOhYi2XJSMU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR12MB2767.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(39860400002)(366004)(396003)(376002)(136003)(26005)(16526019)(186003)(86362001)(52116002)(6666004)(956004)(2616005)(2906002)(7696005)(6486002)(66946007)(66476007)(8676002)(7416002)(36756003)(6916009)(4326008)(478600001)(5660300002)(38350700002)(38100700002)(8936002)(316002)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: SG8qyNU1gCMJIQoYXc1YdYhdDv5bhe0yFw9IdsO/9UhAPSdWlvPUDD4mn0faftsgH1PeHd7yZBvHy+o38d0g3IQEABnpNoObfKTqSHp+xrbOjMQf6ZdxljPAC+8SgQwv9e90nSyGyYfiX3rx5f6z+bLlRgyGzdUlV8NFbPTwfg291+eJb6VP/pbAEoZt8dvMVBOdsq7jFgLmTKLK/+ZDcBIMomtzUb/ar3qMC+uz3h1OJ+TJWKOiAF2hn6STXyrI5voAqXTByYO3k89cFS6bka8DuTk0k0uFUJIL6SYFPhoion5cA5ZVWkUksyzlT3nByM9Y0kBGgTFIrZ5QplDujsIRceV/ZDO/I6rvXqA7whskCboZLy6e9FxgkgI4iNtbTm8aaMf4XJ7IdfUFlLqRO9qk9BwFow4cGKn8LgzaQ+ae+Guk1ED+4v08ooxjCioP3KXQuCfvwUFuMjj7sTVTqzcbeqqtZ9Qvr9gn9802SO+5ts24Jw0mOxJKDyszB/+2eXFyKbXhbMJOnTLzpSUme8+DOBuHBdYwjT/NabVNvPi5CmuM0eBxntaCZhRX6zOWsz6VqEihh2ctzrpdByU0gl04HYeaFcguuVaNz+vNTxfv1UAMhcCJ3C5hR67wBsd22pilfkQxLBI4CYA0QD42oDGNatwKGtIqHuQZTz0I47LEdQ9kdWZfsmYpgzFeS8xQrO14Eev5kVMHqhgLSDcy4rg4Li+AUITNEbUtDJifE7hqbGJp6Z7T29jXzOTcBn3Vo0Li7wJlbgD4vWtH1HVN/Bc0DTui9gKkG/1rB5ImjIjGmb0Q4Vxm8cFYxZEYPq/Yo+U4Ai89oBWDfc4Gql25ofaQLLCroG6EVd18sigD1GKnzKRPDp2fKNND5VivHLFy3YvAHWTGSZ1i6xUiHMI3ua4nzW/ZTvRnrQNEPmi7D0ShVk/0IdLzkgdHB8pBGGVv0Wbu9IeNXhFek2sn2WoGdaqACAfmXODO01oYCNj7zbHAxVMxEQiJJbQ7ixW+6dsbYtSoFqvnsEvdDI/LUPoHnZrXXurCPvu0pjFgeXjjIB0Ef3B7bE97Z/Nzbjz1URx9sQZjbd8IwFlcRAtkgmoWyoOPAoplvbvcKhcfx9Dv0kBLl3VmUzKa3Aj2XTJ0yiyg+aRQ8b51IL5+IoFZuVRHvCyO4rjFG3BncNqGoE3PaKTGmOcXQxvC/V+nonYRfctQoRixAwwGyyQoS/UKDcnSDDhzDq8t0rrH5ZEuUbaB6Aqa/f3znxQbdm0Ft2elAv+j5Q/MSYDxCfdLN+K1IyGsQm8WHMKdjRdCJD+cW3dINHA3h2Gri6ihmRW+6kOLQaz4 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c70c258-1d23-4b85-27b7-08d8fdebdfc2 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 19:47:59.4015 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lgzONNw0cC8DKx6QldL6boJBGcnSg4Xncte33uYVuZd5TIL6A7NfUIm1C1cpqH85T+As4WM+8nW1ojnbfx0Fgw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2415 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Ashish Kalra Reset the host's shared pages list related to kernel specific page encryption status settings before we load a new kernel by kexec. We cannot reset the complete shared pages list here as we need to retain the UEFI/OVMF firmware specific settings. The host's shared pages list is maintained for the guest to keep track of all unencrypted guest memory regions, therefore we need to explicitly mark all shared pages as encrypted again before rebooting into the new guest kernel. Signed-off-by: Ashish Kalra --- arch/x86/kernel/kvm.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index bcc82e0c9779..4ad3ed547ff1 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -39,6 +39,7 @@ #include #include #include +#include DEFINE_STATIC_KEY_FALSE(kvm_async_pf_enabled); @@ -384,6 +385,29 @@ static void kvm_pv_guest_cpu_reboot(void *unused) */ if (kvm_para_has_feature(KVM_FEATURE_PV_EOI)) wrmsrl(MSR_KVM_PV_EOI_EN, 0); + /* + * Reset the host's shared pages list related to kernel + * specific page encryption status settings before we load a + * new kernel by kexec. NOTE: We cannot reset the complete + * shared pages list here as we need to retain the + * UEFI/OVMF firmware specific settings. + */ + if (sev_live_migration_enabled & (smp_processor_id() == 0)) { + int i; + unsigned long nr_pages; + + for (i = 0; i < e820_table->nr_entries; i++) { + struct e820_entry *entry = &e820_table->entries[i]; + + if (entry->type != E820_TYPE_RAM) + continue; + + nr_pages = DIV_ROUND_UP(entry->size, PAGE_SIZE); + + kvm_sev_hypercall3(KVM_HC_PAGE_ENC_STATUS, + entry->addr, nr_pages, 1); + } + } kvm_pv_disable_apf(); kvm_disable_steal_time(); }