From patchwork Wed Feb 15 10:39:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13141508 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 468EEC64EC7 for ; Wed, 15 Feb 2023 10:39:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D66EC6B0074; Wed, 15 Feb 2023 05:39:55 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA16D6B0075; Wed, 15 Feb 2023 05:39:55 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B6A4B6B0078; Wed, 15 Feb 2023 05:39:55 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A9EB26B0074 for ; Wed, 15 Feb 2023 05:39:55 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3B105161542 for ; Wed, 15 Feb 2023 10:39:55 +0000 (UTC) X-FDA: 80469180750.30.A1AB2DB Received: from out30-97.freemail.mail.aliyun.com (out30-97.freemail.mail.aliyun.com [115.124.30.97]) by imf07.hostedemail.com (Postfix) with ESMTP id 21FF640016 for ; Wed, 15 Feb 2023 10:39:52 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676457593; 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=cbCpmN2xrHB4nAObSAv4jFzFkivK7xSMH0baaVaShvo=; b=7pOWUbVOsSY3jqeNFmmmCapd18F+6BkrTYAfNh7hbrPSvOZhJflr2sge2Q15/rIsrVrLZH ZVEuTyAeRAmh/3/adO3bUPcm5p2GcLKh1A/lVzdR0G3ZYY0lKx4BeXSxs4lpJl0m4BPghL zP13ZMc68LbMOyffxWpCzKw/+TL8E1A= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.97 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676457593; a=rsa-sha256; cv=none; b=ppTgmfWs3sXf5gQUutdEdiffGdoMdY0peQMCmWO1DituHiHXXRYsgi9QzFMfuV3FMZ2KoG ARAlshGjHGsmeQrSepBac1plwY5y5pwOK0fn+1hUHACSiuPfdwSffhLuW5h3/RQV8vUwWN uvHF2nkdOdUp9MoCSvQEOW28XVCiYuo= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R541e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=19;SR=0;TI=SMTPD_---0VbkDfWy_1676457588; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VbkDfWy_1676457588) by smtp.aliyun-inc.com; Wed, 15 Feb 2023 18:39:49 +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 v3 4/4] mm: change to return bool for isolate_movable_page() Date: Wed, 15 Feb 2023 18:39:37 +0800 Message-Id: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: 5rxyqi1s9k4qjq6datcyquca5zjf1rs6 X-Rspam-User: X-Rspamd-Queue-Id: 21FF640016 X-Rspamd-Server: rspam06 X-HE-Tag: 1676457592-397670 X-HE-Meta: U2FsdGVkX18QLmkH5iF+GDW743+oyP+mSvxG+bxIc/NFdv0Q8VipmcEq5vVVqDCN8azOhHlbbLARI0K+O03o6v7R2t4Lw3X7Ebahyycj0jdh9ivGkHh8gmid0yyuemg2FGrRUa5hyPLZ2A5L4OBK2e+4MkTqxtGoyygzOg/GTHipJxtUundn9MKzTRasVlOwD3lI4DUJHSi5UsuE0Q3jzcSS1vBCIsqiGFYEfSlWU0CUyh9WnBg4X+fmrMcUBoErZjei0OLO91zOfQj7/ViLOhTF2crFaHzvuDAmXiSP+vF0ELkW1iQlkKwnHtTWUdfJWQDMUnYzFYsKU4q+YMWVN955VIExyaqN9KdT5rg40Shie6Kdl4hZwxSVJuINSC2xLDx9ChI4rmnxABmPm8p0w8B1CXaYSd8+hOZfRoCbkSkuLCdC9DDrwG6ZDzNgEVylT5n0Gmbz9MS2AJgbqPfn4YOqI6vJQvftQGTM7AaS1j4OzudmdUeYsNZub54bMu3vn/ck61h4WVJhtlaYygrA5m7UiChAf49a826y0xwwCyaE/3U8b98SCxuCq1F1pCuoq37wvilwsbmkZKnFGYEElU2sTjUuQ237M+HxrHw/pYxZf8A1c1/ZJahnYerLxQm8r/hCuCbJySKnmFwkxfHk2mQNulLTUv/qeOmVij/gUMzkof0rwJfRyKRXEfJFZrveANvPJf5or0eG229OuOoExn4tYwl1yunBNBapcEuR6IRXbDD8TaoA/VU8uNUSuWvMHIih17UPSiFEpkb55NmOy+aSUC5aLssFhgcxNuOzAuCtlHEWF78g3nTxeVx1zdlSvBaFD0GiWyvTyf7R7AGApir9klf795li4aIWfk9uHcfrm39e0qGGJ0LxAw3UnF3+RYeZy7lBat6iB+0jHmsC4vLmE1HqtWWuGJY76szz88k57p+zuCWEioK0QahcGh/eB+t5tq2s5pk+yv/zReZ mFmRu6Zb /YhQzBLNCW8fEpdcxreqVE7EGH6MFUrS2Rwop2HPOERYSbfR0sZ21jNGtihytLcR/JEf5ttfd4Gks04JQlBih14QQxNCSmdvy/G3o4FpPCu7YExLdGLunAZiVwYUL+lfGiDOa6lFFKrgmXnc9u3QqdH0u5WnfAc94yBQeZm0757IaKKkrEJ/cFyRutKwh9cnwQRLF 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 Acked-by: David Hildenbrand Reviewed-by: Matthew Wilcox (Oracle) --- include/linux/migrate.h | 6 +++--- mm/compaction.c | 2 +- mm/memory-failure.c | 4 ++-- mm/memory_hotplug.c | 10 +++++----- mm/migrate.c | 6 +++--- 5 files changed, 14 insertions(+), 14 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 5fc2dcf4e3ab..bcb0dc41c2f2 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1668,18 +1668,18 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) * We can skip free pages. And we can deal with pages on * LRU and non-lru movable pages. */ - if (PageLRU(page)) { + if (PageLRU(page)) isolated = isolate_lru_page(page); - ret = isolated ? 0 : -EBUSY; - } else - ret = isolate_movable_page(page, ISOLATE_UNEVICTABLE); - if (!ret) { /* Success */ + else + isolated = isolate_movable_page(page, ISOLATE_UNEVICTABLE); + if (isolated) { /* Success */ list_add_tail(&page->lru, &source); if (!__PageMovable(page)) inc_node_page_state(page, NR_ISOLATED_ANON + page_is_file_lru(page)); } else { + ret = -EBUSY; if (__ratelimit(&migrate_rs)) { pr_warn("failed to isolate pfn %lx\n", pfn); dump_page(page, "isolation failed"); diff --git a/mm/migrate.c b/mm/migrate.c index 2db546a0618c..9a101c7bb8ff 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)