From patchwork Fri Jan 13 11:12:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mel Gorman X-Patchwork-Id: 13100524 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 CC1D9C54EBD for ; Fri, 13 Jan 2023 11:12:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 36EBB8E0003; Fri, 13 Jan 2023 06:12:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 31F228E0001; Fri, 13 Jan 2023 06:12:42 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20E5D8E0003; Fri, 13 Jan 2023 06:12:42 -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 147588E0001 for ; Fri, 13 Jan 2023 06:12:42 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D0DFE14056E for ; Fri, 13 Jan 2023 11:12:41 +0000 (UTC) X-FDA: 80349512922.17.DBE6DE0 Received: from outbound-smtp14.blacknight.com (outbound-smtp14.blacknight.com [46.22.139.231]) by imf24.hostedemail.com (Postfix) with ESMTP id 3CBFC180012 for ; Fri, 13 Jan 2023 11:12:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf24.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.231 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=1673608360; 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=LnNHzsxLBAqkc6G9HCgyzTdpj5TzheSV3RrT+CCgXUE=; b=4ZlZ/fw89CbhOaJttRxkXeboo1lKkNIF1ViL1Ic0ZFQvZybPrjJV8cvXI1sIl1DM2E6Vgx PYvVfwqu9cfMtNUPtnY2yyLK9ZlSrVslQyxMuFttsLt+FD4YrY03cxm9j3hUHs9fuhodP5 CFo556gaIhnnfm7jLVDn/39eAkC9A2s= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf24.hostedemail.com: domain of mgorman@techsingularity.net designates 46.22.139.231 as permitted sender) smtp.mailfrom=mgorman@techsingularity.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673608360; a=rsa-sha256; cv=none; b=8cOABMLj1P1A60OH83Qz5L/jIqEMV7QY1GnT6BRPBtekHmsx+kpFWZC5cCtuCnwdsQIKcP SVpfaQk4FVjwCs4pt5Gi8rKs8SRo3RQlxNijlwBSP7TdFJdCbkugqOhnBR86R319iQuIrW eK3sq5/DsNztakK+eHSgfF3QZqwstkQ= Received: from mail.blacknight.com (pemlinmail02.blacknight.ie [81.17.254.11]) by outbound-smtp14.blacknight.com (Postfix) with ESMTPS id 5BF151C42E7 for ; Fri, 13 Jan 2023 11:12:38 +0000 (GMT) Received: (qmail 8795 invoked from network); 13 Jan 2023 11:12:38 -0000 Received: from unknown (HELO morpheus.112glenside.lan) (mgorman@techsingularity.net@[84.203.198.246]) by 81.17.254.9 with ESMTPA; 13 Jan 2023 11:12:38 -0000 From: Mel Gorman To: Andrew Morton Cc: Michal Hocko , NeilBrown , Thierry Reding , Matthew Wilcox , Vlastimil Babka , Linux-MM , LKML , Mel Gorman Subject: [PATCH 1/6] mm/page_alloc: Rename ALLOC_HIGH to ALLOC_MIN_RESERVE Date: Fri, 13 Jan 2023 11:12:12 +0000 Message-Id: <20230113111217.14134-2-mgorman@techsingularity.net> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230113111217.14134-1-mgorman@techsingularity.net> References: <20230113111217.14134-1-mgorman@techsingularity.net> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3CBFC180012 X-Stat-Signature: de16hzf3nnxbm4ipteaaxtsfhd66xosw X-HE-Tag: 1673608360-477366 X-HE-Meta: U2FsdGVkX1+d6ZBuDnqCpZmfFaYeG9PBnLdKLoFDcDGZfATCfBGrU1yv0lJXRLt3WmrhLwncGVCBVw6wserie2w48v6//ncGcVxakitj3E0rLHXirTiwrvbSX7DIVqwhHLQM2v08v8KVqN4MB0XeGYxUMLc2/dF+eCiewoU99FAkzG3ipOYfJvwetrpwnPHv7uB+d06p3IFDgDYhm+LhKssR3ovd33RLxSq1vVshwhbiqrt6V0aHctUil3qYSB2Z9PRooWLjk3DE7M2sTSRMfIDKxLXM6l0HYdlnC0b1YlEeZNZxPRbNCXSwDxW7HNqYfQRBJUyn3sMPbsPQ/AzyngD5fQKUXLQFHCJGE9YbQKVpAkKxa55klRD1dfrXviMgmGT/8Vyw0XrgksYzc2g2ejignp2IniGaYIfGk1UrdddAicUw+oz3H0bSajF1tsI24B3/bZwcWZu231ZLjPejhas1GXFTIYk9uYAEA1rGmHH6/gU3X1ykOLiYjoh+uqARPm0WKpP396tDcgEMdO2eejANd+kcjf4f4ezxQiERw5nioEm/n0f4LKF19rwAy1brQWuIVEXLxdD7Hjhge98nCN1ZVUiyu0dvU1Mctme/QsYzBX1iWiHiSZEU6tWczH+u2f5d2ga63ty8xZtTFUGCmFwyVr56nkUxNfrL117YLOw5TKRgjYkWE2RdeDrL7RyZ2016/TrcQwF/npb0l5xHhzzF/3VXTlpOBw1kDCC8EwIKMxoVp5td9deJMBYpaI91ZkXBNB/lqNu6nP/9uTzEsb29j2z9g1+xKaK2CkDHUxnkLga4V8K0o3tdJRFJ94GPY20IG3vmTtID1RIULrWInWAN93Cxpkv2DpDCQ6bbPOFb4PBqjzTinCKbo9/SXu5PLNVM43Quh3D9cwaSINi5BHwgNMgUC0TFrYcKxxNADnLHfQpARUwiJH+MXq5Y2n4QIT8GQhJzEtBEaubnuTH 4eM4FXvI jFx7wmHFG8+CbjCED54NKgISqjyBVrXvUPNI0DyvjjlHZkWqUx0U26SH/zfOF0h+IdZn9 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));