Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
References: <20221227002859.27740-1-ying.huang@intel.com>
 <20221227002859.27740-2-ying.huang@intel.com> <87y1qhu0to.fsf@nvidia.com>
 <87lemheddk.fsf@yhuang6-desk2.ccr.corp.intel.com>
User-agent: mu4e 1.8.10; emacs 28.2
From:   Alistair Popple <apopple@nvidia.com>
To:     "Huang, Ying" <ying.huang@intel.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org, Zi Yan <ziy@nvidia.com>,
        Yang Shi <shy828301@gmail.com>,
        Baolin Wang <baolin.wang@linux.alibaba.com>,
        Oscar Salvador <osalvador@suse.de>,
        Matthew Wilcox <willy@infradead.org>,
        Bharata B Rao <bharata@amd.com>,
        haoxin <xhao@linux.alibaba.com>
Subject: Re: [PATCH 1/8] migrate_pages: organize stats with struct
 migrate_pages_stats
Date:   Thu, 05 Jan 2023 17:50:14 +1100
In-reply-to: <87lemheddk.fsf@yhuang6-desk2.ccr.corp.intel.com>
Message-ID: <87358psc99.fsf@nvidia.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hSop/gJ9XxDKFpYIc2+LkXssb9EeJJnbCzsF6XDdE5yiJ/oGViyLSeiJidL4?=
 =?us-ascii?Q?JB3dMFolUB4czOCzKbdq5QlQij0uPsTEfvlUpKbPfB51px+u9soQ4dq0f3d+?=
 =?us-ascii?Q?rIG8Q26183b04b/IxqEe0x1KrcTIIlRcwtus41OznYx923FbkcCESMbuyBxA?=
 =?us-ascii?Q?DuDLEQ+0v22tYz016MU97CjYfMslkjlETGIhugqhwSCL6cF2C+DEt/eEZdRp?=
 =?us-ascii?Q?5fXLDpp1GSf8bdJ0EYCk4PsEsbZrP1C7d3KNpjc/7UxDJYVyCGAtLiWDWPRe?=
 =?us-ascii?Q?NIT5NheB5WzoQ8yEqSc+qZLIWOH4tgnH4ZDRT3VAWBjcOGG3iwLr1xAsHHcU?=
 =?us-ascii?Q?zdYhxDNmbGKV2SZjUVdGrNVGUo0QRCjegiWMINRmGTnCGOks8iXgue3leNAe?=
 =?us-ascii?Q?k8D9YbvDeN4pu91oyY9bMhVisriMpwl9e6wx75QIB4bWORxGzJ9bUgKKuBIq?=
 =?us-ascii?Q?DotdNzhPP2UiMgxx3DwcSHnFu+vQmnrbP23lsv2j8LYcLtAgE9uJwQzAuwsh?=
 =?us-ascii?Q?mdlITzu1pAopWNxn8FqszyB1EeEdRLwR/A6ysjXksHtOJt67K+lU6muNgotH?=
 =?us-ascii?Q?OQXnjmB2bZVmpcWSRMGFJyDbjfG+SYSLLAGOUjhXMGS5WXcDunOECjPnvjip?=
 =?us-ascii?Q?yMetpABcX/PVR3wqjb7Tn3mRTNYF3DkVRWfQceyTDxwNHhwpLdX+ipaBrGMY?=
 =?us-ascii?Q?OeXqMnTOrkebaRaBqtBdVOOkZ3ZZMnHlrRCo28k+ARhqjdQsJ4vr2scK0oPS?=
 =?us-ascii?Q?XlWsbQNTz2BmwZMRDHZ1D/ir6oZPvH4LduYB+giM7MbXd4n9fEjHJQC3aZGJ?=
 =?us-ascii?Q?p71tLAlABNghRsO/paYJMDQsKG1BGhWbSkpAKcAnoyz0kxYoT7QdTaSXCGdH?=
 =?us-ascii?Q?DaGoQBMjsAd+Ngi5vvs+UWegz83KaNiEvK+oJbQj8H4oiAEKLHj5E8rJyPyT?=
 =?us-ascii?Q?dwVQJQq6qUdLC1Bz/t61MOE8+U4VUrd1VvmgwZizpg52OQ1MR91eYqznrOoF?=
 =?us-ascii?Q?6gfkjRXvcKvbJiWjYswQN1xjmxCRaghA3gsdfhS997pgv81+4u2jDQaAIJCQ?=
 =?us-ascii?Q?rDkGsYbC8RV6KMv3VYY7A4BoRA3lGN5XLSXOaXOhawb17H0eMKvc8bN5B4Im?=
 =?us-ascii?Q?oEt+0Z6jZTBdgFq1XpDiuMNFTL04tf81mz6XcCmAcIj/SXjRMz8T6yU9j+eL?=
 =?us-ascii?Q?546MJnBjLr2Vw3mZecqmhAr3TP89IlsFWyIGrbn9Y8jP2rGZTF/r3oq3tltg?=
 =?us-ascii?Q?GX6X9AezAX9ef8ZYJojRf0ya2ntXaARmzpBe74o7QIyXu1VJ+uN4qEMwFIUL?=
 =?us-ascii?Q?XHzLhssyR3EG/2NPi8QLcwxna2LW0vfwA7Ju63PxjYmPo44XxMPDUeenMpdq?=
 =?us-ascii?Q?Ta7gd22iLH/JhxLg+BLF73PY3oWrttyDOLaIWtpzeSuhQNM9pzZ3s8BcAWzN?=
 =?us-ascii?Q?n2qcvvpbA2W7UVQ8gijRDqhELg/gtoirQ05PpCZPrbEvNI/EE+AuC+FzufNZ?=
 =?us-ascii?Q?KL1Ldca8l8hcFFuWnXAyQmCz/5nW0GW/IeIpcpLc0/hZl6aP6kyor7oRzuXz?=
 =?us-ascii?Q?Y9ANjyhwYEmvVY7aWkGJIFvnuH/P5regRYWUoC1b?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f4097dd5-1c64-4ada-744d-08daeee996de
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3176.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 06:53:45.3704
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eQg3wXR1fx/WMt1dF+lR1mDo6apWzYZrcuWn4YRME0z1d3k44/+SpmqIHzZShGDtZiy1uCq1vveZk3gB5pworg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6061
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE
        autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


