From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C112C433F5 for ; Fri, 1 Apr 2022 23:08:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353345AbiDAXKD (ORCPT ); Fri, 1 Apr 2022 19:10:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235255AbiDAXKD (ORCPT ); Fri, 1 Apr 2022 19:10:03 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C144C1A7757 for ; Fri, 1 Apr 2022 16:08:12 -0700 (PDT) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 85B365C01C6; Fri, 1 Apr 2022 19:08:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Fri, 01 Apr 2022 19:08:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:date:date:from:from:in-reply-to :message-id:mime-version:reply-to:reply-to:sender:subject :subject:to:to; s=fm3; bh=n7TcKvtoCX05FSZFqOIqh4H/JQJNmNodokE+bj ntX2M=; b=VDAVqSyUvErOuKXGvLhBqj13vFM2Pu/M1VOx9zjzs/ak8FGTQAfhp3 XHIx4YEMxM5OjOhpwoWgkRIcROFUX/2JdGlAVVbgO5df2e41NkxKTJf5Dfe09ot5 0LVTmNpQUnOVZG1QU5Lg95T+7PU2GEfuf4TaR8uehV8FPLTvGQpcoYgpbtSm4IJ2 MxPjOcusxCKHstCEviiRoy/VtLEtXhu2v0FIsHq8GNNdK8mwJnJ+lCewNxfHZMUR NxQN47E0ZLekzArjh44gUEr8fKqqSX1VgYQuHjFMcU3lD+MP4ZWT0zWCA0BRaU/M AXHyaNs3aYX7IMDAFzZm2YXUJlEEshHw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:reply-to :sender:subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=n7TcKvtoCX05FSZFqOIqh4H/JQJNm NodokE+bjntX2M=; b=J3Dav6ap+XnWqah7nTw20jx+92by9t7q8rNPlP0FT3s1Y uk0UFFuQLEPxldHXdl6CMMn5b9Ivl70xM/rrPV8RcuZHuhbx5ljBN27rlddUa8R0 U/CAlDwgV10LoYT/AuA2dp3+TN4tYqkGm0C/7bqKLwKoy/OlDyCQeByoXBO83Gel nV1HXp292OM0PkC5FXPRSSAo0hYmGL5EjswNb4OGowKDCvQD082Da6x0DRJGMpN2 dWRICq249llCECQWTvdKzNDgPdhgj0zFalj1nvtXn6LxsXxcj64ZQBC/ku+6S2iN lMXJB/KV1WMKlcbHucO8VNsg1uvy+HeFMK43/iiOQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudeijedgudduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkfforhgggfestdhqredtredttdenucfhrhhomhepkghiucgjrghn uceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepteeiiedtje fghfefueekjedvueeftddvudelhfetudffiefgfeetheeghfdvgedunecuffhomhgrihhn pehkvghrnhgvlhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpeiiihdrhigrnhesshgvnhhtrdgtohhm X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 1 Apr 2022 19:08:08 -0400 (EDT) From: Zi Yan To: linux-mm@kvack.org Cc: Linus Torvalds , Steven Rostedt , David Hildenbrand , Vlastimil Babka , Mel Gorman , Mike Rapoport , Oscar Salvador , Andrew Morton , linux-kernel@vger.kernel.org, Zi Yan Subject: [PATCH v3 1/2] mm: page_alloc: simplify pageblock migratetype check in __free_one_page(). Date: Fri, 1 Apr 2022 19:08:03 -0400 Message-Id: <20220401230804.1658207-1-zi.yan@sent.com> X-Mailer: git-send-email 2.35.1 Reply-To: Zi Yan MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zi Yan Move pageblock migratetype check code in the while loop to simplify the logic. It also saves redundant buddy page checking code. Suggested-by: Vlastimil Babka Link: https://lore.kernel.org/linux-mm/27ff69f9-60c5-9e59-feb2-295250077551= @suse.cz/ Signed-off-by: Zi Yan Acked-by: Vlastimil Babka --- mm/page_alloc.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 856473e54155..2ea106146686 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1054,7 +1054,6 @@ static inline void __free_one_page(struct page *page, int migratetype, fpi_t fpi_flags) { struct capture_control *capc =3D task_capc(zone); - unsigned int max_order =3D pageblock_order; unsigned long buddy_pfn; unsigned long combined_pfn; struct page *buddy; @@ -1070,8 +1069,7 @@ static inline void __free_one_page(struct page *page, VM_BUG_ON_PAGE(pfn & ((1 << order) - 1), page); VM_BUG_ON_PAGE(bad_range(zone, page), page); =20 -continue_merging: - while (order < max_order) { + while (order < MAX_ORDER - 1) { if (compaction_capture(capc, page, order, migratetype)) { __mod_zone_freepage_state(zone, -(1 << order), migratetype); @@ -1082,6 +1080,22 @@ static inline void __free_one_page(struct page *page, =20 if (!page_is_buddy(page, buddy, order)) goto done_merging; + + if (unlikely(order >=3D pageblock_order)) { + /* + * We want to prevent merge between freepages on pageblock + * without fallbacks and normal pageblock. Without this, + * pageblock isolation could cause incorrect freepage or CMA + * accounting or HIGHATOMIC accounting. + */ + int buddy_mt =3D get_pageblock_migratetype(buddy); + + if (migratetype !=3D buddy_mt + && (!migratetype_is_mergeable(migratetype) || + !migratetype_is_mergeable(buddy_mt))) + goto done_merging; + } + /* * Our buddy is free or it is CONFIG_DEBUG_PAGEALLOC guard page, * merge with it and move up one order. @@ -1095,32 +1109,6 @@ static inline void __free_one_page(struct page *page, pfn =3D combined_pfn; order++; } - if (order < MAX_ORDER - 1) { - /* If we are here, it means order is >=3D pageblock_order. - * We want to prevent merge between freepages on pageblock - * without fallbacks and normal pageblock. Without this, - * pageblock isolation could cause incorrect freepage or CMA - * accounting or HIGHATOMIC accounting. - * - * We don't want to hit this code for the more frequent - * low-order merging. - */ - int buddy_mt; - - buddy_pfn =3D __find_buddy_pfn(pfn, order); - buddy =3D page + (buddy_pfn - pfn); - - if (!page_is_buddy(page, buddy, order)) - goto done_merging; - buddy_mt =3D get_pageblock_migratetype(buddy); - - if (migratetype !=3D buddy_mt - && (!migratetype_is_mergeable(migratetype) || - !migratetype_is_mergeable(buddy_mt))) - goto done_merging; - max_order =3D order + 1; - goto continue_merging; - } =20 done_merging: set_buddy_order(page, order); --=20 2.35.1