From patchwork Sat Aug 5 11:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131423 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp239335vqr; Fri, 4 Aug 2023 20:16:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDOFpNNbkbYk05/zoiWPaetWKAgWIsGzwTXS+WOVpxCjHMRVoUD5ONkuLSzbEZfWPZk2/n X-Received: by 2002:a17:906:292:b0:99c:b0c9:4ec7 with SMTP id 18-20020a170906029200b0099cb0c94ec7mr1441524ejf.26.1691205376621; Fri, 04 Aug 2023 20:16:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205376; cv=none; d=google.com; s=arc-20160816; b=Irw8hpSlyyoIXd2QFRofOubEXNpbLZuJeg8rU+vYvs5jApkENbqLLZQxG8DtLW9ngb SmMicSQtHuHLQUtunYdUayx73rwWFzSdLnCIUzkYE5fELM/k8gTTPyn4n8b7S8JuALZn +74O0YkrBCJpwD11TTgS4hGQP2fAUEtu7f+Q6VnYrEqnesZO+HLqDvIzTlMreoMU+pG4 CKPftzUqR+fGXLA1EvQ9rD88ZmH+TGsW/AmiYAQdrFaaHxxoCZFWUFISKpR/O1CqfRm2 H9HZfrOKQsuRK5RywFFtc7S5SApHp2AauvaTKjjJg4hXU7yyjtdpEb+xCmjDs4zs7nut WuAA== 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=L25XJYbeGeYoEl8Y6AyBg6f6iV40zJxwNT5EL9bqX58=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=edBQdFlqCAg7Uo14+bbUCafeuWMbpKcLv6UDGkQurj+Urxt9UtrJsXBDXlQRzSfizE LeXKyjNuxWziL3/E7n2QuY7CRBNMHjJ5E0g2POMp1/FPf8Xk5+STCax3HG7PDItEFcYq 6ocsAvvOa2SF/gAVe8GDvVx6v61Fyb1lgfoWGjEgva7zHGskZdsMSKg7LkLMlVWxeBlx NtkT+QRiPZ+02gr8XISIApY9eEiVMZYe+crDbcitM3alN4O+K7j36iSxEdT0dYpF0mwX 4vSt1MRiX4V2w1i0eWZ5IV7kw4nrukUk+Ljuz6fNT7M0HS4u/BACvwRS2hdzJk+KYyRr HRuw== 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 q16-20020a17090622d000b0099845f657a9si2395192eja.662.2023.08.04.20.15.52; Fri, 04 Aug 2023 20:16:16 -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 S229729AbjHEDHo (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229634AbjHEDHI (ORCPT ); Fri, 4 Aug 2023 23:07:08 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FBB44EEE for ; Fri, 4 Aug 2023 20:07:03 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYc2cdZz4f3kK2 for ; Sat, 5 Aug 2023 11:07:00 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S9; Sat, 05 Aug 2023 11:07:00 +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 7/9] mm/compaction: factor out code to test if we should run compaction for target order Date: Sat, 5 Aug 2023 19:07:09 +0800 Message-Id: <20230805110711.2975149-8-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--.23962S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uF1rAw47ZryrKr15Zw4kCrg_yoW8Kw4xpF y8Z343K395XF13GFWIya18JF45Xw4xGF1DAwsFqwn2vw1ayay0v3WDta48ZFyUXry3Ar4j qFWYkFyDKFsxAaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Cr0_Gr1UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJV W8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjTRKfOw UUUUU 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: 1773357368952101006 X-GMAIL-MSGID: 1773357368952101006 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 for preparation to remove repeat code. Signed-off-by: Kemeng Shi --- mm/compaction.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index b5a699ed526b..26787ebb0297 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2365,6 +2365,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 +compaction_suit_allocation_order(struct zone *zone, unsigned int order, + int highest_zoneidx, unsigned int alloc_flags) +{ + 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) { @@ -2390,19 +2414,11 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) cc->migratetype = gfp_migratetype(cc->gfp_mask); if (compaction_with_allocation_order(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; } /*