From patchwork Thu Aug 3 09:48:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130249 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp860504vqx; Wed, 2 Aug 2023 19:23:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlEB8iTlO5vHkOkQWDRtZHDoapHMiaz0bNjnm2JbYQS78eXU2sF/gwCcjg6987NHOVtcLv67 X-Received: by 2002:a17:906:73dd:b0:99b:d594:8f89 with SMTP id n29-20020a17090673dd00b0099bd5948f89mr11222401ejl.0.1691029434392; Wed, 02 Aug 2023 19:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691029434; cv=none; d=google.com; s=arc-20160816; b=r798weHG8ipWmAGKYQfgd3BXsGTHUve0YcLFEYf9iZBTUdBapjwkK+XjYgc5GVle64 qBnbv19KgHUFk/KLlDuG+rPvnuPsCEUSmwAxuHQleRbxJuSsNnjtXwor5/SdvmR9mXHO o7GjglAWbdbIMonzMj4SB3TkyqTdbvLtXqtOJkFo2aNXfXV65EYq7gzbzDXnrmeO/B1j Z5hyX3o+d9+cl7xSRMj5HYp32TZM1BBWWZU2lUEvFUTpdHqBboMMwLF837Ag6cMF2z4x v3OFQuE83V198w+KXitsG0lWPcFbJnhFvqjvoOMo1iK9kXUMVjBWiga/ijdWCW8BtEUZ XA+w== 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=mI9VqnGKPrgOQCIVIWrhqTrh/dYptfa0Js+lHVE0BII=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=dcXqeYK6GD/UR2NlSEn1DIo6uwGXfQVtd4rZvK3PQUJ5cggmbbPkLkr+Nsx4sezdXt tF9YBOWa/78A1UpLjgYtwbJWaaWHFVzFbB4qO21y+mKnKQPPKGz2GYmstaWdD5dLinXF 2g7fEMY55e2PpFKERVp2djIzyx1F17EzwFFUIS470Gqoyq+22neJgeJiRfs082ssgAnA 2PdofTU4l10oqz2v9U10pcm5LeVfZJRi3YBLWoLZDPeD9934RtZaDL/fvyyo3rM7un/p MgZxO1U43xICwOqk9JwkykH4z0e2CEqmZAN+I5+zq5ezQZ+dOEcnIyiSj/gfph408HLd kBrw== 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 lo8-20020a170906fa0800b0099bd5561245si1262427ejb.54.2023.08.02.19.23.30; Wed, 02 Aug 2023 19: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 S232768AbjHCBtK (ORCPT + 99 others); Wed, 2 Aug 2023 21:49:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230504AbjHCBs6 (ORCPT ); Wed, 2 Aug 2023 21:48:58 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3E71230E9 for ; Wed, 2 Aug 2023 18:48:48 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGWwD4nbgz4f3mJ1 for ; Thu, 3 Aug 2023 09:48:44 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgCXQiB7B8tkVa5vOQ--.12634S3; Thu, 03 Aug 2023 09:48:45 +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 v2 1/4] mm/compaction: set compact_cached_free_pfn correctly in update_pageblock_skip Date: Thu, 3 Aug 2023 17:48:58 +0800 Message-Id: <20230803094901.2915942-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230803094901.2915942-1-shikemeng@huaweicloud.com> References: <20230803094901.2915942-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCXQiB7B8tkVa5vOQ--.12634S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw1kCr17WFW3KFW7KF15urg_yoWfZrX_G3 WIyFnxK34avrZ3Z3ZrAw4Skr1xKrWrCF1DWw1Yqry7Z3yqvF4kZa9rJwsxXrnIqFyDurnx Gw1kuF1vkF4agjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUb6AFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_JFI_Gr1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sREgyCDUUUUU= = X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: 1773172880224210578 X-GMAIL-MSGID: 1773172880224210578 We will set skip to page block of block_start_pfn, it's more reasonable to set compact_cached_free_pfn to page block before the block_start_pfn. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index fbf50a9e4d23..61f56cee3715 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1714,7 +1714,8 @@ static void isolate_freepages(struct compact_control *cc) /* Update the skip hint if the full pageblock was scanned */ if (isolate_start_pfn == block_end_pfn) - update_pageblock_skip(cc, page, block_start_pfn); + update_pageblock_skip(cc, page, block_start_pfn - + pageblock_nr_pages); /* Are enough freepages isolated? */ if (cc->nr_freepages >= cc->nr_migratepages) { From patchwork Thu Aug 3 09:48:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130247 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp860152vqx; Wed, 2 Aug 2023 19:22:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlHMHgxddcY7KPGG7RWuSdfkywAqaLmDEmQW/sbPor0k77E/qFieewxCqyylFOD9Wc5iX2R8 X-Received: by 2002:a17:906:10da:b0:993:d901:9b46 with SMTP id v26-20020a17090610da00b00993d9019b46mr11251544ejv.3.1691029372403; Wed, 02 Aug 2023 19:22:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691029372; cv=none; d=google.com; s=arc-20160816; b=kbTd/SWaq8CeTHEL3v4o3wMIShf/9btuzzJCPJR5tZlDvFFHajy6P82mhTxvjVGrzK QQkT+oiQEeSavnMhAuqEX1uUXvKn1FzxyvT1MDhL9QlK2A3/2Uxi5wTVb8UN0wOOjIhQ I6UhHk1CO1eog9YP3oU8/x7vwVRDIDjUGU/A0KhJqpF7/EXHbtJJrNxAE0kzrmeAZB7r R+V+OZAppF3UqU4L/NJ2aM77+nIjLqt7Mhu1e/OmJeKoVpBTAoA3MMVOkSB1zy+tCCCp dkEpAfhAfkpiCcEWai3qMWDbdVY9QHFc8N28Ou3ued0dcjvfI9iKZWyAx6v56D9lvV1Z tOZw== 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=Khq5hl+46F1V9VbTxvMStIp/eTd9AoGIBFmfQlsDTls=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=rkNK3h797EYyLBQATLgnlxeyY507X+0ih2t/oFsi8grt40N/ffh1PV7hAL94H/AOWK 6LknjZL7zL+UR4B04b8vok2oAwbjhTjXS/oYlPPmn94aPGdbEWC9FDHkX/aJaIYjH61u OPE6bbN4MU8qI5IFTo9BO8cuBcNzWnA60lHcGQGz3iG5uAK5Cc/Zt2mjCyJkqchE95+N B/9G/F3DX9+1ReFomPrAU+9MlG/fWy1i6AZ1ZcpTGKbwu3MQc6bVm73a8QUSmAuRZwyx aplNWewMML2pG0ZeO9Wr1pquqDfkBKM+df5/XTY4oEJ3H99s4Yh0LKywPOnuuXGqYN1S QGdw== 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 k13-20020a17090627cd00b0097d7282c899si7647879ejc.534.2023.08.02.19.22.26; Wed, 02 Aug 2023 19:22:52 -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 S231648AbjHCBt1 (ORCPT + 99 others); Wed, 2 Aug 2023 21:49:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231734AbjHCBs6 (ORCPT ); Wed, 2 Aug 2023 21:48:58 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EB7530ED for ; Wed, 2 Aug 2023 18:48:48 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGWwF0My7z4f3mJ3 for ; Thu, 3 Aug 2023 09:48:45 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgCXQiB7B8tkVa5vOQ--.12634S4; Thu, 03 Aug 2023 09:48:46 +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 v2 2/4] mm/compaction: merge end_pfn boundary check in isolate_freepages_range Date: Thu, 3 Aug 2023 17:48:59 +0800 Message-Id: <20230803094901.2915942-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230803094901.2915942-1-shikemeng@huaweicloud.com> References: <20230803094901.2915942-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCXQiB7B8tkVa5vOQ--.12634S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr4rZw43GF1UJFWkAry3CFg_yoW8Jw15p3 47GF1xWr1kuayYvFy7Z3s8ZF15GwsYkF4UAFWUGF1rAF9akF97KasayryDZFyjqw1xZrWq vrsFkFyxt3WUZa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: 1773172815003555127 X-GMAIL-MSGID: 1773172815003555127 From: Kemeng Shi Merge the end_pfn boundary check for single page block forward and multiple page blocks forward to avoid do twice boundary check for multiple page blocks forward. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 61f56cee3715..b7a05b9843ed 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -735,8 +735,6 @@ isolate_freepages_range(struct compact_control *cc, /* Protect pfn from changing by isolate_freepages_block */ unsigned long isolate_start_pfn = pfn; - block_end_pfn = min(block_end_pfn, end_pfn); - /* * pfn could pass the block_end_pfn if isolated freepage * is more than pageblock order. In this case, we adjust @@ -745,9 +743,10 @@ isolate_freepages_range(struct compact_control *cc, 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); } + block_end_pfn = min(block_end_pfn, end_pfn); + if (!pageblock_pfn_to_page(block_start_pfn, block_end_pfn, cc->zone)) break; From patchwork Thu Aug 3 09:49:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp855225vqx; Wed, 2 Aug 2023 19:10:10 -0700 (PDT) X-Google-Smtp-Source: APBJJlEnDzC0jd/wQ7xsIM2kGMNtElQiUe96g/3Co93Hn8ES0sFgMRo8V520CBWJ8qM9Cxe2mI6o X-Received: by 2002:a17:906:20d0:b0:993:eed1:8f7 with SMTP id c16-20020a17090620d000b00993eed108f7mr12273149ejc.3.1691028610125; Wed, 02 Aug 2023 19:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691028610; cv=none; d=google.com; s=arc-20160816; b=xFScbMXlk94HqE6Dnti/M+XcXlmIBMukGxqjbesnXHwqEqhH5dtWeqMtGoDL9lq9xp wWCDRdjQXD+M1WxrlAds39japrKUkhDdktfwhvm7qpynbszcxVndoE1yeeNfPnm3sUZf /CCaOttlCx5T3NyARS1t1A1t6yXF2TedoSdlJNuwlmzbmjN/n3epYELNMcoZA+C4DapH Ji4AEI/1CY/C/6SRi+DvF4FW1Ps4594e1sJYyu+0WSXAkjhl6dfVPZjx7WSmxhmTUbNb VFSLY1jrADpvAegF1s61j1NZzzO/4/ilQRV0HabSFQ2QEtkj5x8gJ9rernDRMGCR1/so ZPOw== 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=yy0FuSamKmAE0XgpaSnNLMHoQqjNrRZ1QCGJU4tki9I=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=TUbDSqEqM2D8cUuJ/k38ZAEM3rWYRf+FySJ/vufvtUKwpTso4w6TlCdBUt3Ykv9bzK IhS6Blt2lbUWjvUlZ4HRWfztjg/hU4cx+Y0+Edi+GABYwqQAvZLSP39wZfjOYy5epmKW K9qtqAcb1X9GRFIOCyLSijmZHSsD4+WvUW/Zrqc3pwHLcXTsVn8O/g7QzhnIINLOl0Vv 8er/xqSjc+tj2AUFsgbSIawnyO2w5FRJlO11i8wbXe8az4UPLGCc9mGxWbojMaqcJeXs 4mikrSmTGCfDG8qmvsWpiVg7Du5hF0eNY8BR0epb6SX1IXA3I8Fz+W969RrbOWZo/tS4 L6Yg== 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 e19-20020a170906249300b0099bc2f8e22esi11143053ejb.599.2023.08.02.19.09.46; Wed, 02 Aug 2023 19:10:10 -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 S229727AbjHCBtp (ORCPT + 99 others); Wed, 2 Aug 2023 21:49:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60578 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232394AbjHCBs6 (ORCPT ); Wed, 2 Aug 2023 21:48:58 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EC5430EF for ; Wed, 2 Aug 2023 18:48:49 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGWwF2rYCz4f3n6P for ; Thu, 3 Aug 2023 09:48:45 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgCXQiB7B8tkVa5vOQ--.12634S5; Thu, 03 Aug 2023 09:48:46 +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 v2 3/4] mm/compaction: remove unnecessary cursor page in isolate_freepages_block Date: Thu, 3 Aug 2023 17:49:00 +0800 Message-Id: <20230803094901.2915942-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230803094901.2915942-1-shikemeng@huaweicloud.com> References: <20230803094901.2915942-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCXQiB7B8tkVa5vOQ--.12634S5 X-Coremail-Antispam: 1UD129KBjvJXoW7WrWxAFW3WrW3tr4kZr4fXwb_yoW8AF18pF yjkw1xAF409345WFy7t3ykCr17GrsxtanFkrs3JrWrZFyftFyI9r9Fyr1UCrW8Xr9rurZa v3yqkF97Kan5JaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: 1773172016066809996 X-GMAIL-MSGID: 1773172016066809996 The cursor is only used for page forward currently. We can simply move page forward directly to remove unnecessary cursor. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index b7a05b9843ed..cb1dd5c5bf3f 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -584,7 +584,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, bool strict) { int nr_scanned = 0, total_isolated = 0; - struct page *cursor; + struct page *page; unsigned long flags = 0; bool locked = false; unsigned long blockpfn = *start_pfn; @@ -594,12 +594,11 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, if (strict) stride = 1; - cursor = pfn_to_page(blockpfn); + page = pfn_to_page(blockpfn); /* Isolate free pages. */ - for (; blockpfn < end_pfn; blockpfn += stride, cursor += stride) { + for (; blockpfn < end_pfn; blockpfn += stride, page += stride) { int isolated; - struct page *page = cursor; /* * Periodically drop the lock (if held) regardless of its @@ -624,7 +623,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, if (likely(order <= MAX_ORDER)) { blockpfn += (1UL << order) - 1; - cursor += (1UL << order) - 1; + page += (1UL << order) - 1; nr_scanned += (1UL << order) - 1; } goto isolate_fail; @@ -661,7 +660,7 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, } /* Advance to the end of split page */ blockpfn += isolated - 1; - cursor += isolated - 1; + page += isolated - 1; continue; isolate_fail: From patchwork Thu Aug 3 09:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130251 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp861520vqx; Wed, 2 Aug 2023 19:26:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlGJ2v9Phksvdioo+aMt6bwiLps4QzZVWHDkOWoWjXQk9DXUZiO+YOEovz+hdt3TgRRoBIjF X-Received: by 2002:a05:6402:4315:b0:521:7a4b:9d1 with SMTP id m21-20020a056402431500b005217a4b09d1mr12760608edc.2.1691029602544; Wed, 02 Aug 2023 19:26:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691029602; cv=none; d=google.com; s=arc-20160816; b=WyQ/4YbBri5LnpqN+dm785Ax4miSZNajHywpqXv44U598w5DoU0V9VOzb+Om2M3fwy wnJ2bgp09Uw+XvrOzI0p+CtJnuTG2p/WUkHa9jKGqFhjUA8GcdO1ByRmAivSwzrca5N5 jWGPZ3e7LfttLfTZIG5JmSsoEgpHrYmitvtONMgSJ/aMUVud1ctIq/uSEr1kE7c2UA35 +jiupHps55ZZvRcSff2t9brCFVnd/nb1H+b27MYp3fFIlPn6k8xkWrrCjD/MbB+zo6Bj WIaYc5PpK9fh7OlVMf8+6qPUldQYh0s8eBGXsPhOplhJXip5yvxNxqLzhqOy5mt9osKj yKkA== 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=vI4rRUi6esE6myAhM7XZL+ZaNSQFTFDk8e/xUXRBUDs=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=UMwbDYNNa+5jXTpfL5yTnxxEFwL9QA/NfOR/GScBFDGDDHAcBe/2NLVvTa73BUezYE L8dQsM80LPmJEdtdfVfYhAN7lXI4Pp5J+SpVsu3McGnaIc6brzmcxp2PaBcYrqGti5n9 NCJ4G7h2HULnXudQjlQwNAyuqRVC/NRBzph+gLUixLiAZoRkf2AoLJCcJCsXSPLU22Mr aHDwrVKsD4WsoENH9ueUOY2XzRDKlTgBLimNaA+SKFh/SzfkjjXJoohy23Wp0BkvBJQN R+RAjXWq2g88de1dto676b4DZhW3m/MX/SxMTAS9KxXdvjMuzHLujlTy0v7sTWrBGMCa wPZg== 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 e19-20020a50ec93000000b00521d28a47e5si870404edr.359.2023.08.02.19.26.19; Wed, 02 Aug 2023 19:26:42 -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 S232819AbjHCBty (ORCPT + 99 others); Wed, 2 Aug 2023 21:49:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231444AbjHCBtA (ORCPT ); Wed, 2 Aug 2023 21:49:00 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16E730F6 for ; Wed, 2 Aug 2023 18:48:49 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.169]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RGWwG2QPLz4f404C for ; Thu, 3 Aug 2023 09:48:46 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP3 (Coremail) with SMTP id _Ch0CgCXQiB7B8tkVa5vOQ--.12634S6; Thu, 03 Aug 2023 09:48:46 +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 v2 4/4] mm/compaction: remove unnecessary "else continue" at end of loop in isolate_freepages_block Date: Thu, 3 Aug 2023 17:49:01 +0800 Message-Id: <20230803094901.2915942-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230803094901.2915942-1-shikemeng@huaweicloud.com> References: <20230803094901.2915942-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: _Ch0CgCXQiB7B8tkVa5vOQ--.12634S6 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUOb7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E 6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JF v_Gryl82xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW5JVCq 3wA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26w 1j6s0DM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AK xVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcV AaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0E x4A2jsIE14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI 8F5VA0II8E6IAqYI8I648v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_ Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17 CE14v26r126r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0 I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I 8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73 UjIFyTuYvjTRKfOwUUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-CFilter-Loop: Reflected X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE 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: 1773173056520510174 X-GMAIL-MSGID: 1773173056520510174 There is no behavior change to remove "else continue" code at end of scan loop. Just remove it to make code cleaner. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang Reviewed-by: David Hildenbrand --- mm/compaction.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index cb1dd5c5bf3f..006fc35bffa1 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -666,8 +666,6 @@ static unsigned long isolate_freepages_block(struct compact_control *cc, isolate_fail: if (strict) break; - else - continue; }