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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02B5CC43334 for ; Mon, 11 Jul 2022 12:39:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8291E6B0071; Mon, 11 Jul 2022 08:39:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D8C96B00DE; Mon, 11 Jul 2022 08:39:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C7B46B00DF; Mon, 11 Jul 2022 08:39:27 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 5F3146B0071 for ; Mon, 11 Jul 2022 08:39:27 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay13.hostedemail.com (Postfix) with ESMTP id 3967B60A5F for ; Mon, 11 Jul 2022 12:39:27 +0000 (UTC) X-FDA: 79674774774.24.3870392 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf20.hostedemail.com (Postfix) with ESMTP id C2D001C006F for ; Mon, 11 Jul 2022 12:39:26 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 93FEB1FE0E; Mon, 11 Jul 2022 12:39:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1657543165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xU9MoVznrIVIBMvPbpouJup20DYgj7sfYLi8h4sbB5s=; b=EMAQ3C2JXSsXt7UTY59BN+sxHzMvUmEmfhJX48BwTe52lDfNkJMBJG35xEYYdXbRfEoOZv rDwqvquUfYGBAnwFiuwbP6BmZVceJ2CvLY1+G+XDCEmm8W+hLmr4B1m8pgS+bg2+GWlxBW xANGly8JM0mXyohItIg/HEXMqV7qhjg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1657543165; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xU9MoVznrIVIBMvPbpouJup20DYgj7sfYLi8h4sbB5s=; b=RTNcHc55/ON+DdiQGrxn6/rnDtRSUGX/6e1QVwxJ6oDjc/qZuNzQzzZgliezbz2XyWSbzG Ne7EI7dchnSs+VDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 6956313524; Mon, 11 Jul 2022 12:39:25 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LniXGP0ZzGL3FwAAMHmgww (envelope-from ); Mon, 11 Jul 2022 12:39:25 +0000 Date: Mon, 11 Jul 2022 14:39:24 +0200 From: Oscar Salvador To: Huang Ying Cc: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Baolin Wang , Zi Yan , Yang Shi Subject: Re: [PATCH -V2 6/7] migrate_pages(): fix failure counting for THP splitting Message-ID: References: <20220711084948.274787-1-ying.huang@intel.com> <20220711084948.274787-7-ying.huang@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220711084948.274787-7-ying.huang@intel.com> ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=EMAQ3C2J; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RTNcHc55; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf20.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657543166; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xU9MoVznrIVIBMvPbpouJup20DYgj7sfYLi8h4sbB5s=; b=5kJKepqqdhgvkLv4HupnfVxbCST2141MWM3Te7DBwYX/zD9B/+44Xw7/q//A/pin6csRpd wVav1bqNNSxFy/rCEn30Yv2vYndx1GsUr3M7y2LVTJzc4six/7ff8uM+x9i70dGXojsa0u pi7e4pnQyV3Nop/tR6wMo/Qgq3kgt84= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657543166; a=rsa-sha256; cv=none; b=PvtmDhwdNuDJecaNxOK2WFAYQqKCmfXarKMPYCAqPrjaxmSOGFaSqx5frPMTNESAnKabjR k5L+j5SS4QGHUWIUuy8fLmXgstC8QUrzxx6Quq8Z1IUy6wjG7O27gqsiY6FK6tA6Tc/txX pHeY6zLjmm3gsMRnqupeFjboKsaLflk= Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=EMAQ3C2J; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RTNcHc55; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf20.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de X-Rspam-User: X-Rspamd-Server: rspam08 X-Stat-Signature: pibatbhiqf7yk5dhjuco18eefo31haq9 X-Rspamd-Queue-Id: C2D001C006F X-HE-Tag: 1657543166-524876 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: On Mon, Jul 11, 2022 at 04:49:47PM +0800, Huang Ying wrote: > 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 > Cc: Zi Yan > Cc: Yang Shi Reviewed-by: Oscar Salvador > --- > mm/migrate.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mm/migrate.c b/mm/migrate.c > index 8cce73b7c046..557708ce13a1 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1306,6 +1306,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; > } > @@ -1365,7 +1367,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 > @@ -1412,7 +1413,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) { > @@ -1432,7 +1433,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++; > -- > 2.30.2 > > -- Oscar Salvador SUSE Labs