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 6C2C9C47DA9 for ; Mon, 29 Jan 2024 09:01:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E36F16B0083; Mon, 29 Jan 2024 04:01:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DE7246B0087; Mon, 29 Jan 2024 04:01:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD5D46B0088; Mon, 29 Jan 2024 04:01:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BDE596B0083 for ; Mon, 29 Jan 2024 04:01:40 -0500 (EST) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 460BD40510 for ; Mon, 29 Jan 2024 09:01:40 +0000 (UTC) X-FDA: 81731755560.28.2732CF6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf01.hostedemail.com (Postfix) with ESMTP id 1BF394001F for ; Mon, 29 Jan 2024 09:01:37 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706518898; 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; bh=7huyl9Um6aBT50+Whm2FZ5fk6uOb4m07l+4/4hkRmX8=; b=B/hrNMMl+WOIPpEV0HCpwyL7FLUyQFIU01xhmXCm5vTrT2DEzqTqdph2G8EH0XNi4RsPdU 0+2+PzJwHrF9wR/ahh20FY/Rbv7IX2Yx05uKy/xwP+SRJ679VPmkGZtXJsQjHrjaDXLz+X ru9Ee1DNTo3xovpkFN7MOBooJBm0V6g= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf01.hostedemail.com: domain of anshuman.khandual@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=anshuman.khandual@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706518898; a=rsa-sha256; cv=none; b=CJEFYXM3XmP0MIk+eDFgXfShx1o/TqmIbSAT4O3xBIAXI4jlnx3fJ4KHuFP54uoY5LnEjK YY9XT7xXm1wB1j5OiID/TaAjy3cWBHfTo3uMGcJtmmXUViAvKjvMc2tP5oG4x4TDXrDhWv 4Ii3gEZdcBwi4aTrRxgSxopmdcUwI2o= 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 CE03D1FB; Mon, 29 Jan 2024 01:02:20 -0800 (PST) Received: from [10.162.42.11] (a077893.blr.arm.com [10.162.42.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1E8013F762; Mon, 29 Jan 2024 01:01:25 -0800 (PST) Message-ID: <966a1a84-76dc-40da-bde2-251d2a81ee31@arm.com> Date: Mon, 29 Jan 2024 14:31:23 +0530 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH RFC v3 04/35] mm: page_alloc: Partially revert "mm: page_alloc: remove stale CMA guard code" Content-Language: en-US To: Alexandru Elisei , 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, 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 References: <20240125164256.4147-1-alexandru.elisei@arm.com> <20240125164256.4147-5-alexandru.elisei@arm.com> From: Anshuman Khandual In-Reply-To: <20240125164256.4147-5-alexandru.elisei@arm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 1BF394001F X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: xe4nye3qzxf58ja6cusrejebo1rte15y X-HE-Tag: 1706518897-356636 X-HE-Meta: U2FsdGVkX19LGKQxdD03tSIeTfCEsA81ZRevtBxIsjwU2ydHM0mGkZZOHaSGg6iNxBTy5hyN6Os9p2gJQQCg/TlgLXHHM+jFntlcmVmRd/22AB3d//GzpKPOSOoDCuACWcICN0F1I5fh49xVu+QXVAYLiGwMwSMYwbQlxDQExNMoZPrUjzbw5a2xPxC1RFS78xv680MjCJYnTqsnk6cUSEN801UnRR9CyJVn45F+mTRLO8DjGAULSRtcQD1ZJxnlOY4IBPBu+UJ7305TyyNzFF7jwUJxrbIrPITwD1uH69CD58LAT4ZbZ9NOEM6852q4IJ7BEE8Tu9QvyvN7doxQn0lY4M/15Pq8mzYXdLBujCVmZfe+Oh1Jsou48HM3WAQTPe3xlQGFf7zksL6oRy4jhrnv5x/vu/jAhH1ooUdxUYDITPc4i0+Oo3r4guJ4wQwC1V5G5oAjtuG8oOiTmjgr7bAGIjN/foXVZWqVWiWSuKglCxw+ZtVO6v85z7lDgwgt2UTPdFKgQf0rlVUeKKurCVeENtZ/VYf8iS+gtjcvY65P1j83s+U/j+au8Ee1Q3hkwdtQirdyYnnue6RyV1myRwulEsKHObYhRaDO9ITRXOJnek81z1q5EPPE7t8DzLC7utt4F68On/WGBbLforINTn1E1mpd6rjeCRAJ5Be4s7NqkJk7umF2KdmB2baTEJF7fW+vGRmDzKdlEJecrrHoA1RfqIHkLBKzdyll+j4GwLwp2dmCtuuGjnfthy/A6IdM4Tg7NpRq8YD3XuDOEz9k1+CS49fzn17J056sW+uujAgAFCFHSc48jVGIL+tYhcg+alFljH2tqYAK80NKOss67uvt5EGBijKILlUxF6OCZbYsFzmzZHlwc1R4Cbe2TK5+5VCbfohJdV+ohrab86EUEuxYn31O2Wn3rf/1mNuILpxRtFu+AHiauEReerBmeYbzfS70gSPVYNve+bGNWvh UwWlcRn7 woU6FWj+cETwVwwDCgieqXLaJmReMujP0nRZG6roTizpSJOY4yel3UM8Zm0/hEIZwTd15mApTe/DuMGDxtMr4kElO/CjMyVazavBp/Qtv6lCYwws+VlFm3E+ghLo4SIqGpm+/kNm1DV050a7tM4r4+1kC54EPlHBynsWUa5VVvIBchtwWZv9b7l6NZMEsoOg4HnmzBr6nHA5l/MeV2YHRcoywR0js/+v52N3Al8l92BndO157WpMuBJfG0uGVtrXL8dJI 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: On 1/25/24 22:12, Alexandru Elisei wrote: > 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 makes sense as arch_alloc_cma() now might prevent ALLOC_CMA being assigned to alloc_flags in gfp_to_alloc_flags_cma(). > > 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,