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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7111BC0015E for ; Tue, 15 Aug 2023 09:00:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235900AbjHOJA0 (ORCPT ); Tue, 15 Aug 2023 05:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235902AbjHOI66 (ORCPT ); Tue, 15 Aug 2023 04:58:58 -0400 Received: from out30-111.freemail.mail.aliyun.com (out30-111.freemail.mail.aliyun.com [115.124.30.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4167319AD for ; Tue, 15 Aug 2023 01:58:07 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VprNF3U_1692089882; Received: from 30.97.48.59(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VprNF3U_1692089882) by smtp.aliyun-inc.com; Tue, 15 Aug 2023 16:58:03 +0800 Message-ID: <111c3142-e20b-3e3c-f107-cbb64a16c2b0@linux.alibaba.com> Date: Tue, 15 Aug 2023 16:58:04 +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 6/9] mm/compaction: rename is_via_compact_memory to compaction_with_allocation_order To: Kemeng Shi , linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, mgorman@techsingularity.net, david@redhat.com References: <20230805110711.2975149-1-shikemeng@huaweicloud.com> <20230805110711.2975149-7-shikemeng@huaweicloud.com> From: Baolin Wang In-Reply-To: <20230805110711.2975149-7-shikemeng@huaweicloud.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 8/5/2023 7:07 PM, Kemeng Shi wrote: > We have order = -1 via proactive compaction, the is_via_compact_memory is > not proper name anymore. > As cc->order informs the compaction to satisfy a allocation with that > order, so rename it to compaction_with_allocation_order. > > Signed-off-by: Kemeng Shi > --- > mm/compaction.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/mm/compaction.c b/mm/compaction.c > index d8416d3dd445..b5a699ed526b 100644 > --- a/mm/compaction.c > +++ b/mm/compaction.c > @@ -2055,12 +2055,11 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) > } > > /* > - * order == -1 is expected when compacting via > - * /proc/sys/vm/compact_memory > + * compact to satisfy allocation with target order > */ > -static inline bool is_via_compact_memory(int order) > +static inline bool compaction_with_allocation_order(int order) I know naming is hard, but this name is not good enough that can show the compaction mode. But the original one could. > { > - return order == -1; > + return order != -1; > } > > /* > @@ -2200,7 +2199,7 @@ static enum compact_result __compact_finished(struct compact_control *cc) > goto out; > } > > - if (is_via_compact_memory(cc->order)) > + if (!compaction_with_allocation_order(cc->order)) > return COMPACT_CONTINUE; > > /* > @@ -2390,7 +2389,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) > > cc->migratetype = gfp_migratetype(cc->gfp_mask); > > - if (!is_via_compact_memory(cc->order)) { > + if (compaction_with_allocation_order(cc->order)) { > unsigned long watermark; > > /* Allocation can already succeed, nothing to do */