From patchwork Mon Jan 9 15:16:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 13093708 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 561A1C54EBD for ; Mon, 9 Jan 2023 15:16:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8E148E0007; Mon, 9 Jan 2023 10:16:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E3DF28E0001; Mon, 9 Jan 2023 10:16:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D2F3A8E0007; Mon, 9 Jan 2023 10:16:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C35E18E0001 for ; Mon, 9 Jan 2023 10:16:58 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 9F58A140A1A for ; Mon, 9 Jan 2023 15:16:58 +0000 (UTC) X-FDA: 80335613316.17.12022CB Received: from outbound-smtp62.blacknight.com (outbound-smtp62.blacknight.com [46.22.136.251]) by imf10.hostedemail.com (Postfix) with ESMTP id 14A90C0005 for ; Mon, 9 Jan 2023 15:16:55 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.136.251 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673277416; 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=kw7JUz/rGbzGnFG23IWbxIVRXidXa9M1SzzzPQEsOGU=; b=vp3+eYHvZbgLxddY3VYGVTGCY8E4ZP+JBzShP6ccntDyR7/ZZaxSPiVI3VADmmlqhoF52r uAtbkIs6yomm+dMwQ0/SirUjlVdQVwejFCKsO34DR8VhTzc6RHeEUt0f5uVoLXEFGkb8eI XW1SdX0U7ENBkDJ2mtBKQ/F2XdtHI98= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.136.251 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673277416; a=rsa-sha256; cv=none; b=nxrc2hypzqGpfsv+IHKlZCIt8zkzg6vevrOYP7naD48iCAb2ICz7O+EKxC1JIKittAfZDU 6jOsXMGA0f7HLE4TunMh2Kd1QxeEfEO8Nee01Vgoaibm2m3Gg3kVUdcArxCXWDKp0o3wL1 6WxH1r5o+m9JrWgOwmqYbA1j3lOW6cU= Received: from mail.blacknight.com (pemlinmail04.blacknight.ie [81.17.254.17]) by outbound-smtp62.blacknight.com (Postfix) with ESMTPS id 798A8FA8AF for ; Mon, 9 Jan 2023 15:16:54 +0000 (GMT) Received: (qmail 16592 invoked from network); 9 Jan 2023 15:16:54 -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:16:54 -0000 From: Mel Gorman To: Linux-MM Cc: Andrew Morton , Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , Vlastimil Babka , LKML , Mel Gorman Subject: [PATCH 1/7] mm/page_alloc: Rename ALLOC_HIGH to ALLOC_MIN_RESERVE Date: Mon, 9 Jan 2023 15:16:25 +0000 Message-Id: <20230109151631.24923-2-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-Stat-Signature: i8kugoywwgh8j733yjrjq9jyc68m8g1q X-Rspam-User: X-Rspamd-Queue-Id: 14A90C0005 X-Rspamd-Server: rspam06 X-HE-Tag: 1673277415-671627 X-HE-Meta: U2FsdGVkX18dBAcTAr4xVW0gkJVir1uBmf3KM86IzEqgEXMZ8hSDszhF1bGiXa/EIMy2MgGv2FZVlmcEiGBTzaLWagm3LoAteHT6KXVBjYpgi7DIUho5rULNbP4F+HUgHcAWiO89oOVEj4I31TkevUhcplZhkhL3cODEjxfa+Dl1LjOa6UsC4MHyKo6H8AlSOJsNRPLz3dwX1Q/j3bnH6G48OLio3CMKn7UGlrpcLQgt/f6CxSvL+XPLGyQKFcyGwQMXRTwHqXMnEexJlAtezSP3Ui1xMDIdNetb2JQqr8iTkckUpr2sS6WTIewHgGcbGGp/iPXs3mDCzjD6/iOu47E9SkuxHWTTj+7a3xsYY1xwuKEeOmF0rTDyVnsDcCM08jiwkUFk7rpoGmsrP13cCyn8u4PkCdVROA4mPC8n9pETxMGZ8b75n1iQQkSLyqM12QgJmI5jRFHgVKWbA1aI4WjJq8l0CqoKPX2W7HYLnkbeKZL4csrQ4hAp1kZteW2zTap+HRrQDDM0zLR5kuY1dXfoKp9dMvm4jsBXPTAZsKfT66gIKw0Ims/0u1u+0O5DczYPJ/kPN67sFGPwvnyn+uRUI8a4LSjgosuPTZ9yx8+VXsV330cFzpdxioBasooXlZJjsJFpG0qqqzHY5TuPuKbM/QvOnPiJVZwGEETJ6YRtBxShSfjim73JkcfHYSQcCGvhQCptbFofjZs23FIkU3NU83IW8/6khih6e1daAbpfoNM78Ov4UAvqIHRGD3q+XdpgzYGXo2rCH/06siobBqCgAbsr39EHZQfwgWi1VwV1Fn/cxulaV/DyVIQVVAGMrGkk89Bik2v8YSmnGJhxxeZeHJx5L40YFId5bTccdRLAOmr8DQfNwM7a91PbxmtYvlBATUdvZ6uzSvNhuBGBpDFtSMrZGCrCAeu57C6FxF2zwW16asfLT/VbDBIdS8zzCi39Tb4szp/K8LADvMi yhG2LBQK RUKbYTMgDLGohp5+0C4CFv3PoU3yIKfDmObIntcLTQaQfsAxNtk9k8HM0KoZLNy1ICOfu 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: __GFP_HIGH aliases to ALLOC_HIGH but the name does not really hint what it means. As ALLOC_HIGH is internal to the allocator, rename it to ALLOC_MIN_RESERVE to document that the min reserves can be depleted. Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka Acked-by: Michal Hocko --- mm/internal.h | 4 +++- mm/page_alloc.c | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index bcf75a8b032d..403e4386626d 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -736,7 +736,9 @@ unsigned int reclaim_clean_pages_from_list(struct zone *zone, #endif #define ALLOC_HARDER 0x10 /* try to alloc harder */ -#define ALLOC_HIGH 0x20 /* __GFP_HIGH set */ +#define ALLOC_MIN_RESERVE 0x20 /* __GFP_HIGH set. Allow access to 50% + * of the min watermark. + */ #define ALLOC_CPUSET 0x40 /* check for correct cpuset */ #define ALLOC_CMA 0x80 /* allow allocations from CMA areas */ #ifdef CONFIG_ZONE_DMA32 diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0745aedebb37..244c1e675dc8 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3976,7 +3976,7 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, /* free_pages may go negative - that's OK */ free_pages -= __zone_watermark_unusable_free(z, order, alloc_flags); - if (alloc_flags & ALLOC_HIGH) + if (alloc_flags & ALLOC_MIN_RESERVE) min -= min / 2; if (unlikely(alloc_harder)) { @@ -4818,18 +4818,18 @@ gfp_to_alloc_flags(gfp_t gfp_mask) unsigned int alloc_flags = ALLOC_WMARK_MIN | ALLOC_CPUSET; /* - * __GFP_HIGH is assumed to be the same as ALLOC_HIGH + * __GFP_HIGH is assumed to be the same as ALLOC_MIN_RESERVE * and __GFP_KSWAPD_RECLAIM is assumed to be the same as ALLOC_KSWAPD * to save two branches. */ - BUILD_BUG_ON(__GFP_HIGH != (__force gfp_t) ALLOC_HIGH); + BUILD_BUG_ON(__GFP_HIGH != (__force gfp_t) ALLOC_MIN_RESERVE); BUILD_BUG_ON(__GFP_KSWAPD_RECLAIM != (__force gfp_t) ALLOC_KSWAPD); /* * 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_HIGH (__GFP_HIGH). + * set both ALLOC_HARDER (__GFP_ATOMIC) and ALLOC_MIN_RESERVE(__GFP_HIGH). */ alloc_flags |= (__force int) (gfp_mask & (__GFP_HIGH | __GFP_KSWAPD_RECLAIM));