From patchwork Wed Jan 17 14:46:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 13521799 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 9EE87C47DA2 for ; Wed, 17 Jan 2024 14:47:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 295696B00F3; Wed, 17 Jan 2024 09:47:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 245A26B00F4; Wed, 17 Jan 2024 09:47:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E65C6B00F5; Wed, 17 Jan 2024 09:47:39 -0500 (EST) 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 EEDD76B00F3 for ; Wed, 17 Jan 2024 09:47:38 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BB2B0160BCC for ; Wed, 17 Jan 2024 14:47:38 +0000 (UTC) X-FDA: 81689081796.20.C1092A9 Received: from smtp-fw-9105.amazon.com (smtp-fw-9105.amazon.com [207.171.188.204]) by imf25.hostedemail.com (Postfix) with ESMTP id A0B6DA0014 for ; Wed, 17 Jan 2024 14:47:36 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=Y6aJ6Iuk; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf25.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.188.204 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705502856; 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=Jf05Sl5lvM0QZsncorT5lB2H0a51ZRNMVxi6LqgXCm8=; b=uj7fNq+61LQMtGuSC69FYWW0TA550YdjIaElkq5VyjroKhxdh3sQL6Go+AACCD71r6IcqB M1L4d2K5xOiyN66owHj2k9VW0NuB3R0kQo5AS9ABkzUPwUFuBUQB+s9a6tldPM1qJGRLa+ BRr/yhl9HLJSd9wmRqJwGDOnMHRMVg4= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=amazon.com header.s=amazon201209 header.b=Y6aJ6Iuk; dmarc=pass (policy=quarantine) header.from=amazon.com; spf=pass (imf25.hostedemail.com: domain of "prvs=7399cbc58=graf@amazon.de" designates 207.171.188.204 as permitted sender) smtp.mailfrom="prvs=7399cbc58=graf@amazon.de" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705502856; a=rsa-sha256; cv=none; b=d4mkwzYdHy+U/RHB4Xj2PJZZ7CQoXDS7DaFZv6Gdyko2MiNJJkxj1WO/nYCTwSobIjWE/q OOeMaTKIEzJKdHzsg4DuuBgoibK/ablwcbKhLNKINe5nUbZl1r9ziTR9OdZcK1pgXsHz5k BGZlF25YF1tHz+lqhF9SxBDyvxFhYhM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1705502857; x=1737038857; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Jf05Sl5lvM0QZsncorT5lB2H0a51ZRNMVxi6LqgXCm8=; b=Y6aJ6IuksHPjEjJm26dyL4pPuAtrP1wPhXWUWC4ZkRSbIFO2SRWHDdT/ 8qg8ydnVElHVfXxyfC9RG5qLY7cev27lgk7ZnWZvEYo2pNYZRADkgt/GK gccjGweCLfR+sh48bTan/SgurP/afhlu5iI+jjJxiGvwCRDNwkCwzzmVR A=; X-IronPort-AV: E=Sophos;i="6.05,200,1701129600"; d="scan'208";a="698395732" Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-iad-1d-m6i4x-153b24bc.us-east-1.amazon.com) ([10.25.36.210]) by smtp-border-fw-9105.sea19.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2024 14:47:29 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (iad7-ws-svc-p70-lb3-vlan3.iad.amazon.com [10.32.235.38]) by email-inbound-relay-iad-1d-m6i4x-153b24bc.us-east-1.amazon.com (Postfix) with ESMTPS id 733C7C15BD; Wed, 17 Jan 2024 14:47:19 +0000 (UTC) Received: from EX19MTAUWB002.ant.amazon.com [10.0.38.20:23414] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.14.60:2525] with esmtp (Farcaster) id 39c2bda5-5806-43df-98c0-f0c689dbdf36; Wed, 17 Jan 2024 14:47:18 +0000 (UTC) X-Farcaster-Flow-ID: 39c2bda5-5806-43df-98c0-f0c689dbdf36 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; Wed, 17 Jan 2024 14:47:18 +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; Wed, 17 Jan 2024 14:47:14 +0000 From: Alexander Graf To: CC: , , , , , , , Eric Biederman , "H . Peter Anvin" , Andy Lutomirski , Peter Zijlstra , Steven Rostedt , Andrew Morton , Mark Rutland , "Tom Lendacky" , Ashish Kalra , James Gowans , Stanislav Kinsburskii , , , , Anthony Yznaga , Usama Arif , David Woodhouse , Benjamin Herrenschmidt , Rob Herring , Krzysztof Kozlowski Subject: [PATCH v3 02/17] memblock: Declare scratch memory as CMA Date: Wed, 17 Jan 2024 14:46:49 +0000 Message-ID: <20240117144704.602-3-graf@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240117144704.602-1-graf@amazon.com> References: <20240117144704.602-1-graf@amazon.com> MIME-Version: 1.0 X-Originating-IP: [10.253.83.51] X-ClientProxiedBy: EX19D046UWA001.ant.amazon.com (10.13.139.112) To EX19D020UWC004.ant.amazon.com (10.13.138.149) X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: A0B6DA0014 X-Stat-Signature: ooh49ughapcid3crkk1yqty4p7uhj5t9 X-HE-Tag: 1705502856-642464 X-HE-Meta: U2FsdGVkX1/vHcf9pwmnd3kqE8wkYcyBl9QQqBGKIOeLqlsK5QoPWdXhUCvSAmVXpdbZL8diDfCn8rAdRlXY8OdbpECekYyr6cOwDS0mMjlLuQl8vQ0GbxkzbiITz0I3DEiQDGtCOMygHyqR2OHDS88sA6wl8vlkHWPIv39bRESRXnaJPrbnS54iIw0uiMGZe+ergIdMNXUVa0urvCmh8ajMMx/Fh+Dh9YV16SkDh0nQPk9ZcqlH/0usRZq0ylCE/hWPX71ga7FMyta54GMt3BOl1CHyBPfC2eXeTLD/UOQ3K7pCcj3/v9aDdzeqX1L8iIdWfgYvFJO7LD/wlInRVih/nTf8aJnDptAvQMbIwu5Q2khjBd99DgtKA3JpU/PC+yLgBXUAM8fP+z6OWG3NSgO02LBF255mV0uLyEObYOxGtTuQvVw+jlUcv+b8n6MHC+YBBy5XpRY1Ijq0I79xk/DZ1YLUB2cHWh1LOPq8/we8DcRGDlCDO200CQffF3mLYBWGycvUonkoyOO/F2pE8HceDAEGI5QRjskGO/iSsmRAcg1FT48JGJevz9yCWs0z0NJL9F1yRgmL+sJS2ENiTS5qiI7yFCDQHg4AKtMR3h45gB0Eeedr46eau8m3Q4TMtUY2tdDwjuTY4p+NhrhSokffWlHGHCALRBhpSyfmdZJxtKeIC8D40/epseuO3RNN6jEpVZOzyt88Wo5AaoDjyi1Q/SBxcAlka/3h4fLA8LROqUJplyHvF0XNoeO3VwtlrXlxi09ZuX4bUIoUx0DizgRcYdBZU3a5o1Hfbpsvz7YftLLfUxNtrW17cXYcLXeKQzLq5LdyqvVak6FdZ5KT6BrJrSYzrg/UUEycEGxjwttlX05yq22D325plS7tn7DTPXHIoQ8K4dCzGq5dTrF+J8wgd3nGKVhW6lR3bNPGzlHedxqo1ojLq5BkC4SpIs3cRKhTMY1uoJFFOwLRRhh 71nr7bpz LToKlo9L70xMdfFV06KdE8DXF4WcVuov+YXwfkIi3UNJ+l0Qv/7gOwaJhipCI7tX6pZlXgXW0bw6RCOveTuoYoND1eiRFkfhGokD1zjeo5KW1sg4/6XUUcHA4xtxOu1LSiWLt9SHkI1ArnpIHBLEG64ojfFnlBcFOqK3+HD42YkRTCUMGj6hn8XbTayXAD7J3gv8gLFqBxbVUDx8riWXv5+BbNF+phOpju9ohqziL3iv4N5vbOFMBytQsFNbG3kHubv70pio36J3f90iAm5f845x6un8c/0gOE1PT1FxJBquatvhOuEQNw4qWo7HaMcZ2ydp2j12uVodsxUSKu2sArNJ4Y9//LtjP/RD6Wx3/ZNfSsdi4TbyOodhf6iKfxXZeYn0DBHSbUOXOdbsvcqBDg6fDB1ByIZ5PQQom1ASRpi0Ju7WCKdsJPZkC32Fzl/nSEY07uo0Svwn11hZAVz0OMYar5fq228n4qp9j94+V35NsbDgnjFxlO4yVPCSDPZMidnnZLdFqtxEQFelSOtfI2dK0bfogyKHTOu6HUeAyAOh6AT7D1em4feWQGpAHUFgHVJJsBdIMaut6Jfc59kWkqlG9xt2+ev7CvUMro4uo35+taf4FdL4Z8Wu0CA== 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 v2 -> v3: - s/reserve_scratch_mem/mark_phys_as_cma/ - Declare scratch memory as CMA: Remove ifdeffery - Declare scratch memory as CMA: Remove superfluous comment --- mm/memblock.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index fbb98981a202..56530d0469a8 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include @@ -1134,10 +1135,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; } @@ -2188,6 +2185,16 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end) } } +static void mark_phys_as_cma(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) + set_pageblock_migratetype(pfn_to_page(pfn), MIGRATE_CMA); +} + static unsigned long __init __free_memory_core(phys_addr_t start, phys_addr_t end) { @@ -2249,6 +2256,17 @@ static unsigned long __init free_low_memory_core_early(void) memmap_init_reserved_pages(); + if (IS_ENABLED(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) + mark_phys_as_cma(start, end); + } + /* * 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