From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (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 1D1248F72 for ; Wed, 17 Apr 2024 01:43:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713318218; cv=none; b=NJv7M5rHnw8KMYgnFbK9mUAeMARRFTToodRzOc5QoOXserWQqeOwvqNtc3GH/yCT8w9u/Ay+wjMjXQ/a4sn0vUPacqNeRKKpp451yTeWAa56fbzPMGx0Z5opu2P4kLZLV3XbHSHW/zJVukFOUbkOKZq4thLTDMIKLp5nx1HD81g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713318218; c=relaxed/simple; bh=vNXh/Zh2ebR722szamtesw22IvqQWNGPakqRHCTqd14=; h=Message-ID:Date:MIME-Version:Subject:To:CC:References:From: In-Reply-To:Content-Type; b=UrTNGMUIxGPa4BwGL+OUbcRxebbGBOsgFAAWlgY6l6dxo0WpMwzi4BxtztwHKw4UG0gJg56gz/leeVuJ/tDagrPF+zuf2OkB7KWD9Xy4KtbaYws4D3yhbS9EPUJAjLtuopazfr8bMlxhEWEI4GX5hkgwf8MVNBrvVi+slw+HQy4= 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.187 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.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 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) 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. > .