From patchwork Fri Aug 4 11:04:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130943 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp770712rwd; Thu, 3 Aug 2023 20:30:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlGIwcUMwvV88bOBtPqmPPnKHOr2TOgRy78WHF7Bj2dW9vf49SuE8fsbiIecg2oB8oe4n90w X-Received: by 2002:a17:906:77d5:b0:993:d54b:3e4b with SMTP id m21-20020a17090677d500b00993d54b3e4bmr14549686ejn.0.1691119817935; Thu, 03 Aug 2023 20:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691119817; cv=none; d=google.com; s=arc-20160816; b=eQDJBppbI9lNJrxq4daRTXX+ptx7s1hD1EWqIbN3zGOoTiDFDdFdu4MFrcg+WUXiPI Jk7owlFcURHL5XwSwb9O2+B9Qe6cVuzPzjRIrtH5m3wIyruAzsOSaLp6zCLPtaNNOR1J wgHFeAyQgv6xn0do134vVpYGZmhRF6rhkKP0cOIYCVdtyEfeMpKxxD5KeG2jcr4Xo3cW 6Oye3kr0lvgOfMFbIe73GZgK7nltQW/AGpqm9+td3Q+gsdk6bv0vB9/j0XvF8FrCD2t6 yowiFcjfJsH6YwqDls4ZGVMJZmhLfkjJtfKveP3eAzev9SDhPT4VJG1w+j1CdRMrpKYV 86QQ== 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=U2TL62rfXMiPNnr1HHoXNkf3eE9sAwvMNmdf+/S12Bo=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=cPaf3ov4Ky9fag7V/XuNqC56MOOeg7JRdWi4TRont22Bc4KOW69/CZ+4Y7++HWhowG Hm8P0cMUvizh+EE2T1eEpoehbBkaH3QCD1yobXQuco1OW8E828pktiY8kCU3stGCL3W0 FwpkcFIbcL98pL54xEVDN/QjL+kvdbmkWJv32+TAmbRDOhMCkdx0hAOC1xg+UCsm+bon t/LeF/009iUv0haysT1PnTqLtvKo6xsnOgRGBuHaoSG/3eMI1BzgXvxkPUzUU+uT7cyq A7NwTgJV09KTUzzDTtXLB8auKvTRmWCUGWYd0wbiNFYSFt+O5MvpZPYecqEvyWqpzjsu +NwA== 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 si9-20020a170906cec900b009655fcff588si889827ejb.835.2023.08.03.20.29.54; Thu, 03 Aug 2023 20:30:17 -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 S233378AbjHDDHU (ORCPT + 99 others); Thu, 3 Aug 2023 23:07:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233216AbjHDDEz (ORCPT ); Thu, 3 Aug 2023 23:04:55 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 692D8448F for ; Thu, 3 Aug 2023 20:04:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YK1p8Bz4f3q2r for ; Fri, 4 Aug 2023 11:04:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S3; Fri, 04 Aug 2023 11:04:40 +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 v3 1/8] mm/compaction: avoid missing last page block in section after skip offline sections Date: Fri, 4 Aug 2023 19:04:47 +0800 Message-Id: <20230804110454.2935878-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw1ktF4UAF1DKr4UJr1xuFg_yoW8Zw48pr yxCFy3Wrs0qa4Fga4Iyw1kuryYyrs3GF43JrW2yr18A3W5XFn2gF92yryqvryYg34fZFyj v3yvyFW8Cw47A37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,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: 1773267654080997038 X-GMAIL-MSGID: 1773267654080997038 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 006fc35bffa1..a21b834c5898 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; @@ -1690,8 +1695,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 Fri Aug 4 11:04:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130950 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp778431rwd; Thu, 3 Aug 2023 20:54:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4TvTlGj87ahUU53GQz6lluVG7IPKHZaBVOT2J2rMWnqJeARv5AcgEuMin7xvv2g93DLGT X-Received: by 2002:a05:6a20:4285:b0:123:149b:a34f with SMTP id o5-20020a056a20428500b00123149ba34fmr26204733pzj.1.1691121271433; Thu, 03 Aug 2023 20:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691121271; cv=none; d=google.com; s=arc-20160816; b=qf1Cg3LREGRVJByqCu+D2A05UURdDyeNZtfFkPBjFn8aSRQCxvKdkUpFNJ60XHsazE Jo4mfFMxW8Hf2ETqpxWVmpBVJ0KdFs3WYbgOMhABwXxuUcad2uKVdMozO01G/1cBFNC9 MBLqZDTHepHa0KTm7jLfeBsG9sJS0Qc4ICsq+9dz/gy/Ot2uNqJOxdzs6ybjtNsDVUXN F8134LAOGXqSuC5xzOcOIWZkbcSP/LESSbFkd0DideJhQk29k5k1F8wEDdJkQ8SCO/8o DH1p+cw6KZAkYlpbXnXb+73VjzlRD4O/AnrK23uQHANT5UeWtoNOiybeMIObOJkQpwNc HfGg== 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=/KqxlsqmsSJsj905uarwn3ERrhS1QrLwackbUrPMArs=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=eI+GDiG84vB+clPC+eHBPQLCOy+Fjt4sJORIrox2w3CrvsLAKZTQKBkY9VH0uERqZg TnkOMCdL4flqJJgDVXMjIAYoRg6Bnq1VrhUHB5n1bkdlnvx2dqpK/Wchx5HkA6nTR+iJ 4QVYfkeyJX/0AJKKZQMDCJyAKU9EdN2a8kIm9ZK4RyK0eTDS8nDcBzQHC+OMDt4vO3ZB LgXQhpA/05xQ1gFh4dIIMqeqr5EPkIeSR6QK2o8pakqQ2lYvce9exulWHFwWZRFGmZZF mwUeOMKubaNYHFuP8leuW7kRCCPdhbUWolow6b3hPV0xgJ+Gk2IWQ3Tv3aGf5LP65Nuv KdZA== 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 i14-20020a636d0e000000b00564514df654si1029857pgc.895.2023.08.03.20.54.18; Thu, 03 Aug 2023 20:54:31 -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 S230518AbjHDDHL (ORCPT + 99 others); Thu, 3 Aug 2023 23:07:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233194AbjHDDEz (ORCPT ); Thu, 3 Aug 2023 23:04:55 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6990044A1 for ; Thu, 3 Aug 2023 20:04:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RH9YN14nfz4f3mW5 for ; Fri, 4 Aug 2023 11:04:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S4; Fri, 04 Aug 2023 11:04:40 +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 v3 2/8] mm/compaction: correct last_migrated_pfn update in compact_zone Date: Fri, 4 Aug 2023 19:04:48 +0800 Message-Id: <20230804110454.2935878-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S4 X-Coremail-Antispam: 1UD129KBjvJXoW7CFyfAw1fGrWDCFWrZry7Wrg_yoW8Zr17p3 4rC3Z7Kr4DGayUZF1Yq34kZw1YkwnxKF43JrZ8Jw18AFs5J3WjkwnFk3Wjvry5XrnIy39Y vF4qga9rAanrZa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,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: 1773269178672219579 X-GMAIL-MSGID: 1773269178672219579 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 a21b834c5898..bdb03f38b7f7 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2509,7 +2509,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 Fri Aug 4 11:04:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130951 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp779040rwd; Thu, 3 Aug 2023 20:56:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGo/vbXcOiEEH6NaTjavFQOywOnusGmY04SUou+ESJla9imMkSJjhUZRd85xrEKyrUywGX7 X-Received: by 2002:a05:6a20:8f29:b0:13f:9233:58d with SMTP id b41-20020a056a208f2900b0013f9233058dmr3977080pzk.2.1691121370985; Thu, 03 Aug 2023 20:56:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691121370; cv=none; d=google.com; s=arc-20160816; b=N4Eg+geJQeKW2KFTK0l1V272t1HZWQJRPV3263ZJWHVuU2UaMNQfS6Fl6c2sZnJTcD s0GsaT42NOI7kTz5Yck55erRKX7DvK1oHl5kzu8kQDvxFAv63JFMwENC3Ft/qj3EFm8S VuwrShU8OnH85p2Va/4VELmivti6vc/XdipoPdA41ChKjG00TO3u0KulcA7F6Sq77Jog i7QCLM80eBspJM5NRFi4yTs8WAbTx1uQAhucSTd2GTAeY7t/d4zjN2GxGh/waWk/wP0j DcUSjS5NFihf2eUVWP05UbZrOyvrfA6u8b2YCl5Lh2etL2rJooZYpiKpXWBfFa2Yh0bD NozA== 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=CQgBBhXTp7+vcAAxUYt2t0w4s3J1oYkvEEkL2MTpVgM=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=zVh78WfQpCTHTSW74U9Asx9SZcwa+kc8T8+qYWNU/BmM7x/Us4v9obzbKp7SzBE0Uk PatcAVVc4wjtQdbXb6VlzSjrFsm+Z23M95SffCMbOYsNQ43j4Qki6gKLpk4l4FXm2Mxu XygGJHq0VaeryP4mAwaeK+ooLjC8ifsnjdY1HeBxmIsjlCeqDGnh/atrpgT8DDrd0mml Ltt/WEbnxsjJzHPsnltQysztrPflJfFoc4LeakzVg6zkg9lmvRbzqIRPnyg5P0McD4Cx jRn5tw0PA76wYQlbsri+Ky5GQR+3QCQYyszLMeKKXOAkNEHNaBZ3M2ttokxT2EbZ17P4 V+sg== 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 h2-20020a635302000000b0053f23442f24si1064335pgb.502.2023.08.03.20.55.57; Thu, 03 Aug 2023 20:56: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 S234021AbjHDDGv (ORCPT + 99 others); Thu, 3 Aug 2023 23:06:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233300AbjHDDEz (ORCPT ); Thu, 3 Aug 2023 23:04:55 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 695364495 for ; Thu, 3 Aug 2023 20:04:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YK6R0qz4f3q32 for ; Fri, 4 Aug 2023 11:04:37 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S5; Fri, 04 Aug 2023 11:04:40 +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 v3 3/8] mm/compaction: skip page block marked skip in isolate_migratepages_block Date: Fri, 4 Aug 2023 19:04:49 +0800 Message-Id: <20230804110454.2935878-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S5 X-Coremail-Antispam: 1UD129KBjvJXoW7ur1xCFWfKFyUtr1rKFyDJrb_yoW8Xr1UpF 18G3ZrtFWDWa43ZFnrtrn7uF15Cwn7JF43trZ8t348JFZ8ta4Iy3sFyas8ZrWYqr43trZ0 vF4DKFWxCa17ZaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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, RCVD_IN_DNSWL_BLOCKED,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: 1773269282550808228 X-GMAIL-MSGID: 1773269282550808228 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 bdb03f38b7f7..9a2f0bd5394a 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1141,6 +1141,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 Fri Aug 4 11:04:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130947 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp771439rwd; Thu, 3 Aug 2023 20:31:58 -0700 (PDT) X-Google-Smtp-Source: APBJJlEhMwvTOeQ2ZVd4wdY1vrFaM+vDMedPvv3g5nuGHKnbK2BZVGH/UaGwnZ6vJ2smulL9UDRq X-Received: by 2002:a17:906:196:b0:993:d0e1:f308 with SMTP id 22-20020a170906019600b00993d0e1f308mr15213596ejb.2.1691119918559; Thu, 03 Aug 2023 20:31:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691119918; cv=none; d=google.com; s=arc-20160816; b=l+1Q6JeqK6f73vuROKDfXQUgKoOyqOGad0uCcRZO2xiQLzGjSemyP+Of58tmLsMS/u ErnAX66p+wXT33nkFBKRvMgPcm65qvUuaFjC9mp0V9mamqdAMImAantyVWCnV/kQsiXI /+VYCgpICu9XpjF1BiMPLmEE9UwcQrlbJq5Tj9vFNdNvKKg8Zw3yQbd4/ZI040nMWBym SO7GPJIC0oRBYmcukhtjSmqSXpSRgnUl0kQsKO5oLVu727whsK6jf5pT541GR3nqGn7A CoTpPG3uQ6d3GAdyXZQ56RkyEnn+V70vg2EW47I43ZkHOiYKfvZH+/WECP8ySjzmZZaR 4IHw== 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=rskdlnzcT8oAIsMut4xbyGOKCRXz3TQRkhifY3ziyhY=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=rN8xruendrD4XebeTgV1mvPKdC4UQdk3R5xSQ7OMpiafUHkx85G1XEoOSxKGJvXIrE A1Pv7xDd7sbMa/z6SO1BylSX4toWd1zAC1YehyOttDOLgPW4PVBbSQ4SLMwUmUZP9CTi W5/qKTSyQCwHXiYSmaUbl0bfczPKCDkzhVy85IcXuoDElUdExdA5k3lX2rMo0h2fqx63 57mEfhElf6lf78xC6V9XFRy38TeeKLpIaCuS+nT4NZSdKsnSqNR0ZpJ5M76pyPfsLhS2 JYa6abqR1M0Dq0B8YGbgkLdlhsvCZ22qHDjHYxGbQ/6AwzuDlAk3VSXqKcwhGl7FgTv7 dZqA== 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 z5-20020a170906714500b0099277496cebsi971343ejj.348.2023.08.03.20.31.35; Thu, 03 Aug 2023 20:31:58 -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 S233915AbjHDDGN (ORCPT + 99 others); Thu, 3 Aug 2023 23:06:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233166AbjHDDEy (ORCPT ); Thu, 3 Aug 2023 23:04:54 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 694314494 for ; Thu, 3 Aug 2023 20:04:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RH9YN0B9Kz4f3wQt for ; Fri, 4 Aug 2023 11:04:40 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S6; Fri, 04 Aug 2023 11:04:40 +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 v3 4/8] mm/compaction: correct comment of fast_find_migrateblock in isolate_migratepages Date: Fri, 4 Aug 2023 19:04:50 +0800 Message-Id: <20230804110454.2935878-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S6 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr1Duw4furW5Gw4UAr4fKrg_yoW8Gw18pw 1xC3W0gF4UG3W5W3ZxtF1kZ3W5Kw4fXF13Jr9rXw1xArs0q3Z2v3srtF1Fvr90qF9Iyayq vFsrKFySya1UuFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,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: 1773267759705543885 X-GMAIL-MSGID: 1773267759705543885 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 Reviewed-by: Baolin Wang --- mm/compaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 9a2f0bd5394a..4bf2dc936add 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1988,9 +1988,9 @@ 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 - * search was successful. + * fast_find_migrateblock() has already ensured the pageblock is not + * set with a skipped flag, 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 Fri Aug 4 11:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130941 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp769894rwd; Thu, 3 Aug 2023 20:27:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlH4gmmTw+u1+cMMTs4ju4WnseO1XkxH/SRQM98YF0EPIqFhNeSeV2uoQQaTRE54bPKukmMd X-Received: by 2002:a17:906:24f:b0:993:eef2:5d53 with SMTP id 15-20020a170906024f00b00993eef25d53mr15087557ejl.0.1691119675504; Thu, 03 Aug 2023 20:27:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691119675; cv=none; d=google.com; s=arc-20160816; b=MlpuqNnd3Xy+j5dQQkMALeoaxD9i2V5k6N9dRRPTtx07rsyC02DyMmFhP3cH9d5ETq xj15re9aJuRIT6QY5hFHW5YgWGwn0Eu472ZqQfW/LoRKq1JgZY7CeD0TP9ivm2HzsWnU WxMqoSTIlb1tb/rOOlzMsNQMqVpZ/qRuubnk3W85MJGunhvnvzxAULqpbahGVeCK8GwD kw06hrbSExXt+WbJkPDRT9f48oMskVZI4P3u9BWW6UBfNhiLWyQFJg6NeJXFKTSMMcVm hZWJvrcIjYZ25jEaV/kNqFrxiURfymSXpiGsy/MP/0v+ni40vJ9gbtX0Cy5YG1zVM+fI Jl8A== 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=3FXHuIfV5f3mvJi1wEv8UvvdZ/TMCTjKFGN28OOXy98=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=tNilhy7+XNzf2HoMeGsdRR+NrscYZKO2HvmmkIZht7bpr3VHKVKQF/hKRfW99Vho8w oYpdyLLHXmR1Z2/WgBSX6BBOe6PrdE0FXfw8FwERjf0I5zWAU2iQ5h2RP9DpeExOk1Nz 7Cwg/K9n0nuppvZqBFzc+3yRSfe9ILBPFIpdp5go4SvZOLtbDWfaVvCeFAeR3sUWJr3H Iv78H4B4REWdZ7GXinqyTKeJeSmojhKqfHQLbA7NjKiwVBiIehBH0agneVxAS2laEKO3 iOlPPAjr15TdNOZiUhdBiRNLekXvITzzbzCDQVY7HTIDOy3ijHwdBBAmqQp5H5bS6shL ov8g== 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 n16-20020a17090625d000b009931472bdb8si1054750ejb.965.2023.08.03.20.27.30; Thu, 03 Aug 2023 20:27:55 -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 S234083AbjHDDFz (ORCPT + 99 others); Thu, 3 Aug 2023 23:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233081AbjHDDEy (ORCPT ); Thu, 3 Aug 2023 23:04:54 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 690654234 for ; Thu, 3 Aug 2023 20:04:43 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YL4YRKz4f3q2l for ; Fri, 4 Aug 2023 11:04:38 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S7; Fri, 04 Aug 2023 11:04:41 +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 v3 5/8] mm/compaction: correct comment of cached migrate pfn update Date: Fri, 4 Aug 2023 19:04:51 +0800 Message-Id: <20230804110454.2935878-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S7 X-Coremail-Antispam: 1UD129KBjvJXoW7tr1Duw4UKF45Ww1UJw4rAFb_yoW8Jw13pr 97Cw1jqwsYqa13Kas2yF18Za18Jr4ftFy7trsrK348AF13K3ZrtF9rtFyUZrWUX3sayrWa vF47KF47ta1fZaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,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: 1773267505113686847 X-GMAIL-MSGID: 1773267505113686847 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 4bf2dc936add..fda61dc40f93 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 Fri Aug 4 11:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp779109rwd; Thu, 3 Aug 2023 20:56:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlERgzaXJoSB44pljG9eMVcZjEWH0LD3rxAqLeN33tPlTuDtjdGsz1h/bTH3RnMvSBFOl/ZD X-Received: by 2002:a05:6a21:998c:b0:13d:1ebf:5dfc with SMTP id ve12-20020a056a21998c00b0013d1ebf5dfcmr23603929pzb.5.1691121381239; Thu, 03 Aug 2023 20:56:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691121381; cv=none; d=google.com; s=arc-20160816; b=nMmqFUAbpGyqOaB555vUZY3RulS9I9xOeFVTO1HdZ0L9qOMwxyeFREKDr94Nn8UUVJ zpAJ+zqgzKS1BDpx5gKgFvcjpSxCMkXxxiWaJ9DsCr3ukooEH5Tui4jMY1d1mCe5BXqV OUbwNxfc4NohyWMkXRCwexOCCQSn38ZRfCekZ0BqkggU67Wzl8q1/9/D4Rpw2zESvqqW E+oLigX/TzwROn+3XMWru6q5HKf8LdmTWyXvgEnN7nf5fzZ2ydjN8J8q0sG9UgB77ZB6 u5rF99eVj8fncXL/ZCTa+471qKQKOdP4TlH7YixJzZHwo3qPoJt5vp26wvc6PqsCq0/r Xnog== 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=TP0PXkWhA2kC5VwJy+lV+yNw6x5AWE2lMhaVFZ5sY+8=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=LCgzu2HpQgUt2TTkRRsPUdvQWn9A+y0CV25tKR/pRtAD8D0DDt1sFjwngREfwcyzdl 31OwBry9nV//rDpVrm/NMy94K0mCgcIMqq1E0BfNfi3wf9A/zy4arkOPTivM3FU/8uwz hUu7VZgkpLkg6t3aqGgVXGTXIPKPI90QCzL/2H/dnWI7/KEJURncM1UMiPuXCOBmAtEJ Wxr4Dcby3qdnD5jj1fjKs6hn0QFYfmshUkDi26vbSS+ifff28PxWIc4qMLJ0byEtqiy6 bMlSZf08gVsLLC8Z9lR730e5swxcn2FkotG0JBn2AKW6Q7bpiVW562sbrZmykb5mxW4V fp4w== 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 p13-20020a056a000b4d00b006826c5b86dasi1094035pfo.364.2023.08.03.20.56.08; Thu, 03 Aug 2023 20:56:21 -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 S233769AbjHDDF0 (ORCPT + 99 others); Thu, 3 Aug 2023 23:05:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233055AbjHDDEy (ORCPT ); Thu, 3 Aug 2023 23:04:54 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A2244A4 for ; Thu, 3 Aug 2023 20:04:44 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YM0CJWz4f3q3C for ; Fri, 4 Aug 2023 11:04:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S8; Fri, 04 Aug 2023 11:04:41 +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 v3 6/8] mm/compaction: correct comment to complete migration failure Date: Fri, 4 Aug 2023 19:04:52 +0800 Message-Id: <20230804110454.2935878-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZF1UKrW8Kr48JrWrWrW3Wrg_yoWfWFX_Zr 4Iyws5Ww1F9r9ayanxuayayryagr48Ar17Ww1UG3y8t34vyF43Xa1DZr47Xr9YqFWDW3sx Cw1vvr1Yk3ZakjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_BLOCKED,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: 1773269293119361797 X-GMAIL-MSGID: 1773269293119361797 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 fda61dc40f93..9022209b64c3 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2534,7 +2534,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 Fri Aug 4 11:04:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130954 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp779335rwd; Thu, 3 Aug 2023 20:56:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKNhjAMyMISR7833Mii9Ynua65OOMxlZsTFqPqKrChwNetZxk1LL3KgR4UfR5RlUwa/5Un X-Received: by 2002:a05:6a20:841f:b0:133:6e3d:68cd with SMTP id c31-20020a056a20841f00b001336e3d68cdmr26442751pzd.3.1691121417405; Thu, 03 Aug 2023 20:56:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691121417; cv=none; d=google.com; s=arc-20160816; b=rb+W/FlkKtf1Msfo6Y4vcYkddIU3vEp4UW6pi9/Ahno07o5czx/LYg7RVfymfYltBV vbDSF2/JdG/c+E/CDMUdd+La9zMqxfMpp1KOnfKONo6ahg8YtDrGBMVXl5fy9g42e9bA CCZcdDkKbEDGV7AyMtXjJRbsUx3Y169mTQgJml/z84mXfebD7nVS0n4n8b/tHTlk6oVW eYgDRiCgrOIcqd2Hw6bPmSKOMS8AkKc2NCNF3l6PHZhPCbvGSi4rG9zT0s0ykxzYy9na LfdMtJKooI6WwrLMAUDJnfTlaBusDeODzB3rn+rm8fiAnLtGyMCdOkRJ1sxC0YapQ1oI xwgg== 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=EiwToGGBjXLMfDEMluwEr7HCCInrL4Nv0DwzKcKfLYg=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=PPguiCK3T84B75RTJj+q8Lt3wqChAEJGOlXp86PB3iQziN6YzkDr8rHMiOOVMgIxjg AzCtKU4OLPaNMy2ZY8E1AoaECIXCLlX8XAPGcZez/Xq8EONzbSRI5fB/wJeB9GqObtZD tFpD+u2Th7UcduAguoEX375ABoAEXxcSSxGcVDgVbnH89yFJUVNfXscW3eX9Z86W7iUf mbQFm00PP0U8d8jLzje7PbJkUhqSbemNE5KO5jBsvK17yGShCnXNR01p88+4KJ5oh26r NUKRFKxT1fwS1GD2T4iXtfcLY+Q3kb6mWOkA4FevWYAEBvsvJh281Ss7CMlWz5WE8+8Z g7DQ== 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 y17-20020a63e251000000b0055befc89e11si1018868pgj.84.2023.08.03.20.56.44; Thu, 03 Aug 2023 20:56: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 S233450AbjHDDFB (ORCPT + 99 others); Thu, 3 Aug 2023 23:05:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231269AbjHDDEy (ORCPT ); Thu, 3 Aug 2023 23:04:54 -0400 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 691D6448E for ; Thu, 3 Aug 2023 20:04:44 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RH9YP56tjz4f41Tl for ; Fri, 4 Aug 2023 11:04:41 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S9; Fri, 04 Aug 2023 11:04:42 +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 v3 7/8] mm/compaction: remove unnecessary return for void function Date: Fri, 4 Aug 2023 19:04:53 +0800 Message-Id: <20230804110454.2935878-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtryxtr1UAF4UZry3Kr1UAwb_yoWDCFX_Jr 10yrWSq3yYvr18AFsxCa1S9rykGF4DCr1aqa1UXF1fAa4qya1vv3s7Zr13XrWYqasrur9x G3WkZFsFkF1a9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-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.0 required=5.0 tests=BAYES_00,DATE_IN_FUTURE_06_12, MAY_BE_FORGED,RCVD_IN_DNSWL_BLOCKED,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: 1773269331293735505 X-GMAIL-MSGID: 1773269331293735505 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 9022209b64c3..81be1d0b9622 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1445,8 +1445,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 */ @@ -2900,7 +2898,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 Fri Aug 4 11:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 130940 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:419:b0:139:fa0d:b2d with SMTP id 25csp769324rwd; Thu, 3 Aug 2023 20:26:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlE0KRUYPO4+3g5VkEe/ynFBcWpstLFldYOgkB4Ck8PA7vg/MpQB8QsNAUJSEgW6rhkkaHir X-Received: by 2002:a17:906:224b:b0:99c:22e9:fbe4 with SMTP id 11-20020a170906224b00b0099c22e9fbe4mr8439290ejr.1.1691119568701; Thu, 03 Aug 2023 20:26:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691119568; cv=none; d=google.com; s=arc-20160816; b=oRIeV5w+c1Emn9yB/SJiZS+GHdP1aky7+ga4+CVP2mGVk0638TOH3gE67RB0koyeFX tQmjcft9mR/WfAI6umadFFDXFrA6BTuLbEOQ74xAFE3kB5A23V8j3z5Rm2Vhc3vREHKQ CAC8lzdDWUUIr+hERIBbcJElXAs7QHL2rVA/bCSy9c9i8a5rd15LESGQbvnX48MCIsJ5 J4R0N/itvLetXdmJ3GG0xz5n9nW4xp+POv20vW1epPSMEKxMbsKgMgCC4sZmUDe+qH48 IGH+QhOpCi+K6IP5nlTuawmtHo9rpYQrgi5Eb4dPDxIiZfe8LjIbo0nOkm8RPdNR55lH sg9A== 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=s4Q42Y0a7dd5T/UKwBwYDTy5FM35VvetAVHZRhRCRMk=; fh=zpCCF/J8Z0sUUNZfCNdnaRvm94yhXPVxl9PzV22VU6k=; b=j2IigBvWxaLE8evZ0IiQ9/YWV2ykgwrkz30Br/nXt6gFLibJKJRT6RgeS8OtTJwLnN e5oYQZSZFNTcSW54FdYtQDwixS+c/1YuMMyTibufSc6DRKLHzqnZM6oJF2DDjqKOrA0k ms4vC7r1ernjLyRMdRSm7xeXV2M2WdBE0cmqVfpJc/jCBO14m6IZol+oe+TArmyzwvky siD0K0RGn3BV+0lmDZ2bpje/xiTmFUjBu9e2Twqg9t3FnzreDsG4KhDKoCkQSs+zMrWa YK3uI7QLr3FJZWtxacIGeB4qc9iJEZBH9zYnIrVlsgAxQa0CVfRYAfKZ/ZgD2WgXvJca qDaQ== 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 s4-20020a170906168400b00991df467babsi884630ejd.221.2023.08.03.20.25.43; Thu, 03 Aug 2023 20:26:08 -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 S233034AbjHDDGh (ORCPT + 99 others); Thu, 3 Aug 2023 23:06:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233726AbjHDDFC (ORCPT ); Thu, 3 Aug 2023 23:05:02 -0400 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EC784481 for ; Thu, 3 Aug 2023 20:04:56 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YM5M88z4f3q3K for ; Fri, 4 Aug 2023 11:04:39 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP1 (Coremail) with SMTP id cCh0CgAXODLGasxkWSvZOg--.12542S10; Fri, 04 Aug 2023 11:04:42 +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 v3 8/8] mm/compaction: only set skip flag if cc->no_set_skip_hint is false Date: Fri, 4 Aug 2023 19:04:54 +0800 Message-Id: <20230804110454.2935878-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230804110454.2935878-1-shikemeng@huaweicloud.com> References: <20230804110454.2935878-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: cCh0CgAXODLGasxkWSvZOg--.12542S10 X-Coremail-Antispam: 1UD129KBjvdXoWrtw4ktF1DJF1Utw1kKw43trb_yoW3trc_Jr 10yF4rtw1avr93AFn8Xw43Crn7Kr4DCr1DWa4kXr1ayrWvyF4vqF1kXr9xXwn8XF47uwnx Ga4kZF48GFya9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVWxJr0_GcWl84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2 IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4U McvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I64 8v4I1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AK xVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r1DMIIYrx kI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v2 6F4j6r4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRiVbyDUU UUU== 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, RCVD_IN_DNSWL_BLOCKED,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: 1773267392719037317 X-GMAIL-MSGID: 1773267392719037317 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 81be1d0b9622..ea61922a1619 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1443,7 +1443,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); }