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 0640DC7114A for ; Fri, 13 Jun 2025 20:11:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9245E6B0092; Fri, 13 Jun 2025 16:11:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FB6A6B0093; Fri, 13 Jun 2025 16:11:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 811816B0095; Fri, 13 Jun 2025 16:11:06 -0400 (EDT) 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 5CEDB6B0092 for ; Fri, 13 Jun 2025 16:11:06 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E53BE1006E3 for ; Fri, 13 Jun 2025 20:11:05 +0000 (UTC) X-FDA: 83551471290.02.A3E0711 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by imf29.hostedemail.com (Postfix) with ESMTP id C3DF712000E for ; Fri, 13 Jun 2025 20:11:03 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=neon.tech header.s=google header.b=m07jB46k; spf=pass (imf29.hostedemail.com: domain of sharnoff@neon.tech designates 209.85.218.48 as permitted sender) smtp.mailfrom=sharnoff@neon.tech; dmarc=pass (policy=reject) header.from=neon.tech ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749845463; 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=l3rzndryGKj8FfYnmFJ89LSS6fcKwQtrFfmMlORfHhY=; b=q9isi8WeFeGSxjz5Vyc8IAIs51hhq6a6tEvRiDBoMym92RqeK+b57qG6Ym1xZ0Iujl+v+C qucVcbzTZqUFf7dOL4zNrloSLfwyWro+P2l8QeECAsYxcpN7V9R8c/XLfaRGwQG8havwZ2 vbpvpE5b0m/OtBUxdBbCsNMEWzbyb+A= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=neon.tech header.s=google header.b=m07jB46k; spf=pass (imf29.hostedemail.com: domain of sharnoff@neon.tech designates 209.85.218.48 as permitted sender) smtp.mailfrom=sharnoff@neon.tech; dmarc=pass (policy=reject) header.from=neon.tech ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749845463; a=rsa-sha256; cv=none; b=hj+Kv3WrYzzP7NnhYo4ZWY6oIQho5e/N0BCtzr9PuS2jsaLWGNHgGcQHSXbz4GCs0GoE6G VLxf+LJmz7GD1MN9fp0aqe/joV/ILSfRld/3aMKz7BjK4m3ddoBL5Zi+JkeEkGPrAg+9zr 1INFL8zMlqFvF2sN0ahcKkY6FdeV7Wc= Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-ade4679fba7so452456766b.2 for ; Fri, 13 Jun 2025 13:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=neon.tech; s=google; t=1749845462; x=1750450262; darn=kvack.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=l3rzndryGKj8FfYnmFJ89LSS6fcKwQtrFfmMlORfHhY=; b=m07jB46k1f/oqj3UvzlnQeCG+k48q8AmbUpmpEjnQB+UoNuFxjR+AsnCCvjw6q6Jp7 wIrvxmbTzOKk7YwBKmtFBFAg/hzy8e1TJIWZhNxSC9hERwa0y6Yw4wNX9sODs+2OK5NQ d8jGtWUZpKqU2Gd0wBVsbwBKpoa7kxQferTsA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749845462; x=1750450262; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l3rzndryGKj8FfYnmFJ89LSS6fcKwQtrFfmMlORfHhY=; b=ImTA9/gNHDDssBfXZLBMy2E/hvDX27C1eZ++CfAsEiHkhQYjwNH+dAO6FALwbGsHm/ PAJ63qpCFWs5mLaogOQSwQ99upl9VNpZt0CQilMnj2kBs+mAgbGKNTqb1fUDm3CJGjg7 YeT6a9Km4be5I5UoJXRgSxBi0QGjo7vyvzLmyDzJIKwFBywbae0a2Flo7GOy6upVDdpU hm6g+BV4zzfAfx3fiynaGemx1YBdRDeZ4RP+bvhTR9oCVvFkUfWIprWks7jkcsh48YHD ILTuvLdDafJv45xmz66d7IpIFe/x8cCkuIFfxgXF1zHrhD5XD89hedq2UaknlSIY2qfc mU7g== X-Forwarded-Encrypted: i=1; AJvYcCU/40zs9SF3wXhUmo7isKp/r/Xum+GN3wFf820lHM0M6VETzME+8TZHrLkylUdzAZKjwcP0UrNZgQ==@kvack.org X-Gm-Message-State: AOJu0Yzi+AosgDp7q//8f2Kh0a5K3RUzsTvfjTRSmkYUAM1nHwfGsXBs xQlJ3mlvjb+zB0hqIyzssCLJPZwKQCzgV8i7c4p6pmG56bkREX132stoKnH7XbKiGyc= X-Gm-Gg: ASbGnctA4L0d2jxbxSl0I+FLoWwgL6vRksu2yTfey/+ibApkY/h9Hwrmdsm1Eiw+9il PRtsKUtwhAiXPvb/7gQCFuVpJUsPpRvYurY8Y8lyFCcu6PHEV8pimLtr5OYRHESByoplhDyA6xM qmAvt2fjhMusVacsI5E2alqVBMLKq5zUCG1OeQaTm5X++RZ3pMsIytKyKjN2yhlW6ioDvbgJy7M 79U9G7BzF6/8S1duBWprVmdLtxUk2FSQlhbI1WG+9h2GtiuemKDIDs8xW/AQdQ5zZ/n7wvTnBBR qIMs5leXQEeqRIZXRoG1BOff/6xgwRLcT9z91PrpDEkeWs05j7DQwbQaRLqdRBvC9Q== X-Google-Smtp-Source: AGHT+IHEmyRU5vN+dhA+MrNmjXjScKNcFhj4rTx+ZBf6G3WYchF0YtJ7ycBplglcHfOlSP7d5PWLzQ== X-Received: by 2002:a17:907:1b18:b0:ad2:2fe3:7074 with SMTP id a640c23a62f3a-adfad39c00amr46953066b.14.1749845461793; Fri, 13 Jun 2025 13:11:01 -0700 (PDT) Received: from [192.168.86.142] ([84.65.228.220]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-adfad4505a7sm22175266b.51.2025.06.13.13.11.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Jun 2025 13:11:01 -0700 (PDT) Message-ID: <11b78ad4-9fdf-462c-90e5-469f06064376@neon.tech> Date: Fri, 13 Jun 2025 21:11:00 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH v4 2/4] x86/mm: Allow error returns from phys_*_init() From: Em Sharnoff To: linux-kernel@vger.kernel.org, x86@kernel.org, linux-mm@kvack.org Cc: Ingo Molnar , "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Thomas Gleixner , Borislav Petkov , "Edgecombe, Rick P" , Oleg Vasilev , Arthur Petukhovsky , Stefan Radig , Misha Sakhnov References: <7d0d307d-71eb-4913-8023-bccc7a8a4a3d@neon.tech> Content-Language: en-US In-Reply-To: <7d0d307d-71eb-4913-8023-bccc7a8a4a3d@neon.tech> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: C3DF712000E X-Rspamd-Server: rspam07 X-Stat-Signature: nerzuagtkbxwaqymiy3w8gcycw7cehcx X-Rspam-User: X-HE-Tag: 1749845463-720771 X-HE-Meta: U2FsdGVkX18LyuBwpXgKcqubNY2yHigPOnXpX3SuCc9dK8df4CR7RHEfOctkbbyrlG/6kgCk2D94zykZOg9TAbtBMo4kcCrlJuqpZw0FqM4JoevA11ptdE6NZT/e3zv88Oty8bPaPhfjsrrSVYZszjMkOccbzmdSDxHfYyKKBy9FwM0iSfhUMG9IDOcVuATacSfY6RNI1WV5cuSYECpRtIBgm2jr1zHcLtn+XrQMrag22Dh34F/D7cUErA3Duz1kzKiERfXR9jLJ3al6Zuwi2pDViF9tAL/Je+iYv9BCuOZvACTwUEVcoINfH042pov3e4iv18f8PaVEImzYGeYEO9W+XFFZah1PMG9BcFZcGqXHQ0UYGNTTqn0yK0QoQ979WV72E/I9N/LlR1ruXxei/uLavRxcK7ausbITVqhhLXBqdgNb0HGCAHU0Ar310/gqxyiFhG4NPfvjHBDv6MiWyaGqrmzvlfJpFISKsQV2PhJ9c7eGGMbkb8/eqZMSwxH+MX7j6yJJsVHAmU14km5I8i50mGpIBS08mEbRe9JK8db2VvzcoWHQVFs/k5L8ml5EEyhaEY4lonpS1j+1orV/wFlnZAOR9Esu/waK9WoVe+BZiT1ftpI2uBcSbtFCvbpRiYJwF8sb1CEo9Ns0t9QQ9zESIN0RrfbJJ2IUv8fxjWKaPEfMHvVxkOfQ/gNrq9zPFnG5vrI2r+oytGnhUhFl6P/VaECg9LKhX57Q4c42tQLJk60VUpYKGU5fjnjTZuyP00k71oGlhGhJbjbu30xjM1CUgVkdfezM7no4qegUid09ESf3K4n25vi1J7JZufJnMr5VN1KITRtqrRcI2euCSrnFQtXr5uKhKfo0HJfwWWnFbXxLBkDFe8jwe1KNIy/1RHSEi1LzidFAvjTEeaWt6d94ohRT7jUr1A/aK8D4rdoHL0h1k+BPpp05C1oe8+sOqoBwKunDWBrB6Foa5AB TN28nVQ4 EC13ozGR+CCKO1JLLGOP26G5JI5nbBF19KUKydGFtkHww3QJY3uzuq6OFg3q7Dtvfk73inHwPW5xPNPhLmSE0Z6rmm1CJHv+NgQ/MJj1rdNadYQy84SNKnsHjgdhT8dK3MrklITqxiFszOBT9m3FXppxIhdl/sSmXsDmuYOlOVOdasiqYQ+LBENog2mxX3wy0pIy+V0A63mTYoDn1NEwOx+8Jm56iLC329Km65JWFglOSr670kaKgKX+2oxpfVS4Nx8wce8OXR0lah/DpOfqTa9YS/x8MYSCtijLtduIl6fPIRU+VRBk3p/ugoBurYe5Ei6UKTE6YOqJKnPUdigL0SGSfguzz/0FfZZj5OySAhSoor064+Xe5npI9TIcTdjZEDfX/UktfOsHd8iSVUMThwDlUuE/+X2XjUGuJiVSkgOu55MQq4wMsy9nj8wF1e8oBS2yq 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: List-Subscribe: List-Unsubscribe: Preparation for returning errors when alloc_low_page() fails. phys_pte_init() is excluded because it can't fail, and it's useful for it to return 'paddr_last' instead. This patch depends on the previous patch ("x86/mm: Update mapped addresses in phys_{pmd,pud}_init()"). Signed-off-by: Em Sharnoff --- Changleog: - v2: Switch from special-casing zero value to using ERR_PTR() - v3: Fix -Wint-conversion errors - v4: Switch return type to int, split alloc handling into separate patch. --- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/init.c | 14 +++-- arch/x86/mm/init_32.c | 4 +- arch/x86/mm/init_64.c | 100 ++++++++++++++++++++++----------- arch/x86/mm/mem_encrypt_amd.c | 8 ++- arch/x86/mm/mm_internal.h | 8 +-- 6 files changed, 87 insertions(+), 49 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 138d55f48a4f..b09194c42688 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1244,7 +1244,7 @@ extern int direct_gbpages; void init_mem_mapping(void); void early_alloc_pgt_buf(void); void __init poking_init(void); -void init_memory_mapping(unsigned long start, unsigned long end, pgprot_t prot); +int init_memory_mapping(unsigned long start, unsigned long end, pgprot_t prot); #ifdef CONFIG_X86_64 extern pgd_t trampoline_pgd_entry; diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 1461873b44f1..1dc8fbd8cb63 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -543,11 +543,12 @@ void add_paddr_range_mapped(unsigned long start_paddr, unsigned long end_paddr) * This runs before bootmem is initialized and gets pages directly from * the physical memory. To access them they are temporarily mapped. */ -void __ref init_memory_mapping(unsigned long start, +int __ref init_memory_mapping(unsigned long start, unsigned long end, pgprot_t prot) { struct map_range mr[NR_RANGE_MR]; int nr_range, i; + int ret; pr_debug("init_memory_mapping: [mem %#010lx-%#010lx]\n", start, end - 1); @@ -555,11 +556,14 @@ void __ref init_memory_mapping(unsigned long start, memset(mr, 0, sizeof(mr)); nr_range = split_mem_range(mr, 0, start, end); - for (i = 0; i < nr_range; i++) - kernel_physical_mapping_init(mr[i].start, mr[i].end, - mr[i].page_size_mask, prot); + for (i = 0; i < nr_range; i++) { + ret = kernel_physical_mapping_init(mr[i].start, mr[i].end, + mr[i].page_size_mask, prot); + if (ret) + return ret; + } - return; + return 0; } /* diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 4427ac433041..57bd154c206d 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c @@ -245,7 +245,7 @@ static inline int is_x86_32_kernel_text(unsigned long addr) * of max_low_pfn pages, by creating page tables starting from address * PAGE_OFFSET: */ -void __init +int __init kernel_physical_mapping_init(unsigned long start, unsigned long end, unsigned long page_size_mask, @@ -384,7 +384,7 @@ kernel_physical_mapping_init(unsigned long start, } add_paddr_range_mapped(start, last_map_addr); - return; + return 0; } #ifdef CONFIG_HIGHMEM diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index e729108bee30..b18ab2dcc799 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -503,7 +503,7 @@ phys_pte_init(pte_t *pte_page, unsigned long paddr, unsigned long paddr_end, * Create PMD level page table mapping for physical addresses. The virtual * and physical address have to be aligned at this level. */ -static void __meminit +static int __meminit phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t prot, bool init) { @@ -585,7 +585,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end, * It is idempotent, so this is ok. */ add_paddr_range_mapped(paddr_first, paddr_last); - return; + return 0; } /* @@ -593,12 +593,14 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long paddr, unsigned long paddr_end, * and physical address do not have to be aligned at this level. KASLR can * randomize virtual addresses up to this level. */ -static void __meminit +static int __meminit phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t _prot, bool init) { unsigned long pages = 0, paddr_next; unsigned long vaddr = (unsigned long)__va(paddr); + int ret; + int i = pud_index(vaddr); for (; i < PTRS_PER_PUD; i++, paddr = paddr_next) { @@ -623,8 +625,10 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end, if (!pud_none(*pud)) { if (!pud_leaf(*pud)) { pmd = pmd_offset(pud, 0); - phys_pmd_init(pmd, paddr, paddr_end, - page_size_mask, prot, init); + ret = phys_pmd_init(pmd, paddr, paddr_end, + page_size_mask, prot, init); + if (ret) + return ret; continue; } /* @@ -660,33 +664,39 @@ phys_pud_init(pud_t *pud_page, unsigned long paddr, unsigned long paddr_end, } pmd = alloc_low_page(); - phys_pmd_init(pmd, paddr, paddr_end, - page_size_mask, prot, init); + ret = phys_pmd_init(pmd, paddr, paddr_end, + page_size_mask, prot, init); spin_lock(&init_mm.page_table_lock); pud_populate_init(&init_mm, pud, pmd, init); spin_unlock(&init_mm.page_table_lock); + + /* + * Bail only after updating pud to keep progress from pmd across + * retries. + */ + if (ret) + return ret; } update_page_count(PG_LEVEL_1G, pages); - return; + return 0; } -static void __meminit +static int __meminit phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t prot, bool init) { unsigned long vaddr, vaddr_end, vaddr_next, paddr_next; + int ret; vaddr = (unsigned long)__va(paddr); vaddr_end = (unsigned long)__va(paddr_end); - if (!pgtable_l5_enabled()) { - phys_pud_init((pud_t *) p4d_page, paddr, paddr_end, - page_size_mask, prot, init); - return; - } + if (!pgtable_l5_enabled()) + return phys_pud_init((pud_t *) p4d_page, paddr, paddr_end, + page_size_mask, prot, init); for (; vaddr < vaddr_end; vaddr = vaddr_next) { p4d_t *p4d = p4d_page + p4d_index(vaddr); @@ -708,24 +718,33 @@ phys_p4d_init(p4d_t *p4d_page, unsigned long paddr, unsigned long paddr_end, if (!p4d_none(*p4d)) { pud = pud_offset(p4d, 0); - phys_pud_init(pud, paddr, __pa(vaddr_end), - page_size_mask, prot, init); + ret = phys_pud_init(pud, paddr, __pa(vaddr_end), + page_size_mask, prot, init); + if (ret) + return ret; continue; } pud = alloc_low_page(); - phys_pud_init(pud, paddr, __pa(vaddr_end), - page_size_mask, prot, init); + ret = phys_pud_init(pud, paddr, __pa(vaddr_end), + page_size_mask, prot, init); spin_lock(&init_mm.page_table_lock); p4d_populate_init(&init_mm, p4d, pud, init); spin_unlock(&init_mm.page_table_lock); + + /* + * Bail only after updating p4d to keep progress from pud across + * retries. + */ + if (ret) + return ret; } - return; + return 0; } -static void __meminit +static int __meminit __kernel_physical_mapping_init(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask, @@ -733,6 +752,7 @@ __kernel_physical_mapping_init(unsigned long paddr_start, { bool pgd_changed = false; unsigned long vaddr, vaddr_start, vaddr_end, vaddr_next; + int ret; vaddr = (unsigned long)__va(paddr_start); vaddr_end = (unsigned long)__va(paddr_end); @@ -746,14 +766,16 @@ __kernel_physical_mapping_init(unsigned long paddr_start, if (pgd_val(*pgd)) { p4d = (p4d_t *)pgd_page_vaddr(*pgd); - phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), - page_size_mask, prot, init); + ret = phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), + page_size_mask, prot, init); + if (ret) + return ret; continue; } p4d = alloc_low_page(); - phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), - page_size_mask, prot, init); + ret = phys_p4d_init(p4d, __pa(vaddr), __pa(vaddr_end), + page_size_mask, prot, init); spin_lock(&init_mm.page_table_lock); if (pgtable_l5_enabled()) @@ -761,15 +783,22 @@ __kernel_physical_mapping_init(unsigned long paddr_start, else p4d_populate_init(&init_mm, p4d_offset(pgd, vaddr), (pud_t *) p4d, init); - spin_unlock(&init_mm.page_table_lock); + + /* + * Bail only after updating pgd/p4d to keep progress from p4d + * across retries. + */ + if (ret) + return ret; + pgd_changed = true; } if (pgd_changed) sync_global_pgds(vaddr_start, vaddr_end - 1); - return; + return 0; } @@ -779,13 +808,13 @@ __kernel_physical_mapping_init(unsigned long paddr_start, * The virtual and physical addresses have to be aligned on PMD level * down. */ -void __meminit +int __meminit kernel_physical_mapping_init(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask, pgprot_t prot) { - __kernel_physical_mapping_init(paddr_start, paddr_end, - page_size_mask, prot, true); + return __kernel_physical_mapping_init(paddr_start, paddr_end, + page_size_mask, prot, true); } /* @@ -794,14 +823,14 @@ kernel_physical_mapping_init(unsigned long paddr_start, * when updating the mapping. The caller is responsible to flush the TLBs after * the function returns. */ -void __meminit +int __meminit kernel_physical_mapping_change(unsigned long paddr_start, unsigned long paddr_end, unsigned long page_size_mask) { - __kernel_physical_mapping_init(paddr_start, paddr_end, - page_size_mask, PAGE_KERNEL, - false); + return __kernel_physical_mapping_init(paddr_start, paddr_end, + page_size_mask, PAGE_KERNEL, + false); } #ifndef CONFIG_NUMA @@ -980,8 +1009,11 @@ int arch_add_memory(int nid, u64 start, u64 size, { unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; + int ret; - init_memory_mapping(start, start + size, params->pgprot); + ret = init_memory_mapping(start, start + size, params->pgprot); + if (ret) + return ret; return add_pages(nid, start_pfn, nr_pages, params); } diff --git a/arch/x86/mm/mem_encrypt_amd.c b/arch/x86/mm/mem_encrypt_amd.c index 7490ff6d83b1..04e0b92eb9ad 100644 --- a/arch/x86/mm/mem_encrypt_amd.c +++ b/arch/x86/mm/mem_encrypt_amd.c @@ -444,9 +444,11 @@ static int __init early_set_memory_enc_dec(unsigned long vaddr, * kernel_physical_mapping_change() does not flush the TLBs, so * a TLB flush is required after we exit from the for loop. */ - kernel_physical_mapping_change(__pa(vaddr & pmask), - __pa((vaddr_end & pmask) + psize), - split_page_size_mask); + ret = kernel_physical_mapping_change(__pa(vaddr & pmask), + __pa((vaddr_end & pmask) + psize), + split_page_size_mask); + if (ret) + return ret; } ret = 0; diff --git a/arch/x86/mm/mm_internal.h b/arch/x86/mm/mm_internal.h index 6fea5f7edd48..dacf3c924fbd 100644 --- a/arch/x86/mm/mm_internal.h +++ b/arch/x86/mm/mm_internal.h @@ -12,10 +12,10 @@ void early_ioremap_page_table_range_init(void); void add_paddr_range_mapped(unsigned long start_paddr, unsigned long end_paddr); -void kernel_physical_mapping_init(unsigned long start, unsigned long end, - unsigned long page_size_mask, pgprot_t prot); -void kernel_physical_mapping_change(unsigned long start, unsigned long end, - unsigned long page_size_mask); +int kernel_physical_mapping_init(unsigned long start, unsigned long end, + unsigned long page_size_mask, pgprot_t prot); +int kernel_physical_mapping_change(unsigned long start, unsigned long end, + unsigned long page_size_mask); void zone_sizes_init(void); extern int after_bootmem; -- 2.39.5