From patchwork Fri Dec 22 19:35:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 13503720 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 63BE0C46CD8 for ; Fri, 22 Dec 2023 19:36:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEAC36B0080; Fri, 22 Dec 2023 14:36:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E72AE6B007D; Fri, 22 Dec 2023 14:36:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D61E66B007E; Fri, 22 Dec 2023 14:36:39 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id BF3DF6B0074 for ; Fri, 22 Dec 2023 14:36:39 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 907AAA23C6 for ; Fri, 22 Dec 2023 19:36:39 +0000 (UTC) X-FDA: 81595461318.19.04CE325 Received: from smtp-fw-80006.amazon.com (smtp-fw-80006.amazon.com [99.78.197.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 5C22F4000F for ; Fri, 22 Dec 2023 19:36:37 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=DgtsUCI1; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf27.hostedemail.com: domain of "prvs=71347c2e1=graf@amazon.de" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=71347c2e1=graf@amazon.de" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703273797; 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=V6Ou6SwquM+raA1qs66DJzmcDcyVj924rceIRas5lS8=; b=u9lrlwJqTSFFMFVGfDKoctoMMmpvYk1T5RL+yBspXy9Ev6utkqFBD9j7bS0bTik2fWQydq COrNFRgNRuN3NWmyzakLoRZuAUpf/0LPrAS8vbnJsZ9zXH0/jLbNFV5wt502QgjaAqFtnH LBnIywTLCc3Yadw1FXizfOQtlPMG68A= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=DgtsUCI1; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf27.hostedemail.com: domain of "prvs=71347c2e1=graf@amazon.de" designates 99.78.197.217 as permitted sender) smtp.mailfrom="prvs=71347c2e1=graf@amazon.de" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703273797; a=rsa-sha256; cv=none; b=2gPE0njK/4QCicDiwn4C3v12Qy7tPu/AWyo2Oiw+CHlsYfF3P28/bZRJHhIX+UTHsTXoaf 0tKBA6DW0Xd7Ow3SVVf+gAtOVYQOK+wgZpJobbRe7sEYMe9ddWcknHask5A+r/DABGND9M wdKO8lzgZr2S3sY+ZPzRaWOnFzXYaqE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1703273798; x=1734809798; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=V6Ou6SwquM+raA1qs66DJzmcDcyVj924rceIRas5lS8=; b=DgtsUCI1vJ3og56u4FTE/iNknCiUc0ycq7M3hmyAcrS4ALFommBm3Yni jYIGBB/IrzRnG7PLxatXhNyTfZoPfwvCCjXwl4jTRVKt95v7B7ozKHiVG O9mlhA0OAXX4ZjlAgCz+8U09AayczmhQwbWhpROdOYY07+YhiXgHul28s Y=; X-IronPort-AV: E=Sophos;i="6.04,297,1695686400"; d="scan'208";a="261444389" Received: from pdx4-co-svc-p1-lb2-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-96feee09.us-east-1.amazon.com) ([10.25.36.214]) by smtp-border-fw-80006.pdx80.corp.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 19:36:34 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (iad7-ws-svc-p70-lb3-vlan2.iad.amazon.com [10.32.235.34]) by email-inbound-relay-iad-1a-m6i4x-96feee09.us-east-1.amazon.com (Postfix) with ESMTPS id 9FF3949A6D; Fri, 22 Dec 2023 19:36:22 +0000 (UTC) Received: from EX19MTAUWB002.ant.amazon.com [10.0.21.151:35389] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.24.220:2525] with esmtp (Farcaster) id 9ed8fb9a-78f6-45ad-a602-e555218674d3; Fri, 22 Dec 2023 19:36:21 +0000 (UTC) X-Farcaster-Flow-ID: 9ed8fb9a-78f6-45ad-a602-e555218674d3 Received: from EX19D020UWC004.ant.amazon.com (10.13.138.149) by EX19MTAUWB002.ant.amazon.com (10.250.64.231) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 22 Dec 2023 19:36:21 +0000 Received: from dev-dsk-graf-1a-5ce218e4.eu-west-1.amazon.com (10.253.83.51) by EX19D020UWC004.ant.amazon.com (10.13.138.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Fri, 22 Dec 2023 19:36:17 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H. Peter Anvin" , Andy Lutomirski , Peter Zijlstra , "Rob Herring" , Steven Rostedt , "Andrew Morton" , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt Subject: [PATCH v2 02/17] memblock: Declare scratch memory as CMA Date: Fri, 22 Dec 2023 19:35:52 +0000 Message-ID: <20231222193607.15474-3-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231222193607.15474-1-graf@amazon.com> References: <20231222193607.15474-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D035UWA004.ant.amazon.com (10.13.139.109) To EX19D020UWC004.ant.amazon.com (10.13.138.149) X-Rspamd-Queue-Id: 5C22F4000F X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: psnpcq19jz7oqqkein69sm14b79yez99 X-HE-Tag: 1703273797-445581 X-HE-Meta: U2FsdGVkX1+nt8RKkD/BT0T4h1/aW0pVFoKmgKO6ma+/g5ta+3TrUQuGjA0aznppjATn0jcG2IOFwFtPVOxl4agzVrld2eco1Xqiex+Udjb9xoB1ucAiNzDx0hskTxzURoPQhbPbmcFyi00SX87z9Tvzit+53CaOuTeKED1lrYFt3gUG0RI4rXxEcekzFWIZf3znFNOv80liVkNuGkwhjOBb9OkADWO2bLzYBSTuseaaZX4aI5wtOYUr++OWAL7kA2Pay9830aQvhReFuO6ka2ip7k6MgITSob/62J/etgvUBkePxf+VTo4Z+GphHi7SCGiReF5BVtTihFiDccDaRlms2F75rn/GxYnNWMy4lADM7fZEx1QUQe+kZ5nPHy+fmF2ppmEtwlDx0P3pzwLgANUkdRuW9JL5XSS/yZPFg/CFJFt/4GFHtJxWwJtbE9QU1g5+I7MNhaEMNjYGPQvdNOdJK0kX2uXlUY6x7vAWFldOLpQ0hsU3dKzQDBq3IccF2YegTWXZjiQLE4Ic3wDpORLvs9+y2a0DhXM8Agtt2N55XQGFFNjcUi3zaMlTvrofZPlM29B/TUHBkJuEhjetnOWIQ5SsNUT+IBg+eVnqmFU6sjvdnoiOP9j2N+s/dLAw/5K7VfujWcsuWbn3FvlSXyP/WH6Dh1foYrPK8I8bOa+rgzhQOgvcYy7iLXh31ibd9IcoHNdBQ6G7I6858PceILIAOx4AQwHPrAjeEXUzw8Bv8/BWR4M7ikHAciAcc88vq4tjxiVxQXzMdWPXD5YLCeWTvaN24fJDquStTlJpgJvKgn2eTXTaxaCz/d7sphAZyGVl1f1asiw3BkjSRJHH892Kri0guUV1XJCfFN7Ti5Vq1f0zeTyM6DOYkNerzxh3PlB4vT7dGrSrur4Px+XaBudjSsNVyIHpMXRN9yZZiLmG3QeL2RxPLw1hwzWNs/9a3PlmAvKCSAR5kKSg1+n RIijJLdY jjNhvQPhYbO2U5uvg1YSKWbByAbI4VWe1b87GGKS32enbUPaZceZ42WagbN++uMWouEUWf0nh5pt+VsZXGh5kcssRodbW9qhE3zHL/P2ZNbD8ouNsUq1OJiWP121i7ewCTJIx7YLd/A3LrFOsk5yYgRvsmN6q7MiSC9xvNtKmC2Rz1jBcrwJszzIcEFmqOoA8erCXGFT+bCVyE78742rJ/qmsTUtbUAbR4e208ajZn5kxFH54tNo6i/+IuH5YVi/wlnzC9Q3U88yQHlFXt0n3wJUEkpmxODE9h4ez61xY7phbDiM/MvkrcWM4j8tXvq80yVHhXSqzJ92pY6rA6+WbNqswHPQyO+2aDkpNvF2NTZQBGXRVhNKFzLOZ9HoE1bAsXTLfLpA2bYvYN2cNQHBxoaSPCDw9GWZoxGlUvq9NfiQnYGacvhOFPyFZm4zcfhlL6+hh1bMEzZe+hQcYTW5rGTmWHXXV9/M9o0zi32e5Jgz/+yNzkxPzXQyYTqFHW9if7DLJ/DsTpyGfXGnCs3rWDgtOvCcaOtIS9w6ZlvDoh5xtzxUN7TZ3QkrCnpg8r6HCV7D15hK3Ra1sQWU7ZrztC/pGfvby/7VIWqyNrZtIxHyKx9vokllkjOvIuw== 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: When we finish populating our memory, we don't want to lose the scratch region as memory we can use for useful data. Do do that, we mark it as CMA memory. That means that any allocation within it only happens with movable memory which we can then happily discard for the next kexec. That way we don't lose the scratch region's memory anymore for allocations after boot. Signed-off-by: Alexander Graf --- v1 -> v2: - test bot warning fix --- mm/memblock.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index e89e6c8f9d75..3700c2c1a96d 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -1100,10 +1101,6 @@ static bool should_skip_region(struct memblock_type *type, if ((flags & MEMBLOCK_SCRATCH) && !memblock_is_scratch(m)) return true; - /* Leave scratch memory alone after scratch-only phase */ - if (!(flags & MEMBLOCK_SCRATCH) && memblock_is_scratch(m)) - return true; - return false; } @@ -2153,6 +2150,20 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) } } +#ifdef CONFIG_MEMBLOCK_SCRATCH +static void reserve_scratch_mem(phys_addr_t start, phys_addr_t end) +{ + ulong start_pfn = pageblock_start_pfn(PFN_DOWN(start)); + ulong end_pfn = pageblock_align(PFN_UP(end)); + ulong pfn; + + for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) { + /* Mark as CMA to prevent kernel allocations in it */ + set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_CMA); + } +} +#endif + static unsigned long __init __free_memory_core(phys_addr_t start, phys_addr_t end) { @@ -2214,6 +2225,17 @@ static unsigned long __init free_low_memory_core_early(void) memmap_init_reserved_pages(); +#ifdef CONFIG_MEMBLOCK_SCRATCH + /* + * Mark scratch mem as CMA before we return it. That way we ensure that + * no kernel allocations happen on it. That means we can reuse it as + * scratch memory again later. + */ + __for_each_mem_range(i, &memblock.memory, NULL, NUMA_NO_NODE, + MEMBLOCK_SCRATCH, &start, &end, NULL) + reserve_scratch_mem(start, end); +#endif + /* * We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id * because in some case like Node0 doesn't have RAM installed