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 9E9DEC4345F for ; Wed, 17 Apr 2024 01:43:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 238696B008C; Tue, 16 Apr 2024 21:43:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 180A46B0092; Tue, 16 Apr 2024 21:43:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 047B76B008C; Tue, 16 Apr 2024 21:43:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D014D6B008C for ; Tue, 16 Apr 2024 21:43:39 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 667F51A0CB6 for ; Wed, 17 Apr 2024 01:43:39 +0000 (UTC) X-FDA: 82017326958.10.C450E55 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf10.hostedemail.com (Postfix) with ESMTP id 3E16AC0005; Wed, 17 Apr 2024 01:43:34 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf10.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713318217; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=guI+0GYVyNFGZ+QLISkuloCX/YwMQ5sSLYo/txzkc7o=; b=rgazPn2JHki5wShoeNehGhfnoQD6uG5icokB8r8B/eMPW9x92LE5DFGAWn1LN+jHPubl6G 4HxD9M1zJ8O2UuKF6OjDxyJS0xhhDfGohoSn8/7f0xF+mGWVO6bZUERE+9UsJDDxoDjk5W NKUDB6dIjciRuIiU/hrzDdGJrDqaNgQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf10.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713318217; a=rsa-sha256; cv=none; b=iO3eWGYxryMfciOT720AJq+gK82KOFsK3TS3CUUQo1LMpcBmgbp+6O2RicsGGT4nRnbrSz Ys3MNSV/2Rs9zgZ1GYTb2F3mwmv/11B++uyLt3YFUNHE8TrSz6M3IHMkM6fSz5Bm0hTVgk u3hIC59gHEvLJhLABfo7W20CamYGQWg= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VK3Wq1k6ZztX0J; Wed, 17 Apr 2024 09:40:39 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 4C1F318005D; Wed, 17 Apr 2024 09:43:31 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 17 Apr 2024 09:43:30 +0800 Message-ID: Date: Wed, 17 Apr 2024 09:43:30 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 04/11] mm: migrate: remove migrate_folio_extra() Content-Language: en-US To: Miaohe Lin CC: Tony Luck , Naoya Horiguchi , Matthew Wilcox , David Hildenbrand , Muchun Song , Benjamin LaHaise , , , , Zi Yan , Jiaqi Yan , Hugh Dickins , Andrew Morton , References: <20240321032747.87694-1-wangkefeng.wang@huawei.com> <20240321032747.87694-5-wangkefeng.wang@huawei.com> From: Kefeng Wang In-Reply-To: Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-Stat-Signature: g6qysbr85jju9xrxq3mw1af7zgshbc9w X-Rspamd-Queue-Id: 3E16AC0005 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1713318214-250920 X-HE-Meta: U2FsdGVkX19hg8yXPQEmKQvfCfxcINkYTZPfU0Q1YPW222hwBUc0+QINI3Tft4ItFfA6xMOGcnyaN6uwKw0uI7RliveYrBtmRDQE12uLYFnfMe58N9pcy9uJuadB3tymYcgY7qrYb8yn1lFf1BfW/t4PzZ33vDoatpYPlgFZYpX19vvQ+iFRySFyMlbM38UUEMwfxrmR0c09ZYJRYkxhBmeIlDmOxPTaJbRIsfLNJrmnsJWenxlwyU/grA3ubp8dblvXFVrwp6ceNbOuRuhGDYfv7LTOUY+jDCvJKEh82uf1A+FdQw+SHIPQLhTCXqrsj3GBqgewTFNTAkTBkP7Ibk3wEgXT+E1dRaJ6/wEaXUVpFdT7t5UntPHSUBaCYFf1wt5c3DPktdyZYWkFG7vSdWC1QY1qVLVtOwi3hH2nRqE3RAZe27pHmbTU3aM74N0GdrZFJ50XX5SM5iXuRMJTHeIVgVoJLbC6VcSx2LXdD2nxliYt0owRFEqtWd4gFt4ms552qLPmciqA7ekaPP+ZYE+Rq8/AU1Fps6i1OmZcrgE2Fc6WjyllhmCtQ7tXbEsMKZb6N4heuIkpyfuQnk12BvEKA58jTk0q0BEgyHUAW4W1edTZp3aPE71RejvhCi1VmRkLkyYpZ45iAVgJDWn3gNr37ULMlHOnEAERspOeOLQz6MAD6qOquz401opdguS//S2aCHuQCG4Vbnaj70VXh5lmfvMNRlZ5lo6Y2Lqi38WJ4M6KsLsabrLlMV5FBqf9T4UK3MCB0+gKuhO8M/ur5+AuUrOAhbVT0FTs0ToUggkUxjPJfmVPZp4EEjDeZWcB/KleY+Hif5JxrXkKlB62oVmCLv6ryrlb8eir6r9dJXOa9CXox0ZmzMeVoTnjMIUcraXQaUs/RoNjTIpjW29j39uglSKtz/MeHuFtZagQou65SIu+kc1NlskeKFwDPMNRtKxppOOYGvpSNkfvNQS dE7XW83V 2zTnMPft5/jQWz72ZxDBs39qk3tz6guc8tfE2fvLNhwS9zfmpHUHPnk36xA9EpykUQms1HcHbeNZFoG0hCcHFashEwYxZPnFtft4xJKLiMYeRWhxpu7qkmrCWJQ6rIu87GFrbmwEayom1ShRb8rgHLMFX/5GMEd5KzHGOpgwaihkOupgN6UIeVUhK0xBeK5Cp//Mc7h27jSAtw5H2ywATokb7zVb5YO2a/8XDejMkPgqpgcoVK26zOd7q3g== 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 2024/4/16 20:40, Miaohe Lin wrote: > On 2024/3/21 11:27, Kefeng Wang wrote: >> The migrate_folio_extra() only called in migrate.c now, convert it >> a static function and take a new src_private argument which could >> be shared by migrate_folio() and filemap_migrate_folio() to simplify >> code a bit. >> >> Signed-off-by: Kefeng Wang >> --- >> include/linux/migrate.h | 2 -- >> mm/migrate.c | 33 +++++++++++---------------------- >> 2 files changed, 11 insertions(+), 24 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 cb4cbaa42a35..c006b0b44013 100644 >> --- a/mm/migrate.c >> +++ b/mm/migrate.c >> @@ -658,18 +658,19 @@ 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, void *src_private, >> + enum migrate_mode mode) >> { >> 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) > > src_private seems unneeded. It can be replaced with folio_get_private(src)? > __migrate_folio() is used by migrate_folio() and filemap_migrate_folio(), but migrate_folio() is for LRU folio, when swapcache folio, the folio->private is handled from folio_migrate_mapping(), we should not try to call folio_detach_private/folio_attach_private(). > Thanks. > .