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 5B3FDC4345F for ; Tue, 16 Apr 2024 12:40:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA7956B007B; Tue, 16 Apr 2024 08:40:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C0E086B0088; Tue, 16 Apr 2024 08:40:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAEBB6B007B; Tue, 16 Apr 2024 08:40:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 820FC6B007B for ; Tue, 16 Apr 2024 08:40:54 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3539D80B8E for ; Tue, 16 Apr 2024 12:40:54 +0000 (UTC) X-FDA: 82015354428.30.4CA848D Received: from szxga07-in.huawei.com (szxga07-in.huawei.com [45.249.212.35]) by imf06.hostedemail.com (Postfix) with ESMTP id E20A3180004; Tue, 16 Apr 2024 12:40:49 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713271252; 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=2J5YfBzudWwgx9KbBjK4dLuQsYVEVow8vCXssVmBc+0=; b=uaN5FX/iz0dzVHbqnVm38cqTrLQKbLQ/TJILgo3xuMli1zQ1bld+FEViYdP9jxqa7hniUv 4fJSK6NidlKWIGyPn33H/LLagVowRFJi+lVn9CR8EjSQiF4ZMkgDVkrjXPvIvv5SFKg0yE yd+22Zapif+1cp3psvAU9jrg+KHN03Q= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.35 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713271252; a=rsa-sha256; cv=none; b=ljnVxJ2f5PYNmneAEclrTJq4Iq/qIcgg6RyenMQmLNv4cef/IXiNtFuRd8tMtTh8pEWXuW nsoyTg1eQPGPslv78vy8AnYsEV3Qk5O0rYAAK51j0kI+0OasEOJCmZoQ/vTE1QxuCo816q Us/FSleBWIrUixR9ty0qWZP7G3B0cZA= 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 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-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: E20A3180004 X-Stat-Signature: 1sgthu9qujdcp634u4jbgbxspjd7y3qy X-HE-Tag: 1713271249-868527 X-HE-Meta: U2FsdGVkX1+IZJ3b9AjPLWO97YSaalMXS66ixLE6YVTebqcUrpq86O1VsKKTijVUp/im7OEPLG7W1ZokFJ7iDt9iOZTORThPf/ciZEb1VBDHo7sPkKSF2pnD0j3JTfrgi6JJsvoMI/rDWVh6HQ/M6qzs51BPUAOYgc5O9fnRMH8oAQfmeY/gZFujeek5HRz3etNmY6DWydaQp6Qz54+AolATO9+LxVzbCs7hz/t0Qpl/lI1tO/EYh4jdzfdKTpexofHlciVeZhTfvm+vpzkSPddy/Tfm17gate4aUNAf43YF2baSHGUvhcQ9w9/8gqqyW1mG+gyBsnV0Ky+3Zg3nAH0+138/SopOif69RxYEusVkycWj3OkejlmwVfho/LpNwnbx4/vL42uJSSjDUpBT1x4tbDMRwo84UHSW2CeISiRnsqfjZeYydxIGhp5Y72eVkX+TPTkkbiwOg5svd0rn3miYO2NIDy2upe9nlK/DoZZQDJB/TRc448Cn6si79xejgjRzvntv95tPBMPpsZtYsZO6HmZFBYrNZ1SibHDxkawIBAxL+q80TLOJqKJRPOw2nsvEnTvDUliaDA9kMDNYNuO8f64zLLZs7mQILn6w7g9xtpn6mocf5X17TGRKiNJiM9lyYBKWkLKt4a+JAtrV81ofxs30n5Tj2SoT05HExc1zf4zQchElTGYdBNo5NZ1zfNi/dktdOxSDJvsrSwPtl2F7lbGwUeuapNmJEuC23KhU/bLV1n/xIUVbTCx/R/PRTCCOzGSkPDd76SbQxudldXAIS0HPDg8qhQHj5PefMp6QYq3F5pXyYnlCWH1Vlz30pqj87jWofaDvMuWbjF1jmWKRPXD51AGzGb7yCV7XYE99LpOb/p9YVX83zUDeiKXopPJ9Z0KhFCGOPTSCfnA03fpNmddBFuJgTz+67DAMu7xvH3wnuFKpqS1eg8NMTMGghNShrOMSlKgB+IvqyOY krzQC+3q Fk3AwFWkd1ravXCMa2sOLs35zubp+PTYkEmS5qJrbWu51vaCnVcnBogCRehwrHtt6z/g0Ob5hhAIG7KtXU5z4MxriqWPtpD795R6pg0RzYaPe4PPse6q6+o4cUvDMfbw/V86aa4bRInzLfMALuuF3BUhv3rnt88NAPFa/1rKXKmJm5deMJ8FlGqKPNbm8285Qg2SyCJv3voBThAw= 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/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. .