From patchwork Sat Aug 5 11:07:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp240937vqr; Fri, 4 Aug 2023 20:21:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFiapMAuoJ0jmR4MWEZ1nmeYGSk7d+A3tlfx+eUJQHOCn7LwZS2Bo1CkxFiM6wBgkNcUqDD X-Received: by 2002:aa7:d357:0:b0:522:2add:5841 with SMTP id m23-20020aa7d357000000b005222add5841mr1604084edr.7.1691205689446; Fri, 04 Aug 2023 20:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205689; cv=none; d=google.com; s=arc-20160816; b=hvuT2sAkLqbAaxMAjfo+jEAAjpIYXVJKDzf35msAA+LFJYFtJrY6o39+jTCRn4rFp6 e8h0v/weAVVxC9jbx44PdBNZxJJ8LRJag4/TA08Xgr8SiKQmljxAif7YyF5Em+UMNTMl ziVZPHCjIomWeQv46sJsBisdtM4VePgK9BRgAOOB6D7RWiEEggMvWHdq/8SvFEwH4tuX 0pbH7jEKxC0zqixokr9JZaiAAGIjL4mpVZRt51YKtQDyE8+gOHFwo+oe5Mg9E+CH1bvx UeNsQ9+DY8rPhdBxZ4TcbQvJzOivBKZPZh/jtyQDcw9zGb9CoeSS4F9FRiRVVR1l/A0u bR/Q== 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=VO/BHXhi10eupHa6HLQkoGP00MyxU0bqF8pYPrvEzTw=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=GSiBe2wQk9lP8Qizc1tkcYfA6UuCg/n7nFn/SOa99QZgKJd5nwsKs/pxRUcdeYO1Dg dAQDA+lhuVr2PW3IUm1OKh3+mbCstgJy/iKympAhpz5nC+5TO80hgjdCbBFWHvlV662n J1ozoMxh7GguyGOYmBI/5G3CQzrNkvbrFIGy3Rplsu/132yvYgcJbaf7piWsUMui5DvZ k/KV62dmOjLSppbItC9Z9BIue9UxuejAeHRq5GNBfWU7PBj6PEXHL5UrXIOyQcmkIJeA LNt2id4uZY1P9Ml5zC4CYGi+NVk9+jQcBk/nuLPFvsyjBlEmB3B74b7v0hQbpQWmSsjY 719g== 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 r25-20020aa7cfd9000000b00522bb898a06si2382335edy.18.2023.08.04.20.20.46; Fri, 04 Aug 2023 20:21:29 -0700 (PDT) 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 S229839AbjHEDHg (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229630AbjHEDHI (ORCPT ); Fri, 4 Aug 2023 23:07:08 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2BB64EEF for ; Fri, 4 Aug 2023 20:07:03 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RHnYZ2v7Mz4f3lXP for ; Sat, 5 Aug 2023 11:06:58 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S10; Sat, 05 Aug 2023 11:07:01 +0800 (CST) From: Kemeng Shi To: linux-mm@kvack.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 8/9] mm/compaction: call compaction_suit_allocation_order in kcompactd_node_suitable Date: Sat, 5 Aug 2023 19:07:10 +0800 Message-Id: <20230805110711.2975149-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230805110711.2975149-1-shikemeng@huaweicloud.com> References: <20230805110711.2975149-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAHvrHQvM1k6A5ePg--.23962S10 X-Coremail-Antispam: 1UD129KBjvdXoWrtr48uFyfXFW5GFW7ZFW3Awb_yoWftwc_JF 1FyFs0vrW5Ary8Wr4qyw4FkryUGrW8Cr1DJwn0qF42yF9Fyanavw4vvF17ur13XFyqgrnx ua93A3sxKFyIvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE 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: INBOX X-GMAIL-THRID: 1773357696992800836 X-GMAIL-MSGID: 1773357696992800836 Use compaction_suit_allocation_order helper in kcompactd_node_suitable to remove repeat code. Signed-off-by: Kemeng Shi --- mm/compaction.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 26787ebb0297..f4b6c520038a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2924,14 +2924,9 @@ 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, 0) == COMPACT_CONTINUE) return true; }