From patchwork Mon Feb 6 06:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 13129349 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 3B499C636D3 for ; Mon, 6 Feb 2023 06:33:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDD136B0075; Mon, 6 Feb 2023 01:33:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C65846B0078; Mon, 6 Feb 2023 01:33:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B06526B007B; Mon, 6 Feb 2023 01:33:36 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A22946B0075 for ; Mon, 6 Feb 2023 01:33:36 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7436FC0ACF for ; Mon, 6 Feb 2023 06:33:36 +0000 (UTC) X-FDA: 80435900832.12.1D98AE4 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf25.hostedemail.com (Postfix) with ESMTP id 5D6CFA0013 for ; Mon, 6 Feb 2023 06:33:34 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=eT9fUBcz; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=1675665214; 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=6K6EPnmkM3a5UOufl46/EB5E1x0OF9PgE2F47wj3TE0=; b=fjjfZVdv9vYtc4rhQatWFyhykQFUN/Pc2XQBWRHgQv18lcCXu3BkNKgeDrJvz/1l+ouT6y wOW7lrFyWsV04y/yRVe0LZvcCjGWTwWPzniu3pXVd+ImsE8CuI/1nzeOP+Axd+XxLk1MbJ rTkJn5OqiXZRvLGWcbgmoEpsmOFRJcI= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=eT9fUBcz; spf=pass (imf25.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 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=1675665214; a=rsa-sha256; cv=none; b=NKoQ3sIqJxh5DYMsHFduF8TDGv0swnq9fW/se+u8aZzLExV46kfK7uKUSjBMlgzLeBgY4z PJtfskT6hzsXsPBTWh9+eFAak1z5TDLlCQQ5MR2BOCrhzD30dJD4H1+href0hs4FamTnkH QrOilzHBPRVHwqjBsTtZC4dxU0kVoBs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675665214; x=1707201214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fpqcNpPynLsFmyeQ5s3gi4KQwt0xUU5cyFiW/AFXtXc=; b=eT9fUBcz4XDC3HJtixkuvmX4IYI5z87tJpJV50zOug95yGIUkmPUfoMU JeQAYDZO1I0OB66i0FjpqORBF6eIhmbQ/RtD8k5XtBJrWstHTPzQngdFg YsApcXm0N5/wiPY8oYoM9mA8reObSypdjhJVJgfmEBiSPuAiHjAJi+/k9 sKcXlUiF+YacDc8nP6+JDa8xi8HddqnD0hW5JMBr3XXfhzVElh3X2vIvR 6xLg4U7AehexXEugEH9WvjOzOBBHYB027KY9CWa0Dp+3AuVJJjqWt7g/6 gIlM3RnI0g+ju+gOhD0Ar7XTRM3Gkd2/SnhAnPTkQRXgteeJzEMXGETsN g==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="330432625" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="330432625" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 22:33:33 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="659744625" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="659744625" Received: from baoyumen-mobl.ccr.corp.intel.com (HELO yhuang6-mobl2.smartont.net) ([10.255.30.227]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 22:33:28 -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 , Mike Kravetz , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [PATCH -v4 1/9] migrate_pages: organize stats with struct migrate_pages_stats Date: Mon, 6 Feb 2023 14:33:05 +0800 Message-Id: <20230206063313.635011-2-ying.huang@intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230206063313.635011-1-ying.huang@intel.com> References: <20230206063313.635011-1-ying.huang@intel.com> MIME-Version: 1.0 X-Stat-Signature: s45fgu4765d97it47obszqdsogpafa54 X-Rspam-User: X-Rspamd-Queue-Id: 5D6CFA0013 X-Rspamd-Server: rspam06 X-HE-Tag: 1675665214-188836 X-HE-Meta: U2FsdGVkX18BZH0H66lBJax2es7buFwbyMuTj3aZFpxHqt8SSyh41pIYHcB94NW/WSnkMPhKBYRZ8fkiHV0QpWVtNH4Vi4vAjEw4ZJC+BH2TE9dL4wD6XX9NJI4nDndQPxs+9K5+1pZSLqk85tQ5oMNFUjLvKIj0yvDxVBnWRJ2iO5l07JyRL2O9i1qSvl7b7U+CaRQT+Cvr4ojoOFficV/Vlsx5StFVxHBqY1Z832RTz8XHwV4RJZRwf3+a5M1WXqagExsihP8LwQLqFof1/xXbtR4XLDv9LEut4Z0URB5bwhAJK27THXwT2srlKL17KCAuL97MV5QUG3qO4Va0qeLrwcgGqRs735EhSb/tCgFJOX/gIhZGSWQL4aO3AxzzySRx9dtFn0KYx8SvFnNsqeT7sKQx4sIiJ2Ex3sx319LDw3boOBOGMVr2NVSNx8SFh6w8HFr7Wtg36pJ0tvoy3hf8ETwF7EnI4g7HxWR9TFf/b7T3dB+ghdMfHsB5L5nyxRs6i8ADvwygKeKBfj06T69Rd4EbQFxpE5VzFyAecSiMjwiE5leuTOcAZZibxyD4oFzpk+mtxQDO3Mr+rz5Ezom8HQcYX7nkVkts0BoITf6GZUFRz7AiUnlF7V3Bun/T576vgSGv6WPElS3mds+09DIZZmp0MppUL/EkRXVoQ4GxWdGPTGOCyeerSlY95Dyd6U1/nRV3/1KX9zSp4/BHnNvLNx3eRuvKkQvyeE3LSdvQAg7HB4HhfponpfS3lmMx+UPU+w4PoI2Nxy0o23aIjvhFWj1kcO59801VPu/wGgBvXgS24lwb7FiqY5FSXtVeMBUXQv0Rw2KkDj2hOG8Wwqre+5VNdEoVv6wFNsG4j29/L+doYSlUHoVNPWbWqvkE0vDy0Cb3uFzCPS6Z6MjCf4jo3eAoheMPzBYBsB8qQ0XssjB0ZPwkTNn90Bs/WDQBddbV8y4nlbVgRVQaEUS wCJ1/toj BZQtP6YMIZ9d880YMqA6aCyQqiAPWkkXbtt2z8R3M42zxbJhu+kBonmPxRoLlcCdxBYRLkl0G+VLAb2CYLCKK6a/Rr60eTlXq9+wfs0b+JkO2Fp3Zyv7NasssJjxr1bKePXm0Bg/zxSACi+ML2tRC4l235iXe8TG0xjUred4NoSqr9hsXFZZcQGZVn3lTcnnPdWcKLNmk5ejncKh2WCTuQFtZhzmVc6W2zsZ5JL8vxbG8JXHNH/ea+RQmrPYfWQORiYGH+kCctPm6LnChFmhCI6EvFK9nRLD0z/y/XJPKVZmBLvlILr+ZVEdv6l4CeXLSKnZ08cRqTOKgHs5GGT52znIs8pIKvlEm+JM1F9obOeafYB41NasP3GxGvO3/8xlTbJE8emBCo7djmaNhhC2iShCPnR4C8LJYTTLxEyipru2nINc0vzdJyRdLpisvTOu2lKEaP8RQy74bjL9Uxi62QdPjxOmuCDoBuUVVC+vymSwfQeZGxox+nbQfulwrm7WCRSi69sqfCeB6vS1nAH179RJk2+nrTjkIuEyyZ2YNY2iqY35fRxu0w+itQ/C/TFI0UObyMVSt9+efjRdcfjKz50dPeOvDiaXtmXk9aowdmucvxSgNTCsEHLFcOlnUublakfnHRJQOHAmMwccpubnOwPAbtQ== 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 Cc: Mike Kravetz Cc: Hyeonggon Yoo <42.hyeyoo@gmail.com> Reviewed-by: Xin Hao --- 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; }