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;