From patchwork Tue Feb 18 15:08:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13980153 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 C90FBC021AA for ; Tue, 18 Feb 2025 15:09:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 62E1F280140; Tue, 18 Feb 2025 10:09:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DD9628013C; Tue, 18 Feb 2025 10:09:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 48337280140; Tue, 18 Feb 2025 10:09:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2A8C528013C for ; Tue, 18 Feb 2025 10:09:17 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id A7C20C1D2E for ; Tue, 18 Feb 2025 15:09:05 +0000 (UTC) X-FDA: 83133398250.07.9598896 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf14.hostedemail.com (Postfix) with ESMTP id C19FA100012 for ; Tue, 18 Feb 2025 15:09:03 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e6dVhIcO; spf=pass (imf14.hostedemail.com: domain of mhiramat@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mhiramat@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739891343; 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=/weH51s81AUNhBXpvBiR2tP/oMhSL7MGOr3AHtTzR34=; b=tYuyE60CBb97n7+0JVixz6gpvQEDjd4luCQbVbacCsK2qQMp2PuKyGIgqhHBbazsZYYCfm I0HzxuNj8dkzqlLLbdypvM7qRq0MBYlxHj/aDzkdgnTpZ3O8rsxDCf1TADeCfvPd4WzE9v GYXD1jG9i1Imawzzi/x7RmXFt7ydNeo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=e6dVhIcO; spf=pass (imf14.hostedemail.com: domain of mhiramat@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=mhiramat@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739891343; a=rsa-sha256; cv=none; b=5Q3pbpNTm/hjqvmCf8H1YF+aFMSkRiOA83YvGoTZTCDIfswYLFKo3sUH1a5mcs85s75yPt BX/tOg6Pb5I+aenvGxptxj1JbVCb4RuGLLUK+RPkYWXV3g/+305xTdvkdLSIdGyxYyUVNl F1xqYpPf7Ffg1OLar2Chdxc6uoIf1IU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id CC9B95C554A; Tue, 18 Feb 2025 15:08:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5ADCC4CEE7; Tue, 18 Feb 2025 15:09:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739891342; bh=8v4zZwccKy+E3kLDMp/TBNu5P5+5ygdWnFUDTOV6vhs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e6dVhIcOxjQStAmdg1frwiYYMzwqNWrkW5KnknEwHxn6tpy53X+QuZUBlpcLgZCf1 CKEhu0DH9fC/Je+UIYpHOPzeiwPitaHanVUV2TRGiHdKr/MFRFPslLVWDEouuekeZX 1PRKaxuasqXI3LWVdzF6hhzr8gJH93z6XH3BwEZEB0FX+PMovWkseGWpUlgTsaX1ZQ ce/usigvzflPg5s2CUSHiT/il3eC3bi6Xw3PXcd+ok8GBdoAez7t5tu9UCAdiAEX43 b1t6ue9XccNUA4FWE4IVLXzP5PnCWTOlfmlahs6HObelUFY4EQCD5F8DYhatYhD2Yu YOO2wMctHY73g== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Masami Hiramatsu , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Mark Rutland , Mathieu Desnoyers , Andrew Morton , Mike Rapoport , linux-mm@kvack.org Subject: [PATCH v4 1/2] mm/memblock: Add reserved memory release function Date: Wed, 19 Feb 2025 00:08:58 +0900 Message-ID: <173989133862.230693.14094993331347437600.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173989132750.230693.15749600013776132201.stgit@devnote2> References: <173989132750.230693.15749600013776132201.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: C19FA100012 X-Stat-Signature: f5cbnqxc35tz8wwncc4i1ficmjgg3oo7 X-Rspamd-Server: rspam03 X-HE-Tag: 1739891343-503479 X-HE-Meta: U2FsdGVkX1+A8qhf+ZZkj68EENQGiNNScoZXeG6lHycvb5C+1xRwG/zH/vzPgCDAHknLAh5ZKd2GwVdYyXNzp4t5SGN513TezSt9nnvFfkc1tzarjVfZFRq/TeAFkMyPWV+JnCYLIo8VpIF/LRc5qvW9tFIc+8355WJEezRO1TDyZrdaLs2oYfnyhmws72GqzBJGLAZ5dgMCnxfj3IT/cI4YKk/ytQ2z2jxVOO/p53VxbcC//tsk8okURs8onRFeVyKQUHZX5LGyJxflxDtblv7YrsPsK6guZIByABYkYzFNs3JL8I9DwZcFrZz+LhQnkykm1Xx+fNprfZOnY4gX6Wdi2DmR4PFLIVN+xNQcN57AK882gVLGESFI7dyRUiF7P/nRTA0Bsm2fHCHWpf/I7DtuiwNHQs7P3bYuSqIDCZdl9s/fHrqL0MHQ/WK/Et7Rnd0b4PikqW7BTbxy8ItXsoLCtZRD2/tn4hCeh6+5iO4oQhkCM6FpUhgxL/ko43AGgv6ny1lAuZ6bqk40P1jEO4+HTyBRG0++8/NdQWFzR+82CNguszq+55pC5o1cFqWP/n0apisrYby+33SgLE5in65kTF9W7D+RQ2+0EutOGem2GD0nwNd0nfSdPuKMA5UuD3Dy+f1QAwR+6TUUQYc7WIVV2yBKpOyr9JpKOTuar3yiZCjMB86kzyIdzBkHBkbKR+LMyMHqSfpHteVqQmlyzVfAo1NMxATpYRtFXpkN7ht2BCINEIzySp1kqy4EiCKKrVHGRkffcZ0cVTWpokZ1u5E2xlAheGkYiyArfFt3JSxUlROaeXXjomPYEn7m9us2w0l6puDYNLhapjw0141olguY8bMLl5gpNrvvwRJIXHm9uWPlI+e+LPtfmrHdtlnh88iIRN90fPj4cjo/SOSZRdP2G4IIcceXv/0Tuf44tlW9w4jINK3ShSepuBYSgvgjooWezWKr+XQqnqC1DvC QOZvPTkh bOzUhk9p3HVVWgJfjoBYdseavf86tuepYzexK2ftmEifkmjXCw/wWUzpZqIWHKaUpZndi3g6I0eNh5zMYpiXKaeqEQkfoKM6Ds7BSwPi73+swQGzC1sF/Ygdm9nYQxcnurms2Vl3wHBaI2/1inXztIoYYfxKlCXIAthSieGZRrfaSPXenVD9VdaeNh8eUWFmp8C1atdtN90WlZd3xg+TkM7q/OfWP7wgNkDmW1o9GPy5cw0bM/0NWBs7fr8vWdHhAeNsZjJmkQ0ZuvAJa7FxCue60PflV8EZs77vVWBxsUp9GTtb9HDqsHcV4UyJwcodCqppUPEoRs08tVvbB63H0bAKfMtHqQYTYlnnZKxTxt1V2O1ay7iqMOKOhI+I8GyX2eOeCMp5aGRbV0ZKyW0Fzk1D+KA== 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: Masami Hiramatsu (Google) Add reserve_mem_release_by_name() to release a reserved memory region with a given name. This allows us to release reserved memory which is defined by kernel cmdline, after boot. Signed-off-by: Masami Hiramatsu (Google) Acked-by: Mike Rapoport (Microsoft) Cc: Andrew Morton Cc: linux-mm@kvack.org --- Changes in v4: - Use free_reserved_area() according to Mike's comment. Changes in v2: - Rename reserved_mem_* to reserve_mem_*. --- include/linux/mm.h | 1 + mm/memblock.c | 66 +++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 7b1068ddcbb7..1ee9e7447485 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4123,6 +4123,7 @@ void vma_pgtable_walk_begin(struct vm_area_struct *vma); void vma_pgtable_walk_end(struct vm_area_struct *vma); int reserve_mem_find_by_name(const char *name, phys_addr_t *start, phys_addr_t *size); +int reserve_mem_release_by_name(const char *name); #ifdef CONFIG_64BIT int do_mseal(unsigned long start, size_t len_in, unsigned long flags); diff --git a/mm/memblock.c b/mm/memblock.c index 95af35fd1389..8cd95f60015d 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -2283,6 +2284,7 @@ struct reserve_mem_table { }; static struct reserve_mem_table reserved_mem_table[RESERVE_MEM_MAX_ENTRIES]; static int reserved_mem_count; +static DEFINE_MUTEX(reserve_mem_lock); /* Add wildcard region with a lookup name */ static void __init reserved_mem_add(phys_addr_t start, phys_addr_t size, @@ -2296,6 +2298,21 @@ static void __init reserved_mem_add(phys_addr_t start, phys_addr_t size, strscpy(map->name, name); } +static struct reserve_mem_table *reserve_mem_find_by_name_nolock(const char *name) +{ + struct reserve_mem_table *map; + int i; + + for (i = 0; i < reserved_mem_count; i++) { + map = &reserved_mem_table[i]; + if (!map->size) + continue; + if (strcmp(name, map->name) == 0) + return map; + } + return NULL; +} + /** * reserve_mem_find_by_name - Find reserved memory region with a given name * @name: The name that is attached to a reserved memory region @@ -2309,22 +2326,47 @@ static void __init reserved_mem_add(phys_addr_t start, phys_addr_t size, int reserve_mem_find_by_name(const char *name, phys_addr_t *start, phys_addr_t *size) { struct reserve_mem_table *map; - int i; - for (i = 0; i < reserved_mem_count; i++) { - map = &reserved_mem_table[i]; - if (!map->size) - continue; - if (strcmp(name, map->name) == 0) { - *start = map->start; - *size = map->size; - return 1; - } - } - return 0; + guard(mutex)(&reserve_mem_lock); + map = reserve_mem_find_by_name_nolock(name); + if (!map) + return 0; + + *start = map->start; + *size = map->size; + return 1; } EXPORT_SYMBOL_GPL(reserve_mem_find_by_name); +/** + * reserve_mem_release_by_name - Release reserved memory region with a given name + * @name: The name that is attatched to a reserved memory region + * + * Forcibly release the pages in the reserved memory region so that those memory + * can be used as free memory. After released the reserved region size becomes 0. + * + * Returns: 1 if released or 0 if not found. + */ +int reserve_mem_release_by_name(const char *name) +{ + char buf[RESERVE_MEM_NAME_SIZE + 12]; + struct reserve_mem_table *map; + void *start, *end; + + guard(mutex)(&reserve_mem_lock); + map = reserve_mem_find_by_name_nolock(name); + if (!map) + return 0; + + start = phys_to_virt(map->start); + end = start + map->size - 1; + snprintf(buf, sizeof(buf), "reserve_mem:%s", name); + free_reserved_area(start, end, 0, buf); + map->size = 0; + + return 1; +} + /* * Parse reserve_mem=nn:align:name */