From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10953C433F5 for ; Fri, 29 Oct 2021 07:42:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E9D3261130 for ; Fri, 29 Oct 2021 07:42:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232252AbhJ2HpT (ORCPT ); Fri, 29 Oct 2021 03:45:19 -0400 Received: from out30-131.freemail.mail.aliyun.com ([115.124.30.131]:40440 "EHLO out30-131.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232222AbhJ2HpS (ORCPT ); Fri, 29 Oct 2021 03:45:18 -0400 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R551e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=5;SR=0;TI=SMTPD_---0Uu6r.YH_1635493368; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Uu6r.YH_1635493368) by smtp.aliyun-inc.com(127.0.0.1); Fri, 29 Oct 2021 15:42:48 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: shy828301@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: migrate: Correct the hugetlb migration stats Date: Fri, 29 Oct 2021 15:42:37 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now hugetlb migration is also available for some scenarios, such as soft offling or memory compaction. So we should correct the migration stats for hugetlb with using compound_nr() instead of thp_nr_pages() to get the number of pages. Signed-off-by: Baolin Wang --- mm/migrate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a11e948..2b45a29 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1475,7 +1475,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, * during migration. */ is_thp = PageTransHuge(page) && !PageHuge(page); - nr_subpages = thp_nr_pages(page); + nr_subpages = compound_nr(page); cond_resched(); if (PageHuge(page)) @@ -1540,7 +1540,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_failed += nr_subpages; goto out; } - nr_failed++; + nr_failed += nr_subpages; goto out; case -EAGAIN: if (is_thp) { @@ -1550,14 +1550,14 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, retry++; break; case MIGRATEPAGE_SUCCESS: + nr_succeeded += nr_subpages; if (is_thp) { nr_thp_succeeded++; - nr_succeeded += nr_subpages; break; } - nr_succeeded++; break; default: + nr_failed += nr_subpages; /* * Permanent failure (-EBUSY, etc.): * unlike -EAGAIN case, the failed page is @@ -1566,10 +1566,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, */ if (is_thp) { nr_thp_failed++; - nr_failed += nr_subpages; break; } - nr_failed++; break; } } -- 1.8.3.1