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 5B15CC43334 for ; Mon, 27 Jun 2022 04:29:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C915B8E0001; Mon, 27 Jun 2022 00:29:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C41326B0072; Mon, 27 Jun 2022 00:29:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B07D88E0001; Mon, 27 Jun 2022 00:29:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9E32F6B0071 for ; Mon, 27 Jun 2022 00:29:32 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6A3C3337EA for ; Mon, 27 Jun 2022 04:29:32 +0000 (UTC) X-FDA: 79622736984.12.16DE7A6 Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by imf27.hostedemail.com (Postfix) with ESMTP id 4505A40032 for ; Mon, 27 Jun 2022 04:29:30 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R171e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VHRfB.M_1656304164; Received: from 30.32.122.103(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VHRfB.M_1656304164) by smtp.aliyun-inc.com; Mon, 27 Jun 2022 12:29:25 +0800 Message-ID: <5b40e07d-7ed3-7eba-ea71-52e5a06c1ec8@linux.alibaba.com> Date: Mon, 27 Jun 2022 12:29:28 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Subject: Re: [PATCH 7/7] migrate_pages(): fix failure counting for retry To: Huang Ying , akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, shy828301@gmail.com, ziy@nvidia.com References: <20220624025309.1033400-1-ying.huang@intel.com> <20220627022515.1067946-1-ying.huang@intel.com> From: Baolin Wang In-Reply-To: <20220627022515.1067946-1-ying.huang@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656304172; 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=XcavO2bAi6iCjW8qkNyCFteprt85nxHgMHYR6Pk4Uns=; b=1qzVCLtFLHj/oyl2Vz++CWXlTt65D8vQtWjR3oG9I9K1riJoi2xfSQA3oCAmmUbgz5IvnL 4jHHfzo7otrC7c9lmaLzguWKvFzssaxtc6XHJWwq+neAiwnZ/QRfGv3rIBqrszEwgFNDDH VcWJ8pF6ulq78ogU3KLY0YW6EC5NTu8= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.56 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=1656304172; a=rsa-sha256; cv=none; b=uw2HV5x/jwQjsJWSX6hNDMJSSV8Nc7UlGJ+iqd2TOusdZa3is7+a6rvRTJYlzorps28ZKy JEbDribrHlx+WK+LEFPY+deqgymxg393YYtsNoOx/I7YhDekgphNyStoBaLCxisCur3c8i 1elapUpkT0q/WQAV58d6gfFkU65OGNE= Authentication-Results: imf27.hostedemail.com; dkim=none; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.56 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: fagj7j1355ayn4uy4msdp3ko9n4i4zpu X-Rspamd-Queue-Id: 4505A40032 X-HE-Tag: 1656304170-538789 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 6/27/2022 10:25 AM, Huang Ying wrote: > After 10 retries, we will give up and the remaining pages will be > counted as failure in nr_failed and nr_thp_failed. We should count > the failure in nr_failed_pages too. This is done in this patch. > > Signed-off-by: "Huang, Ying" > Fixes: 5984fabb6e82 ("mm: move_pages: report the number of non-attempted pages") > Cc: Baolin Wang > Cc: Zi Yan > Cc: Yang Shi > --- > mm/migrate.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 70a0e1f34c03..e42bd409d3aa 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1344,6 +1344,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > 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_thp_failed = 0; > @@ -1364,6 +1365,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > for (pass = 0; pass < 10 && (retry || thp_retry); pass++) { > retry = 0; > thp_retry = 0; > + nr_retry_pages = 0; > > list_for_each_entry_safe(page, page2, from, lru) { > /* > @@ -1449,12 +1451,14 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > nr_thp_failed += thp_retry; > if (!no_subpage_counting) > nr_failed += retry; > + nr_failed_pages += nr_retry_pages; Can you move this a little forward to update 'nr_failed_pages' in one place, which seems more readable? nr_failed_pages += nr_subpages + nr_retry_pages; Otherwise, Reviewed-by: Baolin Wang > goto out; > case -EAGAIN: > if (is_thp) > thp_retry++; > else > retry++; > + nr_retry_pages += nr_subpages; > break; > case MIGRATEPAGE_SUCCESS: > nr_succeeded += nr_subpages; > @@ -1481,6 +1485,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, > if (!no_subpage_counting) > nr_failed += retry; > nr_thp_failed += thp_retry; > + nr_failed_pages += nr_retry_pages; > /* > * Try to migrate subpages of fail-to-migrate THPs, no nr_failed > * counting in this round, since all subpages of a THP is counted