From patchwork Mon Jan 16 06:30:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13102651 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 39CFDC46467 for ; Mon, 16 Jan 2023 06:31:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B4AAD6B0072; Mon, 16 Jan 2023 01:31:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AD4636B0073; Mon, 16 Jan 2023 01:31:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99BDF6B0074; Mon, 16 Jan 2023 01:31:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 8C5D36B0072 for ; Mon, 16 Jan 2023 01:31:16 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 54CF780759 for ; Mon, 16 Jan 2023 06:31:16 +0000 (UTC) X-FDA: 80359690152.21.880BA7B Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by imf15.hostedemail.com (Postfix) with ESMTP id 85CEBA000C for ; Mon, 16 Jan 2023 06:31:14 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kMOzXywZ; spf=pass (imf15.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673850674; 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:dkim-signature; bh=Wpg4lyBb2eMdjSDaJn6katrpTx+/pyJbQHtmI0KRGwI=; b=09ZYNTtL/IAoqC2GQydXBIyL4M3PK/hgevyIqXjy70yHYal4FIJYxQujlCLPf93Bvhg8RE AkRI1n0KuiqBs90cGwTUMlhAG0RDnf5WlN/1gZQj5+/g0aZ2Rdo0vDHN9szV+cH/GbQT+b us7XadllH27hF6Z65ghF7b7ATVwpby0= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=kMOzXywZ; spf=pass (imf15.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.100 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673850674; a=rsa-sha256; cv=none; b=DjzMDlfMmXDOS383nIPBgdw3uo8MFqEaSJHBk3yZvpwY9LsAB9HRkJJROm76Q9fOyO5EqP J4Mdk7PDuwwFLjB6Vbu4H8vMVgx6w30grGm1AiJa/cLTJShlEnNbW99k3Fjz02fJP9jqNY TYJBNcH2DI5xTkwXaaur5dV+fp21vKs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673850674; x=1705386674; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kyA2nwu/iDvX1f1gFBqUt2qOO7JRIRhIbEkDSdv9gqU=; b=kMOzXywZOcUsEWmNZac/vtinN21sKWhA5z8yXWaSljqUaFOf1rLrHmR6 A/yJlEax9TROZdWgeiNcbwnNZHG01j7JMS87QKawLbsEFC6C9Ujo9nX9s eGDdM9+ReAswnY3s1KDEtk1brI+g/I/phjfIMmMBi4mNym59dOX4zbOKK Up97LXfedwdJCZSwCOQYrHJ4Z8fl25Xc19VDLaKcTvXvE2Cc/9WwlVUrq d7lZTHUCkTACCPFM91d3OSvIdAaPXSAfDrkgzrNk397dPZ0XCG76PtWzI SJ4u+XiS5y3DnkVJkekKkiD5XADPDA5eX4tH4tjef7C+51581Omspx7gS g==; X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="388892125" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="388892125" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:13 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10591"; a="801286591" X-IronPort-AV: E=Sophos;i="5.97,220,1669104000"; d="scan'208";a="801286591" Received: from tiangeng-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.220]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jan 2023 22:31:10 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Alistair Popple , Zi Yan , Baolin Wang , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , haoxin , Minchan Kim Subject: [PATCH -v3 1/9] migrate_pages: organize stats with struct migrate_pages_stats Date: Mon, 16 Jan 2023 14:30:49 +0800 Message-Id: <20230116063057.653862-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230116063057.653862-1-ying.huang@intel.com> References: <20230116063057.653862-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 85CEBA000C X-Stat-Signature: 149tu7niukw5jscju1befpn4womzd4mh X-Rspam-User: X-HE-Tag: 1673850674-305145 X-HE-Meta: U2FsdGVkX1+mvRC1QB3iXa7dAg/fsj4C9UpZYYz/ARNudYP9eSyGZJDSl8jFnQgR+56wYTyV0IFVMUNmOCuBEykkB9jIwIii8s/SrnKdJGujAU1HwSyltWKv6OcXta4FvlSNuXfykrxUx05WkV9l/nKBsAHES+Lo/oYanXOhwRywEjHNN1n7/rIbo/cZdRhFkpinTTCr6CguuUzeGTC8noog9VRhab7mj3f7IQoiHsRXKO9KImzWTkWUc97VA4dpvbYEwtZaEHIc7bglOkzYld7+Ay7Vj6+969I5jsz2UY/byfUH4LT+8+d9v8srEapv4W2Y2qinfIsjCmj69Uj9bZ2scj1HFjgvWNuHEExRt/Dt9Tc32s3Xrdpa1Dv6/cI3JEDTWnNA/W3lqWG3Vna2/jiR9t3OWabtb/KPtJNv2K090XaWfiiFUv410Qs3XZadi4IKco2NVW4zu0HWHnrT+Hn/RBJglIuN1rf/gcE+ZvRCxT8pvMDXyesZeyQSCXEVs76Y9pHfXAkGdVw7GZtaVv3H8rpQ1SOdXQZVczjQz+F3mdt9VkvklCmzP7tYnayoFNPbRraTpCXicU3vGxwmpe2GoBl/mEP6zdkkATGBBfrejdwzcioSxkua6KP8a9kNUt5ysCMEw3ViCnH/XMoaGjZPRrHkVRwfXUQK9BVVAIQMuelUR0hZMWVW2xSW8fGMkK9iKe4gP5AE8MUIwMH/Dywvgq2MIX7//SQhg48kHfl5+tfYqNdB3rlSAT0iENogoCF3hcDU+4mZACwlomVfZuJMlIJVTC4RNaGi1Z/ihJC8ZWti/pCJn8VrdTUUR3K1SKPIYKT8sS/rj6WxSAjifKc/xo1ERti9jLzM49IJUP8pBidYSl9HVyEZX5qgZO/2ki5Z3FoPaW5b8WpAG1+LP4cWeam9eH1drtMZx9R3jHMKeaFoYQ+JZu3Xtg2oDrwp 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: Define struct migrate_pages_stats to organize the various statistics in migrate_pages(). This makes it easier to collect and consume the statistics in multiple functions. This will be needed in the following patches in the series. Signed-off-by: "Huang, Ying" Reviewed-by: Alistair Popple Reviewed-by: Zi Yan Reviewed-by: Baolin Wang Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: haoxin Cc: Minchan Kim --- mm/migrate.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a4d3fc65085f..ef388a9e4747 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1396,6 +1396,16 @@ static inline int try_split_folio(struct folio *folio, struct list_head *split_f return rc; } +struct migrate_pages_stats { + int nr_succeeded; /* Normal and large folios migrated successfully, in + units of base pages */ + int nr_failed_pages; /* Normal and large folios failed to be migrated, in + units of base pages. Untried folios aren't counted */ + int nr_thp_succeeded; /* THP migrated successfully */ + int nr_thp_failed; /* THP failed to be migrated */ + int nr_thp_split; /* THP split before migrating */ +}; + /* * migrate_pages - migrate the folios specified in a list, to the free folios * supplied as the target for the page migration @@ -1430,13 +1440,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, int large_retry = 1; int thp_retry = 1; int nr_failed = 0; - int nr_failed_pages = 0; int nr_retry_pages = 0; - int nr_succeeded = 0; - int nr_thp_succeeded = 0; int nr_large_failed = 0; - int nr_thp_failed = 0; - int nr_thp_split = 0; int pass = 0; bool is_large = false; bool is_thp = false; @@ -1446,9 +1451,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, LIST_HEAD(split_folios); bool nosplit = (reason == MR_NUMA_MISPLACED); bool no_split_folio_counting = false; + struct migrate_pages_stats stats; trace_mm_migrate_pages_start(mode, reason); + memset(&stats, 0, sizeof(stats)); split_folio_migration: for (pass = 0; pass < 10 && (retry || large_retry); pass++) { retry = 0; @@ -1502,9 +1509,9 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, /* Large folio migration is unsupported */ if (is_large) { nr_large_failed++; - nr_thp_failed += is_thp; + stats.nr_thp_failed += is_thp; if (!try_split_folio(folio, &split_folios)) { - nr_thp_split += is_thp; + stats.nr_thp_split += is_thp; break; } /* Hugetlb migration is unsupported */ @@ -1512,7 +1519,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_failed++; } - nr_failed_pages += nr_pages; + stats.nr_failed_pages += nr_pages; list_move_tail(&folio->lru, &ret_folios); break; case -ENOMEM: @@ -1522,13 +1529,13 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, */ if (is_large) { nr_large_failed++; - nr_thp_failed += is_thp; + stats.nr_thp_failed += is_thp; /* Large folio NUMA faulting doesn't split to retry. */ if (!nosplit) { int ret = try_split_folio(folio, &split_folios); if (!ret) { - nr_thp_split += is_thp; + stats.nr_thp_split += is_thp; break; } else if (reason == MR_LONGTERM_PIN && ret == -EAGAIN) { @@ -1546,7 +1553,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_failed++; } - nr_failed_pages += nr_pages + nr_retry_pages; + stats.nr_failed_pages += nr_pages + nr_retry_pages; /* * There might be some split folios of fail-to-migrate large * folios left in split_folios list. Move them back to migration @@ -1556,7 +1563,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, list_splice_init(&split_folios, from); /* nr_failed isn't updated for not used */ nr_large_failed += large_retry; - nr_thp_failed += thp_retry; + stats.nr_thp_failed += thp_retry; goto out; case -EAGAIN: if (is_large) { @@ -1568,8 +1575,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_retry_pages += nr_pages; break; case MIGRATEPAGE_SUCCESS: - nr_succeeded += nr_pages; - nr_thp_succeeded += is_thp; + stats.nr_succeeded += nr_pages; + stats.nr_thp_succeeded += is_thp; break; default: /* @@ -1580,20 +1587,20 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, */ if (is_large) { nr_large_failed++; - nr_thp_failed += is_thp; + stats.nr_thp_failed += is_thp; } else if (!no_split_folio_counting) { nr_failed++; } - nr_failed_pages += nr_pages; + stats.nr_failed_pages += nr_pages; break; } } } nr_failed += retry; nr_large_failed += large_retry; - nr_thp_failed += thp_retry; - nr_failed_pages += nr_retry_pages; + stats.nr_thp_failed += thp_retry; + stats.nr_failed_pages += nr_retry_pages; /* * Try to migrate split folios of fail-to-migrate large folios, no * nr_failed counting in this round, since all split folios of a @@ -1626,16 +1633,17 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, if (list_empty(from)) rc = 0; - count_vm_events(PGMIGRATE_SUCCESS, nr_succeeded); - count_vm_events(PGMIGRATE_FAIL, nr_failed_pages); - count_vm_events(THP_MIGRATION_SUCCESS, nr_thp_succeeded); - count_vm_events(THP_MIGRATION_FAIL, nr_thp_failed); - count_vm_events(THP_MIGRATION_SPLIT, nr_thp_split); - trace_mm_migrate_pages(nr_succeeded, nr_failed_pages, nr_thp_succeeded, - nr_thp_failed, nr_thp_split, mode, reason); + count_vm_events(PGMIGRATE_SUCCESS, stats.nr_succeeded); + count_vm_events(PGMIGRATE_FAIL, stats.nr_failed_pages); + count_vm_events(THP_MIGRATION_SUCCESS, stats.nr_thp_succeeded); + count_vm_events(THP_MIGRATION_FAIL, stats.nr_thp_failed); + count_vm_events(THP_MIGRATION_SPLIT, stats.nr_thp_split); + trace_mm_migrate_pages(stats.nr_succeeded, stats.nr_failed_pages, + stats.nr_thp_succeeded, stats.nr_thp_failed, + stats.nr_thp_split, mode, reason); if (ret_succeeded) - *ret_succeeded = nr_succeeded; + *ret_succeeded = stats.nr_succeeded; return rc; }