From mboxrd@z Thu Jan 1 00:00:00 1970 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 B8DB1C64EC7 for ; Wed, 1 Mar 2023 10:41:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19DA46B0074; Wed, 1 Mar 2023 05:41:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 14D8D6B0075; Wed, 1 Mar 2023 05:41:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F30D46B007B; Wed, 1 Mar 2023 05:41:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E3FBB6B0074 for ; Wed, 1 Mar 2023 05:41:44 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B764F1C6FBB for ; Wed, 1 Mar 2023 10:41:44 +0000 (UTC) X-FDA: 80519988528.19.CBEE470 Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by imf30.hostedemail.com (Postfix) with ESMTP id 9CEA68000D for ; Wed, 1 Mar 2023 10:41:42 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EPL5WVS3; spf=pass (imf30.hostedemail.com: domain of zhi.wang.linux@gmail.com designates 209.85.167.41 as permitted sender) smtp.mailfrom=zhi.wang.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677667302; 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=i+lwdyMLWrNCUvP02r0csUXgwLUgh7w7WbrI0pmUfWw=; b=RqmNeCgJd1qCHWLq8D9SZAyY5uCo9bCimm438+LoP8d3mzM7pU4gKGi3h/keQqtAO7FNUH qlRdRdAWTJNUEvVTWdg/afZkTiCd+cP/iBAy5f/Ejx7PzkOYXsajx5BzUXJ2s07DtdC9IZ vt/Gb8yNOIZdqa3innGFNJjU2eu2Jsc= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=EPL5WVS3; spf=pass (imf30.hostedemail.com: domain of zhi.wang.linux@gmail.com designates 209.85.167.41 as permitted sender) smtp.mailfrom=zhi.wang.linux@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677667302; a=rsa-sha256; cv=none; b=fMDKRrHnipDY8vvE8fd79dbGG/VYSEbgVKMHiW4bNgzxx5a6qm24ZWl1yFq0UmmtioMAxB WXeH5QoerUpqA2wNAzUSY2Wp/illhZ6ZpzlixMkY/eAQoVDhlqm+Rh2+F84GXoBUtGnC4G d4iAQTRDjkjKCLsHVjIK7pTjNt74WJI= Received: by mail-lf1-f41.google.com with SMTP id r27so16996707lfe.10 for ; Wed, 01 Mar 2023 02:41:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677667301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:date:from:from:to:cc:subject:date :message-id:reply-to; bh=i+lwdyMLWrNCUvP02r0csUXgwLUgh7w7WbrI0pmUfWw=; b=EPL5WVS3tFSDOLTSWnexGJFkVlGLQr63rDlUGz4KbfG1CDAdaTmo2PQBTQq6KzrjbW Posj+feIgGObc/hvqjhm1JUTYHxypeB5N1OocI79dOg5jSq2bv+sk4pb2HdmvxOOmmd7 kRl1TGZgBle2bjJAoLH+sDKyB64RouLB6PL2gxNmqlYD0ypElu5VxW2EX+l9tByHslig Y1z7C71RRCU/s/K3kV/UwHdMnBsKUCm9n3NLTbj+q8Hjdrkivc2LYA3SvekePOb1fwS3 LJe7wJqdjJRYBglMYo5q3AqhBRYqB9AgwFqATK7wS1TQR+nWogVw2Qa2+FLynzqPSsVq 5huA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677667301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i+lwdyMLWrNCUvP02r0csUXgwLUgh7w7WbrI0pmUfWw=; b=edATGJbMela7vhRyZeEjQo+eukzHUrR/+xIjohL30ciwld9PZY7vFeIU1lF2yjO/6A raQRman8ELecphOlp6I/KtzRhYzrV3ouuei9SxqvPh5zUdEfeYsJf5CcxYZELQPsp4Z5 le7Ws5wntFthlQHdf4mxmZN+i6BxFUSayBWkx10tXEmaEP+4AWCkccFX4Plfsl6fD+Yr t+fkrtdLSIw5xurTzprMTCtoQn04TYzFJCKuxvuBtRcPl5dWzkzJfAh1/5ez1IxqGOj9 f28t4YVT4FLx5kkDcKhj5O0RUFmUYr9aYja2T4G+5naT65ADISWGTHDDMKqPggEeWp7g 33Nw== X-Gm-Message-State: AO0yUKXyYhP5+N1/wyS7Qf1Ft7Lxnj7+0rmISa83mw7HSh9LFqfhHpn0 G4DTf7fPox1i/N2lM10bqTQ= X-Google-Smtp-Source: AK7set+11Iny2EdWmD9hXw83EgIIV1mL8orIaUR+ppxy5FtPa7r6ToSfgxtS+0dWKUJcZtFHIvc0pg== X-Received: by 2002:ac2:5197:0:b0:4b5:3e6e:382e with SMTP id u23-20020ac25197000000b004b53e6e382emr1459043lfi.4.1677667300743; Wed, 01 Mar 2023 02:41:40 -0800 (PST) Received: from localhost (88-115-161-74.elisa-laajakaista.fi. [88.115.161.74]) by smtp.gmail.com with ESMTPSA id h5-20020a05651211c500b004dc48d91061sm1680896lfr.304.2023.03.01.02.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 02:41:40 -0800 (PST) From: Zhi Wang X-Google-Original-From: Zhi Wang Date: Wed, 1 Mar 2023 12:41:38 +0200 To: Michael Roth Cc: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [PATCH RFC v8 50/56] KVM: SEV: Handle restricted memory invalidations for SNP Message-ID: <20230301124138.000004f9@intel.com> In-Reply-To: <20230220183847.59159-51-michael.roth@amd.com> References: <20230220183847.59159-1-michael.roth@amd.com> <20230220183847.59159-51-michael.roth@amd.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.33; x86_64-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 9CEA68000D X-Rspam-User: X-Stat-Signature: 3bibcoywokaruems193n14obs3164aro X-HE-Tag: 1677667302-746961 X-HE-Meta: U2FsdGVkX1/Af5Q6IMa0M1rpkLt/yXRrmxtEcXmeGj0ll3jtkDF9aCW1vTCt545bG841DuXXdT2JloeYawAofRLm4wQAtgA4qTJQnqPWa6y9uZf6fCZF8+lOCkEOCOBlZiVX7aliO6lCMeKWe1De7n0OdkukXBEQOsRFOcqxnnNwsliE6V7tKMESICt8w2YXPMzYEItuBafvqxZP2mBtRkVx+XvTFU7R8AjUZROeipW/qXEexiEdla6VyU7b04mrHG9246yOAbbnrtmhPaUaXXTQc0OzuZnvvzQJUCnGv1K3fo3oS4XbumVqDXZs7hxFgmnEfloFlhIveVlMOPDSqHch2l9RYUKiEydLrXIhHKYogBKU9z8MCI7yAiupfEAIITwLVss5BToNBefWksF5rzyFcgFdPKxTPT11avZs1LlCQgovpM3+dMy531zV8yB+fCPGQaJSlgzB+L5uLcosFNvdmotl/qhAL9uPS3p6b1ogO/NZRlH77t9OQC/KCxQUe+MkxyzrC/hD+VJMDusYQT/nAdE0uETO2+Qn5QEkhVcrT+k6Ccck2VvXhyuSuQbSnp3XudTdqdxeBbzAsfEbu6rxwqyttXVoibNnOz8rYR8EDYNf4LRojrYGLpG/bVu2utjna+zX8gTBB3pPNAJ4v8EzYEiAGw0vbDNrOcPfl1xtSXQPY9IckNGxe2l0hjuYUzEnL4zBL5nqZ79vCJ0ME7K0R9XeAas6tLiJpo4ipccERkwaBzc6zhITRmD46PYjhhrDcLrqr3JJGBrrVapxqfeO2wRdfA1fIj90Urizi8moX9TGII6Bab+i0K3isyI5Lnq3AtE4fLXSdhgRJbNR9IrVfUdmlxAbwRoM7Z+SX4UQXBkwugY9P04zDkyHbnIzwPPezsl9zOCB6L5dbq6Cf4qdp7gWhatttj+qpq/wlKURz8FzgVFBYf8+2x871hWvUFvHuIiLvz3erCzYHbe hhiJ3m9i TeSjNq4lFpG7Y+XiUy7sK2C/UrMhg+aSxZ1BpMy5gF7Rb4zPD5vCOPg3zNMQfbzqZ2Og2FFDkEjNfThBeP9PShZovvBQdQLV8sW4Asy6MWRWK1T48TevWdG1yKCLN18uOR0i0OeeLsJcUDSt7BHLi7qGIUXcgsFKspZmh0g+2Lli1mMKfFI6gSOVM1YfsIuQ8ygYmb6v3GmVVCrs49jyvgHTb8f3+4/5AGuYmqXyo5mN+ByYoj9zrQxlqg4N0y4u8gUjGFpTYEn1UvE3MNSS1HC8l2UkNbTJjkSzitQd5zLQxDuPDgp9hLInZACmmxjvsXK4Y12yqdsC+Q4gapDFCRu19U+wgZMHu/oKKA/7VN9uDEz4P+nQw7O1UKhDc1CyzmQLdcoIz80dRaXiTSSZ0N3m+n3LV+l8Mac/OGeUzkdBmEZRojWVRGAcRFA7pCtG54He6m96F76RS5BWhHpC3pfUsNA== 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: On Mon, 20 Feb 2023 12:38:41 -0600 Michael Roth wrote: > Implement a platform hook to do the work of restoring the direct map > entries and cleaning up RMP table entries for restricted memory that is > being freed back to the host. > > Signed-off-by: Michael Roth > --- > arch/x86/kvm/svm/sev.c | 62 ++++++++++++++++++++++++++++++++++++++++++ > arch/x86/kvm/svm/svm.c | 1 + > arch/x86/kvm/svm/svm.h | 1 + > 3 files changed, 64 insertions(+) > > diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c > index 7a74a92cb39a..bedec90d034f 100644 > --- a/arch/x86/kvm/svm/sev.c > +++ b/arch/x86/kvm/svm/sev.c > @@ -4509,3 +4509,65 @@ bool sev_fault_is_private(struct kvm *kvm, gpa_t gpa, u64 error_code, bool *priv > > return true; > } > + > +void sev_invalidate_private_range(struct kvm_memory_slot *slot, gfn_t start, gfn_t end) > +{ > + gfn_t gfn = start; > + > + if (!sev_snp_guest(slot->kvm)) > + return; > + > + if (!kvm_slot_can_be_private(slot)) { > + pr_warn_ratelimited("SEV: Memslot for GFN: 0x%llx is not private.\n", > + gfn); > + return; > + } > + This is a generic check for both SNP and TDX, it should be moved to kvm_restrictedmem_invalidate_begin(). > + while (gfn <= end) { > + gpa_t gpa = gfn_to_gpa(gfn); > + int level = PG_LEVEL_4K; > + int order, rc; > + kvm_pfn_t pfn; > + > + rc = kvm_restrictedmem_get_pfn(slot, gfn, &pfn, &order); > + if (rc) { > + pr_warn_ratelimited("SEV: Failed to retrieve restricted PFN for GFN 0x%llx, rc: %d\n", > + gfn, rc); > + gfn++; > + continue; > + } > + > + if (order) { > + int rmp_level; > + > + if (IS_ALIGNED(gpa, page_level_size(PG_LEVEL_2M)) && > + gpa + page_level_size(PG_LEVEL_2M) <= gfn_to_gpa(end)) > + level = PG_LEVEL_2M; > + else > + pr_debug("%s: GPA 0x%llx is not aligned to 2M, skipping 2M directmap restoration\n", > + __func__, gpa); > + > + /* > + * TODO: It may still be possible to restore 2M mapping here, > + * but keep it simple for now. > + */ > + if (level == PG_LEVEL_2M && > + (!snp_lookup_rmpentry(pfn, &rmp_level) || rmp_level == PG_LEVEL_4K)) { > + pr_debug("%s: PFN 0x%llx is not mapped as 2M private range, skipping 2M directmap restoration\n", > + __func__, pfn); > + level = PG_LEVEL_4K; > + } > + } > + > + pr_debug("%s: GPA %llx PFN %llx order %d level %d\n", > + __func__, gpa, pfn, order, level); > + rc = snp_make_page_shared(slot->kvm, gpa, pfn, level); > + if (rc) > + pr_err("SEV: Failed to restore page to shared, GPA: 0x%llx PFN: 0x%llx order: %d rc: %d\n", > + gpa, pfn, order, rc); > + > + gfn += page_level_size(level) >> PAGE_SHIFT; > + put_page(pfn_to_page(pfn)); > + cond_resched(); > + } > +} > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 18e4a6c17d11..3fe5f13b5f3a 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -4862,6 +4862,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { > .adjust_mapping_level = sev_adjust_mapping_level, > .update_mem_attr = sev_update_mem_attr, > .fault_is_private = sev_fault_is_private, > + .invalidate_restricted_mem = sev_invalidate_private_range, > }; > > /* > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 97038afa8020..857b674e68f0 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -727,6 +727,7 @@ void handle_rmp_page_fault(struct kvm_vcpu *vcpu, gpa_t gpa, u64 error_code); > void sev_snp_init_protected_guest_state(struct kvm_vcpu *vcpu); > int sev_update_mem_attr(struct kvm_memory_slot *slot, unsigned int attr, > gfn_t start, gfn_t end); > +void sev_invalidate_private_range(struct kvm_memory_slot *slot, gfn_t start, gfn_t end); > > bool sev_fault_is_private(struct kvm *kvm, gpa_t gpa, u64 error_code, bool *private_fault); >