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 CB51AC83F01 for ; Wed, 30 Aug 2023 06:28:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 688AB280033; Wed, 30 Aug 2023 02:28:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6396C8E0009; Wed, 30 Aug 2023 02:28:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5019E280033; Wed, 30 Aug 2023 02:28:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3E52F8E0009 for ; Wed, 30 Aug 2023 02:28:46 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 209921C949E for ; Wed, 30 Aug 2023 06:28:46 +0000 (UTC) X-FDA: 81179792652.07.8E6B2C3 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf12.hostedemail.com (Postfix) with ESMTP id A30014000A for ; Wed, 30 Aug 2023 06:28:42 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693376923; 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=0b5mcM844ZquSqvnU934Q/q9rfI74F25Kxlpt9dug40=; b=I185rixqYLgmk0xPM9Ixd8GMjBXrMeGAanlXcM9am2Ms5zXXN/3GkrP7ez23Iiwt9fMTHF rtruej7ly5W0xujerWWrL2j/Iquwq4S0gZohAkH7/NbaaWtsLYKkDLFO4voWEGpnYbfKOZ PvbmHqM6KoKqh9tdiZasV6Gp7Ut+bKg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693376923; a=rsa-sha256; cv=none; b=X3VM2OLtsoO7t/C0w6Md5VMv5d0sPn2wy8NG0uBh81OWCOScPPrhiuKax6CIr7k24Sr6K0 B0nPEKTE5k4XLLRaPlGIjbZgGSn25e8pHSO3CkCUmMOuk0MuRImUibV50GX2LnVRrag6dD bBtj7jDCK7JIG2jjgwSw72zioJkmWac= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; spf=none (imf12.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RbDrV55tJz4f3pFJ for ; Wed, 30 Aug 2023 14:28:26 +0800 (CST) Received: from [10.174.178.129] (unknown [10.174.178.129]) by APP3 (Coremail) with SMTP id _Ch0CgDH5b2L4e5klx0+Bw--.62156S2; Wed, 30 Aug 2023 14:28:28 +0800 (CST) Subject: Re: [PATCH v2 7/7] mm/compaction: factor out code to test if we should run compaction for target order To: Baolin Wang , 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> <940a7978-ebbb-f232-b536-7c8d16c0d1f1@linux.alibaba.com> From: Kemeng Shi Message-ID: <63028022-560d-278e-d7b5-3cdd93467c99@huaweicloud.com> Date: Wed, 30 Aug 2023 14:28:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <940a7978-ebbb-f232-b536-7c8d16c0d1f1@linux.alibaba.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_Ch0CgDH5b2L4e5klx0+Bw--.62156S2 X-Coremail-Antispam: 1UD129KBjvJXoW3WrW7WF1fJFyxCrW5Ww1ftFb_yoW7Cw1kpF 18JryUJry8Xr1rGr1UJF1UJFy5Jr48J3WDJr10qF1UJr1ayr1qvr1qqr1q9F1UJr48Jr4U Jr1UXrnrZFnrArDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyKb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x 0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxk0xIA0c2IEe2xFo4CEbIxvr21l42xK82IYc2Ij 64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x 8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE 2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42 xK8VAvwI8IcIk0rVW8JVW3JwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF 7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUOyCJDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Stat-Signature: t4gdb59efyc6qwetpy1oaciskrnp7nd5 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: A30014000A X-Rspam-User: X-HE-Tag: 1693376922-938779 X-HE-Meta: U2FsdGVkX18/Zpk2Lp4mxSHbc2e3At9hguTOEu4OnOcVHrgKijkPuLaNvxKsLP050atMvL0oSZqjZe7EifgJO3+tmWJ8r9wkkDfR+t+OyvJi/xmMpFBeGJgqUUMru+oRwDEoEixPHN/yB//GjrAjOagCegSZXQqrbRw3gzqBmesoRKfC9PzaEf+lky8SWRnNN9GGdcoLMFULlYeOLPzq0++ShX8fyXkq2Ez56pH8tmBjUL4yfi5pzKLDNWIv6G4ipCm2QoQVmk49zLXU9gusScBq7miIQkIJmr4Qo5fUj0DenOGyX4k1esBfypyH/Yz3m6a7+HqeVkhhbs/VBvKnY8AhMwb/zboNjZfL/ChuiNwluBLrADDr1Heyu1KKdFVVM9yten06LLNxPtim5ZmUzVh7rtVEO6aP+y7MVoCifcHGI3mLtOhpQCJnlUfmFlwEK+nRWAuPsdX9dSkPIwS/GwfizpJNJ/LK1QbiEDrMBaMPxupAkEMtCxhZuIqIGnNCVEd/qpoMFwCwTDxk37pzh0GWXFEwUfnecEiwrb+2xuHI1HXEeM4PX1KtrTNI+OrmNgxrft+CMzJK1Rg96x1gJARFzD+eKcTw2T0IUv7cVRcsBlQqhrJ3jVDjHDAIbmfEuCC8P8gmCrMIGlpyLRNpALljQPPvsSTJM0yU3YGM2rnD5WiY3wj9GLIXsT6idvRFIAuRjbAYIiqsZuzVrTLuePyIjADUGIpAxbK0t6Wt+SdME26WhbvbtGjQdhvrncd9NSejSXplzuMX80o6iJF+ADxdY31alo8/z5cRvVjdlAtaByBYqyN/dESUBdDzqfLRRnflA6YijMnuG+gTYQzzGkfCsdscfU65bwLrnp2BrSlsNfqpJOHRUvDODQDHeSTW1JfovuoSDLa318fzyEKzG+NzJ8P1VgDr5Or0QxPi3LGlqTuxYxiZG213yLgwbkfyIBN0BZQPBg6WlgdeWra ow+iniRv 5j+EI2BpRJnQf0a0BxYRwptmmby8KG+jQ4lkmbz7r8a3XbxPtIKjbMKb8IuCbT5WuSdoZ/39IUhfkNen5kSg0AV8CHTSUrjpXRtRtArodyLF3wYBatXTTCpFd9Vwd5EqMczgonstRQi69x/EWjSsPS6mYfSPHjjZ4FERudzXMKzpN7vk5Ei7MX29/PxWRWm0oQTxgruy5oyye7fxUP7EtQoG7bL7VSy8gTJgF5ncUbNMB7Gy0D8LkbG0qpiKHfHjFzspNXstVl50yUjPR0Xqna6wULA== 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/29/2023 11:48 AM, Baolin Wang wrote: > > > 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. > Sure, I will drop this in next version. Thanks for feedback. >> +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()) >