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: 43189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp213220wrt; Fri, 13 Jan 2023 03:23:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXvYGSZ33qBGJjJvREO+84LzDzQJdUsi2tSLhoiDRpCKfB8/3OZHFrMnqMUK8dNGNc119L8Z X-Received: by 2002:a05:6402:538c:b0:483:21d8:87af with SMTP id ew12-20020a056402538c00b0048321d887afmr60213005edb.24.1673608980743; Fri, 13 Jan 2023 03:23:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673608980; cv=none; d=google.com; s=arc-20160816; b=sggNo+rf106kKGfIBVUQ/Qe6VeYoWkDEMRZEcWOe2hoB9zmVpHo3QrsgZzebFTlH2C XZCDp0LlaM8QGdLSZfewagXLUR9kPNhhfJmZ8s6fE7+A6wkBECx335rTS0O+GWtYH3IW assdWI4rdTWaNz04gxQ73TAWBbdxeeyZCihZDzHGMKJSJtSxNxlvulqQ9Tqt470wa3NF Mm8+GDbBR1ZvPbkEPh0StsRmI3/qwU19OChE/g/1ts+Nmnlf6cxRX7FpvpAZJ2DtPQwS vSyGY6YCi2InA19rUdiDkV4KD+XKxDtLbD6DT+ZHaxBsEitJcfSQ9g99gkp6Y35hZwVV hHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=LnNHzsxLBAqkc6G9HCgyzTdpj5TzheSV3RrT+CCgXUE=; b=IFv6JVcdNxDMVhxA8QMvZVCJg71xbv6AZbBkebZEDQIdXl2/wrCo2rju3p2x4AmCVH i9hXCsug0pgZXgj2mvqOIfM57Ao8Bmpa4CZrp9nJtDwSaZk70urNbZP1ZKxOk7IIHo4f c/fus9hXXQcjx5jebGhGZCIWZ0Hju9Xz1O6nBYIQtnE0jYEuNxpbmT9WHVZJ1V5qXjQf CmWWq8CznGzto6Wr+YrHfmfJrmKcTf6KPoLYa8ERapegSNT6+CufqtaJVBcKr4gzykPY dss/0MYr9ewR89KD+UqGjlkxoE5PjZJ8e/brTjEzv9M8nYi5B3oevAxNGqqCg3YwCsjW uD8Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id xh10-20020a170906da8a00b0084d37abf43csi18691291ejb.919.2023.01.13.03.22.34; Fri, 13 Jan 2023 03:23:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232755AbjAMLSX (ORCPT + 99 others); Fri, 13 Jan 2023 06:18:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241343AbjAMLRU (ORCPT ); Fri, 13 Jan 2023 06:17:20 -0500 Received: from outbound-smtp29.blacknight.com (outbound-smtp29.blacknight.com [81.17.249.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68D42659F for ; Fri, 13 Jan 2023 03:12:39 -0800 (PST) Received: from mail.blacknight.com (pemlinmail02.blacknight.ie [81.17.254.11]) by outbound-smtp29.blacknight.com (Postfix) with ESMTPS id 6BE4C18E031 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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754906210668353148?= X-GMAIL-MSGID: =?utf-8?q?1754906210668353148?= __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));