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: 13341175 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B2B7EB64DD for ; Fri, 4 Aug 2023 03:04:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CB712802BE; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 756B72802AE; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55A572802BC; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 381142802AE for ; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 03DA11CA360 for ; Fri, 4 Aug 2023 03:04:48 +0000 (UTC) X-FDA: 81084929898.12.7359D3B Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf02.hostedemail.com (Postfix) with ESMTP id 5684D80002 for ; Fri, 4 Aug 2023 03:04:45 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=none (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691118287; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rskdlnzcT8oAIsMut4xbyGOKCRXz3TQRkhifY3ziyhY=; b=L4QR46gMZHeQRKLvz0i7gy94ZOc1qn+2Y6R45CX+7KvrJ78YjlQ5ch0Ci8A1oZMNVQrxxX amOH2Rc9dm3XE4Zyb65yyuqVGQZjd4dL2XV7CGL2iILLo8EaiZwcj4egWRTNF3qnvvOueg ZE5B1Qtt2Z4cHjc0oEcINPqZhB4eYIc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691118287; a=rsa-sha256; cv=none; b=1wRtarfFx5Cl0Aj/tIuOCT254CLzHiE7fUCN8MB2j46WuE/EdfcDy7+S1QXzhVLHKUmeLE Xa3BP1olmtDBNcy3EwrxQFtHR6l4lAqu9HvKlS+ZScOlW2E86jzpKeroT3jbcmg0uk1Teb xRZRIj+THJmZa0Qm+qLOa6QXQ7TVKo8= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=none (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RH9YM6yhSz4f3wQl 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--.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-Rspamd-Queue-Id: 5684D80002 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: f3w3966dypsgeu8j1t55zqfrsszuu6wh X-HE-Tag: 1691118285-875010 X-HE-Meta: U2FsdGVkX1+oVKBrs5upPObOkSnvlTN/nms4kZRsqVFyb72MlxnC6rygTIzzuBGpNJghi0pTnywyM8F731rX254k+xOoHrA7GfICJlzHSR+k9yKWmqaSzhVMRRvOP4QwIMb7r+sa6ELPj0PcTILq1pShorn5mLPkrxbUiQ2hw1hXVlXjGPXkrL+NYaYT/BbGLO4qZFNsIyOqdjkMPeKsJKBEYGOdtrH0U9thUaxSNTuDAUE12g7rnimrIjSIm2dCyE6XiNovVwcKAhThkTm1wOMT6AXh7QFcHVgS1CdHyFVOos5tFdxuLRzRM96Pm8GF0NDZ/lqSNYU7ZE1x1RkZhPc7sc+zyXFHkcJSB8bXm6HLK64VpKGo71wjfggyCv+hogVO9Zr4FTrNGqCFwhywr9F3e79Y+b/xCYBkB635NxmM9xH9CX23nTCnchddi93Pd+hhSA1iIaUh8/7zw5REFGrCcwW4VC0AasN0M2HMw7BxO47cFUKvN/Z84Vqbz/rbr8enNPiWYHn9q3pw2ypV94LgftVhh8ErSX8eQiKxMNeuWrR6+MOFHlQpqdkKMYm09IKa19UdQ/3CPbi6XR1o4r7JIMl/x2TitBiUlEvmK5eZIApeREr6840+82b6Fme+9y+98wvBx6tbCRxW2iqu+3Wwh0EUpGKhyUy2z32l8G20HzELEuc8Ose3ysdfsFcC4HgNwepUVQgxN8vnVDoQry+kMtLweSb+v39Si7BUejuJJmcUhfYHEIbPhrYHbBAc1veVQhg2fx9ny8JM4tDrIg7lXvgV0dQm0P6BEBgiaCLMWdoeBi36Z7/vN3RmY23hCd/lfJz8bXaEtNKq8UpQLSybiALWgmpIUnBNekRpncd7WNrtSiqxmkWLUFM8/ty8YQnAeP+inluOVYeHsmhjfJpnTZmpkjnrSv8yfAgEpwTEbzZJ7dZDLmuNaolic3kvj77lcjYyMFuBYoHJfSf 2phpffeF /fPgIBG5+BRy9YhaMD+8vy65vdhDx7Ea+csn9jAg2OdzeIbRO5WtXqVEQDuWmPzPDB5df/znYukBUqW1KtIP+/5kXLFTD6hCUHCZBjSyL9keXKfRm8wDIGbMvVu9J8PQGQEurnyu7Df3fAL1daduc5BG5wniIHlJ6vhaMoTW0hH65HljtJCKca1OgiB0pLeaj8pMXjePkfUklmmEqjPvBlF1WdfK/6+vDYl5QBF498xhxr6yxRehXFHa1e22xT3O4SqJdm2ti8c4SX+yITDiFDji/hnpdckxnJSouxxbff/cvEXzHfkvwn/ss/ZBdWeP7ezq9 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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: 13341176 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E7C6C04A6A for ; Fri, 4 Aug 2023 03:04:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A910A2802AE; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8C6682802BF; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 708182802BD; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 622282802AE for ; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3355080609 for ; Fri, 4 Aug 2023 03:04:49 +0000 (UTC) X-FDA: 81084929898.13.AF019E9 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf04.hostedemail.com (Postfix) with ESMTP id A3B8640019 for ; Fri, 4 Aug 2023 03:04:46 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; spf=none (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691118287; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3FXHuIfV5f3mvJi1wEv8UvvdZ/TMCTjKFGN28OOXy98=; b=czUNCUblQUXczJ9OcNkFzpDJTej7AJLPpgtp6YAXCUZOApQTnaFZgr/qKT1rnGWm7LS9z4 1eTMjWXfda6E8JcR/jsNuPGeNP4lCPGR6XbrwnbrcHgggb9wubeGiAkgwTHoz8/hqBet8i djul+YvpY56JUy9SaYxgv+xfJ9cMXjQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691118287; a=rsa-sha256; cv=none; b=SoMUu0+fAj+Xr4ipzN1zWRkPs08+8YGdi9KD4ydBpaI0upN/UV3BXREXbP5vL6UGkFEdBQ qrQOnjhW6bxHttEO1LqkfgexZ9eSQeJyKltvSGnYxLRIdL3pEZ/IRMei50SoFEku/SchY9 SU5WT+a0g+wW4mv7q60cYXGH9WJUFCs= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; spf=none (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4RH9YN6YSDz4f3yyn 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--.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-Rspamd-Queue-Id: A3B8640019 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: c9aqz5wky1tr64swinz5nkub15ydb83o X-HE-Tag: 1691118286-786943 X-HE-Meta: U2FsdGVkX1/qvdCGhVH0F8lnMHoSIRllaM28sU1NC1HwFO+Ol0SKC3goR0x0tq7bItq3PZcHqZsXmllnrncCmlcNy9e+RS0rMWStYNCWVoA2hUg3nQysIBGpkA9fz1v3kqUZ9+nJ/qiwyJpi1Z9RFzgN9eu1NTKPvZvyJb9lMb/bZh7maSsmd1a+KR+jL7CseSCDGqHu5dYOXLCJ4c8h5OClhXngT0GZ2Ujv+nvA215yWf6RWUHUEX+53u4Ls4GixcR/HKDla8eAiKvtnHjSTP9/9l5OZp/fLykuWGub0Q6iR2cflVm9oo1vPKpc/y+qnH89emLcRZ7xpqSSvMrVZdv/CBSZ0zNik1xPXZYSYAnaJft8oSQwRdTOih8Jq8wwgdmFPivIefx/IQ+68OYW7EB2lYgBOgFnObCg2607ezaoHuEdHTP/NPQ5LXnqsxAhYWhNKpRDAizL741Zu7yEZdvTlRug3/a/WCvKwSkuqu2Hd3YkvkoloVkQexJvDOQDuTmyTlw0yWV63YrP3snVxm5C9R2M4uXnmZm0v+C5CFOb6814AaLfQ/4rI7VmF2X2x5Sb1ecGL1SuZoPpMJjTwZQS4595hcBwyoumJMNMw7YhdVKFvm7fpfwqsRX4JtL+3YqGNjw10/HgOswH1XOd8ojFm/hyeH4soB6abmPp07GVPnBbdZ/MhdCRRCZ3bPBzZ7L2nSeWroOdMPKQQuhOOVgeqRItqYCV2j9d2ySaBwUgNbceA2kpIsQH0mRbH99JtD1UUmfcjSM7YKzOPTL1Ura3cEdUemc5VHr3l+ITmWgce/qimxBUtalqCm53MQW9j2a4C+Brsiav0JNAS8JASG0pHlQRG8pgRJdlc34uInI+VkNNnWELqabj/mcYnsw+QhvzLGmkuKNsSabyyh5EUpsnU0BUrFXsXVenL8EkOkUe1O/2tr3EyLDwNkD3lrh3cbFldVTd+jSexZKSJ0D DDO9F2kR oR0G/el4XfhP4sZPhS+atkE3HbCK3QkxOsxTNAoO9bA9WzuxSlasQnpyoSQs4MIe/IFinRXoJw3IIy0skUNWCyUOGR91lpwgYjpX2YHdpFXg4+XbPFhAZsWtQTZhLlFMAC1HTTTSMXZdwXTwzTx8VyzSLYcPNopKQUf1MmDlUaqxYMJGUW52Uh8PyKZZ29iP6JzBCMmvkw0aRxcAqrJGKaliySbrgj+78sgNvF4+/KN4weODtKiHpwf8AIQvhMQVa/0MgvD8XcIIekLsVgkpDmIgwMHBmWsW8WJdkZvP5G9l4HNBU8VdZ58h0bw== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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: 13341177 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF6A6EB64DD for ; Fri, 4 Aug 2023 03:04:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB2C12802BF; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3CBD2802BC; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9FF3C2802C0; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 77D822802BC for ; Thu, 3 Aug 2023 23:04:49 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 44DC61CA376 for ; Fri, 4 Aug 2023 03:04:49 +0000 (UTC) X-FDA: 81084929898.10.3A45EA8 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf02.hostedemail.com (Postfix) with ESMTP id E1CB180003 for ; Fri, 4 Aug 2023 03:04:46 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=none; spf=none (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691118287; a=rsa-sha256; cv=none; b=RL5n6IALgIou4JOAbu9ZcJSH/fBJ4Yh8Rd7cShzL0YC49GyfiFu9R6+D73PHOexz5ZURKh 3RA7fMZDy845i9DjyxCAz9RiZLNF6GBUD5EPbSDxTRvquwHTiTAu3wvsI20NyvErIZgoaV amc9OlUtX1sK74srn6tzUg6isuYygEU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=none; spf=none (imf02.hostedemail.com: domain of shikemeng@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691118287; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TP0PXkWhA2kC5VwJy+lV+yNw6x5AWE2lMhaVFZ5sY+8=; b=EIoLPfg0rY4FRf5pY1QwQWV0q8vl/lDgGNNFa64wGmP95Pt4Ond48ibhuc/KF6qaDz5Uoi 8qXhxeTsxkeapoOMUVp22pMcviVGY8J0K9DJGFbPxL2Tf02zatGv3ViSwAzqCahXSBTT11 usT9YVYqHFrFUnbWcrKb8hTgDSxa8Pw= Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4RH9YL6vClz4f3q2Q 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--.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-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: E1CB180003 X-Stat-Signature: ukw4t175ksy7w1zhqeqwxxwudsk8oimn X-HE-Tag: 1691118286-239140 X-HE-Meta: U2FsdGVkX18JX0wMwnSGBfEA13wB20IxY5yPYUpJpka9Tk2yw3jqRKHHVgrrNPTJnZ7jr7Yx+ztHpjbsaTkkgMdNUNrY31fK6taQK2BQqcaoSIEnWcr33yCSZv2QqLK56KnKE8DvSdkD6jvAABzKeXBlguGl/lMedHGEvqx7VpQYTs0XRBpbWOZxEJJre7RilbFz8tDrKZ2Rv8JnWCbq2PIb2pjKwl5MJVxwkHNnMjpQ58sHBdxjB49BtH6ZAEOW/Q4PWoONardkUEe5dqSfMcAFBgPbawVodwGc4z3iqgOV4xaWoP2Jla0Z30m85bRvAd8rBNtF/q1hT76Gol6ed2G5VLfK7dDyGPKvf8MVJ/jWAe2e46lXWPS7sBLqmDD+W1BVmrVWsMRYx9GHPsfz03zbwaZEfNXZ5+fw74MR+ccm7Z1XuTBRDBPvU+i3xgHbehSxaHSy9eHx1PFhg2+1Qp/r/cuWPfySHZOdQyl5fl/t65VQGBMULGbL21MOlzZ85o3WwI5ASYIIw7tuKkSPxp34pcB6cyDl5VmZ4H1jN8/t51Xybju3ij8Zx69iW12E++y9HEa4fGDfKsYSi/gF0CZaCmtN1pfK2SDFhGmyq40LDcn/bqjkLP+URuLJ2ddeCAg+7Vk+87KEjcgfmVOOLpgWIQvFM50YdRDqPIOkxXcgKi6OmETvHXIedZbhxgmiusZ5y9Z+5ec5meNgBhBej5qsz8aBjePzSU5hYv7ehtIpSu9Za/MX3GSh+r3udzljBejtKR6yM3P6P4/KRlfzsZHjoajvguCUdkyaXIJYX09O23znx/FL8gI+RpF/0VZ+QtbCYgWFFvsZMl0O9efrLr9xFCWGFuG7LL3AdqVI4naqxTgZxhVSsf/sQmpzgZ5VnkzX/65VVxDDXb+lvbxkIRoYbrW7sNWpuGECcAcOUBQUKuiXUqSurwAvn4oYax3YwDpjNvF3KgDAkZUPnSH 6g4nT0dH nalsU7k2YNOCC3Hh82gvepiSGjva8Y7Gb6aiEWcYGsUrmOzn0rejoxPjCkq14o1W6PQr66ad1BFE66uG2fS4s9HMaJBW0tIhJmbUas0JO32YHnCG+riNi9KbQ1Bz7HDy4je8XlmzTuTjjlhRoIuVxuc/CJnnKbxvKr07r4OcIWFaoOI8omD5Pmho+HmxRV7TVsys8R/XZzY0RIQcDreuJV0gB5Co4J6XxR4xOpfa7kWwgBgjtw6m7ihUIpI0q4d766iJKdQyl7nFVbxWs5SpZ83G0E5JLO7J8tR2Y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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