From patchwork Fri Apr 11 05:37:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changyuan Lyu X-Patchwork-Id: 14047561 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 41CE1C369A8 for ; Fri, 11 Apr 2025 05:38:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 87814280158; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7DDC0280154; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 656CC280158; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3D572280154 for ; Fri, 11 Apr 2025 01:38:21 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id EC4FCBCA64 for ; Fri, 11 Apr 2025 05:38:21 +0000 (UTC) X-FDA: 83320657602.11.C676206 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 21C87100007 for ; Fri, 11 Apr 2025 05:38:19 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=F01OVu1j; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744349900; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=wU68ioeaNkrqxw27n1uGmJC/1nwej+zAzqgIsFzPgG8KxyqXKnxU/FlRbxDB/CMSJUqdEG c8QaeaHcaoBdPksT5lcLGbtutN1bVVn30Pa74gWuGKBmsoy+kcM/AvrtoJ58a+6wJBJK9g V0VoS7pq/KT3lpMrqXKS5YITwExrOEI= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=F01OVu1j; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3yqr4ZwoKCEknslyr95lywrzzrwp.nzxwty58-xxv6lnv.z2r@flex--changyuanl.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744349900; a=rsa-sha256; cv=none; b=CB6K+C3Noawr/u3wc3TL0ydGjZjx2OAWcLEvr0AHdtY9XeZvLbZPsLqv1v7/ucrBwCtsi0 M1c/pFZIJAALKUWh+WbLE6kT42UMOp4hSAsRPRsHAXc+nbK7lVCFLZyqSJURHbS3c2WT7A 7cLpbJ2R2gBnqicyPrXnURSFT28KiI8= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-225107fbdc7so14497945ad.0 for ; Thu, 10 Apr 2025 22:38:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744349899; x=1744954699; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=F01OVu1jkzzcmHtynl1JL1yPDL0tDqWOijZF0sdhyToVNC9tH05DZfx5IAAxwUhB0D 7X4DrmPrX+RuiS9UgEey34e/M43ZYL5497Z/oJrw47B5fUX0HmaNn0f7HumjGYBQNJOM wLiq1cuPHt3XQ1E9Z0fyRLj831AN3TLTZXSk+gDph3FPbWH04fc0ozYOgltrp+HtLL5y HLFpPH2bVVZBa9Pz5aeWgmZwezhlr1IRgIDPjk1KstLE8KBKbkPKPtGHoJHMf6sKZbd7 qzNtc0cITeocslMUsm7ZtR3W1dmLBhRyjGisdAoNpiWZyFqvE+ycbRLCFRAZ7jQGS0sY glJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744349899; x=1744954699; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=z/qZgzMmxZEsawIy31A7dWlG2yn5UQrX3y3KTJwsEo8=; b=Ikj6LYbIOYuy41cNIVavRNf9XJmPu3O3hWNiOripeEvN71U9BadPeXqJLqRHRrT+Uo t9VHivf7cdwtJcRCc3sqjXoEzp5XjkOe2YtAwWDaBEydVxB78eirJXB6JIkBkLAUk4Ky aPSbHP2N1vOR0/QE+DyVtRI4djjuMIYwIDxnrgoNoIm0zoTXJAfr/h2rQCKcnHsYFWHW SbFURndcVxGBxQyam7k5ZHTFcfiOCCHtZbbk0ngXNF60zAoRK7fmgszWocKkQbtVSfJR p+Tgp+FW/G7QOoJRws7UqLQMD89eQWkcovu/7XhfcZ/k3IiMnIcRnrKb0Op0OJ5NZ/1V NSCg== X-Forwarded-Encrypted: i=1; AJvYcCVijWn8vXB5Yl4l0aBjnARfhUvW9QPLbrgQvGJfDCOM4WaF+h4XVnCbXC6It66PQGIcNKPwCVst3Q==@kvack.org X-Gm-Message-State: AOJu0YzDk+ba35Kdq7dANBmNu8l1BB5jFeRtrk/Sy1jTr8CPWw+kgw3t +b0qkGwgOe8EqXsWV1+yRzG8iGcps9pY2ANMMiJOEfodZH/Kwyc7ON3FOc10f0nX6iNep9LwCrU Wmi9VXmbibjnzoH62Zw== X-Google-Smtp-Source: AGHT+IG99LUNNyI0F5UCDR00CoDYpDqXcEmBQa4iTq8cZs6Lne71ZulPB0DnHumN1g4tR4PErtiR85Wp6/nGpAgv X-Received: from plgw6.prod.google.com ([2002:a17:902:e886:b0:227:967c:4f38]) (user=changyuanl job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:2385:b0:227:e74a:a066 with SMTP id d9443c01a7336-22bea4c755cmr27075215ad.28.1744349898687; Thu, 10 Apr 2025 22:38:18 -0700 (PDT) Date: Thu, 10 Apr 2025 22:37:32 -0700 In-Reply-To: <20250411053745.1817356-1-changyuanl@google.com> Mime-Version: 1.0 References: <20250411053745.1817356-1-changyuanl@google.com> X-Mailer: git-send-email 2.49.0.604.gff1f9ca942-goog Message-ID: <20250411053745.1817356-2-changyuanl@google.com> Subject: [PATCH v6 01/14] memblock: add MEMBLOCK_RSRV_KERN flag From: Changyuan Lyu To: linux-kernel@vger.kernel.org Cc: akpm@linux-foundation.org, anthony.yznaga@oracle.com, arnd@arndb.de, ashish.kalra@amd.com, benh@kernel.crashing.org, bp@alien8.de, catalin.marinas@arm.com, corbet@lwn.net, dave.hansen@linux.intel.com, devicetree@vger.kernel.org, dwmw2@infradead.org, ebiederm@xmission.com, graf@amazon.com, hpa@zytor.com, jgowans@amazon.com, kexec@lists.infradead.org, krzk@kernel.org, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com, pasha.tatashin@soleen.com, pbonzini@redhat.com, peterz@infradead.org, ptyadav@amazon.de, robh@kernel.org, rostedt@goodmis.org, rppt@kernel.org, saravanak@google.com, skinsburskii@linux.microsoft.com, tglx@linutronix.de, thomas.lendacky@amd.com, will@kernel.org, x86@kernel.org, Changyuan Lyu X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 21C87100007 X-Stat-Signature: 5oaf6yb88iepe4moy7wzxt1s3as9691r X-Rspam-User: X-HE-Tag: 1744349899-506029 X-HE-Meta: U2FsdGVkX1+Ft9Om0e/hNzC0Q43pR8+yzlobygK0AuEE6IWUCbzpfbeV2ekwsogbnvdDtFBR9OHTmA8A+n/RtDPsmTuAzEn4N6Keo64kIQoWRoXHtoFhsV5td3hnNNjJpkaJZ3Hh5BQVybwMXT+zcTGiCKgNXaaa8RPrDb9FOCFBYvhqfYwrSXi0ZeophYIOCWKR4ZxleOZEa1VFipSYSAr//ETLpVSdoik/Myy8soNOZ0Rt6ke4G+ME/+U5D8f+bwyahM7pGA5xid/8MOMwT5Hwtv+dJmkaYhBqktGt0EKKa9+f3hPn45XVWfJ25VM8j91tWG8qYP5n4JG8uwvPlN2aserVboI4Q6FoPUsrUj//rYNGeKALTZDVl/45H48iQbPsM8SgJRHbbBk4y2FCv41Y9Q0Z680IDS1d2X8bv3JQUIJAyT1/O9LKTcWECv6EFkKtDkuR3UGFzUaynBnD/Y4X8iasJ4/yBLvYBN/atlrZRTUMJOLtMSJfD4QB3ybalKxtBKBJts6OTRKHAXGy6mZGqsZlKm4cEwn/fLo99+9ZjSKV5cyotDhgYmWnN1e/hlpd/XXuHvjv5uG2yOBd7iQHzljUpHvJbtY0k24pnAGbgwO1r74+5u/cJ4mHsLsSPdG6F4m6qOm7Q7f5dpADFgNvGQd/7g4YxvtTirHKbTzOqqUTcTf65yoe+uAWmQbmOt0PvvY85lwXM5+EfyEhynubxNmIoVjHAgTcQpq4H9urhubBpNO1k6Lxadhk2V5RxTeGd+cb1iuwpsWgJH8532WV2ONwzLNVb8pa2T6z8Gf8E1siZrFpB79AV3Q7xIgB6FSTTbOGmBoUkN0LEQ3oLu1NlyOP4yqoE40KCnhHUBQzLZT3GKurVbms/9DXFOHOHnemsjnID7yLasMmk38iu9mg8B3tnMaNGL59hU/204lhWVJjU/stQHbTPym4qPgXhVig+J2aRIR9F0+Nyuc oUxYuLPC sBSu272GAvRg9vFbRM1h8JtRDsEthIdFKKfyBohwqs5lmzIG9cqA18yHosFAtb1NdS4N7ZeBLi3GZ2P6PoCKjBw+yIXdCqijesC3Sh5zeEc0eTSckaboqvXtjAhWsl4eRwcYrbqEOxPI6+1HEzRQ0dYWhydpQFXynARDEVjObUPTmBg+YWVFX55vidBlq1Vag657NG+C069wKyWpbNFAFnv2bvlcgvD06OzfDd1B/DvlQwk2uzcGSRT9DjcKNwk3JE4YBdhY9twYQOqomFuWss2JHOeqeKK96dHGkJ+9lWjgKDtn/OnTZ5lxJU09tnIiXZc4IMbIhCbvm4z55O8By53mt9h164pziRmnCFvu1CY7xUMSa+zzbS9x3K0zngaOBuJwcdMJPQZG+vuNRr2orAaeWh313X4GH8NKJFlEcZljIowyS7rQWS4Cnvb0VHYI2O3CKgJyztC16SdtPh4RaK6sv1x9PqGedkWMmHlcKBtCtXyEALGjsApKCWC5L8d5hv54M7dgaHewsfaU9I2SAVT7cIztZk7rYW128Zg9uPBOTkuRHmwxCTiGQFUJUALLOn/pQy0RDgOWvScjKuM+55mNICuT5SDHaVNv9tfwhpFqvZo4uTBZ8FXt0KKCt/YqP1tIvcDwHeIDQEK4= 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: From: "Mike Rapoport (Microsoft)" to denote areas that were reserved for kernel use either directly with memblock_reserve_kern() or via memblock allocations. Signed-off-by: Mike Rapoport (Microsoft) Co-developed-by: Changyuan Lyu Signed-off-by: Changyuan Lyu --- include/linux/memblock.h | 19 ++++++++- mm/memblock.c | 40 +++++++++++++++---- tools/testing/memblock/tests/alloc_api.c | 22 +++++----- .../memblock/tests/alloc_helpers_api.c | 4 +- tools/testing/memblock/tests/alloc_nid_api.c | 20 +++++----- 5 files changed, 73 insertions(+), 32 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index ef5a1ecc6e595..6c00fbc085132 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -42,6 +42,9 @@ extern unsigned long long max_possible_pfn; * kernel resource tree. * @MEMBLOCK_RSRV_NOINIT: memory region for which struct pages are * not initialized (only for reserved regions). + * @MEMBLOCK_RSRV_KERN: memory region that is reserved for kernel use, + * either explictitly with memblock_reserve_kern() or via memblock + * allocation APIs. All memblock allocations set this flag. */ enum memblock_flags { MEMBLOCK_NONE = 0x0, /* No special request */ @@ -50,6 +53,7 @@ enum memblock_flags { MEMBLOCK_NOMAP = 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ MEMBLOCK_RSRV_NOINIT = 0x10, /* don't initialize struct pages */ + MEMBLOCK_RSRV_KERN = 0x20, /* memory reserved for kernel use */ }; /** @@ -116,7 +120,19 @@ int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid, int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_phys_free(phys_addr_t base, phys_addr_t size); -int memblock_reserve(phys_addr_t base, phys_addr_t size); +int __memblock_reserve(phys_addr_t base, phys_addr_t size, int nid, + enum memblock_flags flags); + +static __always_inline int memblock_reserve(phys_addr_t base, phys_addr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, 0); +} + +static __always_inline int memblock_reserve_kern(phys_addr_t base, phys_addr_t size) +{ + return __memblock_reserve(base, size, NUMA_NO_NODE, MEMBLOCK_RSRV_KERN); +} + #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP int memblock_physmem_add(phys_addr_t base, phys_addr_t size); #endif @@ -476,6 +492,7 @@ static inline __init_memblock bool memblock_bottom_up(void) phys_addr_t memblock_phys_mem_size(void); phys_addr_t memblock_reserved_size(void); +phys_addr_t memblock_reserved_kern_size(phys_addr_t limit, int nid); unsigned long memblock_estimated_nr_free_pages(void); phys_addr_t memblock_start_of_DRAM(void); phys_addr_t memblock_end_of_DRAM(void); diff --git a/mm/memblock.c b/mm/memblock.c index 0a53db4d9f7be..2dc95ecdee5ce 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -492,7 +492,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type, * needn't do it */ if (!use_slab) - BUG_ON(memblock_reserve(addr, new_alloc_size)); + BUG_ON(memblock_reserve_kern(addr, new_alloc_size)); /* Update slab flag */ *in_slab = use_slab; @@ -642,7 +642,7 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, #ifdef CONFIG_NUMA WARN_ON(nid != memblock_get_region_node(rgn)); #endif - WARN_ON(flags != rgn->flags); + WARN_ON(flags != MEMBLOCK_NONE && flags != rgn->flags); nr_new++; if (insert) { if (start_rgn == -1) @@ -902,14 +902,15 @@ int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size) return memblock_remove_range(&memblock.reserved, base, size); } -int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) +int __init_memblock __memblock_reserve(phys_addr_t base, phys_addr_t size, + int nid, enum memblock_flags flags) { phys_addr_t end = base + size - 1; - memblock_dbg("%s: [%pa-%pa] %pS\n", __func__, - &base, &end, (void *)_RET_IP_); + memblock_dbg("%s: [%pa-%pa] nid=%d flags=%x %pS\n", __func__, + &base, &end, nid, flags, (void *)_RET_IP_); - return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0); + return memblock_add_range(&memblock.reserved, base, size, nid, flags); } #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP @@ -1460,14 +1461,14 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, again: found = memblock_find_in_range_node(size, align, start, end, nid, flags); - if (found && !memblock_reserve(found, size)) + if (found && !__memblock_reserve(found, size, nid, MEMBLOCK_RSRV_KERN)) goto done; if (numa_valid_node(nid) && !exact_nid) { found = memblock_find_in_range_node(size, align, start, end, NUMA_NO_NODE, flags); - if (found && !memblock_reserve(found, size)) + if (found && !memblock_reserve_kern(found, size)) goto done; } @@ -1752,6 +1753,28 @@ phys_addr_t __init_memblock memblock_reserved_size(void) return memblock.reserved.total_size; } +phys_addr_t __init_memblock memblock_reserved_kern_size(phys_addr_t limit, int nid) +{ + struct memblock_region *r; + phys_addr_t total = 0; + + for_each_reserved_mem_region(r) { + phys_addr_t size = r->size; + + if (r->base > limit) + break; + + if (r->base + r->size > limit) + size = limit - r->base; + + if (nid == memblock_get_region_node(r) || !numa_valid_node(nid)) + if (r->flags & MEMBLOCK_RSRV_KERN) + total += size; + } + + return total; +} + /** * memblock_estimated_nr_free_pages - return estimated number of free pages * from memblock point of view @@ -2441,6 +2464,7 @@ static const char * const flagname[] = { [ilog2(MEMBLOCK_NOMAP)] = "NOMAP", [ilog2(MEMBLOCK_DRIVER_MANAGED)] = "DRV_MNG", [ilog2(MEMBLOCK_RSRV_NOINIT)] = "RSV_NIT", + [ilog2(MEMBLOCK_RSRV_KERN)] = "RSV_KERN", }; static int memblock_debug_show(struct seq_file *m, void *private) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/memblock/tests/alloc_api.c index 68f1a75cd72c4..c55f67dd367d0 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -134,7 +134,7 @@ static int alloc_top_down_before_check(void) PREFIX_PUSH(); setup_memblock(); - memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size); + memblock_reserve_kern(memblock_end_of_DRAM() - total_size, r1_size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -182,7 +182,7 @@ static int alloc_top_down_after_check(void) total_size = r1.size + r2_size; - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -231,8 +231,8 @@ static int alloc_top_down_second_fit_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); @@ -285,8 +285,8 @@ static int alloc_in_between_generic_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); @@ -422,7 +422,7 @@ static int alloc_limited_space_generic_check(void) setup_memblock(); /* Simulate almost-full memory */ - memblock_reserve(memblock_start_of_DRAM(), reserved_size); + memblock_reserve_kern(memblock_start_of_DRAM(), reserved_size); allocated_ptr = run_memblock_alloc(available_size, SMP_CACHE_BYTES); @@ -608,7 +608,7 @@ static int alloc_bottom_up_before_check(void) PREFIX_PUSH(); setup_memblock(); - memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size); + memblock_reserve_kern(memblock_start_of_DRAM() + r1_size, r2_size); allocated_ptr = run_memblock_alloc(r1_size, SMP_CACHE_BYTES); @@ -655,7 +655,7 @@ static int alloc_bottom_up_after_check(void) total_size = r1.size + r2_size; - memblock_reserve(r1.base, r1.size); + memblock_reserve_kern(r1.base, r1.size); allocated_ptr = run_memblock_alloc(r2_size, SMP_CACHE_BYTES); @@ -705,8 +705,8 @@ static int alloc_bottom_up_second_fit_check(void) total_size = r1.size + r2.size + r3_size; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc(r3_size, SMP_CACHE_BYTES); diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testing/memblock/tests/alloc_helpers_api.c index 3ef9486da8a09..e5362cfd2ff30 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -163,7 +163,7 @@ static int alloc_from_top_down_no_space_above_check(void) min_addr = memblock_end_of_DRAM() - SMP_CACHE_BYTES * 2; /* No space above this address */ - memblock_reserve(min_addr, r2_size); + memblock_reserve_kern(min_addr, r2_size); allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); @@ -199,7 +199,7 @@ static int alloc_from_top_down_min_addr_cap_check(void) start_addr = (phys_addr_t)memblock_start_of_DRAM(); min_addr = start_addr - SMP_CACHE_BYTES * 3; - memblock_reserve(start_addr + r1_size, MEM_SIZE - r1_size); + memblock_reserve_kern(start_addr + r1_size, MEM_SIZE - r1_size); allocated_ptr = memblock_alloc_from(r1_size, SMP_CACHE_BYTES, min_addr); diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/memblock/tests/alloc_nid_api.c index 49bb416d34ffc..562e4701b0e02 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -324,7 +324,7 @@ static int alloc_nid_min_reserved_generic_check(void) min_addr = max_addr - r2_size; reserved_base = min_addr - r1_size; - memblock_reserve(reserved_base, r1_size); + memblock_reserve_kern(reserved_base, r1_size); allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -374,7 +374,7 @@ static int alloc_nid_max_reserved_generic_check(void) max_addr = memblock_end_of_DRAM() - r1_size; min_addr = max_addr - r2_size; - memblock_reserve(max_addr, r1_size); + memblock_reserve_kern(max_addr, r1_size); allocated_ptr = run_memblock_alloc_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -436,8 +436,8 @@ static int alloc_nid_top_down_reserved_with_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -499,8 +499,8 @@ static int alloc_nid_reserved_full_merge_generic_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -563,8 +563,8 @@ static int alloc_nid_top_down_reserved_no_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, @@ -909,8 +909,8 @@ static int alloc_nid_bottom_up_reserved_with_space_check(void) min_addr = r2.base + r2.size; max_addr = r1.base; - memblock_reserve(r1.base, r1.size); - memblock_reserve(r2.base, r2.size); + memblock_reserve_kern(r1.base, r1.size); + memblock_reserve_kern(r2.base, r2.size); allocated_ptr = run_memblock_alloc_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr,