From mboxrd@z Thu Jan 1 00:00:00 1970 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 E637AC46467 for ; Tue, 10 Jan 2023 10:02:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2DDAF8E0002; Tue, 10 Jan 2023 05:02:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 28D978E0001; Tue, 10 Jan 2023 05:02:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 156738E0002; Tue, 10 Jan 2023 05:02:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 079D28E0001 for ; Tue, 10 Jan 2023 05:02:54 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id B559F143353 for ; Tue, 10 Jan 2023 10:02:53 +0000 (UTC) X-FDA: 80338450626.25.3A751A1 Received: from out30-43.freemail.mail.aliyun.com (out30-43.freemail.mail.aliyun.com [115.124.30.43]) by imf09.hostedemail.com (Postfix) with ESMTP id BE16214001B for ; Tue, 10 Jan 2023 10:02:50 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.43 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673344972; a=rsa-sha256; cv=none; b=vXrhLX5HnfINWzfyuyyr1TOgzMo1uPpqEIeeZoffwNKqLBfgFO0q2QoXf7W1+bsvqzMU1q OfJWhYO5ma+0ym0WPO+NMub87syTqaJOtuTED6tmyiRrtMohjuFwq1hsqx6rmU+hM/28Zp +12JTU7hl9Ydhzum+U49ibpK0LxP25E= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=none; spf=pass (imf09.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.43 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673344972; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bgG+qpvYRQ1sC6AxWAq12t3dRnfvzI/d5XX2vVcOipQ=; b=JHxsnISseoyw5M6HfrQx36j9tXNYBO2YGoJzWepF9dd998MpGx3g+RLW+2qzEdpXXDpOiI yr7s5GBxVjCouq4kDIe6rlAh8y2BSF+ktLLWwFi1Nu4soIeq85IRGvPjuIsGhynPG60zSD PIoOxb2JPKsqPkob5nS1RHQvmUlAAIU= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R511e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0VZIrv3t_1673344965; Received: from 30.97.48.74(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VZIrv3t_1673344965) by smtp.aliyun-inc.com; Tue, 10 Jan 2023 18:02:46 +0800 Message-ID: <9d27d10c-ba9a-045d-c170-fa3c4d6ea416@linux.alibaba.com> Date: Tue, 10 Jan 2023 18:03:09 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH -v2 1/9] migrate_pages: organize stats with struct migrate_pages_stats To: Huang Ying , Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Alistair Popple , Zi Yan , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , haoxin References: <20230110075327.590514-1-ying.huang@intel.com> <20230110075327.590514-2-ying.huang@intel.com> From: Baolin Wang In-Reply-To: <20230110075327.590514-2-ying.huang@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Queue-Id: BE16214001B X-Rspamd-Server: rspam01 X-Stat-Signature: qfk8opow4h3qy64arj7o9zyenm9fpwu3 X-HE-Tag: 1673344970-72782 X-HE-Meta: U2FsdGVkX1/UR3NoaN/+68zyyH6XErRKgcMtlxNebaiuXY7YG9IQ7hHo6+iW0eqwUxsUlb82EA8x0Ry0zS3EMg1nSZ3yAJM57xeA+yQTVPS7elLzGPyBC+gea7lOebwFrnAN1bicaQhp07S7xOL30cVNoB5DIRpGBeVliHpA7L5w88ACJEsRzSEIc7WfuajG5oUWFSM9PTycBZCF3mUN34UiB/fmtyqpLLgYyffipZovcUIMV1onQ/admnpZRI3XIN0zAUM3/RtwQm5fScDd0NEprabxnXQxCmjzsCL0mLLp2w5Df7doLYEj7yODSZgzbwHivxaCRStLHF+jxAvNc4TBeD6BpOB++n/8BNxNS/GFs6HRA/z1+hqqrEzVIDXH5+5G4kkVAeb/ldy72xma7JszRGBT47LEMdv3MVtOK4dxdGf+JmK5mbYmiLf8swl11xMtc7P1btsngB+7nkjyrKK3D4sJaFcp/TZMWFYPvN2XKqHwDruSVopSxfYo1LPriQEXBM3OkjfZ/SrqyR2hsYIxjNgi0oVZstEQ+mXLSiYo+gtexdyh2XNjl0G24XdcOt2LDvb4wI+ryUui2wPR9k3EFSkwvsfR8V0tJ5PLZ2ry7afUZW4Bzf7raZOGjq0jIn9oLS3LRvv4ppLRfWPXEF0qZNwAmvhiErdyWFQvyqPAi6WWIDbuY/GJRYRucteei74LyWDEGxLF332RyERlcHprVzmjwvYXNjHJAIIGg4m/pCiXHBE0NX0UmF/wv3LYoZHb+O/6amb39EqPQSgu/oBjEoK46FFSymExvLl38ApsgZsDoYBlDVTtloxc3zHBUoJC8iFHobgfHsTFjtZwEw== 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: On 1/10/2023 3:53 PM, Huang Ying wrote: > 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 > --- > 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 */ I think above 2 fields also contain the number of hugetlb pages. Otherwise looks good to me. Reviewed-by: Baolin Wang > + 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; > }