From patchwork Wed Jan 22 19:39:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 11346331 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 75C331580 for ; Wed, 22 Jan 2020 19:40:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 419E42465B for ; Wed, 22 Jan 2020 19:40:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 419E42465B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 618526B0005; Wed, 22 Jan 2020 14:40:03 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF686B0006; Wed, 22 Jan 2020 14:40:03 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4DF966B0007; Wed, 22 Jan 2020 14:40:03 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0238.hostedemail.com [216.40.44.238]) by kanga.kvack.org (Postfix) with ESMTP id 352E96B0005 for ; Wed, 22 Jan 2020 14:40:03 -0500 (EST) Received: from smtpin27.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id C09DC824805A for ; Wed, 22 Jan 2020 19:40:02 +0000 (UTC) X-FDA: 76406285844.27.note95_475badb6c26 X-Spam-Summary: 2,0,0,8996b9abe9d0f096,d41d8cd98f00b204,yang.shi@linux.alibaba.com,:mhocko@suse.com:richardw.yang@linux.intel.com:akpm@linux-foundation.org:yang.shi@linux.alibaba.com::linux-kernel@vger.kernel.org:stable@vger.kernel.org,RULES_HIT:41:355:379:541:560:800:960:967:973:988:989:1260:1261:1345:1437:1534:1542:1711:1730:1747:1777:1792:2393:2525:2559:2563:2682:2685:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3354:3865:3866:3867:3868:3870:3871:3872:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:5007:6261:7875:7903:8660:9025:10004:11026:11232:11473:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:13148:13161:13221:13229:13230:13845:14096:14181:14394:14721:21060:21080:21451:21627:21740:21749:21811:21990:30034:30046:30051:30054:30091,0,RBL:error,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:24,LUA_SUMMARY:none X-HE-Tag: note95_475badb6c26 X-Filterd-Recvd-Size: 4020 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by imf01.hostedemail.com (Postfix) with ESMTP for ; Wed, 22 Jan 2020 19:40:01 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e07484;MF=yang.shi@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0ToMZIoB_1579721990; Received: from localhost(mailfrom:yang.shi@linux.alibaba.com fp:SMTPD_---0ToMZIoB_1579721990) by smtp.aliyun-inc.com(127.0.0.1); Thu, 23 Jan 2020 03:39:58 +0800 From: Yang Shi To: mhocko@suse.com, richardw.yang@linux.intel.com, akpm@linux-foundation.org Cc: yang.shi@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH] mm: move_pages: report the number of non-attempted pages Date: Thu, 23 Jan 2020 03:39:50 +0800 Message-Id: <1579721990-18672-1-git-send-email-yang.shi@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 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: Since commit a49bd4d71637 ("mm, numa: rework do_pages_move"), the semantic of move_pages() was changed to return the number of non-migrated pages (failed to migration) and the call would be aborted immediately if migrate_pages() returns positive value. But it didn't report the number of pages that we even haven't attempted to migrate. So, fix it by including non-attempted pages in the return value. Fixes: a49bd4d71637 ("mm, numa: rework do_pages_move") Suggested-by: Michal Hocko Cc: Wei Yang Cc: [4.17+] Signed-off-by: Yang Shi --- The patch is based off Wei Yang's cleanup patchset: https://lore.kernel.org/linux-mm/20200122011647.13636-1-richardw.yang@linux.intel.com/T/#t mm/migrate.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 591f2e5..51b1b76 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1582,7 +1582,7 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr, static int move_pages_and_store_status(struct mm_struct *mm, int node, struct list_head *pagelist, int __user *status, - int start, int nr) + int start, int nr, unsigned long total) { int err; @@ -1590,8 +1590,17 @@ static int move_pages_and_store_status(struct mm_struct *mm, int node, return 0; err = do_move_pages_to_node(mm, pagelist, node); - if (err) + if (err) { + /* + * Possitive err means the number of failed pages to + * migrate. Since we are going to abort and return the + * number of non-migrated pages, so need incude the rest + * of the nr_pages that are not attempted as well. + */ + if (err > 0) + err += total - start - nr - 1; return err; + } err = store_status(status, start, node, nr); return err; } @@ -1640,7 +1649,8 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, start = i; } else if (node != current_node) { err = move_pages_and_store_status(mm, current_node, - &pagelist, status, start, i - start); + &pagelist, status, start, i - start, + nr_pages); if (err) goto out; start = i; @@ -1670,7 +1680,7 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, goto out_flush; err = move_pages_and_store_status(mm, current_node, &pagelist, - status, start, i - start); + status, start, i - start, nr_pages); if (err) goto out; current_node = NUMA_NO_NODE; @@ -1678,7 +1688,7 @@ static int do_pages_move(struct mm_struct *mm, nodemask_t task_nodes, out_flush: /* Make sure we do not overwrite the existing error */ err1 = move_pages_and_store_status(mm, current_node, &pagelist, - status, start, i - start); + status, start, i - start, nr_pages); if (err >= 0) err = err1; out: