From patchwork Wed Aug 17 08:14:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Huang, Ying" X-Patchwork-Id: 12945632 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 495A7C25B08 for ; Wed, 17 Aug 2022 08:14:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D31018D0009; Wed, 17 Aug 2022 04:14:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CE03E8D0001; Wed, 17 Aug 2022 04:14:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B80CF8D0009; Wed, 17 Aug 2022 04:14:38 -0400 (EDT) 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 A01728D0001 for ; Wed, 17 Aug 2022 04:14:38 -0400 (EDT) Received: from smtpin31.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 73436A0873 for ; Wed, 17 Aug 2022 08:14:38 +0000 (UTC) X-FDA: 79808373036.31.A4BF4D8 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by imf01.hostedemail.com (Postfix) with ESMTP id AB95240061 for ; Wed, 17 Aug 2022 08:14:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660724077; x=1692260077; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hLXpcVQ48bukYRKZHdLPgeEwQ0PlwBGDjboqajk5r+E=; b=KWvycQs0GQYtj+PDAMiDvdq5wSKYDgYMkGNhjCPqB4OVcehbsUQZlIx8 LNZ++tUfhBa6P13Fd6I7aa1kdUPpknlct3OngVT7jxnBVFMYS7U6vucGx DDhVjM3S53OiAB56kqYF/YTPvhDexWM55N8LNtW3+oremOhDVyl8v3NzE pyvNXmIXjl+v0Jir+BVHmi+ye3Sd4NmoGlhT87GPiubRgjLMtvw76BU+9 jdIWjYnZWoyYCzPkeb/irKc6GzTkyUVHxoDA4jQBpvL81tuDVrSSScmjg 843JxInnvd6k7s1WT4ULpOGGXInmob1iU2upBNURBWfdxyjWlmzqgexZx g==; X-IronPort-AV: E=McAfee;i="6400,9594,10441"; a="293710817" X-IronPort-AV: E=Sophos;i="5.93,242,1654585200"; d="scan'208";a="293710817" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 01:14:36 -0700 X-IronPort-AV: E=Sophos;i="5.93,242,1654585200"; d="scan'208";a="583668137" Received: from yhuang6-mobl1.sh.intel.com ([10.238.6.172]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2022 01:14:32 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Baolin Wang , Oscar Salvador , Zi Yan , Yang Shi Subject: [PATCH -V3 6/8] migrate_pages(): fix failure counting for THP splitting Date: Wed, 17 Aug 2022 16:14:06 +0800 Message-Id: <20220817081408.513338-7-ying.huang@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220817081408.513338-1-ying.huang@intel.com> References: <20220817081408.513338-1-ying.huang@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660724078; a=rsa-sha256; cv=none; b=sENMSnqhfkqLSVuTcut361Wvma0pOlXC+s0tBq2y/N/kZlmKV3/k/h8s2djMyEaLBKOH+L fm29QouM+CbGi2MaSH8XRV4b9TJHJYby2wmpaJDKU0SL4Hiftk1pzFS5lx/9U/Y+v+UCSd tySyrOtADmt/b7d8mdhh4bH5qC0GWT8= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=KWvycQs0; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660724078; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=C6STe6ymkMpd6AGDuaLcdKWhOr960aMqpj0Mbf7jNY0=; b=4gjcf1IRNHIF3mdJSNMdcJHnkX+gKb097B1RVEZpAakFpd5F3gWnPKVGhmKLn7wuidh+JR oFw2A3QYPUTbeh1Pea9fLHHINPUxMYF7VwlyAVroFMVVKm/iUReEfwLkNoUgjaGJe/37AQ f3KoCJ0/wxpRdZxxMo2Ij7NTIOW8AnQ= Authentication-Results: imf01.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=KWvycQs0; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Rspam-User: X-Stat-Signature: xhnsha7fjhepat75emo7zf3gg8run53u X-Rspamd-Queue-Id: AB95240061 X-Rspamd-Server: rspam06 X-HE-Tag: 1660724076-582797 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 be migrated, it may be split and retry. But after splitting, the head page will be left in "from" list, although THP migration failure has been counted already. If the head page is failed to be migrated too, the failure will be counted twice incorrectly. So this is fixed in this patch via moving the head page of THP after splitting to "thp_split_pages" too. Signed-off-by: "Huang, Ying" Fixes: 5984fabb6e82 ("mm: move_pages: report the number of non-attempted pages") Reviewed-by: Baolin Wang Reviewed-by: Oscar Salvador Cc: Zi Yan Cc: Yang Shi --- mm/migrate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 0223673e42d1..81daa4dd3bb6 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1374,6 +1374,8 @@ static inline int try_split_thp(struct page *page, struct list_head *split_pages lock_page(page); rc = split_huge_page_to_list(page, split_pages); unlock_page(page); + if (!rc) + list_move_tail(&page->lru, split_pages); return rc; } @@ -1433,7 +1435,6 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, thp_retry = 0; list_for_each_entry_safe(page, page2, from, lru) { -retry: /* * THP statistics is based on the source huge page. * Capture required information that might get lost @@ -1469,10 +1470,9 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, * retry on the same page with the THP split * to base pages. * - * Head page is retried immediately and tail - * pages are added to the tail of the list so - * we encounter them after the rest of the list - * is processed. + * Sub-pages are put in thp_split_pages, and + * we will migrate them after the rest of the + * list is processed. */ case -ENOSYS: /* THP migration is unsupported */ @@ -1480,7 +1480,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, nr_thp_failed++; if (!try_split_thp(page, &thp_split_pages)) { nr_thp_split++; - goto retry; + break; } /* Hugetlb migration is unsupported */ } else if (!no_subpage_counting) { @@ -1500,7 +1500,7 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, /* THP NUMA faulting doesn't split THP to retry. */ if (!nosplit && !try_split_thp(page, &thp_split_pages)) { nr_thp_split++; - goto retry; + break; } } else if (!no_subpage_counting) { nr_failed++;