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 A2D76C47258 for ; Thu, 25 Jan 2024 16:43:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 429EF6B009F; Thu, 25 Jan 2024 11:43:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DAB06B00A0; Thu, 25 Jan 2024 11:43:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2A2686B00A1; Thu, 25 Jan 2024 11:43:13 -0500 (EST) 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 1B8186B009F for ; Thu, 25 Jan 2024 11:43:13 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id C17DC160DAD for ; Thu, 25 Jan 2024 16:43:12 +0000 (UTC) X-FDA: 81718403424.08.B76F8E3 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id 1982D10001F for ; Thu, 25 Jan 2024 16:43:10 +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=1706200991; 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=yCJEAk/Tce1G3ebANNHIXIwk1XBp1lyQjk0tJJyzuHM=; b=U0DXhu6/U3AYNSb4CtMkEeBpSnqJMRbhXYiNYATfVXeAvjJ3374NRnzCHHfeQFiiUdy7vE NNt/Vsa3h0M2bTISWsrGCnIadsjeImtc/PErqy1UspCFXfeV9jqv+ph7xxskr8iZ7PLuDL DgC0/QNSVSUn0fBgKL/CDHcPGf4ktxA= 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=1706200991; a=rsa-sha256; cv=none; b=Ga1zKiomT0lDdiHon1U7BK/maf9bBMwws9d7m8rxpwlxRUV4AuS7YQRxg8XtGRJWPJLyP9 jx3+qIpjwoMprB77ttm3Z9LPNOLeloQ/sBqusrtQ1d6B794JnlxgAhUVUBovck3+fkXYzF 6YTZP4MUn9/3560w6RSuXbJbyPAxmV8= 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 B2D5A1480; Thu, 25 Jan 2024 08:43:54 -0800 (PST) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ADAA33F5A1; Thu, 25 Jan 2024 08:43:04 -0800 (PST) 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 v3 04/35] mm: page_alloc: Partially revert "mm: page_alloc: remove stale CMA guard code" Date: Thu, 25 Jan 2024 16:42:25 +0000 Message-Id: <20240125164256.4147-5-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240125164256.4147-1-alexandru.elisei@arm.com> References: <20240125164256.4147-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1982D10001F X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: rkokq6b59zpbgsbuesek7gjgwfc8kgo5 X-HE-Tag: 1706200990-44118 X-HE-Meta: U2FsdGVkX1+uApxGbU3AiLH465AHYhTLI1uesXr4FuQTq2qts4bta7qLHsKuObAvszf4fzs5tNSdq+AQUrC7RDufAhXvC0tk+4+gnmBud3H2n3xaC7owgnzlJtT1sztgGBRhJUEAppp5+Xrqyc5PJEB12QH+jd3Mkii0C4VTJ9sdNcyaCgEi0xsw9Vf181gh/gnewmxSQKurT5U8Iye5dPjR3MVdzIkGbwOJCwVHog0PAgIR7YIRLrfEraRr9dUuLV65/KC0MQ3O4adQ5bZqIEj5AJqNiIe9KuR/7NTy2XJyXN9nAV0vfpIJ2JWrvqiDRiJ9L4uL2+tfhUYy0beA58FuMVGb6TJ6/k1rhoJ57QyElA0bMvqfzyWFPqkxsR/aor+2aUKwSSpgsX8od/xvIUKMS93/4+BzhGecQsfKdH6m6DFG36ViA49EhXKS25ZYHbvMpEvbmFHsVRg6eZ9hGG2DwbjkGa/PXjsE83Sets1Y8c3vDZ3G7QhBKKkj8fkQ11/cpKgSgrg2LyjjnxO5pFy1sOxUEFvJqLndsGw3a3CqVFsm82xmiejzpwJs4PraE0mRRoST8n5lvp7qUFdkFX9vmYXnGAzRPv99sStRn2LCFKadu8Egxtw4JPHJuSmBIBlzzFvyG7T0mwAo9dQjufTlygcQZBWbJsxF/gBvdSJaR6poPjB0d6FobWQiOrTp5FYQNW0k0Zf3XRrOt+Xuaotj8p9xHhrRpdO5ANtGUi5VYFP7q7fKBr3s6vtGyaOvbJqD5EzFQE1GBhP1zMBcM2qoo3/klGa1JXZAyLH1lf96pbBlLv1AnNvK0wwDV3UfzvfZUN8hm0xKFVgxsNyLD9SHb1kGw36tWfcnzh+irayWEKzlpeaqCRC0pQv24+F89hD4+UFa7vE7eZy/Fny7iJCDk5C/A3ErmgGS6y2OG9D3SqzL5QJM5J4+pajoUznZbS3G+n4fXT7vNqCaRIm I5+2ru0R es45yGXpzR19ml0bqGbhmOaDVAUYdfF6N2OW/z14gTaGLEsNVLKLdDt93cWHTNSidWooLjcAX4IUWpMTBHFahVZx3d86wXhC9i3CqwNfmZKWluhEs9R5VYabsH0yJxH0hw+8j29a7+aFMlXajnkeXQw4t8cdyxzoYG3SfKP0upczDx5Kdm3zLbq5hW614SM8oG9KVLoqJYh4eFTY= 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: The patch f945116e4e19 ("mm: page_alloc: remove stale CMA guard code") removed the CMA filter when allocating from the MIGRATE_MOVABLE pcp list because CMA is always allowed when __GFP_MOVABLE is set. With the introduction of the arch_alloc_cma() function, the above is not true anymore, so bring back the filter. This is a partially revert because the stale comment remains removed. Signed-off-by: Alexandru Elisei --- mm/page_alloc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index a96d47a6393e..0fa34bcfb1af 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2897,10 +2897,17 @@ struct page *rmqueue(struct zone *preferred_zone, WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1)); if (likely(pcp_allowed_order(order))) { - page = rmqueue_pcplist(preferred_zone, zone, order, - migratetype, alloc_flags); - if (likely(page)) - goto out; + /* + * MIGRATE_MOVABLE pcplist could have the pages on CMA area and + * we need to skip it when CMA area isn't allowed. + */ + if (!IS_ENABLED(CONFIG_CMA) || alloc_flags & ALLOC_CMA || + migratetype != MIGRATE_MOVABLE) { + page = rmqueue_pcplist(preferred_zone, zone, order, + migratetype, alloc_flags); + if (likely(page)) + goto out; + } } page = rmqueue_buddy(preferred_zone, zone, order, alloc_flags, -- 2.43.0