From patchwork Sat Aug 5 11:07:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp238029vqr; Fri, 4 Aug 2023 20:11:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJ5QbXKms/DFRAPcljqkvuj5QcGt82QsBhCa2vdxFNyFDPC+VNy2hXOrMtoUMKhNmfp/5F X-Received: by 2002:a17:902:e74c:b0:1b6:68bb:6ad0 with SMTP id p12-20020a170902e74c00b001b668bb6ad0mr3882492plf.55.1691205119293; Fri, 04 Aug 2023 20:11:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205119; cv=none; d=google.com; s=arc-20160816; b=gBTTlgvKKuFbaFP0NMo+LY/xsaMIFaKbTGRBkBfhMJA/TyXBOYfmDgm2lxHaLS+Sc0 IZZZxJsDFULDfZgDykBPaquWO5dMPhBDmprrPMENKgUrL1oGR81AT5KwE4BIaeKRqVRW TEy6lkp2Rpf23peQpRMHikbrIAewtSMhzK3u/Hfy9QVb8JT6Vr/bWikjyHM4IjVWubyx 7cbw8hzv1rPzXHkQts3Lah4VpP7r08Y0oTQJAx2lntRmSG3qIxXP+t1pQQlEE4gwiK6f teSM5m/RnIMNG1fYjnMxlsr04m1e3oHof1/tSeR4bG6OSMTaLC906Deui9m/aPHJmAcx b6ow== 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=Ip9YPHoUgbg2kf8BGxCk2yJU0rgMI20c0mbtH437+3M=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=lxh8jEROcdvP9e1WO899nKHaC54LTb/SRnZfGBes+naHsTjP96gGIilcAE46eqGC2+ +93GudGx5hImBGoU+IN6qSkT9dYChIuoHSlu/Q4oZOIF4AL8T2/QyKeHccrXsmxgYn4D GG+DFx4xUU7QLppPC8W0ehewnSVQJ4DPbHHrd1/foduAgL3+00fCgPNhKWaDq8EZP9Zi C2f8VdVgqsJ1KUK7ycV+ECvbEvKT1fND6N7plc4Q7Dy+73mMe3E9P9bZvO328PfvJfN/ iiT7sSh13/1STkUiYi2czZ72WcnEQ5jJoczYlYfcNSgr/TSENU95hHaXS9e1PRS8V0Om boYQ== 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 q17-20020a170902dad100b001bbbfe262e2si892840plx.430.2023.08.04.20.11.46; Fri, 04 Aug 2023 20:11:59 -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 S229686AbjHEDHJ (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35268 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjHEDHD (ORCPT ); Fri, 4 Aug 2023 23:07:03 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF5164EE1 for ; Fri, 4 Aug 2023 20:07:01 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYY4hnfz4f3jM7 for ; Sat, 5 Aug 2023 11:06:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S3; Sat, 05 Aug 2023 11:06:58 +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 1/9] mm/compaction: use correct list in move_freelist_{head}/{tail} Date: Sat, 5 Aug 2023 19:07:03 +0800 Message-Id: <20230805110711.2975149-2-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--.23962S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Gw47KFW8urWftr18Jr43Wrg_yoW8JF18pr y5Cr4UXr4UArWFyFnrXa1q9w18tF42vrWjkrZ8uFWDAFn8trW2qF9ayF4UZ3s3XrWjkrWY vrZrKF43GrW3Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pR3PE3UUUUU = 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: 1773357098835629686 X-GMAIL-MSGID: 1773357098835629686 The freepage is chained with buddy_list in freelist head. Use buddy_list instead of lru to correct the list operation. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index ea61922a1619..513b1caeb4fa 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1395,8 +1395,8 @@ move_freelist_head(struct list_head *freelist, struct page *freepage) { LIST_HEAD(sublist); - if (!list_is_last(freelist, &freepage->lru)) { - list_cut_before(&sublist, freelist, &freepage->lru); + if (!list_is_last(freelist, &freepage->buddy_list)) { + list_cut_before(&sublist, freelist, &freepage->buddy_list); list_splice_tail(&sublist, freelist); } } @@ -1412,8 +1412,8 @@ move_freelist_tail(struct list_head *freelist, struct page *freepage) { LIST_HEAD(sublist); - if (!list_is_first(freelist, &freepage->lru)) { - list_cut_position(&sublist, freelist, &freepage->lru); + if (!list_is_first(freelist, &freepage->buddy_list)) { + list_cut_position(&sublist, freelist, &freepage->buddy_list); list_splice_tail(&sublist, freelist); } } From patchwork Sat Aug 5 11:07:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp239673vqr; Fri, 4 Aug 2023 20:17:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXZ4Fkw3at5nOiMB3HQaFFWUbXINBCgjISoeDBkCNtencVmp9IMd6kDJLQQqytH+x4AV4L X-Received: by 2002:a17:906:74db:b0:99c:55c0:acfd with SMTP id z27-20020a17090674db00b0099c55c0acfdmr3339367ejl.62.1691205444318; Fri, 04 Aug 2023 20:17:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205444; cv=none; d=google.com; s=arc-20160816; b=mzd9KxmG9y2eIN2+/xlK9SuS2vGnlGCF90+clXkR+fbKXTb47DtZ6aCc+xGJgbKLS1 RhZR8lq78f4Tjht8sWhNoc4Nh4rvVwi7hxlF9xwz94Wqi/e/fwGHy7Cu0wPY74h8yg7/ 6X1OeVYT6Z9VEYjj7u2Nnwo4vuIt45EDDoQ+DqAlhXBnJUmdNEBoZSQ6phqmciIo+bCC SAgZSyQ3BdEmrS/D78zSeJ7ZPLGWI/vBdIzyGjxl4pscCjXorl1MoOEWubl001LAG7uO v1mcHvGBbjpS15dGEFSHGRfbdcYhBds5Hu2p+yTlmfs5gxq6KXzWfcPfML0elHnR0l2T kajA== 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=aJHA8BSe5njikIfoG5Z4T29pS+C99yFvrv2vyqmBURM=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=wTippS92mPjEbn1+zS2+QHn5EWvhho+Xm5c5JfjHik1j8dLeqatfZD5RVTWqA+8VLc GzmX5YvGm2RVxU0JPqpTw7DfdFdz/G2nR9XtBE+wqRnxr9hIc//IlxjWqxm+EocrrQeK rrjPIdFk/sXcQPDgPXQkaNQmHrRpzeIfggVlzMjMkuf1RaeCgMFh9FbB7uQwTNQ+a7ZW CuRgRPNc261ELMjdYvKZqhpOe0wtUKQqLeorhZKasksLKebgjVa4gJfxcmKglfJ3nfL1 TJ/zVyyd/eOuTvbbITeS6uNv+f1ISvG5tbqqvoNenBTuOb6MROR/o/hweMG8dZa5unsl I7cQ== 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 y13-20020aa7c24d000000b0051dd50eb02bsi2190901edo.5.2023.08.04.20.17.00; Fri, 04 Aug 2023 20:17:24 -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 S229806AbjHEDHZ (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbjHEDHH (ORCPT ); Fri, 4 Aug 2023 23:07:07 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A8814EE2 for ; Fri, 4 Aug 2023 20:07:02 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RHnYX1qSqz4f3lX0 for ; Sat, 5 Aug 2023 11:06:56 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S4; Sat, 05 Aug 2023 11:06:59 +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 2/9] mm/compaction: call list_is_{first}/{last} more intuitively in move_freelist_{head}/{tail} Date: Sat, 5 Aug 2023 19:07:04 +0800 Message-Id: <20230805110711.2975149-3-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--.23962S4 X-Coremail-Antispam: 1UD129KBjvJXoW7ZFyfKF47KryDWF13ZF4fXwb_yoW8Wr1xpF W5ur4rJr48ArWrCFnrXF4q934rJF43Z3yYkrWY9FyUAFn8JrZ2gFySya1jvr95XrWUurWY vrsrKr4rurW7Ar7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4 x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l 84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I 8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AK xVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zV CS5cI20VAGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E 5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAV WUtwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY 1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI 0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7s RNVbyUUUUUU== 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: 1773357439874227097 X-GMAIL-MSGID: 1773357439874227097 We use move_freelist_head after list_for_each_entry_reverse to skip recent pages. And there is no need to do actual move if all freepages are searched in list_for_each_entry_reverse, e.g. freepage point to first page in freelist. It's more intuitively to call list_is_first with list entry as the first argument and list head as the second argument to check if list entry is the first list entry instead of call list_is_last with list entry and list head passed in reverse. Similarly, call list_is_last in move_freelist_tail is more intuitively. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 513b1caeb4fa..fa1b100b0d10 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1395,7 +1395,7 @@ move_freelist_head(struct list_head *freelist, struct page *freepage) { LIST_HEAD(sublist); - if (!list_is_last(freelist, &freepage->buddy_list)) { + if (!list_is_first(&freepage->buddy_list, freelist)) { list_cut_before(&sublist, freelist, &freepage->buddy_list); list_splice_tail(&sublist, freelist); } @@ -1412,7 +1412,7 @@ move_freelist_tail(struct list_head *freelist, struct page *freepage) { LIST_HEAD(sublist); - if (!list_is_first(freelist, &freepage->buddy_list)) { + if (!list_is_last(&freepage->buddy_list, freelist)) { list_cut_position(&sublist, freelist, &freepage->buddy_list); list_splice_tail(&sublist, freelist); } From patchwork Sat Aug 5 11:07:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp241224vqr; Fri, 4 Aug 2023 20:22:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAKfTYpt1USHiiJcO372Vm52L5IOD2anQsLnFhwyP1Gof66Hz1/fHXWR6s2FzBiTjZ9wFw X-Received: by 2002:a05:6358:89d:b0:135:615a:309d with SMTP id m29-20020a056358089d00b00135615a309dmr3852365rwj.7.1691205747747; Fri, 04 Aug 2023 20:22:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205747; cv=none; d=google.com; s=arc-20160816; b=p2AHyCY2pm4hwnWMtqgimB3kMrBTy+DWix12JsRIVo5zT0BbOyoIgxonbwiCVcEFMw mPK60TcVof91jtL04+bpj8sriLMTAQieyJEkv3dNBhOKKtn/NM6mAr5LYq4t/ZgvnoFU 0U557AO4STzsSXe4+KvdHi/gIJEtzkFsfSp7PAzSXo1LPuTQGXBCz/lNSqiEtgiLExTy 1oabFYv0jOlglEgvnApQiIT+53nGWdzSDKDAYuQJuGv+TTIlQcvI+Z4RpcZ5UJ0TkY8j WXbvFXzEA5Omvr9lxH87w2pKhUNvlCj+QfJM6e8cifuctog1tY4CmOWOQ5gto7P4/PW+ IsBA== 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=RVjH75A/UOEb4U4eXTxJQcqx3CjPe408RWD1yLELWBY=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=ZxmE3vpYTp5aMeLcDHY2ooQjygEQHF930eZSm6tN3wAg9F+4QhkadEpPUFQgaZjweP YI1hRVCSUfJEiVsw8QFWOKgLc6z0+YS4TNCLnPYrx6SDbnXssrwrofVwRbg/Am7lvAq6 c/fsBDoANCLKEe8FERgnqPV5tvLmDbAxAz0Be8gq65OZ8/LSBT2JjzqEEXEMIU8ZPvfK Jgw7GbmrE4MJszsOpF15aQ3/YhoarYHdJdiHpBotd/aRX582+1wjm85abLiVWFyhIx8U 2dUgqmmS7kH+bqHD7JaVFMHPH+sjm2fBzJcrhY36yF8HT3NGTLSbn3x+/GPq/v/XUoTw SWrw== 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 li14-20020a170903294e00b001bb94eaa311si2480800plb.567.2023.08.04.20.22.14; Fri, 04 Aug 2023 20:22:27 -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 S229668AbjHEDHO (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229534AbjHEDHH (ORCPT ); Fri, 4 Aug 2023 23:07:07 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73DAC4EE4 for ; Fri, 4 Aug 2023 20:07:02 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RHnYX4D99z4f3lKg for ; Sat, 5 Aug 2023 11:06:56 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S5; Sat, 05 Aug 2023 11:06:59 +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 3/9] mm/compaction: correctly return failure with bogus compound_order in strict mode Date: Sat, 5 Aug 2023 19:07:05 +0800 Message-Id: <20230805110711.2975149-4-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--.23962S5 X-Coremail-Antispam: 1UD129KBjvJXoWxWF18CFWfXr13ArWrXF47Arb_yoW5Ar4DpF 9rK3WxAF1Dua4YqF9rXr4kZ3W29ws5Ka17J3y3KF18ZF9Yya4xG3sFyr1jvFy0qr9xArZ0 vr4DtFWxC3WDXa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRPEf5UUUUU = 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: 1773357757849916824 X-GMAIL-MSGID: 1773357757849916824 In strict mode, we should return 0 if there is any hole in pageblock. If we successfully isolated pages at beginning at pageblock and then have a bogus compound_order outside pageblock in next page. We will abort search loop with blockpfn > end_pfn. Although we will limit blockpfn to end_pfn, we will treat it as a successful isolation in strict mode as blockpfn is not < end_pfn and return partial isolated pages. Then isolate_freepages_range may success unexpectly with hole in isolated range. This patch also removes unnecessary limit for blockpfn to go outside by buddy page introduced in fixed commit or by stride introduced after fixed commit. Caller could use returned blockpfn to check if full pageblock is scanned by test if blockpfn >= end and to get next pfn to scan inside isolate_freepages_block on demand. Fixes: 9fcd6d2e052ee ("mm, compaction: skip compound pages by order in free scanner") Signed-off-by: Kemeng Shi --- mm/compaction.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index fa1b100b0d10..684f6e6cd8bc 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -631,6 +631,14 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, page += (1UL << order) - 1; nr_scanned += (1UL << order) - 1; } + /* + * There is a tiny chance that we have read bogus + * compound_order(), so be careful to not go outside + * of the pageblock. + */ + if (unlikely(blockpfn >= end_pfn)) + blockpfn = end_pfn - 1; + goto isolate_fail; } @@ -677,17 +685,10 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, if (locked) spin_unlock_irqrestore(&cc->zone->lock, flags); - /* - * There is a tiny chance that we have read bogus compound_order(), - * so be careful to not go outside of the pageblock. - */ - if (unlikely(blockpfn > end_pfn)) - blockpfn = end_pfn; - trace_mm_compaction_isolate_freepages(*start_pfn, blockpfn, nr_scanned, total_isolated); - /* Record how far we have got within the block */ + /* Record how far we have got */ *start_pfn = blockpfn; /* @@ -1443,7 +1444,7 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false); /* Skip this pageblock in the future as it's full or nearly full */ - if (start_pfn == end_pfn && !cc->no_set_skip_hint) + if (start_pfn >= end_pfn && !cc->no_set_skip_hint) set_pageblock_skip(page); } @@ -1712,7 +1713,7 @@ static void isolate_freepages(struct compact_control *cc) block_end_pfn, freelist, stride, false); /* Update the skip hint if the full pageblock was scanned */ - if (isolate_start_pfn == block_end_pfn) + if (isolate_start_pfn >= block_end_pfn) update_pageblock_skip(cc, page, block_start_pfn - pageblock_nr_pages); From patchwork Sat Aug 5 11:07:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131428 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp241506vqr; Fri, 4 Aug 2023 20:23:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEqCGOWd2MScrhYsrUILeiejkpZe+q4qyAjjTxcPpWLADr2tnUYUQu7oUmmY2SgswHwa7f/ X-Received: by 2002:a05:6a20:42a0:b0:130:835b:e260 with SMTP id o32-20020a056a2042a000b00130835be260mr3664722pzj.52.1691205812238; Fri, 04 Aug 2023 20:23:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205812; cv=none; d=google.com; s=arc-20160816; b=Y94x6sWzU4BaOdc4DGURJ4uKumplNS6oLHJbdjpYx7MwwfT9Mp1lvMtFpTQm8xSE4H cXZnEwvoUwlZXInIJTvVmTi6CVodsO0gbYzSpf0Ez2UdRJISmk6AZWulhjy5bTWs/5xI ujkyW+RiuETF0+sDKTS4vmmkh2kjwIVvEF4ym9ilKgJ66w4EuF5v/AdB3i3dzAPDtSou ufMUEm5iEOFLz+PLATBo3oRvDMmDdtb8gSvBiE2rhQiEW5UhYexL26iKYnXmeG9hHWKh /wZuV895rhIpHqxxUjOX45pzK+L40akw8oI45wW4tkXlAiLs6OHjuY621dPB774nHQAZ 7otA== 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=BahqPjU4dvuuAUKhAcST1uwOFuiPd6XRA8SSc/fHL9U=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=vvIWaL07D1atlJIT2C3IuAYzPbtHzOMSYLLKoHZ0aTgf4/jciOp/S/sEUjJ2GO5ifL tug+Ds5Ag4GnfZv75HVBhhv9rL+QT5CySscQ9qqT2CDLLx/cmjYsajOFfoUoy9G9Dxrm 5hwHeuyi7Y2JUAzPawlO7yN8Bd+TiBmnjlhtXRYWK2DtW4klCGnaXY3Qc1gcQ4Uz5ZSW bUspWqc3nPjzeQat3ANUHfXj27PlB8T5Qv6M7gfJgoJiP1VSUMNH+uZHt5u8FVtujUys HiiHyE4pYK91eIDh5prM+3uXtYL58o8LU7q95Axj8g2uP9PfF4JPGk6g9ZwHXrQaHfWO XZOg== 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 i8-20020a17090332c800b001ac6d4e1d72si2788084plr.149.2023.08.04.20.23.19; Fri, 04 Aug 2023 20:23:32 -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 S229809AbjHEDH1 (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjHEDHH (ORCPT ); Fri, 4 Aug 2023 23:07:07 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A26014EE6 for ; Fri, 4 Aug 2023 20:07:02 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYb2KYsz4f3jZ6 for ; Sat, 5 Aug 2023 11:06:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S6; Sat, 05 Aug 2023 11:06:59 +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 4/9] mm/compaction: simplify pfn iteration in isolate_freepages_range Date: Sat, 5 Aug 2023 19:07:06 +0800 Message-Id: <20230805110711.2975149-5-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--.23962S6 X-Coremail-Antispam: 1UD129KBjvJXoW7uryUKw17Zw15Jr4rZw4rAFb_yoW8Xr43pa 47C3WIgr1UCayYgF17Z3yDZw15Gws8GF4UGr4UJF1rZF9YkF97Kas2yrykXFy0v34xArZ0 vrZrKFWxKw4UZa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 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: 1773357825838294034 X-GMAIL-MSGID: 1773357825838294034 We call isolate_freepages_block in strict mode, continuous pages in pageblock will be isolated if isolate_freepages_block successed. Then pfn + isolated will point to start of next pageblock to scan no matter how many pageblocks are isolated in isolate_freepages_block. Use pfn + isolated as start of next pageblock to scan to simplify the iteration. Signed-off-by: Kemeng Shi --- mm/compaction.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 684f6e6cd8bc..8d7d38073d30 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -733,21 +733,11 @@ isolate_freepages_range(struct compact_control *cc, block_end_pfn = pageblock_end_pfn(pfn); for (; pfn < end_pfn; pfn += isolated, - block_start_pfn = block_end_pfn, - block_end_pfn += pageblock_nr_pages) { + block_start_pfn = pfn, + block_end_pfn = pfn + pageblock_nr_pages) { /* Protect pfn from changing by isolate_freepages_block */ unsigned long isolate_start_pfn = pfn; - /* - * pfn could pass the block_end_pfn if isolated freepage - * is more than pageblock order. In this case, we adjust - * scanning range to right one. - */ - if (pfn >= block_end_pfn) { - block_start_pfn = pageblock_start_pfn(pfn); - block_end_pfn = pageblock_end_pfn(pfn); - } - block_end_pfn = min(block_end_pfn, end_pfn); if (!pageblock_pfn_to_page(block_start_pfn, From patchwork Sat Aug 5 11:07:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131424 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp239358vqr; Fri, 4 Aug 2023 20:16:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF+43TGSHFpM5qlpJAZOaLCORizH0PKGXSckc029WFstfmUgHRJozuDmBCikHOhNiH5Dlyt X-Received: by 2002:a17:906:32d9:b0:99b:49ac:5fc9 with SMTP id k25-20020a17090632d900b0099b49ac5fc9mr2960146ejk.30.1691205378726; Fri, 04 Aug 2023 20:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205378; cv=none; d=google.com; s=arc-20160816; b=W39y14qEWoIsccdTNvhaDXU1jPSOoYntBH7Awbg0fPCjsrOYZo4O1SEEWJb8bwreRm 3r2+JUw55n9LpENAbFlSRSVuRSvlQVY3gx06Oc+WH2JscodkeOacMeIRRx5j8eGJ3cwK /Wn4TtPwtgfBZ7ipKq7W9CGIELEe84wuRRMrjO1/dx25LusU7w1YAfH6hksOSfbxfglL J6DDpDnQPdue3nT18FLROOJmtVyJdJkfTy9ap9n0ucPRS3R7M36CjmXAPnqBKNHHJSb6 SNeaXXlVhf7dVTUf7tLvLE1G9v1EUx1ReBBo4cmsJYdAISNOYWCgBvfNrQRgmSHH3u0m XM8g== 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=TnEuM+JFuyPJEF5vsFmy3+0fVDqCpjqTmz6mI4Gk1yk=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=Cybbln76Z55wOO8w/1ZaNUGW8jPZCJKnG9jziDIdK8RY5kKxbJkmQ4djFjAAR86X21 xUNAmd90MXgHL0P2NwoVEnCB8m0zC8uR6v3htLqHNJyjio1+cdddAhiGz67+u8NgoblR 8XsK89t/0xqnwm8QPQwlHHf9mKXnudlBA8q64Wr4upb06V9swcf5gEJQ8MD03L9Wd68t sfrsTbH/7NJ0abeNCID3eibV+RBK/lrAattE3Plq1hx5ISh2As1CFzaVYaqCLt64unQQ +bJWuRc1U3tIKhJ/uIQjjrL4SPBhSdjib/YdA7okmAEcyMeFlV2Id7tXcPDpkjbHCddt pQ9A== 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 k23-20020aa7c397000000b00523271b3ee8si635991edq.199.2023.08.04.20.15.56; Fri, 04 Aug 2023 20:16:18 -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 S229820AbjHEDH3 (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35308 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjHEDHH (ORCPT ); Fri, 4 Aug 2023 23:07:07 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 020BB4EE7 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 4RHnYY2BzCz4f3lXB for ; Sat, 5 Aug 2023 11:06:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S7; 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 5/9] mm/compaction: remove repeat compact_blockskip_flush check in reset_isolation_suitable Date: Sat, 5 Aug 2023 19:07:07 +0800 Message-Id: <20230805110711.2975149-6-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--.23962S7 X-Coremail-Antispam: 1UD129KBjvdXoWruFyxur4ruw48JFyxCr15urg_yoW3Wrb_Jr n3KrsYyrW5ArykZrZrArsIyFs0gFWkAr1UWr1qqa1Yy3sIvFsYqa1DZF17Zr15XFW7Wr93 u3WrZFyYkF1fWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== 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: 1773357371143565582 X-GMAIL-MSGID: 1773357371143565582 We have compact_blockskip_flush check in __reset_isolation_suitable, just remove repeat check before __reset_isolation_suitable in compact_blockskip_flush. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 8d7d38073d30..d8416d3dd445 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -434,9 +434,7 @@ void reset_isolation_suitable(pg_data_t *pgdat) if (!populated_zone(zone)) continue; - /* Only flush if a full compaction finished recently */ - if (zone->compact_blockskip_flush) - __reset_isolation_suitable(zone); + __reset_isolation_suitable(zone); } } From patchwork Sat Aug 5 11:07:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp241641vqr; Fri, 4 Aug 2023 20:23:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5MuHXb1JsITyQ/cHV3+Tot7JJYcSx1q507mxfWVAHFkJ8jCtgngcYN9IYJSVLG+fXawZJ X-Received: by 2002:a17:907:2e19:b0:99c:6c29:7871 with SMTP id ig25-20020a1709072e1900b0099c6c297871mr2828589ejc.65.1691205834666; Fri, 04 Aug 2023 20:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691205834; cv=none; d=google.com; s=arc-20160816; b=UpqvT87HRNLJmSpHUwPBPqymAH+4qr3HYwJHrTHP+GU+ZG4iMZqERpukiicysAATfj R3Q7twavw4F9TRM3irfeIksRslps0i0J/ecQrURfNfFz5dJWipoyopcK/HaMhmOsidqT PgrU6CMbwkwD2jC8cq64euiuDqGdT0Nvxvzg4nvajQJQE5sl4DcmxuVrz9QiV9CERjlC 8ejTxjAcYEMw3i9TRnr3j/kRwz7Qy4VCn5Tzem1ObGayAKsOMv7takrftaNQWAJR7RXT otdpR32SXQ6cGAu0mSaKk3u/KAiZ+3PlHqed8/DMDAt4sahKLUYGVutD81bZNAxAtB8U eu1w== 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=3s7tC4jnWijTGwovFlPyZOZKXQlPOjFb94YEx7hM6S4=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=WkZdqC3iQEbdyZ0b9+y5LuDc1BsUxBEM0eq9+EGoZhWjqjXZIxyLOeK/mYR/e2lmoM xvpv+83nu2aLbLaxj1xYqSu8CiwC9N9VFrybcPc5PuAYumPz4RrJPkv69Rqg4HDNVNKo +yZFnctEObW2o5jM8WPS7nmwDsx/Z9FjLn/2L4FOJNR1fUCIBZV+duRQNYgR7qnBwD4o aM6UVWg3pmGyFe6BKa4dTasV6iIfm1O8hJM/oxbK6IODxWXPKLRaCspw8mZGglXx+uRp XE62Bq34hK/6CccGNEYoPEhs5OHq0arkAJbbUrgZiai8fxG99exphGLdJJhORCXq2iWT wa5g== 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 m16-20020a1709060d9000b009886470de61si2404087eji.857.2023.08.04.20.23.31; Fri, 04 Aug 2023 20:23:54 -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 S229827AbjHEDHc (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35312 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjHEDHI (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 46DE14EED 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 4RHnYb3BWKz4f3n6L for ; Sat, 5 Aug 2023 11:06:59 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S8; 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 6/9] mm/compaction: rename is_via_compact_memory to compaction_with_allocation_order Date: Sat, 5 Aug 2023 19:07:08 +0800 Message-Id: <20230805110711.2975149-7-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--.23962S8 X-Coremail-Antispam: 1UD129KBjvJXoW7KF1fKF1fKryxJw4ktry5Jwb_yoW8Xw15pF 10yw1xZ3WvqFy3GF4Iya18C3W5Gw4xKFyUJrs29w48Xw1ak3WFk3ZrtFyFvryUX3sakrWY vFZ8K3WUt39xA3JanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 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: 1773357849101278012 X-GMAIL-MSGID: 1773357849101278012 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) { - 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 */ 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; } /* 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; } From patchwork Sat Aug 5 11:07:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 131433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp259689vqr; Fri, 4 Aug 2023 21:24:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNm4u6bGiUVjwG2H3xZBIzkNG8ZZ3PvjXVZE9rGPWzMdyPwPOdijcH5TTW28983NB5O1c4 X-Received: by 2002:a05:6a20:4418:b0:13e:43df:d043 with SMTP id ce24-20020a056a20441800b0013e43dfd043mr4811212pzb.9.1691209496662; Fri, 04 Aug 2023 21:24:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691209496; cv=none; d=google.com; s=arc-20160816; b=yRIaIdp3NpuGd+9IsIj/fB7Um1cizoiUu1p4p+cXm4GBJgV7+taao18pWXAEyVVYSU KElhS+h4vNe64nZdH126pBUbW1VxFHJWrzYxQHKODNRN9yZHrGt6SLmPHW9C1PoIAWrX Od2jZD4u1FSmfaByCahGrjYK5Sk3cUqQOm4C5PdgnL2ZrOqQPrDimTY9Qj9yC57bOok9 0tmn9+Fcht6HQs/PKZNyhnp55ZrGygyWiI11I9a00WH3/cRkb/aMukdB6mMoX0HtJMTP eIVGf3TRGEW2Rmrfi5tZ4IfFk1kQMue+pVZO/fzJ3Nym8hRe3qZFj8xKwyFosES/21mT mUsQ== 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=KLsFy+v4yVmbzWqz2R32IBuN6RqkZlHIng/lQs9O/Vk=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=SGCMb/c1zAyFCzZ9kOOfeGSrCyNxx564zBmX4V+7BeYvo8aq8fcWQU5QiMj91YrkHJ MRILEnbb4seTZ5O46RawhHcDekedh6cAd3Buxieh+dX1auSo6kMW+J5SUf0Mae+rowlE K3l+brJnYEDunIybeAQ6eCceXrRguy6BzbcTAC90CQ7W45I0ZBIRCMWZFaIUWOP9/xqT MhrtSBcC4H69iWodsJ0Y236DjIEVwHwor8AmnDaaBs0QJgJTlyROKyqqcKtma1TOCLGJ uyeUsTUXhNqe8oeg5G37CI0GiA/4O6pMLoYoGvc2nCsE1DOGZkDtO9hn5/yP3M8we8PH tUeA== 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 x14-20020a63484e000000b0053fb85dd81asi2603248pgk.325.2023.08.04.21.24.38; Fri, 04 Aug 2023 21:24:56 -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 S229804AbjHEDHr (ORCPT + 99 others); Fri, 4 Aug 2023 23:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229661AbjHEDHI (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 47EF64EE1 for ; Fri, 4 Aug 2023 20:07:04 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RHnYd0h4Gz4f3kjg for ; Sat, 5 Aug 2023 11:07:01 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAHvrHQvM1k6A5ePg--.23962S11; 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 9/9] mm/compaction: call compaction_suit_allocation_order in kcompactd_do_work Date: Sat, 5 Aug 2023 19:07:11 +0800 Message-Id: <20230805110711.2975149-10-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--.23962S11 X-Coremail-Antispam: 1UD129KBjvdXoWrtFWrKr47ur4UAw17tFW8Zwb_yoWfXrc_Jr 1xAF4YvrWayrykWr4qkr4SyrW8Gw48Ar1DJwn0qF42yF9Fy39avw4DZFy7Zr15WFyDCr9x ua1rXa4DK3W29jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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: 1773361689472716055 X-GMAIL-MSGID: 1773361689472716055 Use compaction_suit_allocation_order helper in kcompactd_do_work to remove repeat code. Signed-off-by: Kemeng Shi --- mm/compaction.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index f4b6c520038a..05c27a1ef68a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2963,12 +2963,8 @@ 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, 0) != COMPACT_CONTINUE) continue; if (kthread_should_stop())