From patchwork Mon Jul 4 13:21:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 12905364 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 18B73C43334 for ; Mon, 4 Jul 2022 13:22:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B77836B0082; Mon, 4 Jul 2022 09:22:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B01ED6B0083; Mon, 4 Jul 2022 09:22:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A2CA6B0085; Mon, 4 Jul 2022 09:22:20 -0400 (EDT) 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 889BA6B0082 for ; Mon, 4 Jul 2022 09:22:20 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 3EB07120221 for ; Mon, 4 Jul 2022 13:22:20 +0000 (UTC) X-FDA: 79649481240.19.826E2BB Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf03.hostedemail.com (Postfix) with ESMTP id 9B1B120008 for ; Mon, 4 Jul 2022 13:22:19 +0000 (UTC) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Lc5y14zDWzhZ1R; Mon, 4 Jul 2022 21:19:53 +0800 (CST) Received: from huawei.com (10.175.124.27) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Mon, 4 Jul 2022 21:22:16 +0800 From: Miaohe Lin To: CC: , , , , , , Subject: [PATCH v3 12/16] mm/huge_memory: minor cleanup for split_huge_pages_all Date: Mon, 4 Jul 2022 21:21:57 +0800 Message-ID: <20220704132201.14611-13-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20220704132201.14611-1-linmiaohe@huawei.com> References: <20220704132201.14611-1-linmiaohe@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.124.27] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656940939; a=rsa-sha256; cv=none; b=ApoEDCv+c/QUMaRECsrcxqwMklubGXUhZJED1PTkIZqUycIQ/ZqARfrNHRsADx/e0adzYS 549UPzLW4d9UolgZyw6FaXc/DaCmJGd1KG4yr48hxImjEhJZRIa+jkXgnaQSi/PipzNIW0 9AER+YZBhbSy5PX+dvtCnKz4veJ11GU= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656940939; 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=+V6X9wcuGlNLkg/fjtYps5wW3brn/P53tXJasBIUEpI=; b=5cB6LyWonzy6DJC1Ef1CYzhrwtFLEmeZHgzDVRoPdOeOWDgCSFDrZtxEbRh8QI9Ekz4vZZ rncJA/89p2dfOGJI1nXSimFS2UI/fBxEObh+a6TyapXAyCrXBSvhtp0Su4aTK6YYcTYvec TNKwT53GoOB8CR2hXBKWGdYLsMdVVSI= Authentication-Results: imf03.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf03.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com X-Rspam-User: X-Stat-Signature: ywyuzcpmhrsbaanpn5hem81c5ppnp585 X-Rspamd-Queue-Id: 9B1B120008 X-Rspamd-Server: rspam04 X-HE-Tag: 1656940939-595762 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: There is nothing to do if a zone doesn't have any pages managed by the buddy allocator. So we should check managed_zone instead. Also if a thp is found, there's no need to traverse the subpages again. Signed-off-by: Miaohe Lin --- mm/huge_memory.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 6d95751ebfc9..77be7dec1420 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2961,9 +2961,12 @@ static void split_huge_pages_all(void) unsigned long total = 0, split = 0; pr_debug("Split all THPs\n"); - for_each_populated_zone(zone) { + for_each_zone(zone) { + if (!managed_zone(zone)) + continue; max_zone_pfn = zone_end_pfn(zone); for (pfn = zone->zone_start_pfn; pfn < max_zone_pfn; pfn++) { + int nr_pages; if (!pfn_valid(pfn)) continue; @@ -2979,8 +2982,10 @@ static void split_huge_pages_all(void) total++; lock_page(page); + nr_pages = thp_nr_pages(page); if (!split_huge_page(page)) split++; + pfn += nr_pages - 1; unlock_page(page); next: put_page(page);