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 D52A5C4345F for ; Tue, 16 Apr 2024 12:09:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 626776B008C; Tue, 16 Apr 2024 08:09:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D70D6B0092; Tue, 16 Apr 2024 08:09:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 476C16B0093; Tue, 16 Apr 2024 08:09:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 2583D6B008C for ; Tue, 16 Apr 2024 08:09:31 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D791D1C01C1 for ; Tue, 16 Apr 2024 12:09:30 +0000 (UTC) X-FDA: 82015275300.02.7ED8B12 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf12.hostedemail.com (Postfix) with ESMTP id F18A440028 for ; Tue, 16 Apr 2024 12:09:28 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Vv063tOu; spf=pass (imf12.hostedemail.com: domain of skseofh@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=skseofh@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=1713269369; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hdTcvMX0MA6Qf+Koh6U+bB/gDVKh29MBVCeUWNkXxss=; b=djeLB1fOt/CA8IyAuFGcATOfBFXpLSVaCbYgUhTRW1/5yZzBJUn6U2fjl10yh7kCPEtPUx kVPDfGkfAZrhOPE6QVuc/zLt3yG1wCwK2AYc4fXOFOincXMWCm66Knh1+X79eMcMaHzgfo PzsjohBDGojP4Iyf5sAqNvfGFU4ciUQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713269369; a=rsa-sha256; cv=none; b=aBa+xkfbN0DSVBSOz0hX1DyttrpSaYyBb2mgVKA/i1ygEglrUB1CfX7OSMfvrk5XLgfNVb 1yody2RfNxCoxASNLT6M6PPlOC5FYnvTH/MSUmOGXQfJ8hoU3+EDvIbtld9gnUWIRaF+ME tF4lGjUr7OnDVxdTu6qX9oQsy6G88VQ= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Vv063tOu; spf=pass (imf12.hostedemail.com: domain of skseofh@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=skseofh@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1e3c3aa8938so27104165ad.1 for ; Tue, 16 Apr 2024 05:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713269368; x=1713874168; darn=kvack.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; bh=hdTcvMX0MA6Qf+Koh6U+bB/gDVKh29MBVCeUWNkXxss=; b=Vv063tOugem7unH7IFdEG9xze3sGqCtaREBTsMy4FbwOW6cJPjvuN2ztRvvO8oqg0B wF9WK+6ub3EgRiE3CcuIXhzR5+Xq3L7yb+FYimIn8Us/MgXzrnbMbSH1Lm7DjfkXdn0n C9tGIwOhn3msqHq9dxmFfH5woM7e9DA7x0abolvvkYEPvgd0EWe2r6Hyq0YQG/ZDoE5F Of29pmtjFP4g6cUu/gJwTd9uILzRkxU2bsaagzUymm7Fx35Q84ByIwaAANrCokPj7cNi 8WjKsp/RY/uvMI4W9zSZ6FgGD3UTP7niznDxYSXdObvNa0kpLZO/AdG7XAW5BegjzLYb QGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713269368; x=1713874168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hdTcvMX0MA6Qf+Koh6U+bB/gDVKh29MBVCeUWNkXxss=; b=oVN5z/kTY5d6dGYoCxaN0OyibE16d11lbqvB3WmIzVVb1um4JI2w5LiEucb1Td6RrF gmmfpciQDZB1I8KEKP55/pO02Er608r+hsJ3zoA6mFJilhI5LIePpdczRVgpJxEkbdPB G1GFdmvQZsTWQ6eU8vl/EEG5tcH7vpGQmS60RE5nNJsXLHU5KLnYuoonTCZKAlIaVf7a Qug4AQWHHGaehtm5qu17+GFxACsKV7B2kbInXGXgdSxnZR3Nvy71xyvCWzXIsNMNhdBs 6rYkoc+iGG7QVKjtEriS/oMkWF6dVBpNppHU8jTRJN7C1Rv6XNztjDIZ4UJROav8Fl85 3v9Q== X-Forwarded-Encrypted: i=1; AJvYcCVB0ibXd7pidr5q6lNCw1VmV+hkH6jeNARfpgvLurNOj83FBlUNHeuPx4D+cVN800nGcV+5MJLoSL7CAg3uvCQN/74= X-Gm-Message-State: AOJu0YwR/IvshU7aDitQ6Ybl8s9gaO6j4ybWoDpVTjFKPW0nmeSiLKpe 6xNHS4dgRtRWFpjsOe5NGcPH/v7/gTk/0XVsYUNjCsU9GILIP0ZD X-Google-Smtp-Source: AGHT+IEJ7F2Z7YWgH14O0xbmG1gNps2XW0QDAHnGf5wcGH4vLEI3r0IS9XAwzBjdZnYLFyHCkWE9lw== X-Received: by 2002:a17:902:a511:b0:1e2:616e:2883 with SMTP id s17-20020a170902a51100b001e2616e2883mr9996647plq.24.1713269367746; Tue, 16 Apr 2024 05:09:27 -0700 (PDT) Received: from localhost.localdomain ([49.142.40.215]) by smtp.gmail.com with ESMTPSA id b11-20020a170902650b00b001e509d4d6ddsm9813684plk.1.2024.04.16.05.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 05:09:27 -0700 (PDT) From: skseofh@gmail.com To: robh@kernel.org, saravanak@google.com, rppt@kernel.org, akpm@linux-foundation.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Daero Lee Subject: [PATCH v2] memblock: add no-map alloc functions Date: Tue, 16 Apr 2024 21:06:35 +0900 Message-Id: <20240416120635.361838-2-skseofh@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240416120635.361838-1-skseofh@gmail.com> References: <20240416120635.361838-1-skseofh@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: F18A440028 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: kuynsjm7yw4iyys4gmfhpg9pfdh5um5p X-HE-Tag: 1713269368-470963 X-HE-Meta: U2FsdGVkX18LYcjry3H84UeyuIdQRY3/UanTonW5QCi7QGoS+BodZv3ugMCLiVgooGFBwPGoS7CdymLGwrur207gytigqHMWjEAd1NZBP8Hi0+kmfqOBtLuqwvpBE6S6h5p1+/kWcq78XP0Cfmqk5Y3X0yDur+9i779FoAkVif4ZNXFQdGvQxS2vFoPzEanp7Wj0lID4n5qOyNuF+Ur+2GPfpaqdgKundSAzaJgmJs161n5ZKH9K2potsEQsiyOGL6q9FgF8vk98Cm7cI+hCMOhxLl121dKygp0GnvlPq8oRyFLI1bLkJHPST5NIAtX9Cts4D3u7KOlnxVlF3ZCt7qbkNpNHRLJFeFoV6K2nNmyZt1XzDOlIW1GXpCxNlttJui8ELHb6kmvpd7UvReDiu1QydN6H5wn89VKXkyJ9Kd6TUpyL9sY28CtRl28Mw4UrN9kC8dXrsnd5Z5BlxVUtB6LfrcvGJmuowaVceQUgIc3547qHAB6B+XTTW7AQqMa2bcJMz4h6u9VDwBtDYdfSSkpJLXN2tH56TM5kpLyS7bXWal7EpPCvmHF5nu7NTzmVrsI/Detvqb52JnRMA/NDuZ1ssFqzjIaOhnXiXDNGgvy3YMKillWpgT5odnX5emJdKWDajZlHG/JNN4HxTIjQYoZE4Zdj9wNegGqf+iyXC7pPTyHGXTg7+WEygOL7i927ERnGcLKRgfvZ6YnNrbAO8yyUnwiV5vLFtYTDb9Xur9xnmKVV/1CyGIXSovZ9mKW6UrhMVTM1TIFbZQGw2Gb1VsEocpE0qP9AVm6JtHZsVLRly2ZTHn9U6gt+gXdkC9R7aGKBAtSaCcys6mbL5Bc/6i6ePCQANYHVNIVFiHr3Knrh6CcnlqheT4OgisXTDTveLKNGf+Nqh2C16YMbiaN4529xDN3jeHXrrhXpoOp9OxCH456OefaawdykkkKiduzHuM+Tvf+2X2iEqYaxnsQ ZHqU5Gbx X55puo7g7V+nzYdahOS8a1utSZdQm0yZtDpCnIBADBX1dtaRErHBtIDSEvAzVsYw/1W4EgCeCo3rmqPelbvxBpE2+ETHrZ404roF9McC+diIZyh4VuN0MNK+135CasFUdQiaQTXSfE3FJ2xSFQk1zRH5h1lRFTtEXm2274SsavGGPwvwXeOPJbDjo6QdWmJsmB1LPh39M9uv1lhuLJsr3NBmEKc7deTfdhSD07b/yzDSnR43T3upavevIja70KBN2H3TBaY3oDpSgqIv/QKJH0l/lJlz8He2dlnEOH7tAK+oK7YCWWYIF4ejmTKGYigwgUTfDMzmUU7YBc/2Q2U69yiAqxkUOd1DExoKnFv775EWkptfW05tYBhwOLs/+Jq9ExkPNhJhKZDYR0OKF3lALIhS4OAgRodrY6QbwVQv8alwAACn+BbeLQduGlZoGFV2oqgfp 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: Daero Lee Like reserved-memory with the 'no-map' property and only 'size' property (w/o 'reg' property), there are memory regions need to be allocated in memblock.memory marked with the MEMBLOCK_NOMAP flag, but should not be allocated in memblock.reserved. example : arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi reserved-memory { #address-cells = <2>; #size-cells = <2>; ranges; bman_fbpr: bman-fbpr { compatible = "shared-dma-pool"; size = <0 0x1000000>; alignment = <0 0x1000000>; no-map; }; qman_fqd: qman-fqd { compatible = "shared-dma-pool"; size = <0 0x400000>; alignment = <0 0x400000>; no-map; }; qman_pfdr: qman-pfdr { compatible = "shared-dma-pool"; size = <0 0x2000000>; alignment = <0 0x2000000>; no-map; }; }; So, functions were added that find the required memory area in memblock.memory, but do not allocate it to memblock.reserved. In previous patch(a7259df), early_init_dt_alloc_reserved_memory was modified to use memblock_phys_alloc_range allocating memory in memblock.reserved, instead of memblock_find_in_range that just find the available region. But if there is a 'no-map' property, memory region should not be allocated to memblock.reserved. So, the early_init_dt_alloc_reserved_memory_arch function was modified using the no-map alloc function. Signed-off-by: Daero Lee --- drivers/of/of_reserved_mem.c | 9 +++-- mm/memblock.c | 78 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 3 deletions(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 8236ecae2953..504f2f60689c 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -40,15 +40,18 @@ static int __init early_init_dt_alloc_reserved_memory_arch(phys_addr_t size, end = !end ? MEMBLOCK_ALLOC_ANYWHERE : end; align = !align ? SMP_CACHE_BYTES : align; - base = memblock_phys_alloc_range(size, align, start, end); + if (nomap) { + base = memblock_phys_alloc_range_nomap(size, align, start, end); + } else { + base = memblock_phys_alloc_range(size, align, start, end); + } + if (!base) return -ENOMEM; *res_base = base; if (nomap) { err = memblock_mark_nomap(base, size); - if (err) - memblock_phys_free(base, size); } kmemleak_ignore_phys(base); diff --git a/mm/memblock.c b/mm/memblock.c index d09136e040d3..f103f1ecbfad 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -1506,6 +1506,72 @@ phys_addr_t __init memblock_alloc_range_nid(phys_addr_t size, return found; } +phys_addr_t __init memblock_alloc_range_nid_nomap(phys_addr_t size, + phys_addr_t align, phys_addr_t start, + phys_addr_t end, int nid, + bool exact_nid) +{ + enum memblock_flags flags = choose_memblock_flags(); + phys_addr_t found; + + if (WARN_ONCE(nid == MAX_NUMNODES, "Usage of MAX_NUMNODES is deprecated. Use NUMA_NO_NODE instead\n")) + nid = NUMA_NO_NODE; + + if (!align) { + /* Can't use WARNs this early in boot on powerpc */ + dump_stack(); + align = SMP_CACHE_BYTES; + } + +again: + found = memblock_find_in_range_node(size, align, start, end, nid, + flags); + if (found) + goto done; + + if (nid != NUMA_NO_NODE && !exact_nid) { + found = memblock_find_in_range_node(size, align, start, + end, NUMA_NO_NODE, + flags); + if (found) + goto done; + } + + if (flags & MEMBLOCK_MIRROR) { + flags &= ~MEMBLOCK_MIRROR; + pr_warn_ratelimited("Could not allocate %pap bytes of mirrored memory\n", + &size); + goto again; + } + + return 0; + +done: + /* + * Skip kmemleak for those places like kasan_init() and + * early_pgtable_alloc() due to high volume. + */ + if (end != MEMBLOCK_ALLOC_NOLEAKTRACE) + /* + * Memblock allocated blocks are never reported as + * leaks. This is because many of these blocks are + * only referred via the physical address which is + * not looked up by kmemleak. + */ + kmemleak_alloc_phys(found, size, 0); + + /* + * Some Virtual Machine platforms, such as Intel TDX or AMD SEV-SNP, + * require memory to be accepted before it can be used by the + * guest. + * + * Accept the memory of the allocated buffer. + */ + accept_memory(found, found + size); + + return found; +} + /** * memblock_phys_alloc_range - allocate a memory block inside specified range * @size: size of memory block to be allocated in bytes @@ -1530,6 +1596,18 @@ phys_addr_t __init memblock_phys_alloc_range(phys_addr_t size, false); } +phys_addr_t __init memblock_phys_alloc_range_nomap(phys_addr_t size, + phys_addr_t align, + phys_addr_t start, + phys_addr_t end) +{ + memblock_dbg("%s: %llu bytes align=0x%llx from=%pa max_addr=%pa %pS\n", + __func__, (u64)size, (u64)align, &start, &end, + (void *)_RET_IP_); + return memblock_alloc_range_nid_nomap(size, align, start, end, + NUMA_NO_NODE, false); +} + /** * memblock_phys_alloc_try_nid - allocate a memory block from specified NUMA node * @size: size of memory block to be allocated in bytes -- 2.25.1