From patchwork Wed Dec 14 19:40:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 13073432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7DA2C4332F for ; Wed, 14 Dec 2022 19:58:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4669D8E0008; Wed, 14 Dec 2022 14:58:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4166D8E0002; Wed, 14 Dec 2022 14:58:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 290368E0008; Wed, 14 Dec 2022 14:58:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 169A18E0002 for ; Wed, 14 Dec 2022 14:58:25 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E209C1C66EB for ; Wed, 14 Dec 2022 19:58:24 +0000 (UTC) X-FDA: 80241973728.23.73B8A5D Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2072.outbound.protection.outlook.com [40.107.244.72]) by imf17.hostedemail.com (Postfix) with ESMTP id F0A6C40017 for ; Wed, 14 Dec 2022 19:58:21 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=kged6BGC; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf17.hostedemail.com: domain of Michael.Roth@amd.com designates 40.107.244.72 as permitted sender) smtp.mailfrom=Michael.Roth@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671047902; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=h4FSUS3/B0Rm9xArYguEyqZKPzjYjRY9XqH/r8iRhzM=; b=irpO77+2ZY9KsB5o/Hsm/D29vuOCjw7Zi8Kd6fWOadM8ybl0RA4B9G1gpLVN9zF3sPwPkc q30cRPysU2p/oq5+RhleCV6kP+YgQbxSdDu5p8V0CC/RGXbAQLRzkAvLwrrhJOhQIFwLog 4zET62UW9STYck2CcR2arG6nILVyVv4= ARC-Authentication-Results: i=2; imf17.hostedemail.com; dkim=pass header.d=amd.com header.s=selector1 header.b=kged6BGC; arc=pass ("microsoft.com:s=arcselector9901:i=1"); spf=pass (imf17.hostedemail.com: domain of Michael.Roth@amd.com designates 40.107.244.72 as permitted sender) smtp.mailfrom=Michael.Roth@amd.com; dmarc=pass (policy=quarantine) header.from=amd.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1671047902; a=rsa-sha256; cv=pass; b=rC61ZR32bb7C+/BXFluWTxc0U6VU33XjroU2ND3Y3lqz+HiUN62yyIkqvtkQ0WXuH/UTOU O5W1VvoHSwC0zQBioI7cNBSbn/jlVgn83Bk3/tT+l5EGIZiUaiLMN8igwWaIQ15g7AU3i3 cpIjtaTkEfjheUo4hzEgfSYdKkVs5UE= ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FnzufEQkG7tStmHliW3OTf5PwDc2K+Pvi9gqW4CGHNitcW5FbgzTS30Th/a/8WnbqosD6pjP5J5QiE2LHWCBpuKaufHkoo2butcmXqSUdgTK3HOvE71beEvGgC0O41lnTYlUcKmzmnf+UV1TlpY4cZWXCnClmzdLoj102v0uq6c7bQ3e0IK57N46OvHmbkpIfbZz/gD+gcp3r7F4MulPPKWRKdoiyP0X7AIQv7uY8AqgbPJ4sx9NvwdOfqBTc5IKC9azoIXF5RwNZFYh8XG11R0hoOv1VMj5kxWTye/NoAIjIy/mGdS8ysjs6ci2gNaX7teBJdFhhGP4HpO257Wypw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h4FSUS3/B0Rm9xArYguEyqZKPzjYjRY9XqH/r8iRhzM=; b=ilL+0ajOjofVEvnXY5PdoXJrSHsB5bn9zn0/5xoPKEZADzOFHJLlqylPac25hfczjjV/SZddhfZ2NvOB4kYnhQyRyJHWmyaJIriNNpvDzmafraZZp+UZH+iydiePz2Ukny5URktQ+YMc1vtWTvR930i8hCp2QcDMqUeg/5FXqlizh+3JIhtVcxOdG0X3kul9SJX102MAfn833JStcbsOvgveBY79Euo76N4cHoPfkBxx5t8GuaHx4ktHldHUuMinn7nomFgioN+fGkrTZg4H1CROykuJsgIlr4J8hmXBbouv3mvWG6IxsHSzlsb+zUM17zb4670yXodu5o8byteWeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); 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=h4FSUS3/B0Rm9xArYguEyqZKPzjYjRY9XqH/r8iRhzM=; b=kged6BGC3qmgZ81K51GjJmxdAIOhf00z9pWj12w1OLgqf1U4zcFrMqKS0IDjsyiS/qb1waL4MtasWW5fBawmDIMfiLKsY6dRajO+ZAGozkXF8bacCBJvVwaw1BCCrlmQ0L/UPL0e2k5wYb3NVz935xW/oQgACVKa5szsrk97M0I= Received: from MW4PR04CA0253.namprd04.prod.outlook.com (2603:10b6:303:88::18) by IA1PR12MB8309.namprd12.prod.outlook.com (2603:10b6:208:3fe::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Wed, 14 Dec 2022 19:58:18 +0000 Received: from CO1NAM11FT089.eop-nam11.prod.protection.outlook.com (2603:10b6:303:88:cafe::dd) by MW4PR04CA0253.outlook.office365.com (2603:10b6:303:88::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11 via Frontend Transport; Wed, 14 Dec 2022 19:58:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CO1NAM11FT089.mail.protection.outlook.com (10.13.175.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5924.11 via Frontend Transport; Wed, 14 Dec 2022 19:58:17 +0000 Received: from localhost (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Wed, 14 Dec 2022 13:58:16 -0600 From: Michael Roth To: CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Brijesh Singh Subject: [PATCH RFC v7 39/64] KVM: SVM: Add KVM_SEV_SNP_LAUNCH_UPDATE command Date: Wed, 14 Dec 2022 13:40:31 -0600 Message-ID: <20221214194056.161492-40-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221214194056.161492-1-michael.roth@amd.com> References: <20221214194056.161492-1-michael.roth@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT089:EE_|IA1PR12MB8309:EE_ X-MS-Office365-Filtering-Correlation-Id: bcd8080d-ef9e-4911-4f20-08dade0d8b51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eXfYqhqjbZb3s1cNUl7Kc59vIqSca64MEvhg8hhow6b/3xKRFysoksYi/N0KsS5WfeBrKS+uzDv6s40xapckkyoxvLZRkq23urvo6pik6WdtUU9/jwJF55wS4StNEkHHf9N14S3tnmyCxF1f5R3UZP/jVQ3dN1q0+V1Ar7sWXyh/pAkH2gGTU3HsiGeLcPcouMVqpD+buItCvB1+Kw7JROucpnHk2LV0HOluJ03mOL4JD3q8hl0ZwvnbN5jjSRCt6ATpAHII88V/PpvggBJEWAttyIO4UZLm864/y9NtylakyBbcIoPwr8yBI0OOieQ/0O7Axee0JIILW4JBurCn9O8d2kTHRYUH4QyFaX6r49+YJduxpANNL1i54lUdTfqtHB0NzPY/hmohdhkaBxwFB8nfWO31T09NNndaBotb4DxMyKeaupc1dpqtjM+ZC7MGGMJJGQrZ3vkWnr3u+n+QeD02cdYXNdKc2FVg/Gl20AzlwNOKBJM9lrCortRxZqCOshaPnPVfva1RUGTxQAbN8p/ORBiQIAfDDI31Pmfi/hcxoC3Tix+l15yyFgllrF41N0D01F+RVC03C+dqOH9AdZbuQemwWF59b7yjmWgj79mblnn3qnScDVo+QAVmBVLuZG3FZ0fWgV1PJn5eassmM4MuxrNGZnObcy9ZXPAHq0bKnCngTBmJuKmeiwNm5heSZr7LQbStTpg7XKXL0VjTcVUlM4MHT0GQMrrZu5HHhxw= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:CA;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(346002)(376002)(136003)(396003)(39860400002)(451199015)(46966006)(36840700001)(40470700004)(36756003)(81166007)(8936002)(40460700003)(82310400005)(40480700001)(82740400003)(356005)(36860700001)(6666004)(478600001)(86362001)(26005)(16526019)(44832011)(5660300002)(336012)(1076003)(7416002)(41300700001)(4326008)(2616005)(54906003)(426003)(6916009)(70586007)(186003)(8676002)(70206006)(7406005)(316002)(47076005)(83380400001)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Dec 2022 19:58:17.8243 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bcd8080d-ef9e-4911-4f20-08dade0d8b51 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT089.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8309 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: F0A6C40017 X-Stat-Signature: rpjwt3srp4mm31nmeqjhgnrogu65ob1f X-Rspam-User: X-HE-Tag: 1671047901-696157 X-HE-Meta: U2FsdGVkX1+5HJcYumT3kw4YX7fTJ3h7s2ddhwNib9//sr6MHbYevNXC3wG5Bu79eXoRyxW20qc+118EXSxy+y7lNJHeiX3QZPNbVR30SZbZVHQ+vOdIucuRe4weRQUQ29xbROAvoaNsujmNVndOaKEzE530tU9MsWuWjUukU9s+0FdqY7LJqo1StrU3hGdq6x/3jjeh+lI4X15pjgxAmA0CDXl8dKsDTipj+6AOGoapFOfFn/dd9bASsu0xEbnLhtIfZUp03brEm/G/GNshwUjs4qy6OGfny/1hQnhLqJaAASX7K7subcXtuJCYw1bIeAW2ziEW2Eka6VN8Vfnd2RnZFo02Gr9Y30WltSVp4wzxeLUsg0PTjeR9JGGg/PTehEI717uQnwLN+VPkiw2Uaax0jtr2TQR695Asd9Rco7JbnDvIb0jO+4o0XdKoSxH1jG5MgelEe+C3B3097eAPk/zlhOpoxt8Mws0NvCK1xMEpo+xERNHzKhzDcotKY1YYhZXU02Hu+qHP085UC8Rz4nuK24Sk8mK6aC6PzcEXy/pSVDNr8PlDgLcIhWqXJD1y4WphxChyeWaAIZqRZ6m/K849qnu3T7Ri0VNj/SBSD1k/2b2BVdGtygDwqbPlPBzjoBKZsurxZ95n5nHlZ9HpXvC9W0GYjtvyZOXfwJfds+JoD7fpolNEqYjGzYiJrolycDe8QLMNFpO2bdW5a6YhSYjUa7UE7Kn1axUQmSn+b5d8pXCdsusUsIjKhnXl+YTiqT//3v0IBxkikNFMr/+ZwOTeT/KWouIz5OVyrV/TFqvW8m7NEguQUlfrRj3pVLwZra2yKO+usyEmwMPttqf2tXk0WvyIvcgYANkJ5DO+Qain4AxUlCXBOgKmv+uhiWmKCZyyzSnfhsAghySxc6jzxm51kNZjYKKKci15pKZf7sWLZJE8jd93SyZ2NTcCbSIeD3dxxcPyKJk3JJQ3bd7 FQW6h9Ed pIDhsc/Um9B/T65g9TUQqOA3umswq/Ra2LQBNd/I58f+ZRbgW+Ozy56Hb1g== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Brijesh Singh The KVM_SEV_SNP_LAUNCH_UPDATE command can be used to insert data into the guest's memory. The data is encrypted with the cryptographic context created with the KVM_SEV_SNP_LAUNCH_START. In addition to the inserting data, it can insert a two special pages into the guests memory: the secrets page and the CPUID page. While terminating the guest, reclaim the guest pages added in the RMP table. If the reclaim fails, then the page is no longer safe to be released back to the system and leak them. For more information see the SEV-SNP specification. Co-developed-by: Michael Roth Signed-off-by: Michael Roth Signed-off-by: Brijesh Singh Signed-off-by: Ashish Kalra --- .../virt/kvm/x86/amd-memory-encryption.rst | 29 ++++ arch/x86/kvm/svm/sev.c | 161 ++++++++++++++++++ include/uapi/linux/kvm.h | 19 +++ 3 files changed, 209 insertions(+) diff --git a/Documentation/virt/kvm/x86/amd-memory-encryption.rst b/Documentation/virt/kvm/x86/amd-memory-encryption.rst index 58971fc02a15..c94be8e6d657 100644 --- a/Documentation/virt/kvm/x86/amd-memory-encryption.rst +++ b/Documentation/virt/kvm/x86/amd-memory-encryption.rst @@ -485,6 +485,35 @@ Returns: 0 on success, -negative on error See the SEV-SNP specification for further detail on the launch input. +20. KVM_SNP_LAUNCH_UPDATE +------------------------- + +The KVM_SNP_LAUNCH_UPDATE is used for encrypting a memory region. It also +calculates a measurement of the memory contents. The measurement is a signature +of the memory contents that can be sent to the guest owner as an attestation +that the memory was encrypted correctly by the firmware. + +Parameters (in): struct kvm_snp_launch_update + +Returns: 0 on success, -negative on error + +:: + + struct kvm_sev_snp_launch_update { + __u64 start_gfn; /* Guest page number to start from. */ + __u64 uaddr; /* userspace address need to be encrypted */ + __u32 len; /* length of memory region */ + __u8 imi_page; /* 1 if memory is part of the IMI */ + __u8 page_type; /* page type */ + __u8 vmpl3_perms; /* VMPL3 permission mask */ + __u8 vmpl2_perms; /* VMPL2 permission mask */ + __u8 vmpl1_perms; /* VMPL1 permission mask */ + }; + +See the SEV-SNP spec for further details on how to build the VMPL permission +mask and page type. + + References ========== diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 6d1d0e424f76..379e61a9226a 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -238,6 +238,37 @@ static void sev_decommission(unsigned int handle) sev_guest_decommission(&decommission, NULL); } +static int snp_page_reclaim(u64 pfn) +{ + struct sev_data_snp_page_reclaim data = {0}; + int err, rc; + + data.paddr = __sme_set(pfn << PAGE_SHIFT); + rc = sev_do_cmd(SEV_CMD_SNP_PAGE_RECLAIM, &data, &err); + if (rc) { + /* + * If the reclaim failed, then page is no longer safe + * to use. + */ + snp_mark_pages_offline(pfn, + page_level_size(PG_LEVEL_4K) >> PAGE_SHIFT); + } + + return rc; +} + +static int host_rmp_make_shared(u64 pfn, enum pg_level level, bool leak) +{ + int rc; + + rc = rmp_make_shared(pfn, level); + if (rc && leak) + snp_mark_pages_offline(pfn, + page_level_size(level) >> PAGE_SHIFT); + + return rc; +} + static void sev_unbind_asid(struct kvm *kvm, unsigned int handle) { struct sev_data_deactivate deactivate; @@ -2085,6 +2116,133 @@ static int snp_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp) return rc; } +static int snp_launch_update_gfn_handler(struct kvm *kvm, + struct kvm_gfn_range *range, + void *opaque) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct kvm_memory_slot *memslot = range->slot; + struct sev_data_snp_launch_update data = {0}; + struct kvm_sev_snp_launch_update params; + struct kvm_sev_cmd *argp = opaque; + int *error = &argp->error; + int i, n = 0, ret = 0; + unsigned long npages; + kvm_pfn_t *pfns; + gfn_t gfn; + + if (!kvm_slot_can_be_private(memslot)) { + pr_err("SEV-SNP requires restricted memory.\n"); + return -EINVAL; + } + + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, sizeof(params))) { + pr_err("Failed to copy user parameters for SEV-SNP launch.\n"); + return -EFAULT; + } + + data.gctx_paddr = __psp_pa(sev->snp_context); + + npages = range->end - range->start; + pfns = kvmalloc_array(npages, sizeof(*pfns), GFP_KERNEL_ACCOUNT); + if (!pfns) + return -ENOMEM; + + pr_debug("%s: GFN range 0x%llx-0x%llx, type %d\n", __func__, + range->start, range->end, params.page_type); + + for (gfn = range->start, i = 0; gfn < range->end; gfn++, i++) { + int order, level; + void *kvaddr; + + ret = kvm_restricted_mem_get_pfn(memslot, gfn, &pfns[i], &order); + if (ret) + goto e_release; + + n++; + ret = snp_lookup_rmpentry((u64)pfns[i], &level); + if (ret) { + pr_err("Failed to ensure GFN 0x%llx is in initial shared state, ret: %d\n", + gfn, ret); + return -EFAULT; + } + + kvaddr = pfn_to_kaddr(pfns[i]); + if (!virt_addr_valid(kvaddr)) { + pr_err("Invalid HVA 0x%llx for GFN 0x%llx\n", (uint64_t)kvaddr, gfn); + ret = -EINVAL; + goto e_release; + } + + ret = kvm_read_guest_page(kvm, gfn, kvaddr, 0, PAGE_SIZE); + if (ret) { + pr_err("Guest read failed, ret: 0x%x\n", ret); + goto e_release; + } + + ret = rmp_make_private(pfns[i], gfn << PAGE_SHIFT, PG_LEVEL_4K, + sev_get_asid(kvm), true); + if (ret) { + ret = -EFAULT; + goto e_release; + } + + data.address = __sme_set(pfns[i] << PAGE_SHIFT); + data.page_size = X86_TO_RMP_PG_LEVEL(PG_LEVEL_4K); + data.page_type = params.page_type; + data.vmpl3_perms = params.vmpl3_perms; + data.vmpl2_perms = params.vmpl2_perms; + data.vmpl1_perms = params.vmpl1_perms; + ret = __sev_issue_cmd(argp->sev_fd, SEV_CMD_SNP_LAUNCH_UPDATE, + &data, error); + if (ret) { + pr_err("SEV-SNP launch update failed, ret: 0x%x, fw_error: 0x%x\n", + ret, *error); + snp_page_reclaim(pfns[i]); + goto e_release; + } + } + + kvm_vm_set_region_attr(kvm, range->start, range->end, KVM_MEMORY_ATTRIBUTE_PRIVATE); + +e_release: + /* Content of memory is updated, mark pages dirty */ + for (i = 0; i < n; i++) { + set_page_dirty(pfn_to_page(pfns[i])); + mark_page_accessed(pfn_to_page(pfns[i])); + + /* + * If its an error, then update RMP entry to change page ownership + * to the hypervisor. + */ + if (ret) + host_rmp_make_shared(pfns[i], PG_LEVEL_4K, true); + + put_page(pfn_to_page(pfns[i])); + } + + kvfree(pfns); + return ret; +} + +static int snp_launch_update(struct kvm *kvm, struct kvm_sev_cmd *argp) +{ + struct kvm_sev_info *sev = &to_kvm_svm(kvm)->sev_info; + struct kvm_sev_snp_launch_update params; + + if (!sev_snp_guest(kvm)) + return -ENOTTY; + + if (!sev->snp_context) + return -EINVAL; + + if (copy_from_user(¶ms, (void __user *)(uintptr_t)argp->data, sizeof(params))) + return -EFAULT; + + return kvm_vm_do_hva_range_op(kvm, params.uaddr, params.uaddr + params.len, + snp_launch_update_gfn_handler, argp); +} + int sev_mem_enc_ioctl(struct kvm *kvm, void __user *argp) { struct kvm_sev_cmd sev_cmd; @@ -2178,6 +2336,9 @@ int sev_mem_enc_ioctl(struct kvm *kvm, void __user *argp) case KVM_SEV_SNP_LAUNCH_START: r = snp_launch_start(kvm, &sev_cmd); break; + case KVM_SEV_SNP_LAUNCH_UPDATE: + r = snp_launch_update(kvm, &sev_cmd); + break; default: r = -EINVAL; goto out; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index b2311e0abeef..9b6c95cc62a8 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1941,6 +1941,7 @@ enum sev_cmd_id { /* SNP specific commands */ KVM_SEV_SNP_INIT, KVM_SEV_SNP_LAUNCH_START, + KVM_SEV_SNP_LAUNCH_UPDATE, KVM_SEV_NR_MAX, }; @@ -2057,6 +2058,24 @@ struct kvm_sev_snp_launch_start { __u8 pad[6]; }; +#define KVM_SEV_SNP_PAGE_TYPE_NORMAL 0x1 +#define KVM_SEV_SNP_PAGE_TYPE_VMSA 0x2 +#define KVM_SEV_SNP_PAGE_TYPE_ZERO 0x3 +#define KVM_SEV_SNP_PAGE_TYPE_UNMEASURED 0x4 +#define KVM_SEV_SNP_PAGE_TYPE_SECRETS 0x5 +#define KVM_SEV_SNP_PAGE_TYPE_CPUID 0x6 + +struct kvm_sev_snp_launch_update { + __u64 start_gfn; + __u64 uaddr; + __u32 len; + __u8 imi_page; + __u8 page_type; + __u8 vmpl3_perms; + __u8 vmpl2_perms; + __u8 vmpl1_perms; +}; + #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)