From patchwork Fri Aug 16 09:04:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13765784 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 965DEC531DE for ; Fri, 16 Aug 2024 09:05:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7BF0A6B0111; Fri, 16 Aug 2024 05:05:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9676B00D4; Fri, 16 Aug 2024 05:05:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FBAD6B0114; Fri, 16 Aug 2024 05:05:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 248926B00D6 for ; Fri, 16 Aug 2024 05:05:50 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id C2C1D819F2 for ; Fri, 16 Aug 2024 09:05:49 +0000 (UTC) X-FDA: 82457526018.30.D9C5971 Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf25.hostedemail.com (Postfix) with ESMTP id 5D039A0014 for ; Fri, 16 Aug 2024 09:05:46 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1723799134; a=rsa-sha256; cv=none; b=AHtzyS1rDiAYuFZv0FPn1cQ2wQ+Y7mq6A2uIM+kO4wCU9xLVlDq+/0Bk8FgEPOaTJZq0im do9R1eDwWQ3Td8Ax2mwKsKxMaGJAVr93snIobqktu/MBFc/xkPrR2CG+T7YjIb1A81YjKj h5sAKVo+5U0k9HzaIgtOs+K386GtTUs= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf25.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1723799134; 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=k4PijjS54tHclFDjnkXcHqSsxQhhlIxc0hCoJeNbyJA=; b=VDMNSzTRX/tXCJALQX0Fxvo8w7ujpLd7aJU7xgSVFC8RfgfPRjUluzWSOy4OGG+Ue73tLV WvYDKNsciYltDpQQW3qvcr+2mbkF6x3+Sa+tJJv2CM643gaDo9qlCk08Is1Oi07bDfJz+9 acgUtJalqWAwZJL/xGyVi10+gjedhCc= Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4WlbY962fPz1j6ZC; Fri, 16 Aug 2024 17:00:13 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id 29CC014010C; Fri, 16 Aug 2024 17:05:08 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 16 Aug 2024 17:05:07 +0800 From: Kefeng Wang To: Andrew Morton CC: David Hildenbrand , Oscar Salvador , Miaohe Lin , Naoya Horiguchi , , Kefeng Wang Subject: [PATCH v2 5/5] mm: memory_hotplug: unify Huge/LRU/non-LRU movable folio isolation Date: Fri, 16 Aug 2024 17:04:35 +0800 Message-ID: <20240816090435.888946-6-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240816090435.888946-1-wangkefeng.wang@huawei.com> References: <20240816090435.888946-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemf100008.china.huawei.com (7.185.36.138) X-Rspam-User: X-Rspamd-Queue-Id: 5D039A0014 X-Rspamd-Server: rspam01 X-Stat-Signature: r1pqdzotwh83w131e89xfnj4odcmd81t X-HE-Tag: 1723799146-221472 X-HE-Meta: U2FsdGVkX1/sfDdXROIce2O8/QIKr0rCACMd5Iyqh6D8+1MfvKXT5VDhi2dsAeyA5x+WfvZBQ0RzgDCBFrO6I3FFMTc4e37RAs+OlgfrpXE6hc329PPtbP0jSYFc3XLi/DfsCs5oH1z/FhqjXomcLvzOoUBv2BVH+x60mAa/IqhdVTv0X5Ducv07VHjGyKnyRDZXpkNDhJZSnafKYmTvak78dWXGbgOlHE5wSrOqauP5Q9MtEI32mY/8Wv8fw72q5TrvUvDm5uuHwhhmgXmGVpDj1VZx/yq9DT8r+LXPw5W6wduyl/sD4aNUfNUOXAzTKkZQW5DFx4gUtd+aDSAI23KOKXhK1UO8A8bM/3iH01lmB+eTh6vKjYmJtrmnShRIt4DJfV34wtxXyyLkSqUKngxhVytHoerH/aJvFdAJdeNiqpMuCPdAngbETPPoDOtaMV6MhPIULEBpBjUjb+3L9f8yUSQqh+QTMe5RjNJFyol+Z9TBj8cObKHZiDbyWXNFsGlR+8TQoykYUgyNCsKsTNMJ48FrcQalHyFUsf15N8lR2hr+m/QOSevb7N4NUfG4QNOwDWT7Flp/HQRr1XLG9nowhp241L5r4HvMlDTrRPp4D+v6OhVSOz49KTvLy9DEDRa1KFG1AASvhTT1GumXeVuZIl+bF1HrfJ71uMaFCdctuLWtTne+WHWLldc/3jiZ28IvBRApon/XVQv3pNlygiJZ2GDaJ9jbzxbu9ZsVmzcnqprs6WEHrYrObbcpT2u43kBlXPhHHwRWQtSsnBLfu8XuATHcBgVTnX7vdDRQ7qvXUONFnBMbjHwjfTYcj4XoeNws0pKUpfJD9/njSErUMhOAqj3tbmKJVVioxHSEnNzCtahjQLTxBqNodcFSVGozIOxOrDNwKvBRi6b++jDLywM73v2owaa4QNhXvU0Wb/p07mV0BcAYogKwC6UNyqauKO/CJTsJicUKvvOzsSZ a12jwUZ9 StIr4lwP0dgiUJ9AKSyB8VWPFUlHeM7JoXP5pDTn8tCaCSWQVs3z0vVqP7oW7QQoBjDx5cKnyHsOaNPDE3Ucwzw0fraJjKOM8ocTfNZj3Czw+e8f7+YGbeqDLmaWqzNBb0iMUg/YY8vnGIQOGOvh5VScYhTiBCXG3ONJfszKUIm5K5o8DOJu9pqe6hvoAACc3Kd3K3BGy8vpaT3YulcAE+2ZRGX0slNNVLA9totI1kXPiUqAEQCSsVnjb0H8u/LR2tWdL 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: List-Subscribe: List-Unsubscribe: Use the isolate_folio_to_list() to unify hugetlb/LRU/non-LRU folio isolation, which cleanup code a bit and save a few calls to compound_head(). Signed-off-by: Kefeng Wang --- mm/memory_hotplug.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 02a0d4fbc3fe..cc9c16db2f8c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -1773,14 +1773,14 @@ static int scan_movable_pages(unsigned long start, unsigned long end, static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) { unsigned long pfn; - struct page *page; LIST_HEAD(source); + struct folio *folio; static DEFINE_RATELIMIT_STATE(migrate_rs, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RATELIMIT_BURST); for (pfn = start_pfn; pfn < end_pfn; pfn++) { - struct folio *folio; - bool isolated; + struct page *page; + bool huge; if (!pfn_valid(pfn)) continue; @@ -1812,34 +1812,22 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) continue; } - if (folio_test_hugetlb(folio)) { - isolate_hugetlb(folio, &source); - continue; + huge = folio_test_hugetlb(folio); + if (!huge) { + folio = folio_get_nontail_page(page); + if (!folio) + continue; } - if (!get_page_unless_zero(page)) - continue; - /* - * We can skip free pages. And we can deal with pages on - * LRU and non-lru movable pages. - */ - if (PageLRU(page)) - isolated = isolate_lru_page(page); - else - isolated = isolate_movable_page(page, ISOLATE_UNEVICTABLE); - if (isolated) { - list_add_tail(&page->lru, &source); - if (!__PageMovable(page)) - inc_node_page_state(page, NR_ISOLATED_ANON + - page_is_file_lru(page)); - - } else { + if (!isolate_folio_to_list(folio, &source)) { if (__ratelimit(&migrate_rs)) { pr_warn("failed to isolate pfn %lx\n", pfn); dump_page(page, "isolation failed"); } } - put_page(page); + + if (!huge) + folio_put(folio); } if (!list_empty(&source)) { nodemask_t nmask = node_states[N_MEMORY]; @@ -1854,7 +1842,7 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) * We have checked that migration range is on a single zone so * we can use the nid of the first page to all the others. */ - mtc.nid = page_to_nid(list_first_entry(&source, struct page, lru)); + mtc.nid = folio_nid(list_first_entry(&source, struct folio, lru)); /* * try to allocate from a different node but reuse this node @@ -1867,11 +1855,12 @@ static void do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) ret = migrate_pages(&source, alloc_migration_target, NULL, (unsigned long)&mtc, MIGRATE_SYNC, MR_MEMORY_HOTPLUG, NULL); if (ret) { - list_for_each_entry(page, &source, lru) { + list_for_each_entry(folio, &source, lru) { if (__ratelimit(&migrate_rs)) { pr_warn("migrating pfn %lx failed ret:%d\n", - page_to_pfn(page), ret); - dump_page(page, "migration failure"); + folio_pfn(folio), ret); + dump_page(&folio->page, + "migration failure"); } } putback_movable_pages(&source);