From patchwork Thu Jul 21 12:05:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 12925007 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 D6D6BC433EF for ; Thu, 21 Jul 2022 12:05:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5359F6B0073; Thu, 21 Jul 2022 08:05:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E5818E0003; Thu, 21 Jul 2022 08:05:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3D6AC8E0002; Thu, 21 Jul 2022 08:05:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2D9F56B0073 for ; Thu, 21 Jul 2022 08:05:23 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 132071C5097 for ; Thu, 21 Jul 2022 12:05:23 +0000 (UTC) X-FDA: 79710976926.20.30E15BC Received: from out30-56.freemail.mail.aliyun.com (out30-56.freemail.mail.aliyun.com [115.124.30.56]) by imf21.hostedemail.com (Postfix) with ESMTP id C4FF41C00A3 for ; Thu, 21 Jul 2022 12:05:18 +0000 (UTC) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=7;SR=0;TI=SMTPD_---0VK03.nE_1658405115; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VK03.nE_1658405115) by smtp.aliyun-inc.com; Thu, 21 Jul 2022 20:05:15 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: ying.huang@intel.com, ziy@nvidia.com, shy828301@gmail.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: migrate: Do not retry 10 times for the subpages of fail-to-migrate THP Date: Thu, 21 Jul 2022 20:05:08 +0800 Message-Id: <1658405108-100658-1-git-send-email-baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658405122; a=rsa-sha256; cv=none; b=6Tco+y+9IpsZEB/Fzehk1TrVOyOK8nHxebwKsqMp6fk6B1T4QT3dr9DU9L3DgbHoqSNWg6 ZiiMlWZpKCBfcR6JfwkLEIj96r4rbvdjO5olDtCDV/YadQEGHk9CGvLI6fan7CqRVoUlHN cOJ2hx4r22Dn4Sy47SD2toXRrmw+ehs= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=none; spf=pass (imf21.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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658405122; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=V9LWYnrsE80gy0LNkPvhVhKNwb8fv6RXpEc58W78Ops=; b=exzg36olFowQ4sH3jg5GJPDsYe3/gcYwHkSpZx0Yvm08TAaUkI27C7QYFObJ48CXi4zoTz HuayhdUO5Zb4jeE+gVgzWgLc2d4FafCa2m4PoJN3RHabzJXK0mVejxlP+bGp+9D/Beplho vNgtTH3+mVWDtJPlLLZBlxUA8ZCSY28= X-Rspamd-Queue-Id: C4FF41C00A3 Authentication-Results: imf21.hostedemail.com; dkim=none; spf=pass (imf21.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: 6ta9ys1iksedkyaszib61qyij8577z9y X-HE-Tag: 1658405118-776863 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: If THP is failed to migrate due to -ENOSYS or -ENOMEM case, the THP will be split, and the subpages of fail-to-migrate THP will be tried to migrate again, so we should not account the retry counter in the second loop, since we already accounted 'nr_thp_failed' in the first loop. Moreover we also do not need retry 10 times for -EAGAIN case for the subpages of fail-to-migrate THP in the second loop, since we already regarded the THP as migration failure, and save some migration time (for the worst case, will try 512 * 10 times) according to previous discussion [1]. [1] https://lore.kernel.org/linux-mm/87r13a7n04.fsf@yhuang6-desk2.ccr.corp.intel.com/ Signed-off-by: Baolin Wang Tested-by: "Huang, Ying" --- Note, this patch is based on the patch set [1] from Huang Ying. [1] https://lore.kernel.org/linux-mm/20220711084948.274787-1-ying.huang@intel.com/ --- mm/migrate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 8429206..e36a084 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1507,7 +1507,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, case -EAGAIN: if (is_thp) thp_retry++; - else + else if (!no_subpage_counting) retry++; nr_retry_pages += nr_subpages; break; @@ -1533,8 +1533,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, } } } - if (!no_subpage_counting) - nr_failed += retry; + nr_failed += retry; nr_thp_failed += thp_retry; nr_failed_pages += nr_retry_pages; /*