"Huang, Ying" <ying.huang@intel.com> writes:

> Alistair Popple <apopple@nvidia.com> writes:
>
>> Huang Ying <ying.huang@intel.com> writes:
>>
>>> 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" <ying.huang@intel.com>
>>> Cc: Zi Yan <ziy@nvidia.com>
>>> Cc: Yang Shi <shy828301@gmail.com>
>>> Cc: Baolin Wang <baolin.wang@linux.alibaba.com>
>>> Cc: Oscar Salvador <osalvador@suse.de>
>>> Cc: Matthew Wilcox <willy@infradead.org>
>>> Cc: Bharata B Rao <bharata@amd.com>
>>> Cc: Alistair Popple <apopple@nvidia.com>
>>> Cc: haoxin <xhao@linux.alibaba.com>
>>> ---
>>>  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;
>>
>> I think some brief comments in the code for what each stat is tracking
>> and their relationship to each other would be helpful (ie. does
>> nr_succeeded include thp subpages, etc). Or at least a reference to
>> where this is documented (ie. page_migration.rst) as I recall there has
>> been some confusion in the past that has lead to bugs.
>
> OK, will do that in the next version.

You should add that nr_failed_pages doesn't count failures of migrations
that weren't attempted because eg. allocation failure as that was a
surprising detail to me at least. Unless of course you decide to fix
that :-)

>> Otherwise the patch looks good so:
>>
>> Reviewed-by: Alistair Popple <apopple@nvidia.com>
>
> Thanks!
>
> Best Regards,
> Huang, Ying
>
>>> +};
>>> +
>>>  /*
>>>   * 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;
>>>  }