From patchwork Mon Feb 13 12:34:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13138382 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 A4F96C636D4 for ; Mon, 13 Feb 2023 12:35:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 10A2E6B0073; Mon, 13 Feb 2023 07:35:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 093D36B0078; Mon, 13 Feb 2023 07:35:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E50D96B007B; Mon, 13 Feb 2023 07:35:23 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D280E6B0073 for ; Mon, 13 Feb 2023 07:35:23 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 98E5EC0216 for ; Mon, 13 Feb 2023 12:35:23 +0000 (UTC) X-FDA: 80462214126.26.20A44B5 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by imf22.hostedemail.com (Postfix) with ESMTP id 83982C0007 for ; Mon, 13 Feb 2023 12:35:20 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KO0L1mA6; spf=pass (imf22.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 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=1676291720; 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=X/7w6AU0dVQ4ona2w+LdKDayTkxXkGEmhWg+x18hNdg=; b=jrAoPz5svtVVwv/ylrpVUHvJSPkDOcuhNpGzfa54Fy+Kg2vGzX6x8h71Se5Y08vgY9GKv4 KXvP1T19N6+0C8nR9yA4UabmUDuw87myhVm7V9Z9sHlFIxcoU+SL6YDPn0jEkSKaEpaRlZ Bou56ZvlrVYtB0ZGDC+5Mv7xaXuUlxM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=KO0L1mA6; spf=pass (imf22.hostedemail.com: domain of ying.huang@intel.com designates 192.55.52.136 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=1676291720; a=rsa-sha256; cv=none; b=ZQ0cf5tklqTuMDXcWiAoUK5pahJazu3hrqu5PPRzrwmiENcs3woYXgZVCl5Uv+glBkCXSt rIDwVALOlRYsWn5QDfEjgTLH8NYEy9tZa0QwP8Ci6StaXLZEYO2dCgQ3cGjBWJzTzTAZF/ W/qG7QvJxwYSTq/czKq3jl1HocOUZfg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676291720; x=1707827720; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l+3xR+mdu+KvJS/5Kh2raKgnX+cbZNTvoyGmwX5GiZQ=; b=KO0L1mA6OVqg7RUdUazUmMHJJ8JpbotvvRZ62r6D86VRGYs67bITmXB9 1k4CDfws5HSMU2CRReNuznsO6aTSLF+6Vsgqa6D73LUrwkKHRiwAf50ba QczcBSEAZf6jrP6B0TA+RE1ftEeg1G9ccLXLiCqoDuQ5E6WDtv794IBky s/tqsv4Kwbq8KEm1CfFOA9zi+8tah3v+px6GhSiS8ck1brUil4+dwqSb+ iOCGxCuugV37cOxNh4l/hRjm4xXmvFZwc9IxnxO0VJNE5m+KbGqICOtGK D+S7XSixo7HMhSH1Jr/2IMCVX2aOlQI8BJcK45F4X7Pmd3MK3QOw0pWmh Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="310513154" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="310513154" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 04:35:19 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10619"; a="646366593" X-IronPort-AV: E=Sophos;i="5.97,294,1669104000"; d="scan'208";a="646366593" Received: from changxin-mobl2.ccr.corp.intel.com (HELO yhuang6-mobl2.ccr.corp.intel.com) ([10.255.28.171]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2023 04:35:15 -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 , Xin Hao , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Minchan Kim , Mike Kravetz , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [PATCH -v5 1/9] migrate_pages: organize stats with struct migrate_pages_stats Date: Mon, 13 Feb 2023 20:34:36 +0800 Message-Id: <20230213123444.155149-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230213123444.155149-1-ying.huang@intel.com> References: <20230213123444.155149-1-ying.huang@intel.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: f1pyf13pjajd3qa53p8fwzuj1dia4yha X-Rspamd-Queue-Id: 83982C0007 X-HE-Tag: 1676291720-875829 X-HE-Meta: U2FsdGVkX19hF44AfhfsCxrPUsG4tqhXsp9cXDkSqnrdGvf6YrEpNoIJrRFjsh9qGCxe0VssfoEVLiF4Ee5JlC5UwQ4wWkmA4fgQU2t2NPT8R7kFoVW3ZqPC1EyuLeRPDMJ0LmSSys992tNp3W/jJfdikFRq86ukO7srq5vGn7WwiUTM4oJk+X8MJQtYzZGY4npV+iOFcA0M6P1UQe3gaSd6JtD1H+Vo8HqcB63dBzW29cFbbndVCbIRuY5t9OOY+AC6WLZHWPiIik2JDYhwDUg9x1+OX4TMCVylSzUxbTdPYYH6Vj/kwgaZYp0Nu/QfkyZXOqzdaFCFJy3BqlJ8rdj7rlgWEAVdJyT0vHWlFjewgjgiD9Kf0R229x5RbE59C0TrvE6RONRqgt8GTjSBjrkkndXcVKjQE3Gaq1dongzhEQOEEapuyslcMjg3mZGGBUG2UUV0n2X5E2ul7CuTWrVoBketNMvua726ongUkpDdi2X2PHHraWR/U7cdgQ84J855Yz27QjZlnULRX2OhZu/d9YIbV3jsQOw/zlGdpIV2am/tNpnkzz9v7xuN1iVRnQGERwFBWCTuwph71rEEjStBhGSyh01QApThTV1aTHtPzAXHqVDkx1OYYmIE1AW542MYiRV1t4DdhcxXWq34zr7W74mM7+j9dsfglsvzP/eH+fD2Fxn7NNol20myM4H1uiqSVKMbt/DcV/iZ3LQSQez/tUaVFoOYusDU5YvCz9zz6rOh8IPk5Iv7WkivCaffokYk3hTS/2izJxqfJRNw3TzIrKCMIzVu459ZiG3d/RqgMGW0alDElx80eJlfvTdv5b7mzY6SncF1rI38ehgxnHRcZ8O1JrsDW3bUgVScm/OYiUXh/AYAk13uP1iduKUjF+yPQA6Pra0V8c24D3i1KH0p/7ne/EDow6a4kiXNctjN6i8z5hRPqf4Rv9RLaCREDYc44k4cyikRFWGV+qV 3dTBZKpa k/Nx8NAsB4jNbGWeuJ/Gr1I4W8+2Hctt/ar/bnuSTjWMCkNWUmMqrl9YPTvEBH17H1k7qtHfkdxWHz2l1Qlyq7hNdcCaEBseL8hP5JVbGEVXSC5GuLisL3qVgthIWbt9sVajK+jV4gT4HaFom2IFH1/aolh9Ss/9IIi7fnSLAjQCgqyRRu5ZaFWVY5yxIJHIWnnwfWOncxizvZFVGJ587Kjy04fRXVWhM0mE7Nn+ZxlblIEtinhyPspX1qDmxaK8rK+GZScrF7QL31CxJ8OTON5LWyIWbNQbxt/oCaOmoQNnDEqvomaL3jBgLKO9/gjne+Bu6N0i8MOM8wBNqa94kly7CHV/FDGIZKi0Ef3hRbn99K+9twKA8Ye2xkbxgH124sua3Tf9Iz+QBF5Up7Qh3oDUY5XHxukCmBYaEYZTcFp9tVyNiigiOCZqOKRuiVrmnAHEs+KCvHYn9piUXwScWL+fRW/e43SKMoSoBVwgddfwPC6VTgWCR1Tp7bhnfmKCB2GMz2TWBFiSIyO9jDFDN/l6vfw== 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 Reviewed-by: Xin Hao Cc: Yang Shi Cc: Oscar Salvador Cc: Matthew Wilcox Cc: Bharata B Rao Cc: Minchan Kim Cc: Mike Kravetz Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> --- mm/migrate.c | 60 +++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 5b40b9040ba6..1a9cfcf857d2 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1414,6 +1414,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 @@ -1448,13 +1458,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; @@ -1464,9 +1469,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; @@ -1520,9 +1527,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 */ @@ -1530,7 +1537,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: @@ -1540,13 +1547,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) { @@ -1564,7 +1571,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 @@ -1574,7 +1581,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) { @@ -1586,8 +1593,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: /* @@ -1598,20 +1605,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 @@ -1644,16 +1651,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; }