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 A8B12C4828D for ; Thu, 1 Feb 2024 20:10:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9EC76B007B; Thu, 1 Feb 2024 15:09:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D4A2E6B0078; Thu, 1 Feb 2024 15:09:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C11856B0074; Thu, 1 Feb 2024 15:09:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A44B46B0072 for ; Thu, 1 Feb 2024 15:09:59 -0500 (EST) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 6C67140DF9 for ; Thu, 1 Feb 2024 20:09:59 +0000 (UTC) X-FDA: 81744326118.08.041447F Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf28.hostedemail.com (Postfix) with ESMTP id 17ADCC0013; Thu, 1 Feb 2024 20:09:54 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hZbliN24; dmarc=none; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706818197; 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=0gzOElUCdojNqD0lDLrskflJ3j28TYAYIbO09sjYKBI=; b=mNPP3AjGpF35R0nAMKVuEGEU+L2j3SErz3SA7nBXopkN/zh6+wwPCgQ0idEeIO+kghMSFf 392F3EfdIVf7BrFolF3WSKTdVYDEAgcL1Egcnb83xdZTNY/W+1nU3AQ/Trcyf/PMlOhF7A LMCImgjjxZ1UZK3tbrbquJueKTtIYm4= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hZbliN24; dmarc=none; spf=none (imf28.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706818197; a=rsa-sha256; cv=none; b=8Ng+wVi+ZUfPw9SJBfegCqDsx/rNMBtrUfsRUm0T9KG7k+RsnatAMgLZnG2CAYWDEAwVEu bC321mxwmOvn5BtRkodtrc6K3LvCwtUy7MVV11mndmog2d9COgxvQTLJCVnr3bKxI+Dgnx fJWOjL6lNJqxqxangl3BIQM4yn4Ppm0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=In-Reply-To:Content-Type:MIME-Version: References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=0gzOElUCdojNqD0lDLrskflJ3j28TYAYIbO09sjYKBI=; b=hZbliN24rKRY/RhmrHtR7H/K0C EaWJf9/1nazmdNFXgbApB51Zl3riH1/bwgM/99SBu2fvREEym3X8LKTd74p1B+U0VeaKbH6oT2KIB sYzXIPnSp4mFX6csfJaPWcbvYlv2b8x60F3UH7n4dKQcDSVYbQLrUZZNUqp69kNQsamQKgrpRhK2+ q7pk0SELXqwWm5DUZbfzVEMleuTlTRshcjIGrtoAggrsVLOtcocVaXgyiOfWXWUu/npVYfrKvBGSG yOyPxNRQbvEEZcrrjcgw2/n39hJqRvuDXrinf4QOXwQe9X+G6Xzaa9UdfmDpUeAqCztiN4hSEtxrB rdsc2zaQ==; Received: from willy by casper.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVdNd-0000000Ghse-28OW; Thu, 01 Feb 2024 20:09:49 +0000 Date: Thu, 1 Feb 2024 20:09:49 +0000 From: Matthew Wilcox To: Kefeng Wang Cc: Andrew Morton , linux-mm@kvack.org, Tony Luck , Naoya Horiguchi , Miaohe Lin , David Hildenbrand , Muchun Song , Benjamin LaHaise , jglisse@redhat.com, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org Subject: Re: [PATCH rfc 3/9] mm: migrate: remove migrate_folio_extra() Message-ID: References: <20240129070934.3717659-1-wangkefeng.wang@huawei.com> <20240129070934.3717659-4-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240129070934.3717659-4-wangkefeng.wang@huawei.com> X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 17ADCC0013 X-Stat-Signature: p47hm3i4ozgtbq8cdwj3m51fd6nb73ea X-HE-Tag: 1706818194-843659 X-HE-Meta: U2FsdGVkX181fHB6oBbvkJyreP2pOuSgVCWC2EDKRrIcaQYpmJJtquyJN1ygu/IXTNM5uEPIiF377dnxCTiaJWZmp//Qe/LEm6rPMhkOWye+5IY+1C6Jru7HrTNY7TgSQ4HUApF3eqynHu0Bf6rqQsuUX1mT7cC9bzp7f02OuiAzm3ZGhobQ+g4Bf1A1CfqX7eK1IkBAFBWRN76zcCSvFBIjtOL0upFzd2oumnDvqyKSc8Y9n5l2Pt0t/decnzCaBpg/XYoQCe6RuCb+rZgnBn+ylDhotf9kSoOhbSIKu4Ow7MaQuiO1y9QLM8WgbGDrwJWozrAQH7O9+eE1jSHWaezWpkwW7+aKrhiuhuQP6vkDIQPpX4H+rZqPPDEr0Yrt8D61jqIzGp5uEwXNPxmHoj4jBQq/Ap/zkKQ+ZvL3HBp2twzu3/tDSnic/+oB50QJWjr9FlLPB91iLc4fXeHQRCRdQ+Y2rUWh2oG8LTh8GZEdNB6GEfLqaT9jgjpjk2HnhdG47pXmMrEWnVoOfHRfVftOeKE/fhrE37tfz1yrZtV5spsdnk0+yRqVZaKTFiTV35CCVyhqILPvqVD+/Bcu16ltnWMNofy5A3P/x1RchWkyCGHhQ+yTmQjwDwF/9ZRrQKzMfhBHRoaV7/RoIpdsE6puP0HEoAq97gVKoar39f3LTi798SnCQj6YIv3ZN0H8VS2OCgvh1xSGpSZnlW5s87KIU4Dix7Fs2158ZboiCTNkdJgQ5b6Ds+6yiU5IAzhbmKu3OCi0r8IFAk8Z2rfhyJ0728lJIjU+Gndb54H3ehIB/R3qg1GX+bbuWK2wubw59VYY9/vrqpki3bAgn5bNmpPD8Z+NmsXqoL+JSZDokZDnGCQycYSsqfWaQ+xIK+vSwlSziMRoCEk07np9j0wjc7ih2wAo1pZX+A/HSvvnsdvL+OgdYba2TUcJHW9DkugZFHCtAY8ewfsQPZYOmio gjPYX9eH Pzj0yS2DmLcd91WdKU2LV2YuNnKEIrthA55wkg5/G19A3sRIPZTri7udj5lss+HNWBgyuKYCdQ+LM8REdCxudRM1dIb84wNOlglCAPF/p2W33PRVNXdQtFpamhIIvSGcfOKvHf2PEJbgAgFEtSjSu2vd38/ox6pGd46H3dfn7xy2d95ui3wsr+Ol0oN8eo980zqYMhOOZNU5MSgw0JUKWIRvA/g== 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: List-Subscribe: List-Unsubscribe: On Mon, Jan 29, 2024 at 03:09:28PM +0800, Kefeng Wang wrote: > Convert migrate_folio_extra() to __migrate_folio() which will be used > by migrate_folio() and filemap_migrate_folio(), also directly call > folio_migrate_mapping() in __migrate_device_pages() to simplify code. This feels like two patches? First convert __migrate_device_pages() then do the other thing? > Signed-off-by: Kefeng Wang > --- > include/linux/migrate.h | 2 -- > mm/migrate.c | 32 +++++++++++--------------------- > mm/migrate_device.c | 13 +++++++------ > 3 files changed, 18 insertions(+), 29 deletions(-) > > diff --git a/include/linux/migrate.h b/include/linux/migrate.h > index 2ce13e8a309b..517f70b70620 100644 > --- a/include/linux/migrate.h > +++ b/include/linux/migrate.h > @@ -63,8 +63,6 @@ extern const char *migrate_reason_names[MR_TYPES]; > #ifdef CONFIG_MIGRATION > > void putback_movable_pages(struct list_head *l); > -int migrate_folio_extra(struct address_space *mapping, struct folio *dst, > - struct folio *src, enum migrate_mode mode, int extra_count); > int migrate_folio(struct address_space *mapping, struct folio *dst, > struct folio *src, enum migrate_mode mode); > int migrate_pages(struct list_head *l, new_folio_t new, free_folio_t free, > diff --git a/mm/migrate.c b/mm/migrate.c > index cdae25b7105f..a51ceebbe3b1 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -655,22 +655,24 @@ EXPORT_SYMBOL(folio_migrate_copy); > * Migration functions > ***********************************************************/ > > -int migrate_folio_extra(struct address_space *mapping, struct folio *dst, > - struct folio *src, enum migrate_mode mode, int extra_count) > +static int __migrate_folio(struct address_space *mapping, struct folio *dst, > + struct folio *src, enum migrate_mode mode, > + void *src_private) > { > int rc; > > - BUG_ON(folio_test_writeback(src)); /* Writeback must be complete */ > - > - rc = folio_migrate_mapping(mapping, dst, src, extra_count); > - > + rc = folio_migrate_mapping(mapping, dst, src, 0); > if (rc != MIGRATEPAGE_SUCCESS) > return rc; > > + if (src_private) > + folio_attach_private(dst, folio_detach_private(src)); > + > if (mode != MIGRATE_SYNC_NO_COPY) > folio_migrate_copy(dst, src); > else > folio_migrate_flags(dst, src); > + > return MIGRATEPAGE_SUCCESS; > } > > @@ -689,7 +691,8 @@ int migrate_folio_extra(struct address_space *mapping, struct folio *dst, > int migrate_folio(struct address_space *mapping, struct folio *dst, > struct folio *src, enum migrate_mode mode) > { > - return migrate_folio_extra(mapping, dst, src, mode, 0); > + BUG_ON(folio_test_writeback(src)); /* Writeback must be complete */ > + return __migrate_folio(mapping, dst, src, mode, NULL); > } > EXPORT_SYMBOL(migrate_folio); > > @@ -843,20 +846,7 @@ EXPORT_SYMBOL_GPL(buffer_migrate_folio_norefs); > int filemap_migrate_folio(struct address_space *mapping, > struct folio *dst, struct folio *src, enum migrate_mode mode) > { > - int ret; > - > - ret = folio_migrate_mapping(mapping, dst, src, 0); > - if (ret != MIGRATEPAGE_SUCCESS) > - return ret; > - > - if (folio_get_private(src)) > - folio_attach_private(dst, folio_detach_private(src)); > - > - if (mode != MIGRATE_SYNC_NO_COPY) > - folio_migrate_copy(dst, src); > - else > - folio_migrate_flags(dst, src); > - return MIGRATEPAGE_SUCCESS; > + return __migrate_folio(mapping, dst, src, mode, folio_get_private(src)); > } > EXPORT_SYMBOL_GPL(filemap_migrate_folio); > > diff --git a/mm/migrate_device.c b/mm/migrate_device.c > index d49a48d87d72..bea71d69295a 100644 > --- a/mm/migrate_device.c > +++ b/mm/migrate_device.c > @@ -695,7 +695,7 @@ static void __migrate_device_pages(unsigned long *src_pfns, > struct page *page = migrate_pfn_to_page(src_pfns[i]); > struct address_space *mapping; > struct folio *newfolio, *folio; > - int r; > + int r, extra_cnt = 0; > > if (!newpage) { > src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; > @@ -757,14 +757,15 @@ static void __migrate_device_pages(unsigned long *src_pfns, > continue; > } > > + BUG_ON(folio_test_writeback(folio)); > + > if (migrate && migrate->fault_page == page) > - r = migrate_folio_extra(mapping, newfolio, folio, > - MIGRATE_SYNC_NO_COPY, 1); > - else > - r = migrate_folio(mapping, newfolio, folio, > - MIGRATE_SYNC_NO_COPY); > + extra_cnt = 1; > + r = folio_migrate_mapping(mapping, newfolio, folio, extra_cnt); > if (r != MIGRATEPAGE_SUCCESS) > src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; > + else > + folio_migrate_flags(newfolio, folio); > } > > if (notified) > -- > 2.27.0 >