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 D44A0CA5535 for ; Wed, 13 Sep 2023 09:52:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CB666B0174; Wed, 13 Sep 2023 05:52:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A2B36B0175; Wed, 13 Sep 2023 05:52:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21C666B0177; Wed, 13 Sep 2023 05:52:10 -0400 (EDT) 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 0E1326B0174 for ; Wed, 13 Sep 2023 05:52:10 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DB9EEA036F for ; Wed, 13 Sep 2023 09:52:09 +0000 (UTC) X-FDA: 81231108378.01.1F947E2 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf22.hostedemail.com (Postfix) with ESMTP id 2F932C000F for ; Wed, 13 Sep 2023 09:52:06 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694598728; a=rsa-sha256; cv=none; b=6jpZU1lHeJkYH8508/nrsbR7u6cYae0xM/AEGJWLrRDtoHtK8jZhehFORBqOTcAEIAaI+E TimpYZ0xSKhasrGV0BLG3TajUVFLqkdghfXUfG4acj03A795j1Tgm3medlb/Wtm+NW05Jg pn/Tg6qLax7ZvDTJc2UeYLWEvFkQZWk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694598728; 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=tynzkeTlgRE0TnuNJwLboivyiix4m9++Sswl3Rc9Qjw=; b=IU3Cyc0VRqoNX1jgguEy3CwVk4dVaxN3j3aQX0NyMKSBbHXmoNZRDesdjXtTAVFz8HGGr2 hlzF7EXH9rqOk7lGNb1cxzVwqRXZltmqHmGUSOch8dZJAwV3xMNeIxfy+tYIDMv5hpybqf US2ot60+FS1mNiKDzLPhXQtNEvmPFyI= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Rlwfh3mXTz1N7wJ; Wed, 13 Sep 2023 17:50:04 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 13 Sep 2023 17:52:00 +0800 From: Kefeng Wang To: Andrew Morton CC: , , , , , Zi Yan , Mike Kravetz , , Kefeng Wang Subject: [PATCH v3 5/8] mm: migrate: use __folio_test_movable() Date: Wed, 13 Sep 2023 17:51:28 +0800 Message-ID: <20230913095131.2426871-6-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230913095131.2426871-1-wangkefeng.wang@huawei.com> References: <20230913095131.2426871-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2F932C000F X-Stat-Signature: 1hk3g7tcppxqj4skxiot4g89ym1bdpfb X-HE-Tag: 1694598726-538308 X-HE-Meta: U2FsdGVkX1/Sy4K4N3EOkigpCRQ4NsFLrl1xyQdGY1hfD0KZQQLXack9qqoFQgFSow3fBEif6gWaVv2V3d/2NL68gXTBYVliYGcGDffPPTOchhrjvfZ5TC6mTkZCQUMpJHYHMjvS1v8uYflf+izTlpLgcQzbwJHLsrDnba8YjGhwDLUcLJeUjBo5Ei7vUG8QjXe6CsrYeMf2r9nrrLOh5+6yGMagvmkyefECADDPE8JCKyAtOn8Qc40FU13oKEvzdNBNhUnOop/l2AqXC63oT3wLBpAFABGmVTqRqVVCPd1vCOaSdCCoFoKJmRPJeWxui9q6nzVPCrOAz924P6SlAhiIMaWNyOYLhPRszkpgEkPByRCiyFIL8D6IqSUBiKiz7NHf8MyT+ZJqaeAvi1rpYhiZ9TsR5AcZOoDmOdMruJ7wiVjF3Sm2agGTzofw6CVNeN4voox9iWLEQiK7TMqomlQB+MxLpm6XZBi1VG8c3WmG9Xmd8nbCsLjEK8NNLKcPGzH0aehMNUPhwhdJAv9zY2240Kt0JM1S0VoQfuRn3uqsB+ixJwM8Krfm2j2PZUcuxOhO+qm439xUm0SxHiy1OuQOAFQOhM4RqWCMOczdEk+SxE+FleLFQhiQoAszIn8VhAsLlvF+bBG8P/oDBXYR07t0zRs48Jht1cYz44Gt61F7zg48DQfDSPW0fssgM4oFoe++4SyuGyAXqSEBTqO6OrzqJ+VIyLEQJ0i2Bvez2gafDt93VCjvLAhDNoL5dhX4juh5uZqUy2kpqps2CIA5IFb/G3M+J/Q0Nc40IjRlPmrdUBaM2l2kvs0RGx4q4ofwsYuqyR+Psef7kXtL5Z6H/IksXyYg2hmuVwexMzXH4GvLGZtnrRndAG1IbRExXyythw4f48dY+1nYFXhIuk4MmGfngTzsUV6kWOgjoAnctiWytdHA2eMkSc0VecTFNydQ0dI+tY8wmO7yU6sFuqo FNX4zYNS npBL530A91gw0d5JIRtc3OTIAgfQF6ExEmLz6j7HoylpGgknIejOHyAX/p2DQH2erRcSuXVe8IrovvwlJIJw4rsjBGZUi0SX2hV2zetM1sXGyYejrX0NKrSVeNFJuiMXanrNJ4ur+DpkddBeZI1zb1x/rMoTt5W84qOH67UUS8axKP+V5nBV3HNODCqn7oAQwrE/FSgOeLTQHU6IO/AIHLqGS/l+ZHE4QzRE59GVd5ZzkqjqwrClfNqGegCKMLOe4Mj34IspvHSe5qNcB8ptxmbB9CBzpS6wrPH6SZvExmfuo3eI= 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: Use __folio_test_movable(), no need to convert from folio to page again. Reviewed-by: Matthew Wilcox (Oracle) Reviewed-by: David Hildenbrand Reviewed-by: Zi Yan Signed-off-by: Kefeng Wang --- mm/migrate.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index caf60b58b44c..264923aac04e 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -157,8 +157,8 @@ void putback_movable_pages(struct list_head *l) list_del(&folio->lru); /* * We isolated non-lru movable folio so here we can use - * __PageMovable because LRU folio's mapping cannot have - * PAGE_MAPPING_MOVABLE. + * __folio_test_movable because LRU folio's mapping cannot + * have PAGE_MAPPING_MOVABLE. */ if (unlikely(__folio_test_movable(folio))) { VM_BUG_ON_FOLIO(!folio_test_isolated(folio), folio); @@ -943,7 +943,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src, enum migrate_mode mode) { int rc = -EAGAIN; - bool is_lru = !__PageMovable(&src->page); + bool is_lru = !__folio_test_movable(src); VM_BUG_ON_FOLIO(!folio_test_locked(src), src); VM_BUG_ON_FOLIO(!folio_test_locked(dst), dst); @@ -990,7 +990,7 @@ static int move_to_new_folio(struct folio *dst, struct folio *src, * src is freed; but stats require that PageAnon be left as PageAnon. */ if (rc == MIGRATEPAGE_SUCCESS) { - if (__PageMovable(&src->page)) { + if (__folio_test_movable(src)) { VM_BUG_ON_FOLIO(!folio_test_isolated(src), src); /* @@ -1082,7 +1082,7 @@ static void migrate_folio_done(struct folio *src, /* * Compaction can migrate also non-LRU pages which are * not accounted to NR_ISOLATED_*. They can be recognized - * as __PageMovable + * as __folio_test_movable */ if (likely(!__folio_test_movable(src))) mod_node_page_state(folio_pgdat(src), NR_ISOLATED_ANON + @@ -1103,7 +1103,7 @@ static int migrate_folio_unmap(new_folio_t get_new_folio, int rc = -EAGAIN; int page_was_mapped = 0; struct anon_vma *anon_vma = NULL; - bool is_lru = !__PageMovable(&src->page); + bool is_lru = !__folio_test_movable(src); bool locked = false; bool dst_locked = false; @@ -1261,7 +1261,7 @@ static int migrate_folio_move(free_folio_t put_new_folio, unsigned long private, int rc; int page_was_mapped = 0; struct anon_vma *anon_vma = NULL; - bool is_lru = !__PageMovable(&src->page); + bool is_lru = !__folio_test_movable(src); struct list_head *prev; __migrate_folio_extract(dst, &page_was_mapped, &anon_vma); -- 2.27.0