From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f97.google.com (mail-vs1-f97.google.com [209.85.217.97]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E62623E411D for ; Tue, 29 Sep 2026 04:03:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790654612; cv=none; b=I6qy84kr7QNFmY0B/bCAT4oqqM+Cmqa7TpHmcfTL/Qk2+VXzFjGhMpFTPt2EYhlOn6guO/rdX8UAAR1N4/f8PPczzTa18DNPt6JQ902iM/iFoR4o2F76j2qs/XylsVZ8WemknHqyTku9zNrKIe5EMtmKFcSunPG2moIkOuI0dHo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790654612; c=relaxed/simple; bh=hX3+I2l4g4gGBI7+Ch5YSUvuVd6yStdKXgzA8mhRgZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oAwAF0JCvr4ferEx8yQkzsd2nwB46CY1iznQM4m/odDJMkvhk0rwT2kMl9GZ5sZz20qrELnbvQ3gkwnbKVX17uJZPLGpCET0jfeKVAXV5t/Lc0FFE82Zjp+ePtOpk5nst2bf4/x5D98spMZBx3ekLC/Gpv2BV5YZzOJngBfXwec= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=GNycfjyX; arc=none smtp.client-ip=209.85.217.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="GNycfjyX" Received: by mail-vs1-f97.google.com with SMTP id ada2fe7eead31-792c4084f91so79926137.3 for ; Mon, 28 Sep 2026 21:03:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790654609; x=1791259409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=VLpMQWp4oIwCSrdCkDjUFbSbG4amFgJT1I1bhegO2zs=; b=dbOmiB6pCHiIkMculzxQ8XWzpWCMyZLq01FGW3q/zoRhLfLmrANlem8c3H0QnVa5Js 2st2H74Cai2ofyTbKPw/mxZycWBWdofK2p8ffMGp2dKCXitSygk999HkECJ+UCZI3NRO doYnVJ3qfivmwPUEp8ObghSQYlirfhqtiiPmpFFL8HKfKmZ+qGOBxXwUQ8swoKSZjWCC 3lzf7on4sFUCQF/RiGK5dh+jwvQ3/bPdOl/920cHjt6+aeIUBDpD1uoNsYh5qQj5S1k5 3CwFdXUlNryGXOogCwuriizuD4TA6CQJb5nhdnbYKVY4iYeOd83x6D6ZiK1Ub6y8I75L Lz3A== X-Forwarded-Encrypted: i=1; AKwUvBwCV5gUlRRjs04ycqMsgpXjW+8TRUFb8H/pcXsP0ZnJpONJ6pZi+mOx2vRCQf0uVqVWpS8=@vger.kernel.org X-Gm-Message-State: AFq9FYKYaMAKDzvVqqcBDinJrf9sszrLusHp8JI6GmqnjOJTuzbXepfO 9e3NWaP1bNePXDFQzKZhlCFC2/28UlHGHkbtczsHaHylUeFGrmQraEwksPan5OjINgBXWrHezns iV5gGq2O6zuGR1T4//NEa5F6u7KQH+WwHHvPI1Iv+6R0SqbY3Gci3j7nbLPohzzsn5/OI0bRMd5 D4K0eIdU5YzOd1Zz0/EjINxHWQ7iATgdpyOwnfgxfXdgemhoGDZ7LnMyqWcxfUbmLzGMzDPJwza Rm1 X-Gm-Gg: AYBFou3jGFvcTw2TshEUe4Bmkv4yW0dJY8f+3GWxzPoFQkdJrpLq9hkDGo9t1YUKulg R+2CqI40Lo3v88/6AWybJ/HKnbZzu/hb6+oj5x1+6I4kjczWLY5MFpHabXCJ+KBw5fVRmx7q+x4 umxD4/kbNWhvbVTVND9KUJt4ehTue1Xsw3uY67B/eIbNV0dWJ255e7SXdfXEnJnxUQNV2yRbZGW qKLLsY/kDQoUNGq6c2ykJ7B9EOPjj4h0QmZgYydLwJaZH5BjldoRvTffaIV/iGyjy2OxzMdgiId D4PMqm/frmcn7tLFOwrYucFPnHXkby2Fs5frQy3EqPA1fz3qx/a+/NcTRVeFMt2ZVNvz4BBq+iB eJ5M0DsmlxbSCafsMHARt6dM/5TYC4ah7VO49ZUOB7r66bzi374CD4ShbFMs0xfOnE6q6IjUjLv 2zBdjn1AslMvY3ftExbCeMDdsRmb19yqHR X-Received: by 2002:a05:6102:1488:b0:7b4:879c:bb87 with SMTP id ada2fe7eead31-7b4879cc10fmr1715450137.14.1790654608514; Mon, 28 Sep 2026 21:03:28 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-18.dlp.protect.broadcom.com. [144.49.247.18]) by smtp-relay.gmail.com with ESMTPS id a1e0cc1a2514c-986ec4f681csm787215241.2.2026.09.28.21.03.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Sep 2026 21:03:28 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-dy1-f199.google.com with SMTP id 5a478bee46e88-342a0e1d8c4so1487922eec.1 for ; Mon, 28 Sep 2026 21:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1790654607; x=1791259407; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=VLpMQWp4oIwCSrdCkDjUFbSbG4amFgJT1I1bhegO2zs=; b=GNycfjyX60B4qt8x1fTozl+FCUsevGhLVbo2y/juTVF/PU+S5sssLGKtDYXbjBgOAo B5Xi0buSNdNtAnLYGbg4A59h3LycMyXekLKSufCH6V/DUOVDUXecBRuEGMWX7DkejJ4Z CQKPBvcKrZTzMGcIW316bj94e2snf5qPm8CXc= X-Forwarded-Encrypted: i=1; AKwUvBzXknCZAmknKzxN16oLHdYSmjIvueORA34A7ynpVR4U4A8xpe5iC5xumvqQPamd14Nxf6o=@vger.kernel.org X-Received: by 2002:a05:7301:152a:b0:339:7c91:21f4 with SMTP id 5a478bee46e88-34273252770mr13517036eec.34.1790654607150; Mon, 28 Sep 2026 21:03:27 -0700 (PDT) X-Received: by 2002:a05:7301:152a:b0:339:7c91:21f4 with SMTP id 5a478bee46e88-34273252770mr13516961eec.34.1790654606151; Mon, 28 Sep 2026 21:03:26 -0700 (PDT) Received: from vertex.localdomain ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-347323f5a7esm10952571eec.15.2026.09.28.21.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 21:03:24 -0700 (PDT) From: Zack Rusin To: Kiryl Shutsemau , Borislav Petkov , x86@kernel.org, Dennis Zhou , Tejun Heo , Arnd Bergmann , Rick Edgecombe , Tom Lendacky , Wei Liu , Dexuan Cui , Paolo Bonzini , Vitaly Kuznetsov Cc: Ajay Kaher , Alexey Makhalov , Thomas Gleixner , Ingo Molnar , Dave Hansen , "H. Peter Anvin" , virtualization@lists.linux.dev, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, Christoph Lameter , Andrew Morton , Bo Gan , linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, Jonathan Corbet , "K. Y. Srinivasan" , Haiyang Zhang , Long Li , Andy Lutomirski , Peter Zijlstra , linux-doc@vger.kernel.org, linux-hyperv@vger.kernel.org, Nathan Chancellor , Kees Cook , Ashish Kalra Subject: [PATCH v2 4/6] x86/mm: Provide common early memory decryption Date: Tue, 29 Sep 2026 00:02:53 -0400 Message-ID: <20260929040256.543767-5-zack.rusin@broadcom.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260929040256.543767-1-zack.rusin@broadcom.com> References: <20260929040256.543767-1-zack.rusin@broadcom.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Static per-CPU buffers must be shared before the page allocator is ready. Provide a page conversion callback with common early page-table splitting, including the kernel-image alias used by UP data. Flush large translations before changing attributes and retain the AMD content and SNP transitions. Drop UP image aliases before SNP kexec makes the backing pages private. Suggested-by: Kiryl Shutsemau Link: https://lore.kernel.org/r/aqqGUAX65s4LdJkr@thinkstation Signed-off-by: Zack Rusin --- arch/x86/coco/sev/core.c | 16 +++++ arch/x86/include/asm/mem_encrypt.h | 7 ++- arch/x86/include/asm/x86_init.h | 2 + arch/x86/mm/mem_encrypt.c | 117 +++++++++++++++++++++++++++++++++++++ arch/x86/mm/mem_encrypt_amd.c | 12 +++- 5 files changed, 149 insertions(+), 5 deletions(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index cc292d7c6fd1..bc1afa366c33 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -541,6 +541,10 @@ static void set_pte_enc(pte_t *kpte, int level, void *va) set_pte_enc_mask(kpte, d.pfn, d.new_pgprot); } +#ifndef CONFIG_SMP +extern char __start_percpu_decrypted[], __end_percpu_decrypted[]; +#endif + static void unshare_all_memory(void) { unsigned long addr, end, size, ghcb; @@ -550,6 +554,18 @@ static void unshare_all_memory(void) pte_t *pte; int cpu; +#ifndef CONFIG_SMP + /* Drop image aliases before the direct-map walk makes pages private. */ + addr = (unsigned long)__start_percpu_decrypted; + end = (unsigned long)__end_percpu_decrypted; + for (; addr < end; addr += PAGE_SIZE) { + pte = lookup_address(addr, &level); + if (pte && pte_decrypted(*pte)) + set_pte(pte, __pte(0)); + } + __flush_tlb_all(); +#endif + /* Unshare the direct mapping. */ addr = PAGE_OFFSET; end = PAGE_OFFSET + get_max_mapped(); diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h index ea6494628cb0..4d81f693b1d3 100644 --- a/arch/x86/include/asm/mem_encrypt.h +++ b/arch/x86/include/asm/mem_encrypt.h @@ -21,9 +21,13 @@ struct boot_params; #ifdef CONFIG_X86_MEM_ENCRYPT void __init mem_encrypt_init(void); void __init mem_encrypt_setup_arch(void); +int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size); +void __init early_set_page_decrypted(unsigned long addr, unsigned long alias); #else static inline void mem_encrypt_init(void) { } static inline void __init mem_encrypt_setup_arch(void) { } +static inline int __init +early_set_memory_decrypted(unsigned long vaddr, unsigned long size) { return 0; } #endif #ifdef CONFIG_AMD_MEM_ENCRYPT @@ -50,7 +54,6 @@ void __init sme_early_init(void); void sme_encrypt_kernel(struct boot_params *bp); void 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, unsigned long size, bool enc); @@ -86,8 +89,6 @@ static inline void sme_enable(struct boot_params *bp) { } static inline void sev_es_init_vc_handling(void) { } -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 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 953d3199408a..e4131402c783 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -75,9 +75,11 @@ struct x86_init_oem { * the kernel pagetables and prepare accessors functions. * Callback must call paging_init(). Called once after the * direct mapping for phys memory is available. + * @early_decrypt_page: Share a direct-mapped page and its optional image alias */ struct x86_init_paging { void (*pagetable_init)(void); + int (*early_decrypt_page)(unsigned long addr, unsigned long alias); }; /** diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c index 3aefdef5bcb0..c3e239a47b66 100644 --- a/arch/x86/mm/mem_encrypt.c +++ b/arch/x86/mm/mem_encrypt.c @@ -12,10 +12,127 @@ #include #include #include +#include #include #include +#include +#include #include +#include +#include + +#include "mm_internal.h" + +static pte_t * __init early_lookup_pte(unsigned long addr) +{ + unsigned long pfn, step; + unsigned int level, i; + pgprot_t prot; + pte_t *pte, *table; + + for (;;) { + pte = lookup_address(addr, &level); + if (!pte || !pte_present(*pte)) + return NULL; + if (level == PG_LEVEL_4K) + return pte; + + if (level == PG_LEVEL_2M) { + pfn = pmd_pfn(*(pmd_t *)pte); + prot = pgprot_large_2_4k(pmd_pgprot(*(pmd_t *)pte)); + step = 1; + } else if (level == PG_LEVEL_1G) { + pfn = pud_pfn(*(pud_t *)pte); + prot = pud_pgprot(*(pud_t *)pte); + step = PMD_SIZE >> PAGE_SHIFT; + } else { + return NULL; + } + + table = alloc_low_page(); + if (!table) + return NULL; + for (i = 0; i < PTRS_PER_PTE; i++, pfn += step) + set_pte(&table[i], pfn_pte(pfn, prot)); + + if (level == PG_LEVEL_2M) + pmd_populate_kernel(&init_mm, (pmd_t *)pte, table); + else + pud_populate(&init_mm, (pud_t *)pte, (pmd_t *)table); + + if (addr - PAGE_OFFSET < get_max_mapped()) { + update_page_count(level, -1); + update_page_count(level - 1, PTRS_PER_PTE); + } + + /* Flush the large translation before changing any attributes. */ + __flush_tlb_all(); + } +} + +/* The caller has split both mappings before starting the page transition. */ +void __init early_set_page_decrypted(unsigned long addr, unsigned long alias) +{ + unsigned int level; + pte_t *pte; + + pte = lookup_address(addr, &level); + set_pte(pte, __pte(cc_mkdec(pte_val(*pte)))); + if (alias) { + pte = lookup_address(alias, &level); + set_pte(pte, __pte(cc_mkdec(pte_val(*pte)))); + } + __flush_tlb_all(); +} + +/* Boot CPU only; size is in bytes and the contents are preserved. */ +int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size) +{ + unsigned long end, addr, alias, pa; + pte_t *pte; + int ret; + + if (!size || !cc_platform_has(CC_ATTR_MEM_ENCRYPT)) + return 0; + if (!x86_init.paging.early_decrypt_page) + return -EOPNOTSUPP; + if (size > ULONG_MAX - vaddr) + return -EINVAL; + end = PAGE_ALIGN(vaddr + size); + if (end < vaddr) + return -EINVAL; + + for (vaddr &= PAGE_MASK; vaddr < end; vaddr += PAGE_SIZE) { + if (vaddr - PAGE_OFFSET >= get_max_mapped() && + (vaddr < (unsigned long)_text || vaddr >= _brk_end)) + return -EINVAL; + + pa = __pa(vaddr); + addr = (unsigned long)__va(pa); + pte = early_lookup_pte(addr); + if (!pte || pte_pfn(*pte) != PHYS_PFN(pa)) + return -EFAULT; + + alias = 0; + if (pa >= __pa_symbol(_text) && + pa <= __pa_symbol(roundup(_brk_end, PMD_SIZE) - 1)) { + alias = (unsigned long)_text + pa - __pa_symbol(_text); + if (!early_lookup_pte(alias)) + return -EFAULT; + } + + if (pte_decrypted(*pte)) { + early_set_page_decrypted(addr, alias); + continue; + } + ret = x86_init.paging.early_decrypt_page(addr, alias); + if (ret) + return ret; + } + + return 0; +} /* Override for DMA direct allocation check - ARCH_HAS_FORCE_DMA_UNENCRYPTED */ bool force_dma_unencrypted(struct device *dev) diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index 2f8c32173972..e854f3a039f7 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -459,9 +459,15 @@ static int __init early_set_memory_enc_dec(unsigned long vaddr, return ret; } -int __init early_set_memory_decrypted(unsigned long vaddr, unsigned long size) +static int __init amd_early_decrypt_page(unsigned long addr, unsigned long alias) { - return early_set_memory_enc_dec(vaddr, size, false); + unsigned int level; + pte_t *pte = lookup_address(addr, &level); + + __set_clr_pte_enc(pte, PG_LEVEL_4K, false); + early_set_page_decrypted(addr, alias); + early_set_mem_enc_dec_hypercall(addr, PAGE_SIZE, false); + return 0; } int __init early_set_memory_encrypted(unsigned long vaddr, unsigned long size) @@ -479,6 +485,8 @@ void __init sme_early_init(void) if (!sme_me_mask) return; + x86_init.paging.early_decrypt_page = amd_early_decrypt_page; + early_pmd_flags = __sme_set(early_pmd_flags); __supported_pte_mask = __sme_set(__supported_pte_mask); -- 2.53.0