From patchwork Wed Mar 26 01:17:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14029667 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 CCF79C36005 for ; Wed, 26 Mar 2025 01:18:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 77DCA28004E; Tue, 25 Mar 2025 21:18:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7073C280048; Tue, 25 Mar 2025 21:18:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A81928004E; Tue, 25 Mar 2025 21:18:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3983F280048 for ; Tue, 25 Mar 2025 21:18:28 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 554B91214AB for ; Wed, 26 Mar 2025 01:18:29 +0000 (UTC) X-FDA: 83261941938.12.A5420EE Received: from out-189.mta1.migadu.com (out-189.mta1.migadu.com [95.215.58.189]) by imf12.hostedemail.com (Postfix) with ESMTP id 9B96540004 for ; Wed, 26 Mar 2025 01:18:27 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=L1t8UzKi; spf=pass (imf12.hostedemail.com: domain of ye.liu@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=ye.liu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742951907; 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:references:dkim-signature; bh=AXpKOR2GMxCoVvpFxRv1qPlHNVEaxgMDCeiLw9aKmNw=; b=BtH/OpigugwuqHS7GttKD7WyGn4VhsJUHmPkJnDMfSGmA/oJXgL2CEh6EsxIjB9XfRqB8A T4xmI88p3He+UI5nLV8W3wjiNjz+TMbOZGftjls4/o9glOFcr81V29kVX8l/qpnaGsGh8n /7iP1qvKBGej0ORewttg5Gfy21hQZ7A= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=L1t8UzKi; spf=pass (imf12.hostedemail.com: domain of ye.liu@linux.dev designates 95.215.58.189 as permitted sender) smtp.mailfrom=ye.liu@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742951907; a=rsa-sha256; cv=none; b=RODbR1W5jTl/Bef//k1h+/XN42zAGUNn4Odsa6l+rIdBHdysLqWWXAHJtJpXA5CACIMuuq yO2k5qzYPQ1ne2/DjVlTbo8gBdGCU/mZpn6ZwBY/jz1pDbbH6MOnTCFshl9wl5mfT7+ewC 941vZcf5Ns+ddEuq9vCdmDWbTz1T33Q= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1742951905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=AXpKOR2GMxCoVvpFxRv1qPlHNVEaxgMDCeiLw9aKmNw=; b=L1t8UzKiFURd0xqLT3QXXuGuqIW0pYLoPfoPUoCTF7pjeBI6FV2Zvjfot9sLBQDZapeNHq CZEUDxZyhC52alJ7j5ogV51f722vhuD3PzfsUjx7k9M1QWdrvNcEQAriiCCLu/SYeH+LsX +tejpPVrXQCLQfRuOnUXsjnt1gw4gbg= From: Ye Liu To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, sidhartha.kumar@oracle.com, anshuman.khandual@arm.com, Markus.Elfring@web.de, Ye Liu Subject: [PATCH v3] mm/page_alloc: Consolidate unlikely handling in page_expected_state Date: Wed, 26 Mar 2025 09:17:52 +0800 Message-Id: <20250326011752.917564-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9B96540004 X-Stat-Signature: p54uwdp49q6h1rc56ggmnoqqk4tfn6x5 X-HE-Tag: 1742951907-324124 X-HE-Meta: U2FsdGVkX19WKJrav9SlnUZ6ZDOkq0yK59yHtFyqzTzbl8ClZsviOaAKrCimMHD0Fib7D1GNO9ZHGgLDqGLLHkx6kxj1+ANookVcRomwAoY319WYptJwOgVp92nuMUXFiipOv6lAUDOIEngVG4CY0E+EzZ01W6LvjoAHVbHRlQQSh8xIzZhUf9YtwvwQkr8x3LJcpUmwe0ewJmiW/8UIOOS9v+OY8824P93MWPtLisVb1ce3yJpE7/i7B6zHStp+ZuW8QkvuLSKI2RZfVpEzmLR5+FJA0GVX6QrHXWxuSYlMNtfwNc1NIVH+TifUPag40lNR+heNqE5k/qiPq7nf378Xzznt6ELfvdJ6fiFiumHEULLzroRsTy0AYu3349rzA4f2X2DSPWNDtcrOjrRqNgT+uxFCbjhqcSJWLUmN9g0Zcg9y7mkpBvVE3jl2+gGmyyZpZ72Zgibj6wUTSaUumjlACRtogos0OuU7U/ubsAJQR5p+XyYQxZnm5VSmYh/+wPE5ouuZBgOyT/Y7lXhlX4fikiIhvAIpTh+ywRk3UN9dzUEKxPsMpqNdnzoL+Mx35VtBE4q2rLtlS9agfLCxKK3ANhOBj1OlpiQc0B3SpNccabPiuypjbd3AM6/U0HLJCuI1bend16tgGmYV2hriq1EOuAFdEgaKhzpnZQWaDxbkDm90h+SF3HWRSv8a3byDWpkE2V3NGyTQYx/rFjHuhDwFN2+S22H/fP6X6sJD1ru7Lk2xqMldHBTb+xcIO5Ebt/9gi43W0m+GaT+M2M9Q63I4QN0c67adcYLLgStEy9X7OHbPlmZXrU84tVp3LN8d2kJmgSeqQOznKNKdAcST3SRk5gNJJwWZaOU2C5CYFUablOur+JjnISqrzNABjn1KB7Wwf0LCj0grN7xc3jEH6fo839hywkefLkH/8A+63drchsiQHK/DWZl0e2ABy+w34ZcqjBiUiRiVzE8jBEM 4bJLLQEP L8m6IDhy8yHcyYdJzLc+FGCIUU4Sh7ZvKkRWYhK0D8HThnnw8hoiIFeYPOi7WQpOE9c3Lqy6eZ34SuDFFeqdP5dTuKRH42lQrXpa1vtSlQODxUwyk+Pz4BQK3WzYBxl0Ye6ivzeXXmnNBEk9/wTGHTmdH3WlueF9MRFzeBb18AOn8jkHl7nA33NU+IRx7Ab9MQ4uhUoxcsOrhvl7g30uqM6TKl9QegHRxi+IUv66cSItJK7VQf/LDTKlgs6unoMLCKC5SoRLcj+70V41JJgZSFYmlrCQPLnBWw2zNeVWfu8W5Qb0= 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: From: Ye Liu Consolidates the handling of unlikely conditions in the page_expected_state function, reducing code duplication and improving readability. Previously, the check_new_page_bad function contained logic to handle __PG_HWPOISON flags, which was called from check_new_page. This patch moves the handling of __PG_HWPOISON flags into the page_expected_state function and removes the check_new_page_bad function. The check_new_page function now directly calls bad_page if the page has unexpected flags. This change simplifies the code by reducing the number of functions and centralizing the unlikely condition handling in one place. Signed-off-by: Ye Liu Reviewed-by: Sidhartha Kumar Reviewed-by: Anshuman Khandual --- V3: Delete 'This patch'. V2: return true instead of false in the PageHWPoison branch. --- --- mm/page_alloc.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 2842da893eea..e8b95c6a96c2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -903,6 +903,12 @@ static inline bool page_expected_state(struct page *page, (page->flags & check_flags))) return false; + if (unlikely(PageHWPoison(page))) { + /* Don't complain about hwpoisoned pages */ + if (PageBuddy(page)) + __ClearPageBuddy(page); + } + return true; } @@ -1586,29 +1592,15 @@ static __always_inline void page_del_and_expand(struct zone *zone, account_freepages(zone, -nr_pages, migratetype); } -static void check_new_page_bad(struct page *page) -{ - if (unlikely(PageHWPoison(page))) { - /* Don't complain about hwpoisoned pages */ - if (PageBuddy(page)) - __ClearPageBuddy(page); - return; - } - - bad_page(page, - page_bad_reason(page, PAGE_FLAGS_CHECK_AT_PREP)); -} - /* * This page is about to be returned from the page allocator */ static bool check_new_page(struct page *page) { - if (likely(page_expected_state(page, - PAGE_FLAGS_CHECK_AT_PREP|__PG_HWPOISON))) + if (likely(page_expected_state(page, PAGE_FLAGS_CHECK_AT_PREP))) return false; - check_new_page_bad(page); + bad_page(page, page_bad_reason(page, PAGE_FLAGS_CHECK_AT_PREP)); return true; }