From patchwork Tue Oct 17 16:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 154394 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4257063vqb; Tue, 17 Oct 2023 09:32:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGbOo7fRYVdjmtd4L+VIQJyokH/BDGbMeUPBgqxDYdXi/dMfJMBx63x1iS+VkFk7J2rAZXl X-Received: by 2002:a9d:7592:0:b0:6b1:9646:2ea0 with SMTP id s18-20020a9d7592000000b006b196462ea0mr3102945otk.1.1697560334269; Tue, 17 Oct 2023 09:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697560334; cv=none; d=google.com; s=arc-20160816; b=h0xF28xseXs3wjVSnKtYOMawnzFpXPnI0o9O9vERR9zdnqhG93TqKMGnQHTKvOnty2 Ko3qvIol8WjXZ3EeGRvY7w8SE8NUAOah77Uxq1DoS1SFOwhjVfP78wLYbfIOJISRd9ya rnbxnetKf5NYhyWc76tirwGQVsgTn68bJfN3NcoS3dF1gVY08sWbpIj1H6dTXppITwIL /xXp0bI3RF9jokssdwiirvKz7VQb3BhONFLYiXDJk5PM3RHX8tbYWh5ayV4HlliSMqoS xAFbrFUxXefyMM+bvuyQWn2YsuSURSS3HCCbScckOMtMS1eZ/BhKTOZX5HhU1hKE7wFz sIug== 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=0wvr21T8TH7ZbDsGZ1CdyvPwondpshaJK0kYT+cScfw=; fh=cCnZvojZaURT8jH5vmOig0nNKc285jQ0d11KMSgr4+U=; b=lRzePbSjSZNiY6CKdwqoSS3FUaIiMGTVdSkvYGKM0xKp0QldOUZJLQoPPl7MPxN6VT YCRQSsJ1JZunq5GEgiO0gAmxOyG72DUHU+KAD3JQs7H5DTMhIG0Cdvj0xYDsa80Ci4rx COr8+dmf5lrY20qU0A2zJwBCO+NstafcY1lZXVvjdOdsEZYnNFX8RpOeTctkrqO5DH0y uO02UAEsyvG4LX3AXnblXOg9HlCOI+2ty7Nxw5hJCZ2KdvAosqAO/O1CAIGCsTebXeDx 0w7aImwMJkUAk3pUsvdO1ddWHkBhMWP+3oYPYngl/Gi/kyGseBqbntmrB2hMmjEu6Je/ H/1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=3yJnaArN; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=unfNfFs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id l189-20020a6388c6000000b005ac7b5e2357si120764pgd.378.2023.10.17.09.32.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 09:32:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=3yJnaArN; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=unfNfFs2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 0161F80C9DD7; Tue, 17 Oct 2023 09:32:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343606AbjJQQbq (ORCPT + 20 others); Tue, 17 Oct 2023 12:31:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230343AbjJQQbn (ORCPT ); Tue, 17 Oct 2023 12:31:43 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A766FA for ; Tue, 17 Oct 2023 09:31:41 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id C0EFA320097F; Tue, 17 Oct 2023 12:31:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 17 Oct 2023 12:31:38 -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=1697560297; x=1697646697; bh=0w vr21T8TH7ZbDsGZ1CdyvPwondpshaJK0kYT+cScfw=; b=3yJnaArN4SOYAmO1fp K+rmCwdS25C4YRLbYb0xacBS/armI4TMiZSw+anRkphttaPnf81i/MUhL4bTV55z ravLE/h5yQ4iGHaa9q+lHzdu2UTcYuwOa32+huyKdw2QNSGWNr8o8KqCwbnbQLxE WDZFZsAAqo+2HbVXG7gsU8kKCxbgtuz298uj2xt0bbycxccYD7NyZFOAsPRqDawn Z6HlnGXzLQSwHv7rPotAhmldY4xVBkO3EzXyUvtYzWJPHtl497Z9PatJ1yJ3nY3J ubAJCG0ZFs1uHMiVak5L3GNe/sxDWg7xocktRhJJFZvNRUJHnUpSEAJ7q69xnCDx 6xyQ== 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=1697560297; x=1697646697; bh=0 wvr21T8TH7ZbDsGZ1CdyvPwondpshaJK0kYT+cScfw=; b=unfNfFs2TOOscLvAF rtISXudCcuRuLCPnvkyTpJifO7QIISSb3fmEx9IHVybsZWcTf+QCy1nfKYraT5uP 5sY0vQQytBofwThnmDC1UHIE2JCAHDIh1zxN6bWP9zwDhlqHEN/mwy+gSfyeYPM1 zUEyKLpE7axpayZRP8cwKcUauSPCm/XR9NGvmH3E45hoZ3k1IK8ecXr+oRN18A0d Ia+cr/9I8OcTqW/pdRNBS7pwUihug/MyG94NZLIeW774ls2gIH92rUi9LKZNqy9Q 0u4rqE+jFZKvLndXMnAUGVNHe/+14vPmt3jOBh8OFrCsnoBBFgFBkDx3cFa8q1bd kId/A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjedvgdellecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkfforhgggfestdekredtredttdenucfhrhhomhepkghiucgjrghn uceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepffejueeife ejudejudfgiedtfeeltdfgueffhfdulefgtdekteekfeejheekhedtnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnsehsvghnth drtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 17 Oct 2023 12:31:36 -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 v3 1/2] mm/migrate: correct nr_failed in migrate_pages_sync() Date: Tue, 17 Oct 2023 12:31:28 -0400 Message-ID: <20231017163129.2025214-1-zi.yan@sent.com> X-Mailer: git-send-email 2.42.0 Reply-To: Zi Yan MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email 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 (howler.vger.email [0.0.0.0]); Tue, 17 Oct 2023 09:32:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780021025065822127 X-GMAIL-MSGID: 1780021025065822127 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 = 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 firstly") Signed-off-by: Zi Yan Cc: Baolin Wang Cc: David Hildenbrand Cc: Huang Ying Cc: Matthew Wilcox Reviewed-by: "Huang, Ying" Reviewed-by: Baolin Wang --- mm/migrate.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index c602bf6dec97..fc2e70b17704 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 */ }; /* @@ -1614,6 +1615,7 @@ static int migrate_pages_batch(struct list_head *from, int nr_retry_pages = 0; int pass = 0; bool is_thp = false; + bool is_large = false; struct folio *folio, *folio2, *dst = NULL, *dst2; int rc, rc_saved = 0, nr_pages; LIST_HEAD(unmap_folios); @@ -1629,7 +1631,8 @@ static int migrate_pages_batch(struct list_head *from, nr_retry_pages = 0; list_for_each_entry_safe(folio, folio2, from, lru) { - is_thp = folio_test_large(folio) && folio_test_pmd_mappable(folio); + is_large = folio_test_large(folio); + is_thp = is_large && folio_test_pmd_mappable(folio); nr_pages = folio_nr_pages(folio); 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 += nr_pages; @@ -1677,11 +1681,12 @@ static int migrate_pages_batch(struct list_head *from, nr_failed++; stats->nr_thp_failed += is_thp; /* Large folio NUMA faulting doesn't split to retry. */ - if (folio_test_large(folio) && !nosplit) { + if (is_large && !nosplit) { int ret = try_split_folio(folio, split_folios); if (!ret) { stats->nr_thp_split += is_thp; + stats->nr_split += is_large; break; } else if (reason == MR_LONGTERM_PIN && ret == -EAGAIN) { @@ -1827,6 +1832,7 @@ static int migrate_pages_sync(struct list_head *from, new_folio_t get_new_folio, stats->nr_succeeded += astats.nr_succeeded; stats->nr_thp_succeeded += astats.nr_thp_succeeded; stats->nr_thp_split += astats.nr_thp_split; + stats->nr_split += astats.nr_split; if (rc < 0) { stats->nr_failed_pages += astats.nr_failed_pages; stats->nr_thp_failed += astats.nr_thp_failed; @@ -1834,7 +1840,11 @@ static int migrate_pages_sync(struct list_head *from, new_folio_t get_new_folio, return rc; } stats->nr_thp_failed += astats.nr_thp_split; - nr_failed += astats.nr_thp_split; + /* + * Do not count rc, as pages will be retried below. + * Count nr_split only, since it includes nr_thp_split. + */ + nr_failed += astats.nr_split; /* * Fall back to migrate all failed folios one by one synchronously. All * failed folios except split THPs will be retried, so their failure From patchwork Tue Oct 17 16:31:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 154393 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp4256795vqb; Tue, 17 Oct 2023 09:32:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJb5h5RYwg+UBzidVlsXT+EVU7oBEi6cmudvvK/zeEYOIIefCPWjhQ20nU25J3nExIYFGQ X-Received: by 2002:a5e:9404:0:b0:792:8011:22f with SMTP id q4-20020a5e9404000000b007928011022fmr2903107ioj.0.1697560323432; Tue, 17 Oct 2023 09:32:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697560323; cv=none; d=google.com; s=arc-20160816; b=1ArnDs+PozveyUVS1MVTvxmbHbIhT0iUQ7uw8iu8n9l0oxUNClva+YxdR/lPvNp41y 1q5pCIfLEZdoMnFEU8mYOvziOU4BSV+dij2f6bawhJASjHDyCrDPQioTjlYsDPYHEd7G qLbRGLZxnJGg75TA31SOQy8S0KyySz3SEJL+xBOU9O3R5Oc/FfZ3SI5JoH2bpLMFngbB 9T4ExkEcpmdIkVq/freylGe0qNkLqxlBbLcEqiv/d4OHkNOCiCmRtITtIpI4/lK7sbCw 26o37WKKbPL6/UipdBRwBcgSVmtb665bCqmlO0sYtBUXIp9ixR2x/wOPTuA0g1E2TLPl qt1Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :feedback-id:dkim-signature:dkim-signature; bh=1kkUVLmhYZKWaHKAN/xp7aL8gGntQ2zJwQBI6DdNoNU=; fh=cCnZvojZaURT8jH5vmOig0nNKc285jQ0d11KMSgr4+U=; b=YBd0RPmxHz+Je2wycxbylZiqXVTpwbtjF34CdPthoGdm3YoWoAsQjNd7hzqp2KIabJ 2WSLOjgV6nujW/27DMU2Tv7u9pX7MMqcpl2wWgzoo5B/cei+j63uHgAv4njLZ4lgprtV 3c8Ph6yfm198HOoQlYNM2bmI2Oz11f/gk2AQpOt7WNRav9CqFqGCIxt7v7+XY/gcM4GF 86kT/RRO2S99nn2VxTZufphcKGuHoFH26o9Xk5cAX9AzogWKJr+DfIBmh4ZeYZCvH+vR gkk0Z3dI+pdN3ttAvVGvONFc0jUdU1YDN7lobzxoxbGnK3inViqC4Y2mn5tIv6/9iuTY 77bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=unvXa1k4; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=PJ7gUlT3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id h65-20020a636c44000000b005af868c0041si107419pgc.320.2023.10.17.09.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Oct 2023 09:32:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@sent.com header.s=fm3 header.b=unvXa1k4; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=PJ7gUlT3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 453F2804DBFE; Tue, 17 Oct 2023 09:32:01 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234760AbjJQQbo (ORCPT + 20 others); Tue, 17 Oct 2023 12:31:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233016AbjJQQbn (ORCPT ); Tue, 17 Oct 2023 12:31:43 -0400 Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87DBD9E for ; Tue, 17 Oct 2023 09:31:41 -0700 (PDT) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id EFF983200A2B; Tue, 17 Oct 2023 12:31:39 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 17 Oct 2023 12:31:40 -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:in-reply-to:message-id:mime-version:references :reply-to:reply-to:sender:subject:subject:to:to; s=fm3; t= 1697560299; x=1697646699; bh=1kkUVLmhYZKWaHKAN/xp7aL8gGntQ2zJwQB I6DdNoNU=; b=unvXa1k4H/Q7Jd14QuUPoZ4jcQPo5sBEh1o0/eDJkujCX6U7beP nLH41Xgpe4pvssOe6gtCU9QDPKGBdlvmDNw4yxg1llrYmG8knOVw/82VQq96Uwo4 6y6K9KLnFIWYY3kACqOdaJaBGKfF9AueTa2/7h6p+RBBh+QTPGQanQj9wbhPs2Wc RObbk5G5SE2pHWZgMvenTvoEusWbtcSWWmmHuwjDmMNjbriu8zD7FZxSScFyAU++ bcV6VUTUXfKhq3wfxGM89ExEcpII8cZ6IrOOTlxZetRzEtRdkQ9PWg54NXwJfeXa db1DXiSSJ6kc0rwPgl0NRBV+67mJh28LPSg== 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:in-reply-to:message-id:mime-version:references :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= 1697560299; x=1697646699; bh=1kkUVLmhYZKWaHKAN/xp7aL8gGntQ2zJwQB I6DdNoNU=; b=PJ7gUlT3xyf2PcJF4ucbSQ9erQHE7TVNVKbQYEiQccw2LMr40XW 71t0mIFiDHwU4EOH6jKK1Mvv2PiFJrJBczuUX81w3okgCFxj+oom9KFTeMWGr6Ey 0YCiJK00XtIx1YyCPmmmVx4wvdlGMb43WsGLGcFprGjRiz1dToZodBSvGzPWPRHW euWGW61zhbCNpC1/GbbtJ+l4AKkyo5D1CCqGrOfu4vhuOlNg8llOABZBMEKSt8nE wdVEqOO1xLiNa63xg3rv7WQNJI4N/P3R7h/FLa82D0MY+YGv8tQNOJl0wm/5i4XC o3OkMlTpIDG52BWMZPM+GuDMGSCYifZiSZA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrjedvgdellecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhgggfestdekredtredttdenucfhrhhomhepkghiucgj rghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepudfgfe elhfekiefgtedvudfghfduffefieefffejvefhlefhhffgkedtfeevhfevnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnsehsvg hnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 17 Oct 2023 12:31:38 -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 v3 2/2] mm/migrate: add nr_split to trace_mm_migrate_pages stats. Date: Tue, 17 Oct 2023 12:31:29 -0400 Message-ID: <20231017163129.2025214-2-zi.yan@sent.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231017163129.2025214-1-zi.yan@sent.com> References: <20231017163129.2025214-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email 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 (lipwig.vger.email [0.0.0.0]); Tue, 17 Oct 2023 09:32:01 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780021013512740433 X-GMAIL-MSGID: 1780021013512740433 From: Zi Yan Add nr_split to trace_mm_migrate_pages for large folio (including THP) split events. Signed-off-by: Zi Yan Cc: Baolin Wang Cc: David Hildenbrand Cc: Huang Ying Cc: Matthew Wilcox Reviewed-by: Baolin Wang --- include/trace/events/migrate.h | 24 ++++++++++++++---------- mm/migrate.c | 3 ++- 2 files changed, 16 insertions(+), 11 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, 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), TP_ARGS(succeeded, failed, thp_succeeded, thp_failed, - thp_split, mode, reason), + thp_split, large_folio_split, mode, reason), 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) ), TP_fast_assign( - __entry->succeeded = succeeded; - __entry->failed = failed; - __entry->thp_succeeded = thp_succeeded; - __entry->thp_failed = thp_failed; - __entry->thp_split = thp_split; - __entry->mode = mode; - __entry->reason = reason; + __entry->succeeded = succeeded; + __entry->failed = failed; + __entry->thp_succeeded = thp_succeeded; + __entry->thp_failed = thp_failed; + __entry->thp_split = thp_split; + __entry->large_folio_split = large_folio_split; + __entry->mode = mode; + __entry->reason = reason; ), - TP_printk("nr_succeeded=%lu nr_failed=%lu nr_thp_succeeded=%lu nr_thp_failed=%lu nr_thp_split=%lu mode=%s reason=%s", + TP_printk("nr_succeeded=%lu nr_failed=%lu nr_thp_succeeded=%lu nr_thp_failed=%lu nr_thp_split=%lu nr_split=%lu mode=%s reason=%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 fc2e70b17704..1fecebf4c301 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1979,7 +1979,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); if (ret_succeeded) *ret_succeeded = stats.nr_succeeded;