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 1B1D0C636CC for ; Tue, 7 Feb 2023 16:28:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A196C6B0100; Tue, 7 Feb 2023 11:28:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9C9C86B0101; Tue, 7 Feb 2023 11:28:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 892866B0102; Tue, 7 Feb 2023 11:28:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 798356B0100 for ; Tue, 7 Feb 2023 11:28:54 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0A95E14084C for ; Tue, 7 Feb 2023 16:28:54 +0000 (UTC) X-FDA: 80441029788.06.4A88776 Received: from out30-99.freemail.mail.aliyun.com (out30-99.freemail.mail.aliyun.com [115.124.30.99]) by imf21.hostedemail.com (Postfix) with ESMTP id 0656E1C001F for ; Tue, 7 Feb 2023 16:28:49 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf21.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675787332; 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=LUsgoMtXjCZFznLR+N2eIX3pbFkWDF+ppkx0i/PgWSY=; b=29uWYRdvULunCOMtoC9Sf1Xw7IGrUvikLASqy6JEa9do7mv7V2Lql7KCVIrc6uehax19s2 viKUneZEd+JsMUbdgXg48628RKZV9jJfp990WmqxNCTBHsW+O74WlOiN5X30pgMvbYkbQh n4c7hQWszD26XFI7jr4RPjYAi6tUCR8= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf21.hostedemail.com: domain of xhao@linux.alibaba.com designates 115.124.30.99 as permitted sender) smtp.mailfrom=xhao@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675787332; a=rsa-sha256; cv=none; b=cT3cBn1oyR67NEX59pIaLmSI/acacRoq31Lg5GzL9zK+Y3Qekc8F2L2jm1nDVVQq2aNliG 0We6gBrt0aD/RzEK61B/Pg7pxROq8EALHzzxUzOXnEF5K741NynB2w5I9QLUObookArJO6 aQXGaAlo5f3C34ua7fruFLGciZCx48I= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R141e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=xhao@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0Vb8Hzuq_1675787323; Received: from 30.25.212.190(mailfrom:xhao@linux.alibaba.com fp:SMTPD_---0Vb8Hzuq_1675787323) by smtp.aliyun-inc.com; Wed, 08 Feb 2023 00:28:45 +0800 Message-ID: Date: Wed, 8 Feb 2023 00:28:43 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Subject: Re: [PATCH -v4 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 , Baolin Wang , Yang Shi , Oscar Salvador , Matthew Wilcox , Bharata B Rao , Minchan Kim , Mike Kravetz , Hyeonggon Yoo <42.hyeyoo@gmail.com> References: <20230206063313.635011-1-ying.huang@intel.com> <20230206063313.635011-2-ying.huang@intel.com> From: haoxin In-Reply-To: <20230206063313.635011-2-ying.huang@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0656E1C001F X-Stat-Signature: 9ucfcmg3jri9d1zcg5cmb7mh4pfhg3r7 X-HE-Tag: 1675787329-248426 X-HE-Meta: U2FsdGVkX1/Bm9zYPY+lHPTp/GLdja5Yjfc6vd0ji9hkI3KP7doQ6C+rk3SZtXVS3c5asaXr/bEG/q4xACc0boDSFvpSckdNXu/4ZLwmhgcTAVpu0calvdnTQid7AISFW85R7Czii5toqz5HcZ1ua5YUjBCAr8jLBbdxrN5XBWLQU/ruZCNhWRrWY5HsMLZwI5UzD6AccJBVGde5RLnYhZ905PkRajxyP/OeY4XwfEYRVS5iIgM+XkEvGb9YWhwzv45oxXaaIvtSfwF0NmegDj3NMCA2/mgNlwN3ei6ZETZSrEDqgiv6eRQStz3Z7PEbDt8FVW/io4iZCMmdUo/rzHitwOkWXDuAFjmmbbnCr1aofYnLAEwmpJ9UrHb9ZKiox+xibTRtGz/DcgxK7riFCHvS1Ioj7MMkDuFujDEoEpB9n8n6YzTaxzu7KuVYaVPv5LvODW65pGvcDukRIsFB5ZMx+a+GSx+Qe09zg7ulnNmh3789CxB6140SgNQ5xX14NamrWMPmBe4aCGrZk7/tgBsK6/f0rOceLRmtCD67R5DxdfilRQaSzFBcybxP1aAat8RB7EdBoy8Eqi/T7ddprlp0xttEv0h5cDe75NGHUBPXRXeqHc6WsES2XlKNrhiy7BPnU0jjNEOvFBWCe/NKHMKRTBvZE1Yb1ElY1oDnjMqCssaOtOiyzVffI+3TSk1hAXKlauz01CN8DjNu1Oc4qQyfE8XDm2+/ALFRlbyhxZEA0/Xt5Vbhpir4XIPov5SZDsr+g7gwr0UvmfQ1QDIk8cL/G8S06PH+/Mu5clbqwMj5ce3shy3buMgHv/thSxlRMlWMj3bmLK7BVDv0+HQfUAmAo0P3nss8of3eOBG3xf4kZ5/QIbPw/xwMXvAy/Muo55+G7L3jAmDt/xz7FoY3tW5JWj3bsaxOVuNzqG/cu1sGyv04pp8SmJFOhACwajQ81sNJledpmbwfTfyBjD6 S7HNYuY6 gXMeqUNyfCsgY9MTu8j2+WmEeP+rhILWEQnagXnOOclJ6092Hhjcp2k0dwBBOfj1aELsYNiQ+QdObS923qrB8kfh1wXJQ5FAyFjae7JOKU2FE8jEKvV4NaeuvZB0WrC2ARUofAwKjxORT2rWaHsXDEbW6C2h7+iqzXeYz2XP7eR/4wjk7tTB1lwpGInnbznDCEEeojmszqewaz0izI9tqVsemgNqlVmOPYh9mDqGNxjthTwiDL6d4M0J4wvvyCWpOhGgdr65MUqdRdZskYRrfQq+OzkE8zfNx6Brl4gl2jlCdiKKjmgiZ14vcPI6AYvZD9NafqexfMXPc7zGdkdEpEyv/Eu9fe0KUfTR/92/VQZTb6KC+fJIFymVHOSD5P8LR+kfR65XohttIi/bt+DHH2XYaLK8JOgooHhbCR+M1J311GnVwI30yAhkuRGaHwQrEk4RWhmGdo1K/C1FJJSWRrEvP8FlMoqKRkjaD 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: 在 2023/2/6 下午2:33, Huang Ying 写道: > 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> > --- > 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; > } Reviewed-by: Xin Hao