From patchwork Wed Nov 3 10:51:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 12600567 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 CABD2C433F5 for ; Wed, 3 Nov 2021 10:51:37 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 729516103B for ; Wed, 3 Nov 2021 10:51:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 729516103B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id CE83E6B0072; Wed, 3 Nov 2021 06:51:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C97606B0073; Wed, 3 Nov 2021 06:51:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B88C36B0075; Wed, 3 Nov 2021 06:51:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0033.hostedemail.com [216.40.44.33]) by kanga.kvack.org (Postfix) with ESMTP id A08A56B0073 for ; Wed, 3 Nov 2021 06:51:33 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 4EEF731E53 for ; Wed, 3 Nov 2021 10:51:33 +0000 (UTC) X-FDA: 78767302866.07.B495703 Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf02.hostedemail.com (Postfix) with ESMTP id 7B8C0700177A for ; Wed, 3 Nov 2021 10:51:26 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R441e4;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=8;SR=0;TI=SMTPD_---0UutTv9L_1635936687; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0UutTv9L_1635936687) by smtp.aliyun-inc.com(127.0.0.1); Wed, 03 Nov 2021 18:51:28 +0800 From: Baolin Wang To: akpm@linux-foundation.org, rostedt@goodmis.org, mingo@redhat.com Cc: ziy@nvidia.com, shy828301@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/3] mm: migrate: Correct the hugetlb migration stats Date: Wed, 3 Nov 2021 18:51:15 +0800 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-Rspamd-Queue-Id: 7B8C0700177A X-Stat-Signature: 13hg3h8g3nhdrsck3z33qcz3g8sopg6k Authentication-Results: imf02.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf02.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com X-Rspamd-Server: rspam01 X-HE-Tag: 1635936686-452993 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: Correct the migration stats for hugetlb with using compound_nr() instead of thp_nr_pages(), meanwhile change 'nr_failed_pages' to record the number of normal pages failed to migrate, including THP and hugetlb, and 'nr_succeeded' will record the number of normal pages migrated successfully. Signed-off-by: Baolin Wang --- mm/migrate.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 00b8922..00e231c 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1436,7 +1436,8 @@ static inline int try_split_thp(struct page *page, struct page **page2, * It is caller's responsibility to call putback_movable_pages() to return pages * to the LRU or free list only if ret != 0. * - * Returns the number of {normal page, THP} that were not migrated, or an error code. + * Returns the number of {normal page, THP, hugetlb} that were not migrated, + * or an error code. */ int migrate_pages(struct list_head *from, new_page_t get_new_page, free_page_t put_new_page, unsigned long private, @@ -1476,7 +1477,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)) @@ -1523,6 +1524,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, } /* Hugetlb migration is unsupported */ + nr_failed_pages++; nr_failed++; break; case -ENOMEM: @@ -1541,6 +1543,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_failed_pages += nr_subpages; goto out; } + nr_failed_pages += nr_subpages; nr_failed++; goto out; case -EAGAIN: @@ -1551,12 +1554,11 @@ 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: /* @@ -1565,9 +1567,9 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, * removed from migration page list and not * retried in the next outer loop. */ + nr_failed_pages += nr_subpages; if (is_thp) { nr_thp_failed++; - nr_failed_pages += nr_subpages; break; } nr_failed++; @@ -1576,7 +1578,6 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, } } nr_failed += retry + thp_retry; - nr_failed_pages += nr_failed; nr_thp_failed += thp_retry; rc = nr_failed + nr_thp_failed; out: