From patchwork Tue Feb 14 13:59:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13140177 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 5EED8C6379F for ; Tue, 14 Feb 2023 13:59:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2F286B0073; Tue, 14 Feb 2023 08:59:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F056A6B0075; Tue, 14 Feb 2023 08:59:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D7EBA6B007D; Tue, 14 Feb 2023 08:59:49 -0500 (EST) 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 BCAEA6B0073 for ; Tue, 14 Feb 2023 08:59:49 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 9C20D160858 for ; Tue, 14 Feb 2023 13:59:49 +0000 (UTC) X-FDA: 80466055698.07.F589CAA Received: from out30-101.freemail.mail.aliyun.com (out30-101.freemail.mail.aliyun.com [115.124.30.101]) by imf16.hostedemail.com (Postfix) with ESMTP id 6CB1018000F for ; Tue, 14 Feb 2023 13:59:46 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 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=1676383188; 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=f5+plW8QmHBpok1iycf64Rs+0aWZUBtZGTMoNSmdslE=; b=putjE/yjKi8Gh2FjdC5qJmWNVmoX53MgVn98NWnWoeiWd+KjLmPeM92OzHd+KzLsjOJ2J+ 4g5WIj7bI8wXEQZBGUOlyatO6LBgxYYPWgbi3LgPCdf33jb/7YcjGxLLsAgJ027lS5T5W3 p2RAUfE0m17LgQNtsCddKGWgf2ZOnKE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.101 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=1676383188; a=rsa-sha256; cv=none; b=hFBCjR5Sa/bFUUmc95pVydw6lcpbRhu+kaXKEYHzZgJkYBw4QnKHsB955YaDYXdYDmBION bswGq6UW73P0fHiQWodGnfUMc+Xtajt008PYZoQ//svPds6TUMLj3kG/3c7Zhgv55XHMla 58LIcNlUNBnTp8d8LeOuHYUD6YRxk2Y= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R191e4;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_---0VbgLy-t_1676383181; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VbgLy-t_1676383181) by smtp.aliyun-inc.com; Tue, 14 Feb 2023 21:59:41 +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 2/4] mm: change to return bool for isolate_lru_page() Date: Tue, 14 Feb 2023 21:59:30 +0800 Message-Id: <3635a17b9a0cf4be011a886415bf620b1c682ff6.1676382188.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-Stat-Signature: buqqizz7uh7mwfy6jdhuzwxqm6c75drk X-Rspam-User: X-Rspamd-Queue-Id: 6CB1018000F X-Rspamd-Server: rspam06 X-HE-Tag: 1676383186-575988 X-HE-Meta: U2FsdGVkX1+7WGDfn6POgIDQxCGGnR2dbViYKqIjhayb2EdQiNKX6LnMRiUpal8ouF1751NzhER2yv1ld3kBLQ+sajLRHoYGLpxvfAO2kyQzGrnN+l099dJH5m1Im5wzE/TdvTzHhXEaFHWVWWezMLFlyYqDxvB2yVQrl/qr674ctJPbEJqqtc84f8mxTb6JVfQZbZUiV7hQQnb54WZ+CZp/xhEp/l3KO5g8qju/qPfSomvq+iy+8hrGwxuzg+SKLLic7T9bCUC2FkAqV8M7rUznQnkR5EZ/p+2PM96qfHAnNyFHsPFUynRQq57PrX842w+Uygk+vNC9VGzhIR/U2lYm/ZLkTF4BMxTiQeXKBzol318vd08qNzjlLWXPfpGe0zTRmXJLZanj8xbZ/RBb/9lII3HYlUSPjadEk7sXsNadAAMAS4nljYIrf0tKqYIkoilBlvioCjgtItPHSfTRInXn79g2VjypNZwtP7PeWInA1RqIi7rc6gEbP2/yVCedS6R4mZWxZ9N0IqFBt1p2mnXeYnqBql2Pi/vhO//hw+vam8g5luuuEZlt9JFDXj04R5INxBJIMLsBsdHyiJ1dzjFc+t3Vzcpqwa8lV8zmhJ6ze/18IqusB04HsziCdwG833xLVf5aKazZOeHignmwXYXwt49Rk/1zoOHXlTBvg//4ndA8QPTuygXxUGq6dS98i4slcKFtunL1emDR8+/SKCM3qF81qBgOBf+ivJQ8h7kN8ukFkD0G8mph/6Rzs5LOBJ5WjPipi6hkK9+feNU/yZCLsMgMImByN5VT/oahBkACy95RZQcU1Uqneru67NpoFM1hbrXvwU//xn7E4AfiBzQXmuUE6b4evAyH+aqI0zQ2Cv8CVQU2x41sxgUjQO4kG/c73fuT4nbVBPndTp2Jkt8uzslvFnLrWihRUW5JkLSjDnV4TYbgrF6btSec8IMX5fgyHzJ0tE0dCdXdp8V BTKPProw Xc++lyRQYnyv4JLYfqgLhxxDVIFTwniUwnV8hXxqq7qPgJTxu6PSIuTDwtwvCdJd/rPtJa2hlMmZQKgaGJon9gPucuWuIlF7le7sslvn1HOBBrNfAXKehzpQzYyeacvBBioPmN2qH+hDzT/WZqFQAvUVux/7tEgXoZpsz 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: The isolate_lru_page() can only return 0 or -EBUSY, and most users did not care about the negative error of isolate_lru_page(), except one user in add_page_for_migration(). So we can convert the isolate_lru_page() to return a boolean value, which can help to make the code more clear when checking the return value of isolate_lru_page(). Also convert all users' logic of checking the isolation state. No functional changes intended. Signed-off-by: Baolin Wang --- mm/folio-compat.c | 12 +++--------- mm/internal.h | 2 +- mm/khugepaged.c | 2 +- mm/memcontrol.c | 4 ++-- mm/memory-failure.c | 4 ++-- mm/memory_hotplug.c | 2 +- mm/migrate.c | 9 ++++++--- mm/migrate_device.c | 2 +- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/mm/folio-compat.c b/mm/folio-compat.c index 540373cf904e..cabcd1de9ecb 100644 --- a/mm/folio-compat.c +++ b/mm/folio-compat.c @@ -113,17 +113,11 @@ struct page *grab_cache_page_write_begin(struct address_space *mapping, } EXPORT_SYMBOL(grab_cache_page_write_begin); -int isolate_lru_page(struct page *page) +bool isolate_lru_page(struct page *page) { - bool ret; - if (WARN_RATELIMIT(PageTail(page), "trying to isolate tail page")) - return -EBUSY; - ret = folio_isolate_lru((struct folio *)page); - if (ret) - return 0; - - return -EBUSY; + return false; + return folio_isolate_lru((struct folio *)page); } void putback_lru_page(struct page *page) diff --git a/mm/internal.h b/mm/internal.h index 8645e8496537..fc01fd092ea5 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -187,7 +187,7 @@ pgprot_t __init early_memremap_pgprot_adjust(resource_size_t phys_addr, /* * in mm/vmscan.c: */ -int isolate_lru_page(struct page *page); +bool isolate_lru_page(struct page *page); bool folio_isolate_lru(struct folio *folio); void putback_lru_page(struct page *page); void folio_putback_lru(struct folio *folio); diff --git a/mm/khugepaged.c b/mm/khugepaged.c index cee659cfa3c1..8dbc39896811 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -659,7 +659,7 @@ static int __collapse_huge_page_isolate(struct vm_area_struct *vma, * Isolate the page to avoid collapsing an hugepage * currently in use by the VM. */ - if (isolate_lru_page(page)) { + if (!isolate_lru_page(page)) { unlock_page(page); result = SCAN_DEL_PAGE_LRU; goto out; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 17335459d8dc..e8fd42be5fab 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -6176,7 +6176,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, target_type = get_mctgt_type_thp(vma, addr, *pmd, &target); if (target_type == MC_TARGET_PAGE) { page = target.page; - if (!isolate_lru_page(page)) { + if (isolate_lru_page(page)) { if (!mem_cgroup_move_account(page, true, mc.from, mc.to)) { mc.precharge -= HPAGE_PMD_NR; @@ -6226,7 +6226,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, */ if (PageTransCompound(page)) goto put; - if (!device && isolate_lru_page(page)) + if (!device && !isolate_lru_page(page)) goto put; if (!mem_cgroup_move_account(page, false, mc.from, mc.to)) { diff --git a/mm/memory-failure.c b/mm/memory-failure.c index db85c2d37f70..e504362fdb23 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -846,7 +846,7 @@ static const char * const action_page_types[] = { */ static int delete_from_lru_cache(struct page *p) { - if (!isolate_lru_page(p)) { + if (isolate_lru_page(p)) { /* * Clear sensible page flags, so that the buddy system won't * complain when the page is unpoison-and-freed. @@ -2513,7 +2513,7 @@ static bool isolate_page(struct page *page, struct list_head *pagelist) bool lru = !__PageMovable(page); if (lru) - isolated = !isolate_lru_page(page); + isolated = isolate_lru_page(page); else isolated = !isolate_movable_page(page, ISOLATE_UNEVICTABLE); diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index a1e8c3e9ab08..17ed80707518 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1668,7 +1668,7 @@ 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 */ diff --git a/mm/migrate.c b/mm/migrate.c index ef68a1aff35c..53010a142e7f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2132,11 +2132,14 @@ static int add_page_for_migration(struct mm_struct *mm, unsigned long addr, } } else { struct page *head; + bool isolated; head = compound_head(page); - err = isolate_lru_page(head); - if (err) + isolated = isolate_lru_page(head); + if (!isolated) { + err = -EBUSY; goto out_putpage; + } err = 1; list_add_tail(&head->lru, pagelist); @@ -2541,7 +2544,7 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) return 0; } - if (isolate_lru_page(page)) + if (!isolate_lru_page(page)) return 0; mod_node_page_state(page_pgdat(page), NR_ISOLATED_ANON + page_is_file_lru(page), diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 6c3740318a98..d30c9de60b0d 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -388,7 +388,7 @@ static unsigned long migrate_device_unmap(unsigned long *src_pfns, allow_drain = false; } - if (isolate_lru_page(page)) { + if (!isolate_lru_page(page)) { src_pfns[i] &= ~MIGRATE_PFN_MIGRATE; restore++; continue;