From patchwork Wed Feb 15 10:39:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13141509 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 A60FEC636CC for ; Wed, 15 Feb 2023 10:39:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F3C26B0075; Wed, 15 Feb 2023 05:39:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3534B6B0078; Wed, 15 Feb 2023 05:39:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 10B3F6B007B; Wed, 15 Feb 2023 05:39:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D738E6B0078 for ; Wed, 15 Feb 2023 05:39:55 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B381CABA2C for ; Wed, 15 Feb 2023 10:39:55 +0000 (UTC) X-FDA: 80469180750.03.69AFA8A Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf13.hostedemail.com (Postfix) with ESMTP id 86F5920018 for ; Wed, 15 Feb 2023 10:39:53 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1676457594; 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=UuEkfgU855C/DdRqzQTEbnvtZlNjZawljegauwTd+7Y=; b=uJM74AxIWGmIy5YJD2DfVR9wo1MvpbLWSs5nzrQFQE6N9gptfDFuGFXDF9zDsd9QruwMZq LUpr2sZwjyUjQPaDe53vk/1N5cogRWVNReqTXQL+IayDo98PNbLVW8Im7GcMB+6zK8lf8c 0U9+sGO7YB0CJXIsFNKIqAcogi4kt30= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=none; spf=pass (imf13.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1676457594; a=rsa-sha256; cv=none; b=fafOLW+zSax1B/lvsctZg/Rh+6DMocFm2KwBd++YcWT/D28hJ+OQt6/ttfMFLbd41uNX1s swWxz6s6R6yQGsLp0v2ECmX2CtiZkzubABciy5GXKfNH+kboHjyNLvfbwhtkypaVrRS0Ax WzPvdSmxeShCk7WjQwPdVh5Wqmh97kg= 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_---0VbkAEsj_1676457586; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0VbkAEsj_1676457586) by smtp.aliyun-inc.com; Wed, 15 Feb 2023 18:39:47 +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 2/4] mm: change to return bool for isolate_lru_page() Date: Wed, 15 Feb 2023 18:39:35 +0800 Message-Id: <3074c1ab628d9dbf139b33f248a8bc253a3f95f0.1676424378.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: essj774pewwab7bu8w9buf3s1dhs59pe X-Rspam-User: X-Rspamd-Queue-Id: 86F5920018 X-Rspamd-Server: rspam06 X-HE-Tag: 1676457593-565008 X-HE-Meta: U2FsdGVkX18+d7aVoj+k6MDrvbtGNH29Xvj8YxFw71DU8TUQZJ1qAVCgTALxp8e1fvpJsQXvNed3dMi97SKiWlpdXSUiBT66oTKdwmIkgkVI3Oiz3T30Loe1Iy+YE+/c8SU9GG6WEPnrOT9B+Tl2MjMtwjk4R2Hql6oc+fGsW7OcCHxSptMmG5DzPM1waCRZc12GZu/sOwaZ1ixewTXbuG2C94c3JYuehyyf7XFYD0E+eWSvqbwFBqPqKGNvMeAmXxaqAfxO3UAsRb6jROowG0hkBOSpoqS8u+66rx3RvCWqL/HP9Jo7z0RhPOhB5kZhmHU0vpK2STPBO7kTsjs+uCOgAHfXAtWP2WYkUkWY+8Rwc/DS0OOs6z0irqYo+tzgYUxMaGO/+XvopZNPC82YDm5ZuB/D2Pe7atQHZ1NWPQUT6Cx/nRTOTTYBOpAY8Y3RuqpguQ5Izyuy0f03nir36GaaTQ8QXduiOYlNYm/yaUTYkhClUNbBWQHSJmD8ZKnc3HnYyPzbTN0kwUaZywvnZKZFnhMV0R16Le/FbTDLi+QLXZ/+rGtftAdRD6VVCZBY29BH2O0MvMQeKn3g+rBZ911kDKim/AsXSIyYGvkRpLo+LQ1Oi5JhKa2itVrlAY1z53pZ3EAKlsgOVZvu+Wzaq4/zZO6D/tngA80GIee5HpmFJoV2trPgdkGIz7zP2uzGrm+5dtgmmd1NW8D8o1YdN1cTddR4BDZGmOki4PnnxI/Hu6Tm16IKy1lp3Svx9n9pQOM6v5Hm+5A3hGysnx+2IpbdfVNSHudOwi0eczJp3bAgrnYdQ7ScgArZhXJvnZapk0tLOOQNmzRpTI+eHa3OzRhGILIcM11+mbe+VdMx4Uu17edNY//ro+jKogRkdTGz01kzKhpCrKhXysHqaNm+STner+A5ZjpqYsGRhCNwhmgPsesz+1ldxW/Rtn+w7AMLwCElVjO6QJpbR1gGv5k kZlRH3Vr zRoXHyclyPRBCH8nlB6ZzuxnzTSZPR9WwQaD17rgGnLckBlRvhTixfjZZ3DswHfLic/aV6d2WNoi6bgZYwaCihk82uxk1YzZp/1lY8Kz/CHwVlpgpcLfoR3WZc6aT7J2ZbRFig5Ul/tSqMkqGOazNlbUFHH4WMZDvgjsi1yNLVUSmaTsJDt1dqAArG111X+e+CMnh3R+XmnT6LNKej/oo9tKLXxy3PUoD+OBU7LGq0kYNdUKHscadpbn2jzOn0xSvcrZ1uQ78WMr6Kh98jA/mbAnOPw== 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 Acked-by: David Hildenbrand Reviewed-by: Matthew Wilcox (Oracle) --- 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 | 8 +++++--- mm/migrate.c | 9 ++++++--- mm/migrate_device.c | 2 +- 8 files changed, 21 insertions(+), 22 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..5fc2dcf4e3ab 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1632,6 +1632,7 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) for (pfn = start_pfn; pfn < end_pfn; pfn++) { struct folio *folio; + bool isolated; if (!pfn_valid(pfn)) continue; @@ -1667,9 +1668,10 @@ 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)) - ret = isolate_lru_page(page); - else + if (PageLRU(page)) { + isolated = isolate_lru_page(page); + ret = isolated ? 0 : -EBUSY; + } else ret = isolate_movable_page(page, ISOLATE_UNEVICTABLE); if (!ret) { /* Success */ list_add_tail(&page->lru, &source); 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;