From patchwork Tue Jan 10 07:53:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13094776 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 83444C46467 for ; Tue, 10 Jan 2023 07:53:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D0CE8E0003; Tue, 10 Jan 2023 02:53:42 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00C078E0001; Tue, 10 Jan 2023 02:53:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8F3D8E0003; Tue, 10 Jan 2023 02:53:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B596E8E0001 for ; Tue, 10 Jan 2023 02:53:41 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 7D7071206E3 for ; Tue, 10 Jan 2023 07:53:41 +0000 (UTC) X-FDA: 80338125042.30.95DD9B2 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by imf17.hostedemail.com (Postfix) with ESMTP id A6AC140004 for ; Tue, 10 Jan 2023 07:53:39 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=a6XzUIgn; spf=pass (imf17.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 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=1673337219; 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=GkLj8bodM1qeeMksi5L9FrB60k43damwvJgqq8uLrLg=; b=AJwgziwkxLsAxw4AmR4suQW7WhhBXKYpLEZyZgixFAPb/69KeOG4tDDGkfb21Bu3v5mmZA qC9uOMbxY/JidHlp8JxRX0ftI6/VooCocwzWxnIRWg88Ot+MBJWSbfSPNMDoCWGkukFVLF mH6k3QA48j99TW5+0Ya/ymOawKr4wD0= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=a6XzUIgn; spf=pass (imf17.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.151 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=1673337219; a=rsa-sha256; cv=none; b=KHepESETDU0l9QyaR7h3230xzjkPwq5NMS761d5CBA6n9g0Tzd7TqvuK5zV7vWV/Xt9N3T CrRHETOdQQM4nlr/2Qg5Z+lvuybzbdailcg4JFsqADDAmNv0jSZdr5X0Ds5iHfoH6qaW3S WGgiUAX9I6BytEX3g/kdl1KppqwQ46E= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673337219; x=1704873219; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cjJltQK7JFH99xWbvsedhf2YXMfqZWRjPAsent7jXKU=; b=a6XzUIgnhvgpUF3svjVeLl9Jgq7wyDmqgz2L/LW5iOusp2E0jhMjV40+ DfXISrmUccdZ0kDaUXBCTLZ8/enkslmes+ZWeQXLRuZsllCKl5QE47K3L jJQk0PDLbH9TF95iUuFDMwsgPxS4hiKa3C4hlv8VXL4tfF1d5vaA30Oki 7GuzWA4NWl+0r2CJw7CAHX7BBK4fRXBJSCOipx5VB7hONvv3e5Trt8QFE CeNYZVLnxFTFgHijEWL4cYSR2S5KdUd9ZaoWiIblWdpcfYTK6ES18Yl/3 AWgr48rZ7XTXmIWJIkoUn31x1tZRjyiwDZ/5gD3DK2GzSvFbcuJP3YNVh Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="303449267" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="303449267" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 23:53:38 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="902287143" X-IronPort-AV: E=Sophos;i="5.96,314,1665471600"; d="scan'208";a="902287143" Received: from juxinli-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.254.214.35]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 23:53:35 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Alistair Popple , Zi Yan , Yang Shi , Baolin Wang , Oscar Salvador , Matthew Wilcox , Bharata B Rao , haoxin Subject: [PATCH -v2 1/9] migrate_pages: organize stats with struct migrate_pages_stats Date: Tue, 10 Jan 2023 15:53:19 +0800 Message-Id: <20230110075327.590514-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230110075327.590514-1-ying.huang@intel.com> References: <20230110075327.590514-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A6AC140004 X-Stat-Signature: dc7349ozp34ykfzyx4dcoysoapb6f38t X-Rspam-User: X-HE-Tag: 1673337219-327209 X-HE-Meta: U2FsdGVkX1/AAFtVwAANWiQgTf4arsiVjvcf3LSYEE7/rjNhvgZ4+mJb+/ugPolsYordWvvnrnIqpjkKJaaa6z0CsjO6KuC6ozJ68jnI0rkpCiP4UjMaRlSUo9m87T9R36AJI3Y0D3C6ZMvsLCBnNMgJ8abSFyT6JoNHylnfIHo+aJI1XfZ0xScQOq6ryPqEsdembZND8nOn2fSAPJS1VNk+4mt5Q4/0tPtYzJbv/1K0FXI04XE5osiHjqNERhKq5vY0CePHOrYUq39F528/7G/BEQauxumEK1fWY5xKaJUWyaTr1V3GXyh4T03DYzvnGPA09iHo+X+SgPyFAvQPjW9sEx4Qbfn+tPo9FqigmQF0fKbc1xYhZ4YVas6wVFIXZjGAAw2uAXH9bQFC9UfqbHI63XrG1wXgj5DfyajuGRtcllipqUVzd84hyarbur6q/qVxuXvhvpbr5U4HkC1UUtVuYOGZ8ZP3PcbM3Q27hQ/IvM6RR4XnKTL4AuFOXosMuIZ2YVruoF2Dd1oQnjGw22tsy/ODsT6ogyXVNx0rerFLzyDLKXhiYWNAmtMXVNpdmVFnIajLOP/bCCECUDQC9k+fXT7mdMGsTKfFS4S/FI0E9FyFRKhqwrRF2fRy5srEUKQEshUwP1PUFnxgNnjpPO4/NVGw1U3m2UBMGhPBUPWRwNPPmV6lmqGRM+GNmxYoKAtOOFrYVxgANadcJApHSqIvPih4wddI4YVE6dhDj6dkRImcPO25nVUuJTGMKkfXPFUtT8vm6gbiQ2d2YpTDK0cB7KMRAaqkcfIPDUZ0c82hYXUoJNqTxQt6u+8sT64JLtSykjWT8FMKeiD2S2VSsAiMBoPBt+hpol4h1f9ZXXEa29hij15ruYegGFzlYyEoTXkwTDrDW6zJhtqibQeBGa8/WpPVZm4Cq3nvnUzqb0wV0AB4Vpv4kTEjUCWdua82 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 Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: haoxin Reviewed-by: Baolin Wang --- mm/migrate.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a4d3fc65085f..d21de40861a0 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 pages and THP migrated successfully, in units + of base pages */ + int nr_failed_pages; /* Normal pages and THP failed to be migrated, in units + of base pages. Untried pages 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; }