From patchwork Fri Aug 25 11:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13365446 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 00C7CC71133 for ; Fri, 25 Aug 2023 11:18:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E36BC280093; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DBFF8280091; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5F48280093; Fri, 25 Aug 2023 07:18:54 -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 B19E0280091 for ; Fri, 25 Aug 2023 07:18:54 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 748ED8061B for ; Fri, 25 Aug 2023 11:18:54 +0000 (UTC) X-FDA: 81162379788.30.4185E74 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by imf30.hostedemail.com (Postfix) with ESMTP id 8976680021 for ; Fri, 25 Aug 2023 11:18:52 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EsMNC1tz; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf30.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692962332; a=rsa-sha256; cv=none; b=5Qdu2d8vV8ebphofYI96LPgEFTuJBLcIetJPyQDCjomB3E1/PSFfgQoQcMNMK0XLqwQcAK DweDR1rhGAseVaNwZgEAf1rzkoA+oRsx7BOKav8gUj/Us6zxaHKxjuygcC65W0mw/TPrUz P1JTlQCFLg9tjAnfyWm4Csu6zVJ2C1g= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=EsMNC1tz; dmarc=pass (policy=quarantine) header.from=bytedance.com; spf=pass (imf30.hostedemail.com: domain of usama.arif@bytedance.com designates 209.85.221.48 as permitted sender) smtp.mailfrom=usama.arif@bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692962332; 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=rt7VA+fn11wPN2WZOsDR2kSrdsBwWADUH8ZcQSjaiPs=; b=zR00Fr4ff23Yo1DHGeoDV5Zxuw9kZeTtdP8QktJYZuh4W+ZYhKtCKwTNQDpwNN0fW6yvp2 rPyISYJteRu450bNj7RK1V8CHzneRbWrXh1zRDhVVU39t001WTtx8D5FJT0fsOAn/u+Sag +SE9AVKjd6Uky64LEJpEPRPCT5nnPnw= Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-31c7912416bso689407f8f.1 for ; Fri, 25 Aug 2023 04:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1692962331; x=1693567131; 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=rt7VA+fn11wPN2WZOsDR2kSrdsBwWADUH8ZcQSjaiPs=; b=EsMNC1tzWSxQdc599l5SHDEEa98rqlp7iDryuFhBYk8fHJ511NFQyTznh0mCDBUIn8 VL8K3tloTbGtKUrcH4jjAAsVmaUTZ2RNBUAs8YhCr5NG+vVevNZdq3uQ1G1uBY6LhJVF rTwmWgEz1MvQA9fuhdFC9bXz4LoNfymZjqSABGUPV23JzQFZnk9thziUhDk9YadzQzpK 0Y4SguwVDubIC/esFXv70EfncJva9GyavT5l0kJrs+9ZjMhqgofSo0kMiSVl8P6uaV89 V29hVlv/XbysBximjie5EPo24O7osCBf+oDoT7rAPNGdseqXFPTWzYczRyNlM8M7odR8 9gkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692962331; x=1693567131; 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=rt7VA+fn11wPN2WZOsDR2kSrdsBwWADUH8ZcQSjaiPs=; b=C36JjLsvcpObFIWL0HZ6O1HcBjyq6Lg6EcyJUZcn/WhXCcv5SUCp0UtWOhOZmIUI0W Gs6GK6YKOTjkyD4L0kUMysEud+pFFGlQBKJ4pdD/GkSmcdKsU7iJJBfr4ijRRWb6pqTw SH3ryFYvQWNs4DyUNA3zCeHOohrz4MWcwNt0Sqh3C9SvypvHyEPXHPR6Be/xaDJV4qQ1 +h/8JvFgniRqiK2vmNuIcCoYyRGhHNKqqXucB8XrvlUoTHmWZTQBl/ysRnP4gczVVg+Q MuIo+vDfOl2d468rfpHRFvgUzylDFDj1evYogyEmoAm3KZVTY42y2to9NjuZ8Bkesf+D frfg== X-Gm-Message-State: AOJu0YyWz+dIqi5O0GwKbIYfnDzK2QyobPgqQJQtTBE2osQLyBBLq2ZZ oTmJuBkLP2c5ve6LKPVjLMsGvS/jjU65DHMcrO0= X-Google-Smtp-Source: AGHT+IEec5EPpcaKObbex9bUWyp4GWlAmHPClDlt9NrVYi+5iTZNS2Jj3ebXr6R8Gt7v2gUbQKOW1A== X-Received: by 2002:a5d:4403:0:b0:31a:d49a:38d with SMTP id z3-20020a5d4403000000b0031ad49a038dmr13545294wrq.54.1692962331003; Fri, 25 Aug 2023 04:18:51 -0700 (PDT) Received: from localhost.localdomain ([2a02:6b6a:b5c7:0:9000:8d13:d0bb:ba7d]) by smtp.gmail.com with ESMTPSA id g9-20020a056000118900b0031ad5fb5a0fsm1939502wrx.58.2023.08.25.04.18.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Aug 2023 04:18:50 -0700 (PDT) From: Usama Arif To: linux-mm@kvack.org, muchun.song@linux.dev, mike.kravetz@oracle.com, rppt@kernel.org Cc: linux-kernel@vger.kernel.org, songmuchun@bytedance.com, fam.zheng@bytedance.com, liangma@liangbit.com, punit.agrawal@bytedance.com, Usama Arif Subject: [v3 3/4] memblock: introduce MEMBLOCK_RSRV_NOINIT_VMEMMAP flag Date: Fri, 25 Aug 2023 12:18:35 +0100 Message-Id: <20230825111836.1715308-4-usama.arif@bytedance.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230825111836.1715308-1-usama.arif@bytedance.com> References: <20230825111836.1715308-1-usama.arif@bytedance.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 8976680021 X-Stat-Signature: qbwhuhth6b7sr3w7dffgwt984s94m3ff X-HE-Tag: 1692962332-508322 X-HE-Meta: U2FsdGVkX18Xua8B6NWgLiGPnxdyw7x2lYTKbefda1NHLxhrkuYTRfhfczotP1/Z2cnAozaCc0khNCeXz+WmPCRMM7WPLJXzzF/kQcxvR004UeTZ7D9XNVU48Bx/QXlzLDNCWswrf8f+6+wTyfOlOkoqejVA6nX3FwxjP4Q4CrKeV+tVwGqZu6XItMSx38T9F3e6RbZrNNYWx8KcMyc6MQXNSNB9+ZpIxHE6d2VfAnjikT8E3i8yabUP1CcAeO9HEEHLSzlMxTM5zODlhWrjbilDed1TP+pzaTSdDNWY538GdleZWIOD1QkjDjhWzmNHIFWXRIXTss1Tqqh1XzJ1+fTB2lO5+oxWKqpfJa1XJQG3cEhcFcTskQ1QYZixyxy8B5EB31OktO2g06juogPcsm1wnld6z+sMElWttGY54GFIVSE3OFWlLe6iCPiMGJiJgDIgIzSDFS6q/7HbVBR/GdjleERnMsriN6X/iU+BtxgTCet+zS8SEBvKU5oXyLT2Z6J+RiZH4eDOFlTkIYJoLkg76wrVol2NBXuRwXsoE4lpdRfA+ALJyP8I/W8EIOfzNtTIGnVoaxCmZfA4zKcDILQ3AgkJKYgXJqua12Ojhjb+4VgLjqQKJ9l5oxUEC297JGnL7CZoI554FM+ComiOePxnj1q1EczV+pYzXHaDBDWhuNckXP8odCInKu+Z0Q421+2CVvfGF7mNi2NtY449TubRICbuAWr2gPjeZtpI+gD5cL+EON3vXvYeosEbAq5xNwVgYpcp5HI7iAmFd1GLK1R6YW6CIFfN0YHFmIX+Qdo8nM2DXrZSwvfZLausKmtnHO3lsLQse57aHWevh7/TxE+JQcJHwS7lOLFLrxunqVirE7HWS2ibTboaylEv9rQc2PWaYp8LxLd3V2VIuHW3TNdrHjaBrKmo3dw85sdL+4QWBt5U1QUPThb036yxPc/jX5qSD74at3ReY0qRqcU qUkEU128 GD+pOmDFXz3vq4XB9OsOZICKLYMvMJ7jViIPta0VfZBjRlYnxmd/rNyoc340hy1RV71ZX3wtIRGu5a+v486xOv8vLDWitJEJKu0ZC8BVpj82QStAn22WYs+PBOgOcVdSvptJU2p3smfY0zz0NaO63EL+4+nRbxQ2RVVoJPlxhsoUZecMYpPA9d5KQCW7rYa450pOC/urSAqVdA6O8rRSzAveilnXWBiwDNIwhyDYOWQTulT42BK+WYfxtNGjtverPQjuWNb1QLgG5StWP8YJuVB4aOo9HlKXCh87SLE1K0jqJkg4cTzk7M0q3jYQcxxojfz8sjoP9aee4MuaXB5KBygHJWzr+iPVOXNfuN3njUOsEByug6j2uZHfyzajoPmLue6/2/E0CrhxqEEjsGRhf0pI9Ac8aiUzJRcaFP+Abju0QB8DR5n4uA+ZMMKKlQnZnpNN5pTuK6jI0TjReBqEK3wly9LjD6aZOaI97 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: For reserved memory regions marked with this flag, reserve_bootmem_region is not called during memmap_init_reserved_pages. This can be used to avoid struct page initialization for regions which won't need them, for e.g. hugepages with HVO enabled. Signed-off-by: Usama Arif Reviewed-by: Muchun Song --- include/linux/memblock.h | 10 ++++++++++ mm/memblock.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index f71ff9f0ec81..6d681d053880 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -40,6 +40,8 @@ extern unsigned long long max_possible_pfn; * via a driver, and never indicated in the firmware-provided memory map as * system RAM. This corresponds to IORESOURCE_SYSRAM_DRIVER_MANAGED in the * kernel resource tree. + * @MEMBLOCK_RSRV_NOINIT_VMEMMAP: memory region for which struct pages are + * not initialized (only for reserved regions). */ enum memblock_flags { MEMBLOCK_NONE = 0x0, /* No special request */ @@ -47,6 +49,8 @@ enum memblock_flags { MEMBLOCK_MIRROR = 0x2, /* mirrored region */ MEMBLOCK_NOMAP = 0x4, /* don't add to kernel direct mapping */ MEMBLOCK_DRIVER_MANAGED = 0x8, /* always detected via a driver */ + /* don't initialize struct pages associated with this reserver memory block */ + MEMBLOCK_RSRV_NOINIT_VMEMMAP = 0x10, }; /** @@ -125,6 +129,7 @@ int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); +int memblock_reserved_mark_noinit_vmemmap(phys_addr_t base, phys_addr_t size); void memblock_free_all(void); void memblock_free(void *ptr, size_t size); @@ -259,6 +264,11 @@ static inline bool memblock_is_nomap(struct memblock_region *m) return m->flags & MEMBLOCK_NOMAP; } +static inline bool memblock_is_noinit_vmemmap(struct memblock_region *m) +{ + return m->flags & MEMBLOCK_RSRV_NOINIT_VMEMMAP; +} + static inline bool memblock_is_driver_managed(struct memblock_region *m) { return m->flags & MEMBLOCK_DRIVER_MANAGED; diff --git a/mm/memblock.c b/mm/memblock.c index 43cb4404d94c..a9782228c840 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -991,6 +991,23 @@ int __init_memblock memblock_clear_nomap(phys_addr_t base, phys_addr_t size) return memblock_setclr_flag(&memblock.memory, base, size, 0, MEMBLOCK_NOMAP); } +/** + * memblock_reserved_mark_noinit_vmemmap - Mark a reserved memory region with flag + * MEMBLOCK_RSRV_NOINIT_VMEMMAP. + * @base: the base phys addr of the region + * @size: the size of the region + * + * struct pages will not be initialized for reserved memory regions marked with + * %MEMBLOCK_RSRV_NOINIT_VMEMMAP. + * + * Return: 0 on success, -errno on failure. + */ +int __init_memblock memblock_reserved_mark_noinit_vmemmap(phys_addr_t base, phys_addr_t size) +{ + return memblock_setclr_flag(&memblock.reserved, base, size, 1, + MEMBLOCK_RSRV_NOINIT_VMEMMAP); +} + static bool should_skip_region(struct memblock_type *type, struct memblock_region *m, int nid, int flags) @@ -2107,13 +2124,18 @@ static void __init memmap_init_reserved_pages(void) memblock_set_node(start, end, &memblock.reserved, nid); } - /* initialize struct pages for the reserved regions */ + /* + * initialize struct pages for reserved regions that don't have + * the MEMBLOCK_RSRV_NOINIT_VMEMMAP flag set + */ for_each_reserved_mem_region(region) { - nid = memblock_get_region_node(region); - start = region->base; - end = start + region->size; + if (!memblock_is_noinit_vmemmap(region)) { + nid = memblock_get_region_node(region); + start = region->base; + end = start + region->size; - reserve_bootmem_region(start, end, nid); + reserve_bootmem_region(start, end, nid); + } } }