Message ID | 20231119165721.9849-9-alexandru.elisei@arm.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 AC425C5AE5B for <linux-mm@archiver.kernel.org>; Sun, 19 Nov 2023 16:58:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45E3C6B034C; Sun, 19 Nov 2023 11:58:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 40E456B0350; Sun, 19 Nov 2023 11:58:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FD596B0353; Sun, 19 Nov 2023 11:58:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 20E906B034C for <linux-mm@kvack.org>; Sun, 19 Nov 2023 11:58:24 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id D5E214014E for <linux-mm@kvack.org>; Sun, 19 Nov 2023 16:58:23 +0000 (UTC) X-FDA: 81475312086.08.E6FB45E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf13.hostedemail.com (Postfix) with ESMTP id 47EC520025 for <linux-mm@kvack.org>; Sun, 19 Nov 2023 16:58:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.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=1700413102; 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=zTtUZUTgtHFDNv65wh+SaRP8YGXoC86zJE/tcdUO5mg=; b=Gmr4qbBQ6V39cKhQ4iouQhINjrJaHU2BKGEAuY4i+3nimUoENtK3zlS+NRw8HkTuvavy9Y cJpptP5J6ngOVY3zHkDiVYJuZ5vVlBXNrc/t5DhX1jUQGBpH294MYFkg03iN5xa+FffXDk LawvBdPhTixLIsKg5/jAvMDU3KTFWuY= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf13.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=1700413102; a=rsa-sha256; cv=none; b=gOwOAU1jB+P9ck+gp2S4YGrHY9X+wMokcFY5GYi5Qxr1jmRpaFqkAl96BhnGNX5UJN3hRV L2T4u3DdLzNS80PzCs51+whhPwSOtmGjqYWisQFlitbjQdrt5ibB/Bpk8X7rJXPYdmgE9/ 36jo7+M1rTh78cW2WG66p7K1mxEN37M= 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 DABF9FEC; Sun, 19 Nov 2023 08:59:07 -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 A20A03F6C4; Sun, 19 Nov 2023 08:58:16 -0800 (PST) From: Alexandru Elisei <alexandru.elisei@arm.com> 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 v2 08/27] mm: page_alloc: Partially revert "mm: page_alloc: remove stale CMA guard code" Date: Sun, 19 Nov 2023 16:57:02 +0000 Message-Id: <20231119165721.9849-9-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231119165721.9849-1-alexandru.elisei@arm.com> References: <20231119165721.9849-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 47EC520025 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: jhwwf1nwuwqk9b3nd71mscd8owxrwsbn X-HE-Tag: 1700413102-290472 X-HE-Meta: U2FsdGVkX1+k8r1NYEP26ueQKXOp+4zAv7j2nRgZQCL/vzvf/uW+j0oJG6NA2Wdzss9up6S+L4bYdjWmCrf/mlok30BAvmHaMebejIgYgmS3crTaOckxL/akYUlI2mPN9jppxYca1M06E9fCh58ZHQAwoHCJpx1mbleN+9KckPyRWuNLcqLECNBvqa+Qxj64TFDh3++1GYv0GpG37ajAqgjKpNToiDOPnxHy2g3j+xNkxT+/yPTKbxosdAKYkCXL7fwd/eZNoR3rvQPkOO3jilvj2jyT4z98to5Kz/1KSbEywrbrIg7R2xZAj/P5swxB7Aue7CEiYTtkmBY6WsyJHz1YYP9oK9oj9+0OPLQ9tdJyPHbdvQzu3Vwj8fzLodLVeI8wOVocbZt79Sp/VPzJtSSJM5ramXniwuwRNmTpcUFXJl/AjK6tTIt5LLamzPLKjYogx7IqWKL5rBs1fDH3P2pvaTZgYlrtJg+l7m8x8anLtNdiHsc2Rw+b0zFC6IXDSeVm54RP3xU+K/GxLY615HOp7CVY/de916RgW4GhSwYSIQS+kb9pt1D0f3qJlAD1Ys+OrsuupdtjxUnicW66VJiCOJH9GqzxjKQ0P3d4Gn6/dCnqXkL6uOq/bz1ClRwfJWO47y+RT+u3FPI3NKAWzd3V+NJ8fbz0gkd6J9Xm+n9tcx1ZHnWAisyEWg0KIgybTu6n86uyidzkzjKqA4xAC6gWPz/DmVAaTZ8TIL/JrJQ6l+4uJanRwU8yoDcpinxEoE1tpozOFRqo29DYOLVF888aLLpMF6COxrSCq5fbhdgrdRxYaOauoMqdAbSnJGMMKlL4UVbSlpTqdVA8FAhfeofNro7W+PZYxZHa0gXQANdvL+Ptkt2RAzKs75PaVxhKjDbKJpoItF++5THnQ6t7UhvodPVw3gjDMxmLoC4nX3FvDBYaS50OWdQU8nJ2ZUPa8I03PeDPd+k/hs7tDGj hvwpl5DZ LOak3tU68AmJtO+RXxHKuKaPEqxFf9t+pkVwm+jK+9uOS/mOo/i2vydOjZQwFyeuWb7sbdRKs1DHLEAQMCRu+WOJIrFnpS2wSj3v0BVfNjQeSHsmPYwJpgJzTZBBgTeT+sY26YQc260Keu4nQAwJP0dA4z9gui1d4zwx1F2hoY0Gv9TPQSk4o+0F0BieZBKILNu1McMz75GaB468= 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
[RFC,v2,01/27] arm64: mte: Rework naming for tag manipulation functions
|
expand
|
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0f508070c404..135f9283a863 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2907,10 +2907,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,
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 <alexandru.elisei@arm.com> --- mm/page_alloc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)