From patchwork Tue Feb 14 13:59:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13140179 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 C5A0CC64ED6 for ; Tue, 14 Feb 2023 13:59:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14C7B6B007B; Tue, 14 Feb 2023 08:59:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D5976B007D; Tue, 14 Feb 2023 08:59:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE0A46B007E; Tue, 14 Feb 2023 08:59:54 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id DBB5F6B007B for ; Tue, 14 Feb 2023 08:59:54 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 532D040DFB for ; Tue, 14 Feb 2023 13:59:54 +0000 (UTC) X-FDA: 80466055908.23.B3684A8 Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf14.hostedemail.com (Postfix) with ESMTP id 9928A100015 for ; Tue, 14 Feb 2023 13:59:51 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676383192; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ERYW5/aezTXNO1pqffZ8S7kC9G8bfbzOznEWZRFlSUI=; b=xlx/K5d69CSLX04LLos7GVfe12xUExYqStuCnmQCzVFXQwy6TFSqE7u1e6qAl1YlwEtNVc f4DZ/JSQCUS/cuGKzeLFaffK6UI4WI41r0LDE3M5VOYL/T/UaZs0PSJ+2d0uM0LaqmCDVP wcAzLFjPO6TPwm0MEkqfNG/q70RWAy8= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676383192; a=rsa-sha256; cv=none; b=w4q8jMSXJdgnpi8X8ChWUUq9cBSeeADIAhZZMi8jNkdH00BcQ6mamLppItveCrB+VYCXca m1P3VMU2KlHDVjRnwdscciM/zUfF9UZ2Kl97071/NNUOdkv8Odxty5av3LBxNPeaAWz7v8 qJq23qul9weASktunH0c4JBCey6H3gQ= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046056;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=19;SR=0;TI=SMTPD_---0VbgTJ1R_1676383183; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VbgTJ1R_1676383183) by smtp.aliyun-inc.com; Tue, 14 Feb 2023 21:59:44 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: torvalds@linux-foundation.org, sj@kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, naoya.horiguchi@nec.com, linmiaohe@huawei.com, david@redhat.com, osalvador@suse.de, mike.kravetz@oracle.com, willy@infradead.org, baolin.wang@linux.alibaba.com, damon@lists.linux.dev, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] mm: change to return bool for isolate_movable_page() Date: Tue, 14 Feb 2023 21:59:32 +0800 Message-Id: <57406039579e764fb6002648699d4896da56ba4a.1676382188.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 9928A100015 X-Stat-Signature: fwnpsktxaxht9pa1giymztehs6wro7oj X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1676383191-340149 X-HE-Meta: U2FsdGVkX19yBYSl+cXiIjlGMw+Y374abkZKqICRUxY8LZs/7JyOBCKLcxUJ7nCkpkKRP923HIOe0Thf1wJ3UDSGc5x+oi4lXghB62J8uJTiFgtiDvpynUbnNUxVjs2RkEaj49G66pLvP+k0dJvj3XZ6t90nfNAxj6Kgl/0kCSU5kq1g7P9lo+5Z2GVbpxtzznHATgiOfB91FYfzBGEVp+OxH52ZDgptJiVQjEQO1aUkTgPFhHw1FSt51NHihY30owEa+/7JQ17NPQWxt5DFaGN3WVgHv3l7XH0ES0ePJ2UkQqu3Ja+X/8os5erNwaTJtkQDlaoRau3IJRzslwUzGxRagvMEb744K4cDHjWFIi1Mt8irL6PZdsZ6AGc3pQ3heRrfPibu2dGGgq/UPxsOwIaoNlFlA7T/xvcszbrFuVFrxUE+Dc2oZ+YNhV8Fl+2JupQEYY+9taZbU3heU4+MZz4c536165fNrgE4jd9kpbepdBRE3Fhz6BKc79qMLKMFFu0ZRZH0vJQgUtlNHse1P+UpujuoFZx7TVYGs4eACt1rUCEUKqa2khcnhjj1Aku1gbFZLF1A7yAqaX/ly4sz1o+DAX1v6SUdErBhDXi9immCLZSRUa7w2r7hfFPShdeOlpQ59JXYnbOxdz6eVJaqJ0nq3h/z7+GTvzGKg2tjQ65p8pJhou1fHodxF4KiqscJaulh16XA/E3CvwhdnXVpmcjvDqtRrv1/GY2fCWHUwIQsN7kGY1JVK15L56HqBrvlHp1VAPyzC34e8Q0jnAGb0hVk3/V61iw3hQnXpRLGyOCV3U87rg6chCExr10Ls3GmDoIybHsHy6cR2xfNDRDW2WHO14cXJ7UOIEMfqp1vmuqi9nEyvudB78ydv2EgSO4BXn+azdOGJcBn8SWsZaXJ/C4XQhoZPKQozcRydAuA5IVfwRCfD3oV9TiZNt+KoRRQJndxX1PHX8Gp4c8GhUs rpJFcPfI 4AgSHpe2iYrrHCTCyzMlV088IdQBfOOpzyVAHhQf/ZxeMoRxzTqbyVlYcmultjzz0TsrApa2gS/BBOILH/BdK7CWynU1UMAvnS4kOzUsAS1UBqNjYIaPV/CClyQf7lU4NrpaFA0/MeHntmSX7Wtf82rJf53eUegfN/HNq 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: Now the isolate_movable_page() can only return 0 or -EBUSY, and no users will care about the negative return value, thus we can convert the isolate_movable_page() to return a boolean value to make the code more clear when checking the movable page isolation state. No functional changes intended. Signed-off-by: Baolin Wang --- include/linux/migrate.h | 6 +++--- mm/compaction.c | 2 +- mm/memory-failure.c | 4 ++-- mm/memory_hotplug.c | 4 ++-- mm/migrate.c | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/migrate.h b/include/linux/migrate.h index c88b96b48be7..6b252f519c86 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -71,7 +71,7 @@ extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free, unsigned long private, enum migrate_mode mode, int reason, unsigned int *ret_succeeded); extern struct page *alloc_migration_target(struct page *page, unsigned long private); -extern int isolate_movable_page(struct page *page, isolate_mode_t mode); +extern bool isolate_movable_page(struct page *page, isolate_mode_t mode); int migrate_huge_page_move_mapping(struct address_space *mapping, struct folio *dst, struct folio *src); @@ -92,8 +92,8 @@ static inline int migrate_pages(struct list_head *l, new_page_t new, static inline struct page *alloc_migration_target(struct page *page, unsigned long private) { return NULL; } -static inline int isolate_movable_page(struct page *page, isolate_mode_t mode) - { return -EBUSY; } +static inline bool isolate_movable_page(struct page *page, isolate_mode_t mode) + { return false; } static inline int migrate_huge_page_move_mapping(struct address_space *mapping, struct folio *dst, struct folio *src) diff --git a/mm/compaction.c b/mm/compaction.c index d73578af44cc..ad7409f70519 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -976,7 +976,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, locked = NULL; } - if (!isolate_movable_page(page, mode)) + if (isolate_movable_page(page, mode)) goto isolate_success; } diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 8604753bc644..a1ede7bdce95 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -2515,8 +2515,8 @@ static bool isolate_page(struct page *page, struct list_head *pagelist) if (lru) isolated = isolate_lru_page(page); else - isolated = !isolate_movable_page(page, - ISOLATE_UNEVICTABLE); + isolated = isolate_movable_page(page, + ISOLATE_UNEVICTABLE); if (isolated) { list_add(&page->lru, pagelist); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 17ed80707518..e54c4aa69636 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1668,10 +1668,10 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) * LRU and non-lru movable pages. */ if (PageLRU(page)) - ret = !isolate_lru_page(page); + ret = isolate_lru_page(page); else ret = isolate_movable_page(page, ISOLATE_UNEVICTABLE); - if (!ret) { /* Success */ + if (ret) { /* Success */ list_add_tail(&page->lru, &source); if (!__PageMovable(page)) inc_node_page_state(page, NR_ISOLATED_ANON + diff --git a/mm/migrate.c b/mm/migrate.c index c5136fa48638..b7982aa745b0 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -58,7 +58,7 @@ #include "internal.h" -int isolate_movable_page(struct page *page, isolate_mode_t mode) +bool isolate_movable_page(struct page *page, isolate_mode_t mode) { struct folio *folio = folio_get_nontail_page(page); const struct movable_operations *mops; @@ -119,14 +119,14 @@ int isolate_movable_page(struct page *page, isolate_mode_t mode) folio_set_isolated(folio); folio_unlock(folio); - return 0; + return true; out_no_isolated: folio_unlock(folio); out_putfolio: folio_put(folio); out: - return -EBUSY; + return false; } static void putback_movable_folio(struct folio *folio)