From patchwork Fri Jul 28 17:10:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 127450 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp305316vqg; Fri, 28 Jul 2023 02:24:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlGHSlqxWMFKIopST6iD+M5lslfcZ1ndT6ckgSE1Qn9YcdC+wjQRmnQME0Hd90m+T9Yz1u7C X-Received: by 2002:a17:906:64c9:b0:957:1df0:9cbf with SMTP id p9-20020a17090664c900b009571df09cbfmr1378164ejn.19.1690536276107; Fri, 28 Jul 2023 02:24:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690536276; cv=none; d=google.com; s=arc-20160816; b=e15g3DCnZMvrnvMED6taKJ6CxBuXdiH+8EvnfiN6Fe1mWRs8riPrLUE4y+ZsjPeOU1 gokPMxiUCgzRvqzzUAmxJ8+9zTf0h+Jgv/Q0nq6KdV659mchRYtANxD6qKxD+BpPLuxY j2kmyBBwd6yVROvb/WWkIf6wizFXTwYwq1DqGDgAgPeHjtqaRKmitaH8iyRzqx4WVUrQ feTQkzPj1JJo6hylntifabzZ3fVgvkHcl4/ZpWGRYRMNWdPsxnt6lErMflFLSnT8j0+i is3pu1FMYunQXSWVs/ssw/v4ZJtCn+ERYLxnbF5fDqfrlVCx25pJRnoRlmfhFVD4KcGm gz8Q== 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=eMD6Ql0Q1ij/dAwXyJnIBqmbYOJgFPIXohnwUBHUui8=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=mEgzCsEyqmng9U64+VgduQRaTN/GKM9mjyDicxWLjsPr31wcRtivbFwZs/GaPT7LHE BXbE9ujhzNwy0yiKh7KZPnUULV6B6Tq7BUY67oPj8BR1U3BxWZJV2Qao35516WIUYwVp hwRGxedDL7kqOq45ESJKCsTUkkSQ9ROblmG25UxfRbhLrC+NJ3nXqD5qGCVjxIXu7QbO mAYO8PvdcUrZ1eTc4q8JBNla14Q+ALqoOJtcFiiA2pHrsjqyS9XddPqIJx8ishWvSFNZ 9cU3aHl8EVkvitrJWDBZcoNjyps1PAT86BSPK3GPV2K/0i/RproZOYxXkdWhH3ozWOox v0hg== 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 va16-20020a17090711d000b009874842217bsi2446905ejb.441.2023.07.28.02.24.12; Fri, 28 Jul 2023 02:24:36 -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 S235316AbjG1JNh (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235309AbjG1JMi (ORCPT ); Fri, 28 Jul 2023 05:12:38 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1167244AE for ; Fri, 28 Jul 2023 02:10:19 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RC20R4vVwz4f3m8Y for ; Fri, 28 Jul 2023 17:10:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S3; Fri, 28 Jul 2023 17:10:16 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 1/8] mm/compaction: avoid missing last page block in section after skip offline sections Date: Sat, 29 Jul 2023 01:10:30 +0800 Message-Id: <20230728171037.2219226-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw1ktF4UAF1DKr1ktr1DZFb_yoW8XF17pr W7Ca43Wr1qqa4rWa4Iyw1kuryYyrs3WF43JrWayr18A3Z5XFn2gF92yryjvryjgryfAFyj vr4vyFW8Gw47ZFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVW5JVWrJwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jr4l82xGYIkIc2x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRi6pBUUUUUU= = 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: 1772655766293892084 X-GMAIL-MSGID: 1772655766293892084 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 --- mm/compaction.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index 9b7a0a69e19f..ce7841363b12 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -259,7 +259,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 + 1); } return 0; @@ -1670,8 +1670,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 Jul 28 17:10:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 127452 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp305599vqg; Fri, 28 Jul 2023 02:25:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlGAHq+2XjRS6eGsujB5tNMzdboMOiu37fFR2/PG518RgHfGmOvgVoTcgmwWytW6DfF1zO7n X-Received: by 2002:aa7:c68f:0:b0:522:4964:d590 with SMTP id n15-20020aa7c68f000000b005224964d590mr1155538edq.10.1690536321055; Fri, 28 Jul 2023 02:25:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690536321; cv=none; d=google.com; s=arc-20160816; b=Fnbt13KmD+C/vhpqg9CGWdM3M0Jl5QT7wyXPYSPNLpuC/qnjrLVh5gAv/iTUEA4imW meL1XAqkMjm3UT6cBgevq4GydJf9REAuawNyQ6fhp+mbOLAS031ifiAWEbiKmynBtjTg +WNnuGbA/ss0NqISORfv7FvUfLKXpqb4uas0P9B/0SPAMm153a5oGxjxk1aN8DXkpeBe Kry1MppNC9jK905ZPkrcH7g/DGTtUnNqG4x+TITC+9ZZ90pOwdy94zxrU6BP/rZmd6+i vWnEPNLsEWsNTmDileYd8akx/8U2nrHx2Nz/m9kkCbIKEMfMxKokZ85+k/cbCFVJDapr DDkQ== 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=Mpjk2P6RiXjgICoXizaFLfK3UaZ6mz5AsfEmljnimno=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=huokLnXLntkOowhyeJsmnHURFhvt3DqTsMnZqieYJSIslnTWI2d9IC62Z3gG3ut+ag g31EnruFsm1PQrFbC8HW+10IaJzmCyPYGTzxmm1NMfb7CTGpfs7zbwy65zX0j+3wJOR5 +gu+Arb/x/5fRjsN1yHTrrHqcHWi5fxVbgZjk5v0Zb0BZ6kmFP2jL6KpJSw43X96rqHx 187CJF3XSTqwqrihqE6wokgmAo4dvhXHYQrmGiDLoyfvL7UbSVaR2Zm+naQ9t3EWZtbG ZY+6N5eSZYbfil3RJwK0xeC1OwNDUMNYbWNuUPu+ccP+lmSzYizO15eZNdYy0fJFpaBa /pdw== 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 b17-20020aa7d491000000b00522598abb55si1036726edr.68.2023.07.28.02.24.57; Fri, 28 Jul 2023 02:25: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 S235406AbjG1JNq (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234304AbjG1JMj (ORCPT ); Fri, 28 Jul 2023 05:12:39 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3979044B1 for ; Fri, 28 Jul 2023 02:10:20 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RC20P6k66z4f3nyk for ; Fri, 28 Jul 2023 17:10:13 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S4; Fri, 28 Jul 2023 17:10:16 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 2/8] mm/compaction: correct last_migrated_pfn update in compact_zone Date: Sat, 29 Jul 2023 01:10:31 +0800 Message-Id: <20230728171037.2219226-3-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S4 X-Coremail-Antispam: 1UD129KBjvJXoW7CFyfAw1fGrWDCFWrZry7Wrg_yoW8WryUp3 4rCwn7Kr4kWayUZFyYy34kZ3WYkwsxKF43ArZ8Jw18AFs5Ka4jk347KF1jvrWUXrnIy3sY vF4qga97AanrZa7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBK14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_Jryl82xGYIkIc2x26xkF7I0E14v26r4j6ryUM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E 87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64 kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8JwAm 72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20VAGYx C7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_ Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc40Y0x 0EwIxGrwCI42IY6xIIjxv20xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8 JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIx AIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sR_veHUUUUUU= = 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772655813389084971 X-GMAIL-MSGID: 1772655813389084971 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. Signed-off-by: Kemeng Shi --- mm/compaction.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mm/compaction.c b/mm/compaction.c index ce7841363b12..fb250c6b2b6e 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2482,7 +2482,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 Jul 28 17:10:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 127449 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp304256vqg; Fri, 28 Jul 2023 02:21:56 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPGwp8iCmsTBSnn88ZEmaTh0tLMObF0VoFJb6V1bMDtrvr7Vd3d5pr5Oetnsj0fNttW0/V X-Received: by 2002:a17:906:8a74:b0:99b:cf4f:9090 with SMTP id hy20-20020a1709068a7400b0099bcf4f9090mr1428686ejc.66.1690536116263; Fri, 28 Jul 2023 02:21:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690536116; cv=none; d=google.com; s=arc-20160816; b=eo/rkZj3L4Hp/x5IYGsa3WN/cwymF1KaUSTBi/NBy7gRCYe9lvSb1OY+PptbdUvREv AD4/LuS35kz5n0r/bZuNrFxHtH6/h1/3ffJJVF/LlrWSoh0j4Bn5XAhafWd4NgFKqqiz WH4EPrzFfvc5F98/+Iv1heZE7UEBnh9qeamgvzZcp1uUDprtwjQqcEtKNgofEui7ssdP 1MyuGLEXbQg/YZ4Ut++j2oIY4QEsKV/Xfpf6F9E057nGyU74Zg9x9gSP2Ceuxn5Bhcbe 7HgW71Pc7DTUN8yImIe8ViUbzEW3xCrfCjJMXOcANloDzGbTtr0gQhQgLj/eQ9aSz8PE w4Ew== 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=Vx94DlN+DMFHhI+63SByVhWC9yCUDJOjzYGpJXO2dZ4=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=C9g+Iu2esDIife8Quvu/4x92r0Y8LRF5N5CYc7czKCPpniK/H+FOumWZ2m5uYiChtf lDSQbyyk4sGdiV8mB2aoqoliX/3NiZr1+n5w7FfwdbagZoR3CpbisFvAUFpxWSWZSrIP N0kWcEZHPwyn0EIppn7osxZ/W/Nwvu5HhYRGU7ujQ7ukop2jCbaB0PdFZrGzOoFu/FTK MvjQy4wlbWFM6fSYt4Pllpxc70QrWwMQsth9Q//8T3ZFBej9wwJv17zkmh6StNjvs3bQ 3YnB77PCEtfnLcYXLgYQdhScedtOv8u3XpbsrEOZcUEY9bh18y7gptQwUclCnAAuDGVj XKQA== 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 gq25-20020a170906e25900b0099bcf2371d3si2290001ejb.926.2023.07.28.02.21.32; Fri, 28 Jul 2023 02:21:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235237AbjG1JNf (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235338AbjG1JMi (ORCPT ); Fri, 28 Jul 2023 05:12:38 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CAFA44B0 for ; Fri, 28 Jul 2023 02:10:19 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RC20S3KPJz4f41Tj for ; Fri, 28 Jul 2023 17:10:16 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S5; Fri, 28 Jul 2023 17:10:16 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 3/8] mm/compaction: skip page block marked skip in isolate_migratepages_block Date: Sat, 29 Jul 2023 01:10:32 +0800 Message-Id: <20230728171037.2219226-4-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S5 X-Coremail-Antispam: 1UD129KBjvJXoW7ur1xCFWfKFyUtr1rKFyDJrb_yoW8GF1fpF 18G3ZxtFWDWa4av3Zrtw1kuF15Cwn7JF43JrZ8t348JFZ8ta4Iy3srtas5ZrWYqr4ayFZ0 vF4DKFWxCa17ZaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBE14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JrWl82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2 F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjx v20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2 z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0V AKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_Gr1l Ox8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErc IFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pR_-BtUUUUU = 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: 1772655598839822207 X-GMAIL-MSGID: 1772655598839822207 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 fb250c6b2b6e..ad535f880c70 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1123,6 +1123,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 Jul 28 17:10:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 127488 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp317063vqg; Fri, 28 Jul 2023 02:52:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlFPLUQRz/+6aeKaiqeocdE1SpWj4DmcJ8/BGYgNBgialQRsepIBI8cLdbKkWOFZr7Owjp8i X-Received: by 2002:a05:6a00:23d5:b0:667:e17e:85c1 with SMTP id g21-20020a056a0023d500b00667e17e85c1mr1261332pfc.1.1690537936969; Fri, 28 Jul 2023 02:52:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690537936; cv=none; d=google.com; s=arc-20160816; b=Uo9mhixCEyF5OkhfY/qrDDoPIZG+rKqtGMBwozt1wfkHjD05KCO4MJIVeo15FfZlAg FmOUwUjghmB5Zik+zqZ6flYruFXpkmB6RTwijL3cKVPEd0m4f6GVkrWFDXxCJ2/7M2bh JjddHDCHTClTndeAVqgymtZInhpD1mx1iCsQPwwUDMwa97vZ234V9sV0AARYhA0KZb3v ltoqH3JiFSNxq3o4506AubQSvaphz/gjX9R7YoX7U/8XI2MxQhjNjhS69YzcfIyrv99S mvVa9rtSm1QXB4PluhiHsjSP2p5JWGFAolNNVmCNfFnGry6L22sx7rQoe7ejPSxkPSBS s/3g== 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=Vnh3A0Em3JneUg74kv573qyZagn0gQqMWRVEbRoAVfA=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=ui5VVqJVXk7uK2U5m4GuzzndJOSWGEGhFA2M+w0G2DPW9Mn+hevtIRsxWzzpdoNfaU 6M8AeH63sNy44xYNUjHx7bcHzcwi6nsvSZ7y9rQ0MYj4n1dEFGwgjEi8Er+/3ej/wgNy 6C7V9j+m9Q2ohMTxxxQhs7ztUpuv0Ei7N0peEYYWJzvpwEUjqgH7PWPNxGvAlzwZe3iw 3KI4GIY1TIbLE1+sDoS/BLPD0tSBBVtR4B5I2AekmMyQk++vIm+gbNnYZEErT+/RdFjp 7qq4vDu88WjrOQZ4pXz84v3D1PLfYo3OCUjkPiulG6wpIKWCnbHKZjeSumSvddXS9OWC jvaQ== 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 z4-20020aa78884000000b00679cdcafec1si2980119pfe.109.2023.07.28.02.52.03; Fri, 28 Jul 2023 02:52:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235387AbjG1JNo (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232776AbjG1JMj (ORCPT ); Fri, 28 Jul 2023 05:12:39 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A6C044B2 for ; Fri, 28 Jul 2023 02:10:20 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RC20Q5DXlz4f3nyv for ; Fri, 28 Jul 2023 17:10:14 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S6; Fri, 28 Jul 2023 17:10:17 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 4/8] mm/compaction: remove stale fast_find_block flag in isolate_migratepages Date: Sat, 29 Jul 2023 01:10:33 +0800 Message-Id: <20230728171037.2219226-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ArW3uFWUWF1fuFykCryUZFb_yoW8tFWxpw 1fJwn7GF4DGa43W3ZIqFyDZ3W5Cw1fKF17JrW7Kw18AFnxtFnF93Z7tFnYvFyFqr9avF90 vr4Dta4Iya1jva7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPY14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2jI8I6cxK62vIxIIY0VWUZVW8XwA2048vs2IY02 0E87I2jVAFwI0_JF0E3s1l82xGYIkIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0 rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6x IIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xv wVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFc xC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Jr0_ Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2 IErcIFxwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jw0_GFylIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRKFAPU 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772657508248593652 X-GMAIL-MSGID: 1772657508248593652 In old code, we set skip to found page block in fast_find_migrateblock. So we use fast_find_block to avoid skip found page block from fast_find_migrateblock. In 90ed667c03fe5 ("Revert "Revert "mm/compaction: fix set skip in fast_find_migrateblock"""), we remove skip set in fast_find_migrateblock, then fast_find_block is useless. Signed-off-by: Kemeng Shi --- mm/compaction.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mm/compaction.c b/mm/compaction.c index ad535f880c70..09c36251c613 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1949,7 +1949,6 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) const isolate_mode_t isolate_mode = (sysctl_compact_unevictable_allowed ? ISOLATE_UNEVICTABLE : 0) | (cc->mode != MIGRATE_SYNC ? ISOLATE_ASYNC_MIGRATE : 0); - bool fast_find_block; /* * Start at where we last stopped, or beginning of the zone as @@ -1961,13 +1960,6 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) if (block_start_pfn < cc->zone->zone_start_pfn) 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_block = low_pfn != cc->migrate_pfn && !cc->fast_search_fail; - /* Only scan within a pageblock boundary */ block_end_pfn = pageblock_end_pfn(low_pfn); @@ -1976,7 +1968,6 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) * Do not cross the free scanner. */ for (; block_end_pfn <= cc->free_pfn; - fast_find_block = false, cc->migrate_pfn = low_pfn = block_end_pfn, block_start_pfn = block_end_pfn, block_end_pfn += pageblock_nr_pages) { @@ -2007,8 +1998,7 @@ static isolate_migrate_t isolate_migratepages(struct compact_control *cc) * before making it "skip" so other compaction instances do * not scan the same block. */ - if (pageblock_aligned(low_pfn) && - !fast_find_block && !isolation_suitable(cc, page)) + if (pageblock_aligned(low_pfn) && !isolation_suitable(cc, page)) continue; /* From patchwork Fri Jul 28 17:10: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: 127453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp305791vqg; Fri, 28 Jul 2023 02:25:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlG7AkAc5We8/L1g5vaPPblx0Wb3BPNIucuqLUWK9Fo9XoaUsPY3bN7bmWRXwdx6LS/AtYkP X-Received: by 2002:a17:906:3002:b0:991:fef4:bb7 with SMTP id 2-20020a170906300200b00991fef40bb7mr1475137ejz.73.1690536346013; Fri, 28 Jul 2023 02:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690536345; cv=none; d=google.com; s=arc-20160816; b=lBLd9oT4X7iYP2jitKxCh3npuE6YHqhaftaToPTh0Kv7P12FCqYBid6CPlQRa7Ikz1 XBZCK2sm5YM4ujaSVVJ154vu2S6zciv8Ms54/ndgk0cwyUwuEzgBCpbF5gOdNIaBNNG/ D6t9AAMgfi2gL9LMw4l00rMZ5a9zPgHWVpM1+yopSlwMlzMu19JJPFsn4IpZEZ6m+eHk 89cbaqTYxd37fAPyPhD2JoUHA2XXnn9VG0G8WYp9q045xPQjce823btmBzzCLO1CZXP2 CUW2WLy4ZMaGusM1hB0+kcpM+dI8DiVXrZ2tPPNw0+PevYV/CnrCZiC5LDtRIkR4KBNL rErQ== 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=IX2xAfEp8ZVgXbkaWKLtfcUpvHjyvM0q566WPMqN2WI=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=QkTV504y7s+dns/U8EGm+eTq1XvBJc53xfyOe593049VeQZvVLXK6gT+nqrclWHO5+ 5DA7LKCb/pu7kmmVAAxXicbw3r27NCeBsa+HifFQOoer+46rUK5BNc1QgNJWMXxjIG7E BP2mxPmS1fcipcUkiMwmbE3hFpdIaWOIumzkkRJadN2TP/CayQv2oq9b+Tw2kL8H8RsF N+UdhqgZN3Y8o3lV+t+JsbOcWjVz9SJjniPleHlKjGog1BtUqCMJpmJmvMdiGh5Ln80C HuK0Aily01S1w1hLfuKp60q0Kyr++Nj1LrdM0L8gQpEEfRm4gY7e3G8idWAdupQnAUJG Gq4Q== 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 e13-20020a17090681cd00b00992ee6da8e7si2387312ejx.740.2023.07.28.02.25.22; Fri, 28 Jul 2023 02:25:45 -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 S235395AbjG1JNy (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235023AbjG1JMj (ORCPT ); Fri, 28 Jul 2023 05:12:39 -0400 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7937944BC for ; Fri, 28 Jul 2023 02:10:21 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RC20R15Vzz4f3mJ5 for ; Fri, 28 Jul 2023 17:10:15 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S7; Fri, 28 Jul 2023 17:10:17 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 5/8] mm/compaction: corret comment of cached migrate pfn update Date: Sat, 29 Jul 2023 01:10:34 +0800 Message-Id: <20230728171037.2219226-6-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S7 X-Coremail-Antispam: 1UD129KBjvdXoWruF1kGw4xtr1kGw4rtw18Zrb_yoWktFX_Xa 1xtrs0k390kFyvqanrAw4akr4UGFWDZF1DG3Wktr47CFyvy3WDZ3WDZr1fur90qa9rWr9x Gw1kuFyjkFyakjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDkFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVW8JVWxJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr 1lIxAIcVC2z280aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7sRRkucDUU 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, KHOP_HELO_FCRDNS,MAY_BE_FORGED,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: 1772655839640722088 X-GMAIL-MSGID: 1772655839640722088 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 09c36251c613..1eebb61a1f63 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -464,6 +464,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 && @@ -485,7 +486,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 Jul 28 17:10: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: 127448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp303248vqg; Fri, 28 Jul 2023 02:19:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlGFioqTichuvmuw66naGEmSPJW9ZE2+qK0ziJUPkToLx7HpaGGrs9WGbk6IW2uDT4/DmAyf X-Received: by 2002:a17:907:2cc9:b0:993:d536:3cb8 with SMTP id hg9-20020a1709072cc900b00993d5363cb8mr1451934ejc.2.1690535966990; Fri, 28 Jul 2023 02:19:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690535966; cv=none; d=google.com; s=arc-20160816; b=L/AN6McjnlbaXJmvUxlU3KQw1OXIOd9TvnML7dZvN6e97M4Laxjuai65U6V6u3+kPK Lo5Kc7fcE7nEnRXI9pRVutFzQQjqqo4E1x6GGgJeSixW2R3DKc+AFp7+YqFZRoH+wwnC tdpzzwOO4imW9mBd2lX77RFDygJXs/aHEJ7n6cXZLkX+V/hWDySfaPsQ24dXb24CLQrX fxWUM/b4EI8Xy06qLwbNOUvCbq1EpZW4Mk/hnN6aS5TUHZgdYPXbsvyd8kxHVXbIftPp por/yTPWdcX62G2L3xeGJZPWTKM2fVyzGl/IFqm2gLok3LkFuWddFVXdaJZfyq2WTssH wTQw== 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=yNLpwsojZtnUrJ8c6VmeMk/OKHNgg+Pd1halO2UWgAc=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=NCBGEzUXYaWsVqchx4oeIn7VcwiXKIEGTVtC3URzUkeQcf/XceUn9Edb1Z5AT7WgB4 jscTd3skzB5YNsJiMRgF8/tsA8OBtIm41ibMhssk8iP3QFXSwzCX6vfRTKz/sYGHlTqh vxbxEvjsSBu6ZyGhqaHcG6hSGjqmyfraprT/uvoSVMRL5ow6Yebp2dngEFzUBTJzanJx fGpxGkrh5Y59qsCTHRv9TBYjHzjrd/B/t7z/V+KtQHy9XOXMkOIvfYaUpvDix1kJC3jT V4us5HrzrNK1F0qPHpl9wgZmbPkp+LmWXTRYUbORe1rSlzFRuV/zRWsDNInffZkuQ9Yr KLAQ== 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 sb10-20020a170906edca00b00993116b01f9si2305806ejb.120.2023.07.28.02.19.01; Fri, 28 Jul 2023 02:19:26 -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 S234857AbjG1JN2 (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235058AbjG1JMi (ORCPT ); Fri, 28 Jul 2023 05:12:38 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9CDD44B4 for ; Fri, 28 Jul 2023 02:10:20 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RC20T4k62z4f43L5 for ; Fri, 28 Jul 2023 17:10:17 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S8; Fri, 28 Jul 2023 17:10:18 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 6/8] mm/compaction: correct comment to complete migration failure Date: Sat, 29 Jul 2023 01:10:35 +0800 Message-Id: <20230728171037.2219226-7-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S8 X-Coremail-Antispam: 1UD129KBjvdXoWrZF1UKrW8Kr48JrWrWrW3Wrg_yoWfWFX_Zr 4Iywn5Kw1F9r93AanrCa9Iyryagr48Ar1UWw1UGrW8t34vyF4aq3ZrAr47Zr95XFWvg3sx u34vvr1j93ZakjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRKFAPU 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: 1772655442048449391 X-GMAIL-MSGID: 1772655442048449391 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 1eebb61a1f63..6052cb519de1 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2497,7 +2497,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 Jul 28 17:10: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: 127451 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp305358vqg; Fri, 28 Jul 2023 02:24:43 -0700 (PDT) X-Google-Smtp-Source: APBJJlE7696LiyxjZ9+307HCsiGGYKaA/qiH97BhVggxmrjfhBpy+qFGhYRVI4GZ2qXGaZmcsXQf X-Received: by 2002:a17:906:1005:b0:99b:d89c:9dd7 with SMTP id 5-20020a170906100500b0099bd89c9dd7mr1471872ejm.77.1690536283252; Fri, 28 Jul 2023 02:24:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690536283; cv=none; d=google.com; s=arc-20160816; b=q1H0cxutRa7UHhVQpb4seaGlVdWf4wFIyMLw21vzKZ3NO1L76MB59MuYcvFgM7ErMd wiwyGZJpIg3q1D4ow2LAXCyp8/ER+5H/65j83ZiRESxW2eOBDTz6PR3pdazYcQyh/m00 pHED7USeIFsd2uSEAdmNd6LR3DAZKe9u8/rXqInhqTJQhoMDxE5GxM2C+ylMNkdx/cHn ddDDeTUj3+OT3UYuGySJJ8BiG51nMWQ0iA+hXZXcegEPKZy/6qSzXoZitT+mEeuCVAIJ NVs1B0Nw0qfngXvUUTJif4KjhA+2D3wnbxjYo5GE7WuiZxUDHcOqyQMwoka2jM5DpZlT 32Dg== 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=aN2rlWqu7BZrnC/zxPsG2DrPNlKyotTO1A51nFjJGlY=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=c/wgf5hroify3E5kvL63rad+nK4B8UzSDpF01I9aemuRNeafRCzztfO9XRVnpGrw/y wRCWjUMn7gUL7WaETka4wUqQLwTDuKcj7dzB3eEHCaH0CBYaK4iGZbbTxOmbZY1/Ap28 iwLl8K8Fdfg9Ij24PtTRVbS4CXmIpWrODlppSZLrwIwJW6Eqv22CYhSpupQ5JdWumdDS 8STdYp3IQP9HJC7GXDT/sfRiOChpsScoNsqnyZgjifDQTKMHGcxiTR4WeG+/LpH1El7K XHQgcEo2T2N2CG3Z64EiVvyeMtGwCe37d9zqSqtilcOMFiN/aEyVKtUEOYtO3PUBcxNy 6TZA== 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 rv23-20020a17090710d700b0099bcc342fc3si2657503ejb.677.2023.07.28.02.24.19; Fri, 28 Jul 2023 02:24:43 -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 S235335AbjG1JNl (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234228AbjG1JMj (ORCPT ); Fri, 28 Jul 2023 05:12:39 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EA3644B5 for ; Fri, 28 Jul 2023 02:10:21 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RC20V0Wq6z4f43L8 for ; Fri, 28 Jul 2023 17:10:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S9; Fri, 28 Jul 2023 17:10:18 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 7/8] mm/compaction: remove unnecessary return for void function Date: Sat, 29 Jul 2023 01:10:36 +0800 Message-Id: <20230728171037.2219226-8-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S9 X-Coremail-Antispam: 1UD129KBjvdXoWrtryxtr1Utr4UtF4ruF45Wrg_yoWfCwb_Jr 1SkrWFqw1Yvrn5CFsrCw4SvrykKr4DCr1Yqa1qqF17tr92ya1vvwnrZr13ZrWYqa9rWr9x Kwn5ZFsFkF1avjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRKFAPU 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: 1772655773686107570 X-GMAIL-MSGID: 1772655773686107570 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 6052cb519de1..188d610eb3b6 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1420,8 +1420,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 */ @@ -2863,7 +2861,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 Jul 28 17:10: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: 127486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp316736vqg; Fri, 28 Jul 2023 02:51:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlFQqDM3pnD23f+hS1KH7tj12ylSpmbOniv5sXOldW2MvjZpESxK7OBKu7lPbmO556Wvcejt X-Received: by 2002:a17:902:7d8e:b0:1bb:c5a9:6b26 with SMTP id a14-20020a1709027d8e00b001bbc5a96b26mr1025804plm.5.1690537885413; Fri, 28 Jul 2023 02:51:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690537885; cv=none; d=google.com; s=arc-20160816; b=0Dk069oCJ8SUG9KMjbymesDycKvucfcdjyPoN7/t/JyEEs1CiT0/LQgHUaFCUBKimc jPJ887DZnfkvOa9I+7pCoorfqXKM5j7h295eM0DchiqiFwDchDnxty58WiCFYyEJwk6n e4JheJzOh842Z4isHRGUrhgKgP7yF9FKU/O2lhb0FAh9fW7doBpvugs7vciF9GRkeab2 9zLDdpRQ5Y8NMLMLnmX9YTTtZ6AR5ZAPzhuPgoBesfkQfgQbdNbLkTSp/5HEDTU2Qj9z nWDdRgHHgQpycVjdbaGEpcNWMrpV47F6n90r16LFwD00utm6W0FPWRfTdinpe+mM7Bbd 1vZA== 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=qj0nYBSsAC2wvn2l1Gxd9Hb49uXKy1ml83q/tUvBcI4=; fh=TSUM3bg1l4VMuLzo5+/YZeHv/ZQR+PETNj1d6BtXHQc=; b=i0/yN+SlDtH5HFQ+AyhbqMDvjO83OUFC1ROvOng0MPBuVbd6eAvTh5dRFXRg7i8G+W K80iuqqxCFLvANCaliMfUYrX4vVZXk8zr2+WmqRnehs/VrofaPN2fcE7ILUj41ZIqoSJ YkX/SADDD1qtf0PsW1+ipAjF4zTj4IUp3+9ARkELpN82YXbjLu4rI3AWxkYYG+APJ69u 2Rq0+H/FzJ0eddDSWbG0SGfb4BVXJ0EwtVtBlzQlujQCmL/hkurkZ4J/2M5ufJ3KIulC rMhBX+Z1DpGodzXY+5VziDVbMIagOm/Ahid8N1yyOVy9v8RwKQj650L42bCz3n/AI0vP Msiw== 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 n6-20020a170902e54600b001b88ff83e45si2917075plf.571.2023.07.28.02.51.12; Fri, 28 Jul 2023 02:51:25 -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 S235413AbjG1JNu (ORCPT + 99 others); Fri, 28 Jul 2023 05:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234705AbjG1JMk (ORCPT ); Fri, 28 Jul 2023 05:12:40 -0400 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B192244BD for ; Fri, 28 Jul 2023 02:10:21 -0700 (PDT) Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RC20V3TVdz4f43LB for ; Fri, 28 Jul 2023 17:10:18 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgA3n7L1hcNkCrD+Ow--.32454S10; Fri, 28 Jul 2023 17:10:18 +0800 (CST) From: Kemeng Shi To: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, baolin.wang@linux.alibaba.com, mgorman@techsingularity.net, willy@infradead.org, david@redhat.com Cc: shikemeng@huaweicloud.com Subject: [PATCH 8/8] mm/compaction: only set skip flag if cc->no_set_skip_hint is false Date: Sat, 29 Jul 2023 01:10:37 +0800 Message-Id: <20230728171037.2219226-9-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20230728171037.2219226-1-shikemeng@huaweicloud.com> References: <20230728171037.2219226-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 X-CM-TRANSID: gCh0CgA3n7L1hcNkCrD+Ow--.32454S10 X-Coremail-Antispam: 1UD129KBjvdXoWrtw4ktF1DJF1UKr4fGr17ZFb_yoW3WFc_Jr n2yF4Fyw1Svr93AFn8uw43Cr1kKrWDCr17Wa4kXr1ayrWvya1kX3Z7Xr9xXrn8XFW7W3sx G3ykZF48GFyS9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M28IrcIa0xkI8V A2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJ M28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2I x0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK 6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4 xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r106r15McIj6I8E87Iv67AKxVWUJVW8 JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7I21c0EjII2zVCS5cI20V AGYxC7MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAF wI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUtVW8ZwCIc4 0Y0x0EwIxGrwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AK xVWxJVW8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0pRKFAPU 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: 1772657453918133185 X-GMAIL-MSGID: 1772657453918133185 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 188d610eb3b6..6841c0496223 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1418,7 +1418,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); }