From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2D755FEE3 for ; Tue, 16 Apr 2024 12:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.35 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713271251; cv=none; b=Rr4tOSJGGEFUvgbL0H+M91t4znzJM5qWgeZ6QWN3F5ihYWqubGUysR+OfRwQN80dDLO0ryETBoAZqO2+jN4zo/eGQBfVF0rELHfDRinnJJWC0ixiA1HqxjS0wbqg3yMglZmlbf1pGCGw322NjA+hp3aw1Z+vvO0osQozhZZLu38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713271251; c=relaxed/simple; bh=M12afI+rEqE8m0KTtYDTfgLdCMGFyyIZ/ElMSXQoXCs=; h=Subject:To:CC:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=VLShK8/iZGoxiV2Ue48AaWc7v96v2TPRc437qHrv7Yjojb0s1pXPNR5bkIWundGsGrKP3/jsA6LRNtSiate56SbQTBjmATF5QwOEOCc670qy5Ea/AVp1+Mj85uMT7kJ9wsmIhBf4ucDkxjkVnOP8xiJrJzD27pplB8aSl/uw7iA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.35 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.112]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4VJk8X2NZjz1RD8t; Tue, 16 Apr 2024 20:37:48 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id E8D19140120; Tue, 16 Apr 2024 20:40:45 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Tue, 16 Apr 2024 20:40:45 +0800 Subject: Re: [PATCH v1 04/11] mm: migrate: remove migrate_folio_extra() To: Kefeng Wang 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: Miaohe Lin Message-ID: Date: Tue, 16 Apr 2024 20:40:44 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In-Reply-To: <20240321032747.87694-5-wangkefeng.wang@huawei.com> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) 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)? Thanks. .