From mboxrd@z Thu Jan 1 00:00:00 1970 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 EBDC6C83F12 for ; Tue, 29 Aug 2023 03:49:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88BBB280032; Mon, 28 Aug 2023 23:49:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83C348E001E; Mon, 28 Aug 2023 23:49:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 72C15280032; Mon, 28 Aug 2023 23:49:04 -0400 (EDT) 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 650638E001E for ; Mon, 28 Aug 2023 23:49:04 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 311C91C9829 for ; Tue, 29 Aug 2023 03:49:04 +0000 (UTC) X-FDA: 81175761408.18.004B5BA Received: from out30-100.freemail.mail.aliyun.com (out30-100.freemail.mail.aliyun.com [115.124.30.100]) by imf20.hostedemail.com (Postfix) with ESMTP id 863071C002A for ; Tue, 29 Aug 2023 03:49:00 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693280942; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+6XsVNXcCRx6PDduQs4h9B6a5VBwTf8brg6HujoB0Gc=; b=XwjgEZpDyBeo/Lvv0Rafwo94Etmqu3hkD1sjL//pI/uq6C2XXRQ7TaQoNMNvrYNL+FhYcK cETcXGwVvZI/BM8Qd/ToFU3QTOLHQ7xRkowphqNBWHSrEcmGhiymUgc6jRdwM39aelnn98 cqYIuSetBNJgMiGvtiPK2Jmmdh/Oq2Y= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.100 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693280942; a=rsa-sha256; cv=none; b=15T4xUOzMQuWBSANOM8Vl3Td5KSYkzn4NZ02b7YT61ELjlQX9+i6knJwsbQ54S+6RyLL9X 2KfqyUx8sXxNPER6Fr0SXl79STIotmR1orKvs5dhEUhaAGsDW7nksOOCuU8Ckczh+PNpN7 O2Wh927b8y2xblETpBD/HSF8MW+uxxA= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R621e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0Vqpt4fA_1693280935; Received: from 30.221.133.4(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vqpt4fA_1693280935) by smtp.aliyun-inc.com; Tue, 29 Aug 2023 11:48:56 +0800 Message-ID: <940a7978-ebbb-f232-b536-7c8d16c0d1f1@linux.alibaba.com> Date: Tue, 29 Aug 2023 11:48:59 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [PATCH v2 7/7] mm/compaction: factor out code to test if we should run compaction for target order To: Kemeng Shi , linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mgorman@techsingularity.net, david@redhat.com, willy@infradead.org References: <20230826153617.4019189-1-shikemeng@huaweicloud.com> <20230826153617.4019189-8-shikemeng@huaweicloud.com> From: Baolin Wang In-Reply-To: <20230826153617.4019189-8-shikemeng@huaweicloud.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 863071C002A X-Rspam-User: X-Stat-Signature: t8ktrhf7pj3z19dw3nx5neyuqmmqc4g4 X-Rspamd-Server: rspam01 X-HE-Tag: 1693280940-822323 X-HE-Meta: U2FsdGVkX1/wJ6mTZ0415akFMqiqKx9L2yfKqfRpur00NJzzO+Bh7f8A/z0kifvGtjLGAZQwMUm+n3wjqMrzoiJaBxRX8ba6bfkX+8X+3MFQm0AgK5p9GsSeVE5fMCQ6zEt9JTmGtsHC6kDbsCgDpzOKz3zmF0Jeh5H+7DOD9VwENfezk+X6OYXHFnBrI0ToTk99b//pW4LuzVoJlZ7ctd/zIjHx/fCvuLq703xBUKdDT6SBWPJqJYKU2Rpxuvpcg2/YDNzsy1rUD9q6sQddLLHbpLXpRZhwn0F8anZUmXuUGRBtRWtoV2qN8aveB3W4mMhSeBFvEOQs50YzkwKUW/IOr/BTRk87KWXVYq2Yyf8d+YGsla8tgU+HDzzzA24IsYqKQx7jVkHFoL3riCHOv0rcpKbo9m4AVG1gvkJ53RkptZe/xEaEPiYe+5IXFUngUDQQ230iP/arxYZ6p5F3FWhoFt4RKtWP452O5ktnQEOUTJacXZ5kpAUj6EHuX5Zw3eG4B2OlcBpbcCPjRizqZwD0Aa8UX9WrKnO4awY7Jq+j1G1B1GB5Fyt/6PBj82ri9KMR+p9cVA90GtHLNA+3BdWPeu3L7fuD7I2VCeH8Oanw7A4NZgj6U2StDY/uunq30MTDK+c0M0n4LdwRwJaTsTIJEGqSO59NPY3v2k8sVjrEVy4WnhsJb0WDIwXYzvHho0cVwt2AJIzqJrB85z8max3J3hHyjre94yQw4HzSg6YM1FO7MZN95FpFU0DU2T21i2NyjzZbTO9gF+mU8GWdZK7HyeWGX1AmoUo1TpPrC0sF3ZYYyRp6p8jw1AGb+3ikArXu4JrRakbX7Am/Mf0ByLkbSJvxxX8rZtCZ/+TV2PM7tBz/y1dwrN2GUAWj7lM08UZcnsE190zffYHWI88tGhXDgE9zvyOczLTerPX4KuPg/gMM/e3GSUW19yCgD/05GlXThiNXj8fWA7XMVoy lVt6feIk 5a4OZJeqUQKCsGDr5QXbomZqR2gsoatbFIWtuLieHjANS/M87rS3sa9638kTTC2eqJxIdklIz47XwNjOqwuSXt6AnXeElwf76qAf1T5waqaeZQxfB6CcOneM/PqPB6St8YzyQNEzFKD7T5rttz/abBxz/4UkSbcBO96Ik27ViKtS/46DpBhk1c6GeWcdeTPsold2lr7il/EPMzSvRJQXz0ZbyB6xvbBOIaqVO 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: On 8/26/2023 11:36 PM, Kemeng Shi wrote: > We always do zone_watermark_ok check and compaction_suitable check > together to test if compaction for target order should be runned. > Factor these code out to remove repeat code. > > Signed-off-by: Kemeng Shi > --- > mm/compaction.c | 63 ++++++++++++++++++++++++++++--------------------- > 1 file changed, 36 insertions(+), 27 deletions(-) > > diff --git a/mm/compaction.c b/mm/compaction.c > index 00b7bba6c72e..6f2b87b026b8 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -2374,6 +2374,30 @@ bool compaction_zonelist_suitable(struct alloc_context *ac, int order, > return false; > } > > +/* > + * Should we do compaction for target allocation order. > + * Return COMPACT_SUCCESS if allocation for target order can be already > + * satisfied > + * Return COMPACT_SKIPPED if compaction for target order is likely to fail > + * Return COMPACT_CONTINUE if compaction for target order should be runned > + */ > +static inline enum compact_result I think you should drop the 'inline' to let the compiler make the decision. > +compaction_suit_allocation_order(struct zone *zone, unsigned int order, > + int highest_zoneidx, unsigned int alloc_flags) The changes look good to me. So please feel free to add: Reviewed-by: Baolin Wang > +{ > + unsigned long watermark; > + > + watermark = wmark_pages(zone, alloc_flags & ALLOC_WMARK_MASK); > + if (zone_watermark_ok(zone, order, watermark, highest_zoneidx, > + alloc_flags)) > + return COMPACT_SUCCESS; > + > + if (!compaction_suitable(zone, order, highest_zoneidx)) > + return COMPACT_SKIPPED; > + > + return COMPACT_CONTINUE; > +} > + > static enum compact_result > compact_zone(struct compact_control *cc, struct capture_control *capc) > { > @@ -2399,19 +2423,11 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) > cc->migratetype = gfp_migratetype(cc->gfp_mask); > > if (!is_via_compact_memory(cc->order)) { > - unsigned long watermark; > - > - /* Allocation can already succeed, nothing to do */ > - watermark = wmark_pages(cc->zone, > - cc->alloc_flags & ALLOC_WMARK_MASK); > - if (zone_watermark_ok(cc->zone, cc->order, watermark, > - cc->highest_zoneidx, cc->alloc_flags)) > - return COMPACT_SUCCESS; > - > - /* Compaction is likely to fail */ > - if (!compaction_suitable(cc->zone, cc->order, > - cc->highest_zoneidx)) > - return COMPACT_SKIPPED; > + ret = compaction_suit_allocation_order(cc->zone, cc->order, > + cc->highest_zoneidx, > + cc->alloc_flags); > + if (ret != COMPACT_CONTINUE) > + return ret; > } > > /* > @@ -2917,14 +2933,10 @@ static bool kcompactd_node_suitable(pg_data_t *pgdat) > if (!populated_zone(zone)) > continue; > > - /* Allocation can already succeed, check other zones */ > - if (zone_watermark_ok(zone, pgdat->kcompactd_max_order, > - min_wmark_pages(zone), > - highest_zoneidx, 0)) > - continue; > - > - if (compaction_suitable(zone, pgdat->kcompactd_max_order, > - highest_zoneidx)) > + if (compaction_suit_allocation_order(zone, > + pgdat->kcompactd_max_order, > + highest_zoneidx, ALLOC_WMARK_MIN) == > + COMPACT_CONTINUE) > return true; > } > > @@ -2961,12 +2973,9 @@ static void kcompactd_do_work(pg_data_t *pgdat) > if (compaction_deferred(zone, cc.order)) > continue; > > - /* Allocation can already succeed, nothing to do */ > - if (zone_watermark_ok(zone, cc.order, > - min_wmark_pages(zone), zoneid, 0)) > - continue; > - > - if (!compaction_suitable(zone, cc.order, zoneid)) > + if (compaction_suit_allocation_order(zone, > + cc.order, zoneid, ALLOC_WMARK_MIN) != > + COMPACT_CONTINUE) > continue; > > if (kthread_should_stop())