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 7B591EE49B0 for ; Wed, 23 Aug 2023 13:14:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1559D900027; Wed, 23 Aug 2023 09:14:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 106898E0011; Wed, 23 Aug 2023 09:14:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE914900027; Wed, 23 Aug 2023 09:14:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id DD4D18E0011 for ; Wed, 23 Aug 2023 09:14:49 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A43691C822C for ; Wed, 23 Aug 2023 13:14:49 +0000 (UTC) X-FDA: 81155414298.22.7801242 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id CE71F100022 for ; Wed, 23 Aug 2023 13:14:47 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692796488; 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; bh=NyZXYewavhBbZmGyqV77AChMJ6F3CygpLyxWgKDcDkI=; b=NVL+ZNP4FY6tJ2ZfcQEMHEq9iIkihBMltC6Mr5VUYcifOzpabMkcJBDWF7oVvh7RVMM9Ru GR+NwjugBQzJ/cnPf7g94tGLOkGOt6TjRJm0ofNDhh0z7KrLHg+zISMqZX7td3C+uVT+hK zMOfVml7NFamqd9fhzK71xO908zH2jI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796488; a=rsa-sha256; cv=none; b=Q7SeLG+P9mtBL2k+Zjh7bRR192O3kL+mncgysv+/EnayzjDfK7Z9nGR4G0M8wWursdJkcm 3kJVfrqbcTPIyrvZPtXRYjyLX8Av9yz/0fSyOO86b1oz+gBGz15glOcAU/lpgrEzsKnpvf QKRh048sHEmeYYUt4v2PXvozHHI6OKU= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 919B61576; Wed, 23 Aug 2023 06:15:27 -0700 (PDT) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 415F23F740; Wed, 23 Aug 2023 06:14:41 -0700 (PDT) From: Alexandru Elisei To: catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, arnd@arndb.de, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, mhiramat@kernel.org, rppt@kernel.org, hughd@google.com Cc: pcc@google.com, steven.price@arm.com, anshuman.khandual@arm.com, vincenzo.frascino@arm.com, david@redhat.com, eugenis@google.com, kcc@google.com, hyesoo.yu@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC 06/37] mm: page_alloc: Allocate from movable pcp lists only if ALLOC_FROM_METADATA Date: Wed, 23 Aug 2023 14:13:19 +0100 Message-Id: <20230823131350.114942-7-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823131350.114942-1-alexandru.elisei@arm.com> References: <20230823131350.114942-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CE71F100022 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: gwb17wbhhztdw4x7mjw8zhf4fu6yuskp X-HE-Tag: 1692796487-363157 X-HE-Meta: U2FsdGVkX18IabF+8dHytiO3IIiGpKfY+0SPw4Q5eH/J7s1BiqVCs0iUAhwoTdsdRd/e1LEivRRB/0JLAbkz8jXJmHEe0CzNeqO7bb1ro4K6wSzj6S16lVu/FNlfOVPKqWbtlw0lYzjUo7k+Gfo3hcegCMjOly1Vr4KxMQDDdb/DEQ9X5WhKk05MFLWYZDaB1O5UxxFsdrowg58eXlMJ7lSgHkgb0wqFCMQ1k2EzaTW/Z/k6nqvCvsZs2LbH+NUyggWYIdipKkPVBoL4naltJO6829nWkPi3XiIZkRdFPLCerQAjqHDreo+nmrWrcBuH9f809XEXpu9glpVSvwPxp2rVH3YU2c905Gl5mv2cjC2VjGMisG8sZYniVCtliq9a2Wni8BOaUh9fhKq2mBzHBNtoC3dXBnYVFmkR8sf1+2jz1/46dzmwGEWfrjTiAC6tWyd8vr9WTFtm5QaqKG+OIWweJn9p747XHZI5IRecwSpWjohYfh49iWgHWnSHghB0haN4cXXR6RKBNhgryDYxl45V2rDERJS6w9TIPZUV2zxbRGAB6SzERhWtl7b8aOmcuzsdWVk9MYCqYScTeku4xnFqqiiVEQvk+mE6OfE357NjGo0zEM6zWGuLVaZCZshic89Azs1iGgaLE2SkIyMwadQ0NTDguXATv9y5vH5VsAFxmjVQpJhBzG8sqDiyMCRqIy4epieWwwx9a9bjyYhgrC+MxznzKKVIEtcQTSZXtzqEyM9Ur2Cee8yCM+x3UPGdbWLnEO1GI7fStFaC8jKfyZZD2fxIIks7ZtQAOkQ8qH4vwWscaYa9C2Su8vpMY9X+9KdIzmMdO8kbSqU3j8xlZ36z4tvRMMI1I4uVuUo6WWgx7LD+ZonJPZt0W42KkoCHGta9L/9qhoaddNTlRkIdZ4++04p59cdDvCc1obPukv4OxwkzFcZ/VGlrXJ8vO3hMUFO+1OUSYJ0kwEw9TgP 4lSdaOJR s0UeGTt8b8ZELpE8OZ3ko1FbNe6xOf7gIKVHwuBhzY6UA2ys1IGzekk+dHAMnyR9gYH1wm9R8ytQrJfTVYkDKqnkYGkkFz7MdyOGDe7Uu5eTz5f65bOHAA9aXoo+PyBOEd/3FkMhhvqFA52BEkg6G3jzW0ZAjy7soIaxalLwQsL3RSAz4hhS7SDKw+u7ZtFlLFXA6fm7T6EUQGUE= 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: pcp lists keep MIGRATE_METADATA pages on the MIGRATE_MOVABLE list. Make sure pages from the movable list are allocated only when the ALLOC_FROM_METADATA alloc flag is set, as otherwise the page allocator could end up allocating a metadata page when that page cannot be used. __alloc_pages_bulk() sidesteps rmqueue() and calls __rmqueue_pcplist() directly. Add a check for the flag before calling __rmqueue_pcplist(), and fallback to __alloc_pages() if the check is false. Note that CMA isn't a problem for __alloc_pages_bulk(): an allocation can always use CMA pages if the requested migratetype is MIGRATE_MOVABLE, which is not the case with MIGRATE_METADATA pages. Signed-off-by: Alexandru Elisei --- mm/page_alloc.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 829134a4dfa8..a693e23c4733 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2845,11 +2845,16 @@ struct page *rmqueue(struct zone *preferred_zone, if (likely(pcp_allowed_order(order))) { /* - * MIGRATE_MOVABLE pcplist could have the pages on CMA area and - * we need to skip it when CMA area isn't allowed. + * PCP lists keep MIGRATE_CMA/MIGRATE_METADATA pages on the same + * movable list. Make sure it's allowed to allocate both type of + * pages before allocating from the movable list. */ - if (!IS_ENABLED(CONFIG_CMA) || alloc_flags & ALLOC_CMA || - migratetype != MIGRATE_MOVABLE) { + bool movable_allowed = (!IS_ENABLED(CONFIG_CMA) || + (alloc_flags & ALLOC_CMA)) && + (!IS_ENABLED(CONFIG_MEMORY_METADATA) || + (alloc_flags & ALLOC_FROM_METADATA)); + + if (migratetype != MIGRATE_MOVABLE || movable_allowed) { page = rmqueue_pcplist(preferred_zone, zone, order, migratetype, alloc_flags); if (likely(page)) @@ -4388,6 +4393,14 @@ unsigned long __alloc_pages_bulk(gfp_t gfp, int preferred_nid, goto out; gfp = alloc_gfp; + /* + * pcp lists puts MIGRATE_METADATA on the MIGRATE_MOVABLE list, don't + * use pcp if allocating metadata pages is not allowed. + */ + if (metadata_storage_enabled() && ac.migratetype == MIGRATE_MOVABLE && + !(alloc_flags & ALLOC_FROM_METADATA)) + goto failed; + /* Find an allowed local zone that meets the low watermark. */ for_each_zone_zonelist_nodemask(zone, z, ac.zonelist, ac.highest_zoneidx, ac.nodemask) { unsigned long mark; -- 2.41.0