From patchwork Mon Jan 9 15:16:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 13093713 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 1603CC54EBD for ; Mon, 9 Jan 2023 15:17:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A957A8E000E; Mon, 9 Jan 2023 10:17:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A467A8E0001; Mon, 9 Jan 2023 10:17:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 935148E000E; Mon, 9 Jan 2023 10:17:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 865DE8E0001 for ; Mon, 9 Jan 2023 10:17:49 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5D7811A07D1 for ; Mon, 9 Jan 2023 15:17:49 +0000 (UTC) X-FDA: 80335615458.06.A9E9D76 Received: from outbound-smtp27.blacknight.com (outbound-smtp27.blacknight.com [81.17.249.195]) by imf28.hostedemail.com (Postfix) with ESMTP id 95EBAC0008 for ; Mon, 9 Jan 2023 15:17:47 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of mgorman@techsingularity.net designates 81.17.249.195 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673277467; a=rsa-sha256; cv=none; b=8ZvV2zwFNY3YUzXO48jBM9QsgWmwfEXbk5AV7DOhsTOHh3PJ6wQMqDlu42TK4ULkKrS/oz IE1xByRI5v41+xHJvfKXYd//ymTL5ZpS3Lgm45HE7yKW8aSY06ZSa2crMg4Eln/2OTj445 +fJ1rmV/PSWStThnjRUOto2sGApEHFQ= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf28.hostedemail.com: domain of mgorman@techsingularity.net designates 81.17.249.195 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673277467; 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=/aosjVf9wnG2odvEfIQHwOZ4v3JbIECRX2kB0cfaaik=; b=rPzfMvcMlVeF6t3g/qkmFSxDVX5z5lSLIBQrHAZa7BpztZ/bIarqfEejgn6KjBFDhEx3rW B2I5YbkaIUJBCkE0sA8bfraeGssb6GBFTxxOEPrMUDSNsdGxGYVLgMhQ7B6V7g+jt8n4LA 76O2NeELnOzmmd0ao3HBt+YchwRHoXY= Received: from mail.blacknight.com (pemlinmail04.blacknight.ie [81.17.254.17]) by outbound-smtp27.blacknight.com (Postfix) with ESMTPS id CC0FECACB4 for ; Mon, 9 Jan 2023 15:17:45 +0000 (GMT) Received: (qmail 19193 invoked from network); 9 Jan 2023 15:17:45 -0000 Received: from unknown (HELO morpheus.112glenside.lan) (mgorman@techsingularity.net@[84.203.198.246]) by 81.17.254.9 with ESMTPA; 9 Jan 2023 15:17:45 -0000 From: Mel Gorman To: Linux-MM Cc: Andrew Morton , Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , Vlastimil Babka , LKML , Mel Gorman Subject: [PATCH 6/7] mm/page_alloc: Give GFP_ATOMIC and non-blocking allocations access to reserves Date: Mon, 9 Jan 2023 15:16:30 +0000 Message-Id: <20230109151631.24923-7-mgorman@techsingularity.net> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230109151631.24923-1-mgorman@techsingularity.net> References: <20230109151631.24923-1-mgorman@techsingularity.net> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 95EBAC0008 X-Stat-Signature: jhukdisk8eayf31sf3hq8dxx6f4913mc X-HE-Tag: 1673277467-68026 X-HE-Meta: U2FsdGVkX19qxSmUe2RgvzLtrjGViYVYrglYGbHmGcjg3B1QkZ5G14v+zNAp7MtJhTcvY66sXhPMpk/U1VwolLAXd0ZNhvrKt1cWJcaoOjOFzLFqhf4zS8AJwmZNeInB/aBqFWINrbo0nHg0miPOJQ66esLggKZ7JcTGEo/9mO/6EqBUXBWQIWR4DxMGsU7mrcU1imRt7BkdhepjG8NhyJkOYkWKucRsILIdGcl4aXSdf+PPlppunIRjdfjWNtaxrzuYRaOE4z1rf310nq1likozSJCldzpefFPpMpAs1ayjdxDN5NKqpmgT+ADnLzuRwxPiqw8Xq3xgmVbegugAZa8sNNJq+8olBwfs4RIFW+IX8GZ1SJuQWKRh0L6XqvzvRYRYspsAOWh+z9ldYc/UeKocMVBiUGQEZH024kmsHKu6LuBuZlzxVVE0NP1uJQZwuIzdAtIXDWwu8u9Fq48oen3aGg6ZxkStSVDIo6V1mcd9W3PsPWpSebOlV11DBPlS4fyOW9fOi0D4PXuMaPrefNBxioPaAB4f1zLsckokEhS7RCYVURDEocN2zVvVmrfrPLitJMrvQXcaYwbRetFk6uRseGrzobjXaZX+nrDgxb96SwsyEWuPTGw/doMewbW5Kz6/Zs6fIQae+uIMB5tqSJ/sxQf8XualIiwwiaRvtr7gqStDGd2Kg5+6JRfYuc2Zei7jiiIMzSqtD+DFb3f2BHIYIegizye3cFmOoz+G6JH656ze01GXrvSMF5zvYR2u66QMKTqWPFZkWE3WNZbm3WM+tWeDzEP/LeRPXv7QTxfd8lYtFH6jWwQ7CSx/+uVPRMcsKJWgjDZ0iXAioIWjn84GTlbcQHAiyC1h1snr2jAMOL2e2pRhRDsrdPP4RiYRJ7M56CTR9u11sq17cjMohSwBkfaWuBBiB79fHqMpxSfXVWGcWOtAsu0wZ7e9XQZpgoEb3yYYIRcMRzfnlrW 5v6A14Bf JzYP3fgV9ucF8QDsrtqnoyuCOfPrKyf8lD5QTotla4g/ChGjDLhKpEN/LkyrTClD+R/15 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: Explicit GFP_ATOMIC allocations get flagged ALLOC_HARDER which is a bit vague. In preparation for removing __GFP_ATOMIC, give GFP_ATOMIC and other non-blocking allocation requests equal access to reserve. Rename ALLOC_HARDER to ALLOC_NON_BLOCK to make it more clear what the flag means. Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka --- mm/internal.h | 7 +++++-- mm/page_alloc.c | 23 +++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 8706d46863df..23a37588073a 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -735,7 +735,10 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #define ALLOC_OOM ALLOC_NO_WATERMARKS #endif -#define ALLOC_HARDER 0x10 /* try to alloc harder */ +#define ALLOC_NON_BLOCK 0x10 /* Caller cannot block. Allow access + * to 25% of the min watermark or + * 62.5% if __GFP_HIGH is set. + */ #define ALLOC_MIN_RESERVE 0x20 /* __GFP_HIGH set. Allow access to 50% * of the min watermark. */ @@ -750,7 +753,7 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #define ALLOC_KSWAPD 0x800 /* allow waking of kswapd, __GFP_KSWAPD_RECLAIM set */ /* Flags that allow allocations below the min watermark. */ -#define ALLOC_RESERVES (ALLOC_HARDER|ALLOC_MIN_RESERVE|ALLOC_HIGHATOMIC|ALLOC_OOM) +#define ALLOC_RESERVES (ALLOC_NON_BLOCK|ALLOC_MIN_RESERVE|ALLOC_HIGHATOMIC|ALLOC_OOM) enum ttu_flags; struct tlbflush_unmap_batch; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index d2df78f5baa2..2217bab2dbb2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3999,7 +3999,7 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, * if it cannot get memory quickly, particularly if it's * also __GFP_HIGH. */ - if (alloc_flags & ALLOC_HARDER) + if (alloc_flags & ALLOC_NON_BLOCK) min -= min / 4; /* @@ -4851,28 +4851,30 @@ gfp_to_alloc_flags(gfp_t gfp_mask, unsigned int order) * The caller may dip into page reserves a bit more if the caller * cannot run direct reclaim, or if the caller has realtime scheduling * policy or is asking for __GFP_HIGH memory. GFP_ATOMIC requests will - * set both ALLOC_HARDER (__GFP_ATOMIC) and ALLOC_MIN_RESERVE(__GFP_HIGH). + * set both ALLOC_NON_BLOCK and ALLOC_MIN_RESERVE(__GFP_HIGH). */ alloc_flags |= (__force int) (gfp_mask & (__GFP_HIGH | __GFP_KSWAPD_RECLAIM)); - if (gfp_mask & __GFP_ATOMIC) { + if (!(gfp_mask & __GFP_DIRECT_RECLAIM)) { /* * Not worth trying to allocate harder for __GFP_NOMEMALLOC even * if it can't schedule. */ if (!(gfp_mask & __GFP_NOMEMALLOC)) { - alloc_flags |= ALLOC_HARDER; + alloc_flags |= ALLOC_NON_BLOCK; if (order > 0) alloc_flags |= ALLOC_HIGHATOMIC; } /* - * Ignore cpuset mems for GFP_ATOMIC rather than fail, see the - * comment for __cpuset_node_allowed(). + * Ignore cpuset mems for non-blocking __GFP_HIGH (probably + * GFP_ATOMIC) rather than fail, see the comment for + * __cpuset_node_allowed(). */ - alloc_flags &= ~ALLOC_CPUSET; + if (alloc_flags & ALLOC_MIN_RESERVE) + alloc_flags &= ~ALLOC_CPUSET; } else if (unlikely(rt_task(current)) && in_task()) alloc_flags |= ALLOC_MIN_RESERVE; @@ -5304,11 +5306,12 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, /* * Help non-failing allocations by giving them access to memory - * reserves but do not use ALLOC_NO_WATERMARKS because this + * reserves normally used for high priority non-blocking + * allocations but do not use ALLOC_NO_WATERMARKS because this * could deplete whole memory reserves which would just make - * the situation worse + * the situation worse. */ - page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE|ALLOC_HARDER, ac); + page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_MIN_RESERVE|ALLOC_NON_BLOCK, ac); if (page) goto got_pg;