From patchwork Wed Aug 2 09:37:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129551 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp139237vqx; Tue, 1 Aug 2023 18:49:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlEPBnhufT6a0qf7g7PkD5bRm/0RyD/pegtI2ZoztembXm7tus1uv6ecuVQ4c3gLFaJPOSVe X-Received: by 2002:a17:906:5308:b0:994:577:f9dd with SMTP id h8-20020a170906530800b009940577f9ddmr3952494ejo.9.1690940945720; Tue, 01 Aug 2023 18:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690940945; cv=none; d=google.com; s=arc-20160816; b=ihb51lEPT8DaUZ9e5/AfLr8jc51zNRZob+HZQJo40OtcNa6vvAEEpSiVLvlphNt1A7 MNddBm67QfgFAP7Av7cusw9yZGUyt8lViW737ASPtITDQAH4CCBOuBbqDG+uB54SyiRO lv/VuLTYT/1LGM79k0SMVIrBIz9DAR1rFh6puJDJwspKZm94NBcQyeZ9HL8dwXoatnCS YRqUNmDvVcUPULAtkJUlA3hqZzaVoN4FAgk4npr4RdWGB07BUnu/SAuiFsPiPdqoJPwh btATjz1/bqPx1YoPr2xyjIvjrJGi29qRXM7V/hZ89uAJtEc95fpyPA/jB4SXHhn3MteL iR3A== 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=DqdNyMmgkaph5hGEpbl52NeKTlemxV2HXIlgdsl/9kg=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=0Dfe7hpCF+ls81qQVyphx+DlOmK+gSHqCybAOoBI2KFPcnhQQw4TGZgvPl/bP2SHMR nadBq2q7CB1aXP2Ea3/zuYLV/m59FjdvIThP6D6zqu5M1gAODVqComYbpCRZzPUVX+52 RzjBRNlWkar9T0I2BPvC8SFQQ5erXDw+IGgOyRU9EoSe4HCy7X8swH7wRIHmEOp5XgMx lJYa0OcvjaP8ckfRQ8N4229sKdFzzf5cqLxVa1+oeFq6GSCPjtJYYb7JzyXkyVT7HGlf ZcuNgo8+ePfSXLwRu4b8Uw9Aq6h3WP8+P5pXBZahxu1gHdrSarfM9eTEkgYBHIIj0dCh 5sNA== 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 qt7-20020a170906ece700b0099bcb3ad50csi1352323ejb.504.2023.08.01.18.48.38; Tue, 01 Aug 2023 18:49:05 -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 S231230AbjHBBhc (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42438 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230230AbjHBBha (ORCPT ); Tue, 1 Aug 2023 21:37:30 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73E892701 for ; Tue, 1 Aug 2023 18:37:29 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjd6zVbz4f3mHb for ; Wed, 2 Aug 2023 09:37:25 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S3; Wed, 02 Aug 2023 09:37:26 +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/8] mm/compaction: avoid missing last page block in section after skip offline sections Date: Wed, 2 Aug 2023 17:37:34 +0800 Message-Id: <20230802093741.2333325-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw1ktF4UAF1DKr1kuFW5trb_yoW8ZF1Dpr yxCFy3Wrn0qa4Fga4Iyw1kuryYyrs3GF43JrW2yr18A3W5XFn2gF92yryqvryjg34fZFyj v3yvyFW8Cw47A37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx 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.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: 1773080092922063430 X-GMAIL-MSGID: 1773080092922063430 skip_offline_sections_reverse will return the last pfn in found online section. Then we set block_start_pfn to start of page block which contains the last pfn in section. Then we continue, move one page block forward and ignore the last page block in the online section. Make block_start_pfn point to first page block after online section to fix this: 1. make skip_offline_sections_reverse return end pfn of online section, i.e. pfn of page block after online section. 2. assign block_start_pfn with next_pfn. Fixes: f63224525309 ("mm: compaction: skip the memory hole rapidly when isolating free pages") Signed-off-by: Kemeng Shi Acked-by: David Hildenbrand --- mm/compaction.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index cd23da4d2a5b..a8cea916df9d 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -250,6 +250,11 @@ static unsigned long skip_offline_sections(unsigned long start_pfn) return 0; } +/* + * If the PFN falls into an offline section, return the end PFN of the + * next online section in reverse. If the PFN falls into an online section + * or if there is no next online section in reverse, return 0. + */ static unsigned long skip_offline_sections_reverse(unsigned long start_pfn) { unsigned long start_nr = pfn_to_section_nr(start_pfn); @@ -259,7 +264,7 @@ static unsigned long skip_offline_sections_reverse(unsigned long start_pfn) while (start_nr-- > 0) { if (online_section_nr(start_nr)) - return section_nr_to_pfn(start_nr) + PAGES_PER_SECTION - 1; + return section_nr_to_pfn(start_nr) + PAGES_PER_SECTION; } return 0; @@ -1668,8 +1673,7 @@ static void isolate_freepages(struct compact_control *cc) next_pfn = skip_offline_sections_reverse(block_start_pfn); if (next_pfn) - block_start_pfn = max(pageblock_start_pfn(next_pfn), - low_pfn); + block_start_pfn = max(next_pfn, low_pfn); continue; } From patchwork Wed Aug 2 09:37:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129554 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp140389vqx; Tue, 1 Aug 2023 18:52:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlH89/ZWiSJjL/51KSRvYaHCpy/yY27V0oy9GIbFuvWDqVYt2Oz/1ggnti4KZaYY2Hg1Evks X-Received: by 2002:a05:6808:f88:b0:398:5d57:3d08 with SMTP id o8-20020a0568080f8800b003985d573d08mr17875352oiw.37.1690941127887; Tue, 01 Aug 2023 18:52:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941127; cv=none; d=google.com; s=arc-20160816; b=U+dY3oU4WCiG9hg6sWPqqUYT2kUziI6lrq4+mt0eoRfGF2OBt23hz1a5zVVdHR3BiU jICeFtqagxm2HSeWRjKPnxeQ0XHQ1J7q0/XKxaJVzus7hNAvGE8up+nOladYkUgoM2nN T9XD3+K5r5spapqgV8TUo0H5GJLaA3lGrwgCddETXTGRYG8uqk2aYPbqtJ9JGP/acBmN qz7SGuV8FbtjgRT0dcIHkna/jTJ1/FSoNzjR/NmLR0rM4Ik/iBn/7dxL9WUmrGPDVoPn 3CjjzvLecSb0s0YKU8ZcFuGn5x/g3KranfeNqxbPT7UN29Y+phFl8Gks0Pw94D5blSxs bIDA== 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=pdRei9fGJiN18feezXtlCPg8SZ6q5avN8dZRCRdO4gs=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=q4cKVm7fFH0FyrIOvagYfcFhUCLKRY/zj3jp8x7v/1CU9GZtlR2Q83WFkX0gqCW6h0 nfXhAno1KRGd49zbMFTvHCIIUsS93jplyPmi6mpm27qN/Kq77um87m+7Iw/2dBUzV19b I22r8W0lnxBULBKrd8Cu7OcG6Ny4yKfi2ZELMf47k68bqCWE9oW16yov9lFxP0ZvjpPE NjfhiF092/N+fIpwlWBL/jj5vVHMTt7emss3m5YBzGTUlv3ECVaA7m+Z6SX1gxK1pkJ4 aF8InOSHUna9QQFrlnkPBTxCGVxSgKY+xFMw8vNZg1EK74ULdJodItJ8ZWjEM/eDkIS4 ZKQA== 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 p22-20020a63c156000000b005572b563e65si9628355pgi.305.2023.08.01.18.51.55; Tue, 01 Aug 2023 18:52:07 -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 S231481AbjHBBhu (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231133AbjHBBhb (ORCPT ); Tue, 1 Aug 2023 21:37:31 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 101102708 for ; Tue, 1 Aug 2023 18:37:30 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RFvjc4D2fz4f3lX5 for ; Wed, 2 Aug 2023 09:37:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S4; Wed, 02 Aug 2023 09:37:27 +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/8] mm/compaction: correct last_migrated_pfn update in compact_zone Date: Wed, 2 Aug 2023 17:37:35 +0800 Message-Id: <20230802093741.2333325-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S4 X-Coremail-Antispam: 1UD129KBjvJXoW7CFyfAw1fGrWDCFWrZry7Wrg_yoW8CF48pa 4rC3Z7Kr4DWayUZF1Yq34kZw1Ykws3KF43JrZ8Jw18Ars5Ka4Iyw17K3WjvrW5XrnIy3sY vF4qgay7AanrZa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPSb4IE77IF4wAFF20E14v26ryj6rWUM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUXwA2048vs2IY020Ec7CjxVAFwI0_Gr0_Xr1l8cAvFVAK 0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4 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: 1773080283957084430 X-GMAIL-MSGID: 1773080283957084430 We record start pfn of last isolated page block with last_migrated_pfn. And then: 1. We check if we mark the page block skip for exclusive access in isolate_migratepages_block by test if next migrate pfn is still in last isolated page block. If so, we will set finish_pageblock to do the rescan. 2. We check if a full cc->order block is scanned by test if last scan range passes the cc->order block boundary. If so, we flush the pages were freed. We treat cc->migrate_pfn before isolate_migratepages as the start pfn of last isolated page range. However, we always align migrate_pfn to page block or move to another page block in fast_find_migrateblock or in linearly scan forward in isolate_migratepages before do page isolation in isolate_migratepages_block. Update last_migrated_pfn with pageblock_start_pfn(cc->migrate_pfn - 1) after scan to correctly set start pfn of last isolated page range. To avoid that: 1. Miss a rescan with finish_pageblock set as last_migrate_pfn does not point to right pageblock and the migrate will not be in pageblock of last_migrate_pfn as it should be. 2. Wrongly issue flush by test cc->order block boundary with wrong last_migrate_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 a8cea916df9d..ec3a96b7afce 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2487,7 +2487,8 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) goto check_drain; case ISOLATE_SUCCESS: update_cached = false; - last_migrated_pfn = iteration_start_pfn; + last_migrated_pfn = max(cc->zone->zone_start_pfn, + pageblock_start_pfn(cc->migrate_pfn - 1)); } err = migrate_pages(&cc->migratepages, compaction_alloc, From patchwork Wed Aug 2 09:37:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp158032vqx; Tue, 1 Aug 2023 19:37:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlGe6wQeAY0NQLdi3S1ivI5dCr2/8IFWdhw7+6/C84RkrB1iGDbMzxSyPaf8bRD9ybRi696w X-Received: by 2002:a17:902:dac8:b0:1b3:fafd:11c5 with SMTP id q8-20020a170902dac800b001b3fafd11c5mr17023051plx.44.1690943862664; Tue, 01 Aug 2023 19:37:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690943862; cv=none; d=google.com; s=arc-20160816; b=mLbDrPcikzuj1dT1XeU3AiFv7pxCwD1zmwW90o2T+XcyKrUUn1e5BbYA7C+t/aOFCb 5JS4ntvjW0hf2FJ3DIj9Ncj4aywAB+GbBPoI7Il4btZ1+Ue9PTClyk6G/vZTz8Ld4Pfo mHzqgwTeo64DmwJtnUcHtTF0CubYyuybqZexf6cJrvZSs/uvKI7cC+LPidkj53dB7kyp BYAZMPX+IYRvxnnYU+S0DAdMYbvSkchoIkuEK6lCqyWF2SIiwSD4gKyVxioV/7Wg8JZB B1yKTTwGLQXeADhPSk7rnn9mC3UGw1FEDlWK46lHdOgKQkNjtS0YDjoetlvq0EG6qjW3 693Q== 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=w5y+e1xOh+s/GoTCGPCfdJ/N0cohcmt6yz4ij2XKPJo=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=cLRKqcodJuhd5xEh3rOX+R7IrY14P2DSlFeSpchmvzK4Oxpp0Gyy9IAjHpHVNHVFi0 HBSw7iVZ42mdwl23tecnJ268LKGfwxSoIH1hHnlyOTuuMCrlafSew4zpVX9hnveeLYj3 J/hQeuaiJOG8LgMwDgfcFfPIEgUyJlznjxQ4hbP44rMIU32BAkZ7L+zihaDZC9S5FGkm s9BChLV0UObdM1R5RS/Los+NvZKR3mcSycKJdXtWkHV+8PcEeQUE0BJ9LWpnjeWTamVU /Zaansthkt5MWWWcELD8cwXbRjzNF4VOwsbogUv0vtNTxxqPEitEcy/rSbWZH1Pqx2Iy ntgQ== 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 m2-20020a170902e40200b001b8a4954be1si9871280ple.595.2023.08.01.19.37.23; Tue, 01 Aug 2023 19:37: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 S231408AbjHBBhj (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230484AbjHBBhb (ORCPT ); Tue, 1 Aug 2023 21:37:31 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E4A9270E for ; Tue, 1 Aug 2023 18:37:30 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RFvjc6W33z4f3lXF for ; Wed, 2 Aug 2023 09:37:24 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S5; Wed, 02 Aug 2023 09:37:27 +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/8] mm/compaction: skip page block marked skip in isolate_migratepages_block Date: Wed, 2 Aug 2023 17:37:36 +0800 Message-Id: <20230802093741.2333325-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S5 X-Coremail-Antispam: 1UD129KBjvJXoW7ur1xCFWfKFyUtr1rKFyDJrb_yoW8Xr1UpF 18G3ZFqFWDW3W3ZFnrtwn7uF15Cwn7JF43trZ8t348JFZ8ta4xt3srt3Z5ZrWYqrnxtrZ0 vF4DKFWxCa17ZaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUCVW8JwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ 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: 1773083151384560614 X-GMAIL-MSGID: 1773083151384560614 Move migrate_pfn to page block end when block is marked skip to avoid unnecessary scan retry of that block from upper caller. For example, compact_zone may wrongly rescan skip page block with finish_pageblock set as following: 1. cc->migrate point to the start of page block 2. compact_zone record last_migrated_pfn to cc->migrate 3. compact_zone->isolate_migratepages->isolate_migratepages_block tries to scan the block. The low_pfn maybe moved forward to middle of block because of free pages at beginning of block. 4. we find first lru page could be isolated but block was exclusive marked skip. 5. abort isolate_migratepages_block and make cc->migrate_pfn point to found lru page at middle of block. 6. compact_zone find cc->migrate_pfn and last_migrated_pfn are in the same block and wrongly rescan the block with finish_pageblock set. Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang --- mm/compaction.c | 1 + 1 file changed, 1 insertion(+) diff --git a/mm/compaction.c b/mm/compaction.c index ec3a96b7afce..984c17a5c8fd 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1126,6 +1126,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, skip_updated = true; if (test_and_set_skip(cc, valid_page) && !cc->finish_pageblock) { + low_pfn = end_pfn; goto isolate_abort; } } From patchwork Wed Aug 2 09:37:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129552 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp139963vqx; Tue, 1 Aug 2023 18:50:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlGi2fEbYlr7CzCHstrJ7ScoS7kGnXpovoDkKtXdQUjIl5TS0+Xf016wT5iA1IyhIO1Fei64 X-Received: by 2002:a05:6402:134c:b0:522:abaf:1b0b with SMTP id y12-20020a056402134c00b00522abaf1b0bmr5638499edw.18.1690941057393; Tue, 01 Aug 2023 18:50:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941057; cv=none; d=google.com; s=arc-20160816; b=ynt34/s+Q7FRYZUx1eplC0ttyRK31M20dDzZHph326Kmm8Dw2pUxQUKArXzrLVeEWl P69n6JJNHXb9x3kX/SBJw+kD0Q+wOPo1sSPRhdS50itx3u6UAOK+JKLkEtoLlQfl3ChX taE2yzSOI+aoOCYNWRDynaigvg5hZ71AqwIhDG+pGkyZOPnb0Njq/Uhk//z/W+D4k/dM g3KpnSIjcVDlyEM2Mhdim88+8+Cct8C3BeZIXnSpnsvuj9sWIl0CYlJB6FwUPMGjveuL wrcHMr4v3tt6O76ozaRZGojIU3036oUQ9KU+jOnO6wu/J2yn+YT5RITYzZkHmxez3Ary ucAw== 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=zwMKyTqVJ8Zl9NHsNE8W26XxnXlDSfnIBeHIS7EYcBo=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=oDbrjcRBNNY8q7l+b9nLSHSJHWxJ5yjUbjBt5ReST7Fa5DLsaXRM0ZeotvEf59stDP NYr1QaUIJASlXi00pDap89iSJ28m4dr0YSlVH+oAPGnjBxruVp6Q0Uz1agl7Lh2g8ZmE TMTcmMuza6+qD2a4X7hMUcPDcVUxqXPw9JjXCUqrJaESgbeL1fIBDn+za0t0lDHcsw60 u+zDfm0FQ5/e8xxbtDkiic5wa7Qdu4gG3o9maUr1HAd/eiUjJ/ykse7yWki6CSXcdvl9 oCL0DWa1Wyd2JjvBrDtUb8WmWzAJgm/hFV0pXCxbl0I4gcxrInNmJWwjWCrypG5KE3hc ifXA== 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 w8-20020aa7cb48000000b005227bab0331si5691300edt.139.2023.08.01.18.50.33; Tue, 01 Aug 2023 18:50:57 -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 S231479AbjHBBhq (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231145AbjHBBhb (ORCPT ); Tue, 1 Aug 2023 21:37:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E527210D for ; Tue, 1 Aug 2023 18:37:30 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjg00c7z4f3nTy for ; Wed, 2 Aug 2023 09:37:26 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S6; Wed, 02 Aug 2023 09:37:27 +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/8] mm/compaction: correct comment of fast_find_migrateblock in isolate_migratepages Date: Wed, 2 Aug 2023 17:37:37 +0800 Message-Id: <20230802093741.2333325-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr1Duw4furW5Gw4UAr4fKrg_yoW8Gryfpr 1xC3Z2gF1UW3W5G3ZxtF1DZ3W5Kw4xWF13JrZrXw1xJrs8X3Z2v3srtF1Fqr90qFy3Aayq vF4DKFyfAa1DZFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x 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.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: 1773080209888982840 X-GMAIL-MSGID: 1773080209888982840 After 90ed667c03fe5 ("Revert "Revert "mm/compaction: fix set skip in fast_find_migrateblock"""), we remove skip set in fast_find_migrateblock. Correct comment that fast_find_block is used to avoid isolation_suitable check for pageblock returned from fast_find_migrateblock because fast_find_migrateblock will mark found pageblock skipped. Instead, comment that fast_find_block is used to avoid a redundant check of fast found pageblock which is already checked skip flag inside fast_find_migrateblock. Signed-off-by: Kemeng Shi --- mm/compaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 984c17a5c8fd..5c9dc4049e8e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1966,8 +1966,8 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) block_start_pfn = cc->zone->zone_start_pfn; /* - * fast_find_migrateblock marks a pageblock skipped so to avoid - * the isolation_suitable check below, check whether the fast + * fast_find_migrateblock will ignore pageblock skipped, so to avoid + * the isolation_suitable check below again, check whether the fast * search was successful. */ fast_find_block = low_pfn != cc->migrate_pfn && !cc->fast_search_fail; From patchwork Wed Aug 2 09:37:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129555 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp140414vqx; Tue, 1 Aug 2023 18:52:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlEcRS/WyhW/zkAPFOm+/e/+vXehEo5E1OTkF3rGOCKwsYzjkyegkx7S+X3gvt6EixTKJqg6 X-Received: by 2002:a05:6358:725:b0:139:9fc3:eade with SMTP id e37-20020a056358072500b001399fc3eademr5121367rwj.29.1690941131612; Tue, 01 Aug 2023 18:52:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941131; cv=none; d=google.com; s=arc-20160816; b=vXV9dBh0QYZFIwMtPIzawYOcOTSvcyIwrGpXHnTtTkYsLkTCpoEkfJr8/5FhdhvKKc kvG5p52k2O3rSh90Iz2rQpAMU9Chu+qipL7+UXwsSIQgsKKKpEkN/j36tlbmNZsUTZLj YesFpbMCJYnF1axMBe7KLjEBTnd9nSi3/AGYBD8Wq/MxIjMnoReBGB6CJRFODm4SpQDx ir7MsqdPcspKP0qD5jfIPYMO4mx+I1OGWYapspwDM/HqmskqiET3fgik0EoZjhOgkv3S USjIkbgSGnhaFOPFgIEeW9kTBHZv55Y529LBnjvCB3Hhda5SbrxRlWsGz3nrnESAxkL3 4aDw== 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=Bgf3L5+1beG8C64RCCnI2PAMOD4a+B0/f237uX2C7Xk=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=MwsXCTPp/YLXmUhlDUw9+zo1sSkpUyv41M4GOrd78q3A5yiLHpN/Gw4rt0ImmofEyi c+MdP+0zHRX/yiwsadHUBpIIJHQt5uSpxkFVZkcCfEnnLZo6b5cx1onVPk52cntSRWNH cBsbspP4L1yYgPuyeEWV1c5iwMKqEMMJ8QW70oR5t+8llVfAGXHxA2W3bKP5voc3Rh+I xqrrtQ/Fp39vp6NApRUc408RJ+8dKVlC6JjLvK38mJFfWbTm2rif1d07SGVeryAUZt5e yqSTff6QcEiuaSpGCO1bVKCipV9SlTz71KDxNdZXUNVARw78/hk57tuS8ulnX1BxECBo oE4w== 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 c5-20020a6566c5000000b005645bbc8427si3168900pgw.452.2023.08.01.18.51.58; Tue, 01 Aug 2023 18:52:11 -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 S231510AbjHBBhx (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbjHBBhb (ORCPT ); Tue, 1 Aug 2023 21:37:31 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAAA526AA for ; Tue, 1 Aug 2023 18:37:30 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjg2XRXz4f3n6M for ; Wed, 2 Aug 2023 09:37:27 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S7; Wed, 02 Aug 2023 09:37:28 +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 5/8] mm/compaction: correct comment of cached migrate pfn update Date: Wed, 2 Aug 2023 17:37:38 +0800 Message-Id: <20230802093741.2333325-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S7 X-Coremail-Antispam: 1UD129KBjvJXoW7tr1Duw4UKF45WFWktFWDArb_yoW8Jw13pr 97Cw1jqw4vqa13Kas2yr1kZa18Jr4ftFy3trsrK348AF43K3ZrtF9rtFyUZFW5X3sIvrWa vF47KFW7ta1fZaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPF14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x 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.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: 1773080288098435808 X-GMAIL-MSGID: 1773080288098435808 Commit e380bebe47715 ("mm, compaction: keep migration source private to a single compaction instance") moved update of async and sync compact_cached_migrate_pfn from update_pageblock_skip to update_cached_migrate but left the comment behind. Move the relevant comment to correct this. Signed-off-by: Kemeng Shi Reviewed-by: David Hildenbrand Reviewed-by: Baolin Wang --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index 5c9dc4049e8e..7f01fbeb3084 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -469,6 +469,7 @@ static void update_cached_migrate(struct compact_control *cc, unsigned long pfn) pfn = pageblock_end_pfn(pfn); + /* Update where async and sync compaction should restart */ if (pfn > zone->compact_cached_migrate_pfn[0]) zone->compact_cached_migrate_pfn[0] = pfn; if (cc->mode != MIGRATE_ASYNC && @@ -490,7 +491,6 @@ static void update_pageblock_skip(struct compact_control *cc, set_pageblock_skip(page); - /* Update where async and sync compaction should restart */ if (pfn < zone->compact_cached_free_pfn) zone->compact_cached_free_pfn = pfn; } From patchwork Wed Aug 2 09:37:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129553 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp140234vqx; Tue, 1 Aug 2023 18:51:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFHQKmJpt2EJ7HXgIhEygO4G3NsRLolQD6iMqGTMQRH8UVSnPNW4GvKYSwV89viXcuY03Eu X-Received: by 2002:a17:903:545:b0:1b8:1e05:ed09 with SMTP id jo5-20020a170903054500b001b81e05ed09mr11473254plb.36.1690941101960; Tue, 01 Aug 2023 18:51:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941101; cv=none; d=google.com; s=arc-20160816; b=vWfxUKQmMGXaBxlkEDnS/5hnjj20UYu8xSCzbEVSxLbnFj5hfqGQaoUvK9cURmEQi8 3+RMYOyvgNY1g7HLwtFBBQu++/FGzuwUeydp8iVIotVkBTVJygP/1IWbapsN3NrqR1Ee Wfxx9811m6MjWI5jsPlLjC+FeXA5GOeD7mzsPZ5Yb8+Jq4ffVpAw4W4TcHZwmTp48pV/ JtGoHctA9ddnOyBlAkEsYMWptd8XOpvnbNkm4ggiRqP9fFCRig2sSxWdD1HViY2bVj2U ivumCcJzsqOeo5eNUnG8I9RmrRDL0cdSpfRtkKk5smTLNkAvsgkvqu0bMjCtkYw7jQq3 NdfA== 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=ojMDeLWoj1XODyjeyi7n+gkeOl0JR/suB/pw9H0+pdg=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=Uv1fIsxYsmn5JpvSMx2HBdWYzs6XuRpi8iew8UETb9cX1l+5n2DylNlAr7N6Ngx4Hk GMEQ4Jc0k+w4V7QvnLVm7KhD8Mk2QEpChqvz3nG2CrViCPR5nApqpZ1ntMocRVxzynmJ J0bA4k9KsNeDp3/NQPms7LnAuiv8C1t9M6RXQ0On0Dx/e5sLRxl0EY4nOZ2xKinLhmg9 sbzfYHBRYSKWuUcb91w1GkhDY1MZ+AJXIagDFaRg4pWNvxW4BNm7xJW8Q09PfqWACe3v 7ALIGByOw7+X4ZTDbv+1/VpJ9ky3xJS1tf9nPdENudMlb3IB3lXEAbaSd/Pwg6y9flMk IQGA== 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 lb7-20020a170902fa4700b001b86671b3f1si9797845plb.190.2023.08.01.18.51.28; Tue, 01 Aug 2023 18:51:41 -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 S231461AbjHBBh4 (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231222AbjHBBhc (ORCPT ); Tue, 1 Aug 2023 21:37:32 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 449121B7 for ; Tue, 1 Aug 2023 18:37:31 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjh1vNyz4f3pC7 for ; Wed, 2 Aug 2023 09:37:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S8; Wed, 02 Aug 2023 09:37:28 +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 6/8] mm/compaction: correct comment to complete migration failure Date: Wed, 2 Aug 2023 17:37:39 +0800 Message-Id: <20230802093741.2333325-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZF1UKrW8Kr48JrWrWrW3Wrg_yoWfWFX_Jr 4Iyr1rWw1F9r9IyanrCayayryagr4kZr17Ww1DX3y7t34vyF4fW3WDArsrZr9YqayDW3sx C34kZr1jk3Za9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I 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.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: 1773080256623643459 X-GMAIL-MSGID: 1773080256623643459 Commit cfccd2e63e7e0 ("mm, compaction: finish pageblocks on complete migration failure") convert cc->order aligned check to page block order aligned check. Correct comment relevant with it. Signed-off-by: Kemeng Shi --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index 7f01fbeb3084..5581e4cccac5 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2512,7 +2512,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc) } /* * If an ASYNC or SYNC_LIGHT fails to migrate a page - * within the current order-aligned block and + * within the pageblock_order-aligned block and * fast_find_migrateblock may be used then scan the * remainder of the pageblock. This will mark the * pageblock "skip" to avoid rescanning in the near From patchwork Wed Aug 2 09:37:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129556 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp140998vqx; Tue, 1 Aug 2023 18:53:45 -0700 (PDT) X-Google-Smtp-Source: APBJJlHZ2IjtnKDkwyvFblTCjK8GbxEW1eki02nD7N+8IBjAtl6Av55N8KXweVOWZFOqmrSiG1B7 X-Received: by 2002:a05:620a:2ac2:b0:76c:a3a6:6edd with SMTP id bn2-20020a05620a2ac200b0076ca3a66eddmr10605669qkb.34.1690941225023; Tue, 01 Aug 2023 18:53:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941224; cv=none; d=google.com; s=arc-20160816; b=Onitgx/wAJQaiNfXOGWkAq/AyjqpJXDyvmf9bx2BLdE8Q49I7V93qMdQ1CI7VKuZdC An344G6lg7EgWXrMKXCPtQSvmhTn5IqMAbcfAHp7I0syGMgCLS8l16Il2yDExRFZ46+r lsIKHVB1U/Vms8chdBJycO8OV3rfduLa4cpeZlVonu3R2oWjUEFfWOLKvhUwraTf+wO1 KApk+64ur3njufa9iuKYfy67lkY0/031xdnFJ9DK22lG0lgaGS75trYEHHvCePAF4dEb Ue8z+jWXSsNzSJSrVR4B9SILI8P+T7nPkgPfwPyS4s9+Nfn4JP+6TCssp7UaShIvl6xk T23A== 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=UtV/YKltSAJUyOWW5/p3KEWmnAsx16rvcSp42ZO7nwU=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=z0lFnpF4D7852auDheebE4WtA3aXshvMjnydEj66G1NggyabIw5IxaI9skynbYkXXA qCxHQBwJkmYA+JXCeLvDP/4JXjzLFQbRsVZCR11ODvjCR3XcS3Q/TqHiKwjVoowmg4V/ IeMk92fy79m2mo8U8PrZzDnyJIhW4EMaESxuA+vDC9vcy78XYAoWwo6Y+kwkYhzhwL4k LeafzevwTyssxAdAxc8ramz0bKDy6Rdj6XActOMZsr/qIwg23sBVFORQZ/IsEmnNk872 ZTyGlz9rWBh/HgCpFJwNVGgqjcoCBjkPBjNslT7JEknj2VxK3loAbS+S+j1QCtJMU5nB Sb7w== 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 p22-20020a63c156000000b005572b563e65si9628355pgi.305.2023.08.01.18.53.32; Tue, 01 Aug 2023 18:53:44 -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 S231616AbjHBBh6 (ORCPT + 99 others); Tue, 1 Aug 2023 21:37:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231308AbjHBBhc (ORCPT ); Tue, 1 Aug 2023 21:37:32 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8A98210D for ; Tue, 1 Aug 2023 18:37:31 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjh4ps8z4f3pCB for ; Wed, 2 Aug 2023 09:37:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S9; Wed, 02 Aug 2023 09:37:29 +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 7/8] mm/compaction: remove unnecessary return for void function Date: Wed, 2 Aug 2023 17:37:40 +0800 Message-Id: <20230802093741.2333325-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtryxtr1UAF4UZry3Kr1UAwb_yoWDCFX_Jr yIyrWFqw4Yvr18AFnxCF4avrykGF4DCr1aqa1DXr1fAa4qya1vv3srZr13X3yYqa9rur9x G3WkZFs2kF1avjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I 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.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: 1773080386198753579 X-GMAIL-MSGID: 1773080386198753579 Remove unnecessary return for void function Signed-off-by: Kemeng Shi Reviewed-by: David Hildenbrand 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 5581e4cccac5..a1cc327d1b32 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1423,8 +1423,6 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) /* Skip this pageblock in the future as it's full or nearly full */ if (start_pfn >= end_pfn) set_pageblock_skip(page); - - return; } /* Search orders in round-robin fashion */ @@ -2878,7 +2876,7 @@ int compaction_register_node(struct node *node) void compaction_unregister_node(struct node *node) { - return device_remove_file(&node->dev, &dev_attr_compact); + device_remove_file(&node->dev, &dev_attr_compact); } #endif /* CONFIG_SYSFS && CONFIG_NUMA */ From patchwork Wed Aug 2 09:37:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 129557 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f41:0:b0:3e4:2afc:c1 with SMTP id v1csp141062vqx; Tue, 1 Aug 2023 18:53:52 -0700 (PDT) X-Google-Smtp-Source: APBJJlFBklSOFUlhoyTyKrA2faJ+b7BTDQ8op/pQtxmpDclosOnhuwETM0HFzcFvT6lwycMYeVfJ X-Received: by 2002:a67:f54a:0:b0:43f:4714:a03b with SMTP id z10-20020a67f54a000000b0043f4714a03bmr3933375vsn.17.1690941232534; Tue, 01 Aug 2023 18:53:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690941232; cv=none; d=google.com; s=arc-20160816; b=hWBk5H68vAvPYYC7ifyo6uJhoCIRohhGwYSJrqfU+fAg17B3Zx4LtC7hVn/WZh/f6M A9lHH/cP/q2TLgCUrpWeisKuqdcgySOvW7arQnvwmXtjXqk5R1GmMelPoLoPzdoFMX7q /1xhLbCMDlbmvl9O7rX0nbvLE2bUWhmYIKbXltx3U+BwnPe7jc3SBPPuoF9+FEqydaFV MhSj8koD2PlKGjNMKwugTezyUDN3kOfG6BXuEldafAuXs6iU4VlbcV31ZoxeXEwO14uL WbhDCOHZKKQMkSEoFki7P8KsXDkjqWuAPCRTVp5aCLeRzUFhSnWmbYpJirVaXZtSy7ZY 4CRA== 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=E8Ghhfo476pomQiMg5Ny4FSukhbg2Nff++sDyzBNwac=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=0SWBqYpJ8ZGvy6KW+qEwu0ofPG19Upn2k6dLuWmzMRMMupOwFRH1S4f1GMXEo2Pr7t dzs9to6CVB4HhDQ5ObhOf+wUewXea2I8e5dqITtsX8OAZMPlSBtMrXxIEcd43jXLGDEo l9m8tdYl/mBHRwx5zfLgyKaZbUb3xC40/JShEUpmIZhFIjKZOk9ovjVLLz+zBAD52Pdf NkJoLCwD5WCzrAwh2AphWc38FyU4YKpIhK9kTV6hL9v/QN5FrLXMxF1h0yq+PDRGxEYB 73iYoMe0IZCP8XQLd2DRON8YuNa5tg3oiuUj8URpWkiHHCyyzaKVUlnrhIkuIZtZ+PyI a/cw== 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 r8-20020a17090aa08800b0025027e0ad3dsi307279pjp.81.2023.08.01.18.53.39; Tue, 01 Aug 2023 18:53: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 S231396AbjHBBiD (ORCPT + 99 others); Tue, 1 Aug 2023 21:38:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231349AbjHBBhc (ORCPT ); Tue, 1 Aug 2023 21:37:32 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0072E269A for ; Tue, 1 Aug 2023 18:37:31 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RFvjh3Zmkz4f3nbJ for ; Wed, 2 Aug 2023 09:37:28 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAXzrFTs8lkvrtvPQ--.56352S10; Wed, 02 Aug 2023 09:37:29 +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 8/8] mm/compaction: only set skip flag if cc->no_set_skip_hint is false Date: Wed, 2 Aug 2023 17:37:41 +0800 Message-Id: <20230802093741.2333325-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230802093741.2333325-1-shikemeng@huaweicloud.com> References: <20230802093741.2333325-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgAXzrFTs8lkvrtvPQ--.56352S10 X-Coremail-Antispam: 1UD129KBjvdXoWrtw4ktF1DJF1Utw1kKw43trb_yoW3trc_Jr 10yF4rtw1avr93AFn8Xw47Cr1kKrWDCrnrWF1kXr4ay3yqya1vq3WDXrnrXw15XFW7ur9x GaykZF48GFya9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r4j6ryUMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRvJPtU UUUU= 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: 1773080393576653556 X-GMAIL-MSGID: 1773080393576653556 Keep the same logic as update_pageblock_skip, only set skip if no_set_skip_hint is false which is more reasonable. Signed-off-by: Kemeng Shi Reviewed-by: David Hildenbrand --- mm/compaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index a1cc327d1b32..afc31d27f1ba 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1421,7 +1421,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) + if (start_pfn >= end_pfn && !cc->no_set_skip_hint) set_pageblock_skip(page); }