From nobody Tue Dec 16 22:00:07 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D95A3C61D85 for ; Tue, 21 Nov 2023 21:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234565AbjKUVUx (ORCPT ); Tue, 21 Nov 2023 16:20:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234476AbjKUVUm (ORCPT ); Tue, 21 Nov 2023 16:20:42 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82031D49; Tue, 21 Nov 2023 13:20:38 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1ce627400f6so32487445ad.2; Tue, 21 Nov 2023 13:20:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700601638; x=1701206438; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nt8kvnxFSl+/wVVyFPR7xfVyeuKxVIIu+IJHgsCJP0Y=; b=MfXJdKyXJa5M7bputpsRPNkIe1r+rndMz1t7OTc6VLKPUYSPVi+5oGvVFMHse6DR8T QKwzY2PgVz1zUSealwSmKO4duMlDKnV0F+uy3BvtSC+iE9wF/yarFrLfgczby/Cu+7Np Qhczqgr+UbhaBGLc6erKZYc47eyJX6LJz043nwcpCGnOUJ5a09hgWwhGnctHAj13CWEk vGueONsZLHYm4wcTggbwuT39o2xYJarQdu8n9Ki1gg4IS41TOesQc5JN7tv1m4RgblpO sg/rAdGdYmw1LU3cahjA1oxHv3jnlYThMxN93UBT3eHKqFguqiV3B8pYi10yPtj6XPwY rXmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700601638; x=1701206438; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Nt8kvnxFSl+/wVVyFPR7xfVyeuKxVIIu+IJHgsCJP0Y=; b=B2twDUZ2pxfKrRSpusDkE65FnUsj7CV5u4ayboK5hnCYK9tDiml5UT8NAtEPqkM5ZI c01T0JGrnDfCyR/SsrJUd5Y+nSFvqI/b9l7PMin/E4BUNPo30cJPTdigxRTp7TgieNDO UwnM5XRcyXmG88lbUPDQ8dY02caGgGLA4T3+G3XyUcnP7kioNj1S6c/JvOLNoOkYijbl +Ff5PEzKPhA5n7jKbP5Hs6cQzy8IOie9u3KWqMJ/UW0dyqCf27BC1rP0n25pmci01HSM XEfgL/0tqFr86OfCJAxaVRGYKgPnp22AQwycvwW9xFOibk9Ne1qKlhb4yAu8JxLj+x6U ts2g== X-Gm-Message-State: AOJu0YzwrDZ2EQAL4zZgqEO0Ff5N3SOhCOb3uxCxKPW0sbkVuelnmBe9 /llUBna1nCRARowey1tPcYU= X-Google-Smtp-Source: AGHT+IEPwy5ASKSSy89dfpOvuqw7AqdqnJir15Ua8HeuGGJBuSGULdcSSfuzaTCr2on+/k5ZZyh5Vg== X-Received: by 2002:a17:902:f687:b0:1cc:3bfc:69b1 with SMTP id l7-20020a170902f68700b001cc3bfc69b1mr443828plg.24.1700601637908; Tue, 21 Nov 2023 13:20:37 -0800 (PST) Received: from localhost.localdomain (c-73-254-87-52.hsd1.wa.comcast.net. [73.254.87.52]) by smtp.gmail.com with ESMTPSA id j2-20020a170902758200b001bf52834696sm8281924pll.207.2023.11.21.13.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 13:20:37 -0800 (PST) From: mhkelley58@gmail.com X-Google-Original-From: mhklinux@outlook.com To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kirill.shutemov@linux.intel.com, kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, luto@kernel.org, peterz@infradead.org, akpm@linux-foundation.org, urezki@gmail.com, hch@infradead.org, lstoakes@gmail.com, thomas.lendacky@amd.com, ardb@kernel.org, jroedel@suse.de, seanjc@google.com, rick.p.edgecombe@intel.com, sathyanarayanan.kuppuswamy@linux.intel.com, linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, linux-hyperv@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 4/8] x86/sev: Enable PVALIDATE for PFNs without a valid virtual address Date: Tue, 21 Nov 2023 13:20:12 -0800 Message-Id: <20231121212016.1154303-5-mhklinux@outlook.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231121212016.1154303-1-mhklinux@outlook.com> References: <20231121212016.1154303-1-mhklinux@outlook.com> Reply-To: mhklinux@outlook.com MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Michael Kelley For SEV-SNP, the PVALIDATE instruction requires a valid virtual address that it translates to the PFN that it operates on. Per the spec, it translates the virtual address as if it were doing a single byte read. In transitioning a page between encrypted and decrypted, the direct map virtual address of the page may be temporarily marked invalid (i.e., PRESENT is cleared in the PTE) to prevent interference from load_unaligned_zeropad(). In such a case, the PVALIDATE that is required for the encrypted<->decrypted transition fails due to an invalid virtual address. Fix this by providing a temporary virtual address that is mapped to the target PFN just before executing PVALIDATE. Have PVALIDATE use this temp virtual address instead of the direct map virtual address. Unmap the temp virtual address after PVALIDATE completes. The temp virtual address must be aligned on a 2 Mbyte boundary to meet PVALIDATE requirements for operating on 2 Meg large pages, though the temp mapping need only be a 4K mapping. Also, the temp virtual address must be preceded by a 4K invalid page so it can't be accessed by load_unaligned_zeropad(). This mechanism is used only for pages transitioning between encrypted and decrypted. When PVALIDATE is done for initial page acceptance, a temp virtual address is not provided, and PVALIDATE uses the direct map virtual address. Signed-off-by: Michael Kelley --- arch/x86/boot/compressed/sev.c | 2 +- arch/x86/kernel/sev-shared.c | 57 +++++++++++++++++++++++++++------- arch/x86/kernel/sev.c | 32 ++++++++++++------- 3 files changed, 67 insertions(+), 24 deletions(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 454acd7a2daf..4d4a3fc0b725 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -224,7 +224,7 @@ static phys_addr_t __snp_accept_memory(struct snp_psc_d= esc *desc, if (vmgexit_psc(boot_ghcb, desc)) sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PSC); =20 - pvalidate_pages(desc); + pvalidate_pages(desc, 0); =20 return pa; } diff --git a/arch/x86/kernel/sev-shared.c b/arch/x86/kernel/sev-shared.c index ccb0915e84e1..fc45fdcf3892 100644 --- a/arch/x86/kernel/sev-shared.c +++ b/arch/x86/kernel/sev-shared.c @@ -1071,35 +1071,70 @@ static void __init setup_cpuid_table(const struct c= c_blob_sev_info *cc_info) } } =20 -static void pvalidate_pages(struct snp_psc_desc *desc) +#ifdef __BOOT_COMPRESSED +static int pvalidate_pfn(unsigned long vaddr, unsigned int size, + unsigned long pfn, bool validate, int *rc2) +{ + return 0; +} +#else +static int pvalidate_pfn(unsigned long vaddr, unsigned int size, + unsigned long pfn, bool validate, int *rc2) +{ + int rc; + struct page *page =3D pfn_to_page(pfn); + + *rc2 =3D vmap_pages_range(vaddr, vaddr + PAGE_SIZE, + PAGE_KERNEL, &page, PAGE_SHIFT); + rc =3D pvalidate(vaddr, size, validate); + vunmap_range(vaddr, vaddr + PAGE_SIZE); + + return rc; +} +#endif + +static void pvalidate_pages(struct snp_psc_desc *desc, unsigned long vaddr) { struct psc_entry *e; - unsigned long vaddr; + unsigned long pfn; unsigned int size; unsigned int i; bool validate; - int rc; + int rc, rc2 =3D 0; =20 for (i =3D 0; i <=3D desc->hdr.end_entry; i++) { e =3D &desc->entries[i]; =20 - vaddr =3D (unsigned long)pfn_to_kaddr(e->gfn); - size =3D e->pagesize ? RMP_PG_SIZE_2M : RMP_PG_SIZE_4K; + size =3D e->pagesize; validate =3D e->operation =3D=3D SNP_PAGE_STATE_PRIVATE; + pfn =3D e->gfn; =20 - rc =3D pvalidate(vaddr, size, validate); - if (rc =3D=3D PVALIDATE_FAIL_SIZEMISMATCH && size =3D=3D RMP_PG_SIZE_2M)= { - unsigned long vaddr_end =3D vaddr + PMD_SIZE; + if (vaddr) { + rc =3D pvalidate_pfn(vaddr, size, pfn, validate, &rc2); + } else { + vaddr =3D (unsigned long)pfn_to_kaddr(pfn); + rc =3D pvalidate(vaddr, size, validate); + } =20 - for (; vaddr < vaddr_end; vaddr +=3D PAGE_SIZE) { - rc =3D pvalidate(vaddr, RMP_PG_SIZE_4K, validate); + if (rc =3D=3D PVALIDATE_FAIL_SIZEMISMATCH && size =3D=3D RMP_PG_SIZE_2M)= { + unsigned long last_pfn =3D pfn + PTRS_PER_PMD - 1; + + for (; pfn <=3D last_pfn; pfn++) { + if (vaddr) { + rc =3D pvalidate_pfn(vaddr, RMP_PG_SIZE_4K, + pfn, validate, &rc2); + } else { + vaddr =3D (unsigned long)pfn_to_kaddr(pfn); + rc =3D pvalidate(vaddr, RMP_PG_SIZE_4K, validate); + } if (rc) break; } } =20 if (rc) { - WARN(1, "Failed to validate address 0x%lx ret %d", vaddr, rc); + WARN(1, "Failed to validate address 0x%lx ret %d ret2 %d", + vaddr, rc, rc2); sev_es_terminate(SEV_TERM_SET_LINUX, GHCB_TERM_PVALIDATE); } } diff --git a/arch/x86/kernel/sev.c b/arch/x86/kernel/sev.c index 7eac92c07a58..08b2e2a0d67d 100644 --- a/arch/x86/kernel/sev.c +++ b/arch/x86/kernel/sev.c @@ -790,7 +790,7 @@ void __init snp_prep_memory(unsigned long paddr, unsign= ed int sz, enum psc_op op } =20 static unsigned long __set_pages_state(struct snp_psc_desc *data, unsigned= long vaddr, - unsigned long vaddr_end, int op) + unsigned long vaddr_end, int op, unsigned long temp_vaddr) { struct ghcb_state state; bool use_large_entry; @@ -842,7 +842,7 @@ static unsigned long __set_pages_state(struct snp_psc_d= esc *data, unsigned long =20 /* Page validation must be rescinded before changing to shared */ if (op =3D=3D SNP_PAGE_STATE_SHARED) - pvalidate_pages(data); + pvalidate_pages(data, temp_vaddr); =20 local_irq_save(flags); =20 @@ -862,12 +862,13 @@ static unsigned long __set_pages_state(struct snp_psc= _desc *data, unsigned long =20 /* Page validation must be performed after changing to private */ if (op =3D=3D SNP_PAGE_STATE_PRIVATE) - pvalidate_pages(data); + pvalidate_pages(data, temp_vaddr); =20 return vaddr; } =20 -static void set_pages_state(unsigned long vaddr, unsigned long npages, int= op) +static void set_pages_state(unsigned long vaddr, unsigned long npages, + int op, unsigned long temp_vaddr) { struct snp_psc_desc desc; unsigned long vaddr_end; @@ -880,23 +881,30 @@ static void set_pages_state(unsigned long vaddr, unsi= gned long npages, int op) vaddr_end =3D vaddr + (npages << PAGE_SHIFT); =20 while (vaddr < vaddr_end) - vaddr =3D __set_pages_state(&desc, vaddr, vaddr_end, op); + vaddr =3D __set_pages_state(&desc, vaddr, vaddr_end, + op, temp_vaddr); } =20 void snp_set_memory_shared(unsigned long vaddr, unsigned long npages) { - if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) - return; + struct vm_struct *area; + unsigned long temp_vaddr; =20 - set_pages_state(vaddr, npages, SNP_PAGE_STATE_SHARED); + area =3D get_vm_area(PAGE_SIZE * (PTRS_PER_PMD + 1), 0); + temp_vaddr =3D ALIGN((unsigned long)(area->addr + PAGE_SIZE), PMD_SIZE); + set_pages_state(vaddr, npages, SNP_PAGE_STATE_SHARED, temp_vaddr); + free_vm_area(area); } =20 void snp_set_memory_private(unsigned long vaddr, unsigned long npages) { - if (!cc_platform_has(CC_ATTR_GUEST_SEV_SNP)) - return; + struct vm_struct *area; + unsigned long temp_vaddr; =20 - set_pages_state(vaddr, npages, SNP_PAGE_STATE_PRIVATE); + area =3D get_vm_area(PAGE_SIZE * (PTRS_PER_PMD + 1), 0); + temp_vaddr =3D ALIGN((unsigned long)(area->addr + PAGE_SIZE), PMD_SIZE); + set_pages_state(vaddr, npages, SNP_PAGE_STATE_PRIVATE, temp_vaddr); + free_vm_area(area); } =20 void snp_accept_memory(phys_addr_t start, phys_addr_t end) @@ -909,7 +917,7 @@ void snp_accept_memory(phys_addr_t start, phys_addr_t e= nd) vaddr =3D (unsigned long)__va(start); npages =3D (end - start) >> PAGE_SHIFT; =20 - set_pages_state(vaddr, npages, SNP_PAGE_STATE_PRIVATE); + set_pages_state(vaddr, npages, SNP_PAGE_STATE_PRIVATE, 0); } =20 static int snp_set_vmsa(void *va, bool vmsa) --=20 2.25.1