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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7480EC433EF for ; Fri, 24 Jun 2022 02:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229642AbiFXCxs (ORCPT ); Thu, 23 Jun 2022 22:53:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230356AbiFXCxi (ORCPT ); Thu, 23 Jun 2022 22:53:38 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75D392E9D2 for ; Thu, 23 Jun 2022 19:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656039217; x=1687575217; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zkfooEuAcL1s/GMfIWYGeryZUxTknJxESw3mSAR4BLA=; b=LXo/4aZewFsFDElFuqMINljESYzYdijT/Qen49/5pEcIvJm5oQnq8kCp 0BPnbAHEA8jEwnPyWqiQE7sfbi6tDsTDpbMLg45phvSHWvi0wpEi+ctBA tvPXmyoTH11WTBNTsvxn4AWcjbzNAoA1rfBWMvGsohGacwlLRD0ISsq12 vuVTx+I1UIm6K7aJwmhHfNKsFG6ZYbHJR9aAkQsHYjLFWaAnKOZQVrhmX bKe1mSgwEv3sa/+/NwXe18ofZMsZByW8pxHIgc8lOuEn6nk/jzIDBntyq lqDuvKSDDLlOFEr1HIR5u20ff89LUA8cc/yks9NBkmH/KuRdKPUPBxdWy g==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="279672724" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="279672724" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:53:37 -0700 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="593018084" Received: from yxia2-mobl1.ccr.corp.intel.com (HELO yhuang6-mobl1.ccr.corp.intel.com) ([10.254.214.143]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 19:53:35 -0700 From: Huang Ying To: Andrew Morton Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying , Baolin Wang , Zi Yan , Yang Shi Subject: [PATCH 3/7] migrate_pages(): fix THP failure counting for -ENOMEM Date: Fri, 24 Jun 2022 10:53:05 +0800 Message-Id: <20220624025309.1033400-4-ying.huang@intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220624025309.1033400-1-ying.huang@intel.com> References: <20220624025309.1033400-1-ying.huang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In unmap_and_move(), if the new THP cannot be allocated, -ENOMEM will be returned, and migrate_pages() will try to split the THP unless "reason" is MR_NUMA_MISPLACED (that is, nosplit == true). But when nosplit == true, the THP migration failure will not be counted. This is incorrect. So in this patch, the THP migration failure will be counted for -ENOMEM regardless of nosplit is true or false. The nr_failed counting is fixed too, although that is not used actually. 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 82444e7df9f1..542533e4e3cf 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1425,11 +1425,11 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, /* * When memory is low, don't bother to try to migrate * other pages, just exit. - * THP NUMA faulting doesn't split THP to retry. */ - if (is_thp && !nosplit) { + if (is_thp) { nr_thp_failed++; - if (!try_split_thp(page, &thp_split_pages)) { + /* THP NUMA faulting doesn't split THP to retry. */ + if (!nosplit && !try_split_thp(page, &thp_split_pages)) { nr_thp_split++; goto retry; } @@ -1446,6 +1446,8 @@ int migrate_pages(struct list_head *from, new_page_t get_new_page, */ list_splice_init(&thp_split_pages, from); nr_thp_failed += thp_retry; + if (!no_subpage_counting) + nr_failed += retry; goto out; case -EAGAIN: if (is_thp) -- 2.30.2