Received: by 2002:a05:7412:d8a:b0:e2:908c:2ebd with SMTP id b10csp2586208rdg; Mon, 16 Oct 2023 08:42:19 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGC1uZkbuZh1iVyhoRgd68DKiifAvd3N5PKtfD5K1zVbj8bW+/vyRV9UDMBQPQt8e2yLrWx X-Received: by 2002:a17:902:6b47:b0:1ca:2caa:aca5 with SMTP id g7-20020a1709026b4700b001ca2caaaca5mr4522317plt.1.1697470938846; Mon, 16 Oct 2023 08:42:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697470938; cv=none; d=google.com; s=arc-20160816; b=qSya8b8BE5e4CT3YMpR3euZJv0SbzT/DpHNrthWR7WqfZRRrz0yQm8J43o7vXaJAOu ludTNIRDF1S8EdZXbobfkfhx4QICh/468ylv04FhVVMGIZW9uBiNH8H54pou07Uwn/fr A5cnxWmjdSjRp9wfDE+T0c5pxXBh+OIsYXP+55992kJI7Iyz4VDDIX/vaOfu/zyCGFuX gkA/PDqOo1EOUbSTzMqGZhIarRmhaCPUEXnQzwWiWRJorZqbmaXd+1ysnB9viIPCBX2m 1odQoOyTuoXC6MOvcIPB/Gxd8AQjIDNA/eoW1ZXpFX0tKuRYR6RrTYArRN4O5aKQsQ4g soPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version:reply-to :message-id:date:subject:cc:to:from:feedback-id:dkim-signature :dkim-signature; bh=UemfV4Gp6AsBHDDvuajuUvalvcQkOw1ynNlnNSjNndE=; fh=cCnZvojZaURT8jH5vmOig0nNKc285jQ0d11KMSgr4+U=; b=X7bUg4B08c5dN+GsMoPmag3vDRaLtovyjkIFJkS7xD5Gs2Cef/1xJg36HpxI8UgycU c5nz/AnRPhoYPpVLJLIXFMJKzUNMELggULI/5b4EUyRWoOPf6zTlr8GDRluYRkzlvNo5 sHB+Zu7bt8Q9CmdFNlg4Cm3NAsl4IxhXcGjSQSJV/VEYQRR5hnm3KfDbj7ewNuCNet/5 zC8pOhxvBnJZP78TaYoavcmue+9iSgTRfdS6yEwQNdPrwdvWOYxwlbIEEkQqv7PsW2xc 1HqRPQ/ZY5DfprtBdY+2BJ/sJqY+zFwtz5EdsVIim3UvkyjRKc4sR06rFxTRoLBGr5si BAAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=ao+hJIbV; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=LV6+i1vJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sent.com Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id j2-20020a170902da8200b001c8920e3021si11618863plx.539.2023.10.16.08.42.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 08:42:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=ao+hJIbV; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=LV6+i1vJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=sent.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 33A22802FD0F; Mon, 16 Oct 2023 08:42:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233412AbjJPPmP (ORCPT + 99 others); Mon, 16 Oct 2023 11:42:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37254 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231569AbjJPPmO (ORCPT ); Mon, 16 Oct 2023 11:42:14 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F070383 for ; Mon, 16 Oct 2023 08:42:10 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 28F2D5C02AE; Mon, 16 Oct 2023 11:42:10 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 16 Oct 2023 11:42:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:reply-to:sender :subject:subject:to:to; s=fm3; t=1697470930; x=1697557330; bh=Ue mfV4Gp6AsBHDDvuajuUvalvcQkOw1ynNlnNSjNndE=; b=ao+hJIbVMlCc80+xz1 DRb0PAtMUumDou9lEsn8CRT1G6I0BmztwUbPoD4L2YWNDxmWqknotRCGoRkpF4ny sryhoY3t/7imJJ0uC67mo44/1kmrWwCERxL7gYdwJkoXQZh2Y2cgi0yrsjDudXt5 dK49EOiCu1AsXiuv1rkcqZwKC4fFdeyxyinrrgVvMS1TN5HwYP5QUCLe3eT8+Gra Xhx8ue74igoAiNc7FyXMx0XCYDuQAyZ4VV9xhTd4UPoHhx4WzNWD/DczodFIjPsm /oZq+OH3Bcfp03Y2qqn4g7zUCKUQ27+395J7RoBKGu3gugy0D/jqe/b3WbTV3U3V Q2Rg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1697470930; x=1697557330; bh=U emfV4Gp6AsBHDDvuajuUvalvcQkOw1ynNlnNSjNndE=; b=LV6+i1vJKKFDJwS4U uus6PGhNnzg+DejED9ZlPibFMH0fAS6GSY2dElvzMpPo034PYRmwRLFbOMUJNzZi z3PQjtCeT5sujStIojMmv+I2sufJ1pfHGFep+5FkvgpcLeQYD/c0H+KeihQ9jYgr qn4z4QiC9Ua/WzCxJsnpPJ8tyfAGTVtkh07dM9NlzeeQYX7HlQ9GI7gXIPP4vknY YeOr/KsYtcWWYbNZT6n5Z0SxGy11Tvk1gRkqQ5ab140sHxgW+Q5rGIkdHj9IY1z7 VcCwh0hQ5vRgS/NlU2P5fbEQ+pn3tcB3tA2qGA5/xLs6VS0Za12ddh+s0M8BfvDB imT8Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjedtgdekkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkfforhgggfestdhqredtredttdenucfhrhhomhepkghiucgjrghn uceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnheptdfghfdtte eltdekiefhfeeuueehvdduhfdvieefvedtkedttefgieeijeeuhfdtnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnsehsvghnth drtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 16 Oct 2023 11:42:09 -0400 (EDT) From: Zi Yan To: Huang Ying , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Zi Yan , Andrew Morton , "Matthew Wilcox (Oracle)" , David Hildenbrand , Baolin Wang Subject: [PATCH v2] mm/migrate: correct nr_failed in migrate_pages_sync() Date: Mon, 16 Oct 2023 11:41:56 -0400 Message-ID: <20231016154156.1948815-1-zi.yan@sent.com> X-Mailer: git-send-email 2.42.0 Reply-To: Zi Yan MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 16 Oct 2023 08:42:17 -0700 (PDT) From: Zi Yan nr_failed was missing the large folio splits from migrate_pages_batch() and can cause a mismatch between migrate_pages() return value and the number of not migrated pages, i.e., when the return value of migrate_pages() is 0, there are still pages left in the from page list. It will happen when a non-PMD THP large folio fails to migrate due to -ENOMEM and is split successfully but not all the split pages are not migrated, migrate_pages_batch() would return non-zero, but astats.nr_thp_split =3D 0. nr_failed would be 0 and returned to the caller of migrate_pages(), but the not migrated pages are left in the from page list without being added back to LRU lists. Fix it by adding a new nr_split counter for large folio splits and adding it to nr_failed in migrate_page_sync() after migrate_pages_batch() is done. Fixes: 2ef7dbb26990 ("migrate_pages: try migrate in batch asynchronously fi= rstly") Signed-off-by: Zi Yan --- include/trace/events/migrate.h | 24 ++++++++++++++---------- mm/migrate.c | 15 +++++++++++---- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/include/trace/events/migrate.h b/include/trace/events/migrate.h index 061b5128f335..0190ef725b43 100644 --- a/include/trace/events/migrate.h +++ b/include/trace/events/migrate.h @@ -49,10 +49,11 @@ TRACE_EVENT(mm_migrate_pages, =20 TP_PROTO(unsigned long succeeded, unsigned long failed, unsigned long thp_succeeded, unsigned long thp_failed, - unsigned long thp_split, enum migrate_mode mode, int reason), + unsigned long thp_split, unsigned long large_folio_split, + enum migrate_mode mode, int reason), =20 TP_ARGS(succeeded, failed, thp_succeeded, thp_failed, - thp_split, mode, reason), + thp_split, large_folio_split, mode, reason), =20 TP_STRUCT__entry( __field( unsigned long, succeeded) @@ -60,26 +61,29 @@ TRACE_EVENT(mm_migrate_pages, __field( unsigned long, thp_succeeded) __field( unsigned long, thp_failed) __field( unsigned long, thp_split) + __field( unsigned long, large_folio_split) __field( enum migrate_mode, mode) __field( int, reason) ), =20 TP_fast_assign( - __entry->succeeded =3D succeeded; - __entry->failed =3D failed; - __entry->thp_succeeded =3D thp_succeeded; - __entry->thp_failed =3D thp_failed; - __entry->thp_split =3D thp_split; - __entry->mode =3D mode; - __entry->reason =3D reason; + __entry->succeeded =3D succeeded; + __entry->failed =3D failed; + __entry->thp_succeeded =3D thp_succeeded; + __entry->thp_failed =3D thp_failed; + __entry->thp_split =3D thp_split; + __entry->large_folio_split =3D large_folio_split; + __entry->mode =3D mode; + __entry->reason =3D reason; ), =20 - TP_printk("nr_succeeded=3D%lu nr_failed=3D%lu nr_thp_succeeded=3D%lu nr_t= hp_failed=3D%lu nr_thp_split=3D%lu mode=3D%s reason=3D%s", + TP_printk("nr_succeeded=3D%lu nr_failed=3D%lu nr_thp_succeeded=3D%lu nr_t= hp_failed=3D%lu nr_thp_split=3D%lu nr_split=3D%lu mode=3D%s reason=3D%s", __entry->succeeded, __entry->failed, __entry->thp_succeeded, __entry->thp_failed, __entry->thp_split, + __entry->large_folio_split, __print_symbolic(__entry->mode, MIGRATE_MODE), __print_symbolic(__entry->reason, MIGRATE_REASON)) ); diff --git a/mm/migrate.c b/mm/migrate.c index c602bf6dec97..4caf405b6504 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1495,6 +1495,7 @@ struct migrate_pages_stats { int nr_thp_succeeded; /* THP migrated successfully */ int nr_thp_failed; /* THP failed to be migrated */ int nr_thp_split; /* THP split before migrating */ + int nr_split; /* Large folio (include THP) split before migrating */ }; =20 /* @@ -1614,6 +1615,7 @@ static int migrate_pages_batch(struct list_head *from, int nr_retry_pages =3D 0; int pass =3D 0; bool is_thp =3D false; + bool is_large =3D false; struct folio *folio, *folio2, *dst =3D NULL, *dst2; int rc, rc_saved =3D 0, nr_pages; LIST_HEAD(unmap_folios); @@ -1629,7 +1631,8 @@ static int migrate_pages_batch(struct list_head *from, nr_retry_pages =3D 0; =20 list_for_each_entry_safe(folio, folio2, from, lru) { - is_thp =3D folio_test_large(folio) && folio_test_pmd_mappable(folio); + is_large =3D folio_test_large(folio); + is_thp =3D is_large && folio_test_pmd_mappable(folio); nr_pages =3D folio_nr_pages(folio); =20 cond_resched(); @@ -1649,6 +1652,7 @@ static int migrate_pages_batch(struct list_head *from, stats->nr_thp_failed++; if (!try_split_folio(folio, split_folios)) { stats->nr_thp_split++; + stats->nr_split++; continue; } stats->nr_failed_pages +=3D nr_pages; @@ -1677,11 +1681,12 @@ static int migrate_pages_batch(struct list_head *fr= om, nr_failed++; stats->nr_thp_failed +=3D is_thp; /* Large folio NUMA faulting doesn't split to retry. */ - if (folio_test_large(folio) && !nosplit) { + if (is_large && !nosplit) { int ret =3D try_split_folio(folio, split_folios); =20 if (!ret) { stats->nr_thp_split +=3D is_thp; + stats->nr_split++; break; } else if (reason =3D=3D MR_LONGTERM_PIN && ret =3D=3D -EAGAIN) { @@ -1827,6 +1832,7 @@ static int migrate_pages_sync(struct list_head *from,= new_folio_t get_new_folio, stats->nr_succeeded +=3D astats.nr_succeeded; stats->nr_thp_succeeded +=3D astats.nr_thp_succeeded; stats->nr_thp_split +=3D astats.nr_thp_split; + stats->nr_split +=3D astats.nr_split; if (rc < 0) { stats->nr_failed_pages +=3D astats.nr_failed_pages; stats->nr_thp_failed +=3D astats.nr_thp_failed; @@ -1834,7 +1840,7 @@ static int migrate_pages_sync(struct list_head *from,= new_folio_t get_new_folio, return rc; } stats->nr_thp_failed +=3D astats.nr_thp_split; - nr_failed +=3D astats.nr_thp_split; + nr_failed +=3D astats.nr_split + astats.nr_thp_split; /* * Fall back to migrate all failed folios one by one synchronously. All * failed folios except split THPs will be retried, so their failure @@ -1969,7 +1975,8 @@ int migrate_pages(struct list_head *from, new_folio_t= get_new_folio, count_vm_events(THP_MIGRATION_SPLIT, stats.nr_thp_split); trace_mm_migrate_pages(stats.nr_succeeded, stats.nr_failed_pages, stats.nr_thp_succeeded, stats.nr_thp_failed, - stats.nr_thp_split, mode, reason); + stats.nr_thp_split, stats.nr_split, mode, + reason); =20 if (ret_succeeded) *ret_succeeded =3D stats.nr_succeeded; --=20 2.42.0