From patchwork Tue Dec 27 00:28:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13081971 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 70BF8C4332F for ; Tue, 27 Dec 2022 00:29:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F3E54900002; Mon, 26 Dec 2022 19:29:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EEC14940007; Mon, 26 Dec 2022 19:29:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D8CBE900004; Mon, 26 Dec 2022 19:29:31 -0500 (EST) 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 CAA32900002 for ; Mon, 26 Dec 2022 19:29:31 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 85E84C0532 for ; Tue, 27 Dec 2022 00:29:31 +0000 (UTC) X-FDA: 80286202542.05.356A4E2 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by imf11.hostedemail.com (Postfix) with ESMTP id 95FE440002 for ; Tue, 27 Dec 2022 00:29:29 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=cKxwry+c; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 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=1672100969; 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=oXkqm2R/AYFSawwF3yOuv+8E/SIxEytfCh6xrgMAPBQ=; b=HGSIGUZknPDewiBFHEnZhOWZ3dV4nawCMnGuKy1HDviWb6uE6+8gzHT9RuFfDscsxUSZVU DtG0czP2chlQ+AYB7ximDqLZhSEa+GTYQf9XCrFhWf9nUGHO0qv2hkDPCBQ0TgJ+nR9GuC 3zulMNS/g/CbxKcwlNAyFhGJyieD8ME= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=cKxwry+c; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 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=1672100969; a=rsa-sha256; cv=none; b=dT+Jdzlgwl8bbSuXroMhGa6S7xNeOsFC97PPBav0YXjCwtFos8h9Avyl7fEkp0TIxFWvG6 zWOisWcQPikmJvkbYXML0TJI6fhv239qJu4+4Qz+omYrQP7gFCOffONuSsb6GMutz+rLon 30/vqYPjImo+f7kw/1i8JwzFP+VyHM8= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672100969; x=1703636969; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0ZlE1166uwC0o6eW3hBf1ccltW3myzWM3kgZ5n2OLo4=; b=cKxwry+cLm8VI9ohZvCIsd/+F6+V0lTrTv1l9us7A0tfVyiSzR6RwtK3 m987HpeyuRnrcftcGXVXvnCV7sXskpoPHh5UZ2v3P8cph5Mm1x6PfWmQY 3W8awnmY2AW3dmaMPcRPJGTy0vOjTErweLZzjiamCfIXbdPUamkdTS5KG bkpfOVYmJz0EaI6/PNcneWKo7qxqCUoSFQhkTQW8snFMRQ3/Gz+GbTUhO BubGUg/rWIiDkHzFwA7dzKXzYzOjTsg3c8+FIoWUoes5P4XaHw5ze/ZBF gl4rJTTnlcKs4/dE019XGuYjAvlkzlMwoK6fMhrorP1TN0sDByGfFKnTf w==; X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="322597206" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="322597206" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 16:29:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10572"; a="760172186" X-IronPort-AV: E=Sophos;i="5.96,277,1665471600"; d="scan'208";a="760172186" Received: from yyang3-mobl1.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.254.212.104]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Dec 2022 16:29:21 -0800 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Zi Yan , Yang Shi , Baolin Wang , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Alistair Popple , haoxin Subject: [PATCH 1/8] migrate_pages: organize stats with struct migrate_pages_stats Date: Tue, 27 Dec 2022 08:28:52 +0800 Message-Id: <20221227002859.27740-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221227002859.27740-1-ying.huang@intel.com> References: <20221227002859.27740-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 95FE440002 X-Rspam-User: X-Stat-Signature: ha6nrmda45gn9z6rojh4mn9zm85qypdo X-HE-Tag: 1672100969-689497 X-HE-Meta: U2FsdGVkX1/zrjApetOQnTi9I5utv8Wcmce+opShGvBY9hrlobm7/xOuI8QJJLz4OxeqqR7FYiMnAPJrJfcF4mO+KWWOoYS6jcfzLo/icXok9kAlpAeo4VgARn/Py53ugC5tcXFHmtcqa/y9FEX4rjx+H9g1idDGZ4OBd2DLX1RniWRx4XloVPsKZ+eJzeVenwWkUHINWiZjzexdjwLnqxNnVD9XFSQp2EfaTe+e/+h/4udpWjZJxLnhX2W3miCjHlCGR94Mr+FXskMv6LOm3KbiBJieeKgVmanPpMZU2x3UEivcE3ohR15GzgxBxPmHwpKh0DvLgqWhqRljRHYNNk5zo6Em2QQCX9dp13izzFGnNIXsBRXcFibSlr26np6Kp4Lfgz9KH14K2YH4vgzhhJXcNfxcCb6h1pB3dgIXAa8F8f+Lve6xdv28w7k7Yj3ta9v1cN8IlPR83Flh+yymmMFZFYn+K0280P+m9W+9EBxaXLkJesW+SfzES/T1liQF1aMKV0atFuPhYF2ZHLdHSRxp9YiOt2Eg0IKXzgIRkrVs5yz/zR9lIg6PhyA7OBKH230mxp7oDa6ElgzKOZX3vuAh3Pzdy+0JH5GsfiC10AETUyZbwERaEXdFmhaQgl2mxQjurfsaD5aG2eQzB07gJKlaORk2HkgT9AnSY7s4pkAV+wrXts9a+A2/yOMQ0HyTo+gbOvUE2UfHpPLwyTzD6NBnt0JJ0WnlXmVf6yYf7bryWT13RjzKR/vJ6ajF5kXSfd7++Vj0s5lGb+ywetTVqna2V41Zi2XFrGfDcwzm1WaEwUUYUeCRMCEcClu0gxVFFcTtnRTg+0yuxg+SXPiYm1jgPYWjpwc1P88iUt1X3YvuLk0bDYGfxyfDRd1IUJxBdW4KCUgBn5tXB6W3RqFcGIfVKvJEMNo6ky1C95fnGGZSFLnjiOaV+Z5zYVc0FfdQobbVAeOfRB4= 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" Cc: Zi Yan Cc: Yang Shi Cc: Baolin Wang Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Alistair Popple Cc: haoxin Reviewed-by: Alistair Popple --- mm/migrate.c | 58 +++++++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index a4d3fc65085f..ec9263a33d38 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1396,6 +1396,14 @@ static inline int try_split_folio(struct folio *folio, struct list_head *split_f return rc; } +struct migrate_pages_stats { + int nr_succeeded; + int nr_failed_pages; + int nr_thp_succeeded; + int nr_thp_failed; + int nr_thp_split; +}; + /* * migrate_pages - migrate the folios specified in a list, to the free folios * supplied as the target for the page migration @@ -1430,13 +1438,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 +1449,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 +1507,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 +1517,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 +1527,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 +1551,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 +1561,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 +1573,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 +1585,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 +1631,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; }