From patchwork Fri Mar 21 06:20:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ye Liu X-Patchwork-Id: 14024874 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 B7179C35FF3 for ; Fri, 21 Mar 2025 06:21:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B8E14280002; Fri, 21 Mar 2025 02:21:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B3BA3280001; Fri, 21 Mar 2025 02:21:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A2D6E280002; Fri, 21 Mar 2025 02:21:07 -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 8446B280001 for ; Fri, 21 Mar 2025 02:21:07 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id AD97B1A1B4C for ; Fri, 21 Mar 2025 06:21:07 +0000 (UTC) X-FDA: 83244560574.07.986A67D Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) by imf26.hostedemail.com (Postfix) with ESMTP id 5EB2914000F for ; Fri, 21 Mar 2025 06:21:04 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ppn/qS4Y"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1742538066; 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=zJ1YRoLIf8zcf/wFjPAu7C/iYpkw+xRSPmSNbI9AVrU=; b=4hdCZDXek6V7bZfmBRW4yxsB7Iq+XEuLA1r08f44hrkgckwWrz+PTgbql/VllSBWt8FHz6 Q6kDI7+6f2KlNbxfP4L1SC7iXYsTf5p1WrMpLwOGmvrQyQeb9xxyqb7gZRCDNjM8u4R7dM snOgO/ssKwWUIb1s3XL+vc2eOP4QMJc= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b="ppn/qS4Y"; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf26.hostedemail.com: domain of ye.liu@linux.dev designates 91.218.175.172 as permitted sender) smtp.mailfrom=ye.liu@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1742538066; a=rsa-sha256; cv=none; b=Ei/O9Dp8kgE0GSO2VHDGghNjNtBIlvpYDmRVroZX0xwm+XOA0Pn8YRLvHDsDdhJu5cf6ay t/HO4K3acVA/SuoE/l8EhHHuXlXf1C+dsL2zMde789xy7+D7mq0AGMSZVGFgrRhcCxaAsB Rw4BlqVnnM66wpvZmfjVE0YWOaluKdw= 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=1742538062; 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=zJ1YRoLIf8zcf/wFjPAu7C/iYpkw+xRSPmSNbI9AVrU=; b=ppn/qS4YvC6HMSANOytO0WDCaqJ2t0l33N6ToAA8roA99vMs5rIFM7lRqHPx/AgRswBJqY RJSwZcehVE6gsXeHaHSFiksG92OR6140GtZqr28xH5S3lQVCd/YT5BbC0jxu21t45L7Ah/ w6ATagwIStlwx+KFlZoi78RWkjSjLyQ= From: Ye Liu To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ye Liu Subject: [PATCH v2] mm/page_alloc: Consolidate unlikely handling in page_expected_state Date: Fri, 21 Mar 2025 14:20:53 +0800 Message-Id: <20250321062053.607044-1-ye.liu@linux.dev> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam01 X-Stat-Signature: me6ybh3oijtj71wihfbp5899iksxbzps X-Rspam-User: X-Rspamd-Queue-Id: 5EB2914000F X-HE-Tag: 1742538064-315531 X-HE-Meta: U2FsdGVkX1+6Ow4mLEGpHuFbXknxNLpvz1sU37EnamDuQ0Eembb4pYwFYEucR22wLkIy0nGamvd84s7aRomqRnZc6o29qfIv2WUJaR41fVRc76SySXRRg5P0oY0j8SsLlcLT/2m/pua00gYXvx/fZqWsZmd/im56UH9FttH8qQcBBTvIOs8ORHV3Zltg8GUqnhudSVhwmgD4xgKfHzPvdyy88jGuodfspjpkgOLeovqeVdrBBym5fHSOCvWEpUKToTknkfAbAhvDdwlP5G+OOKOgNz9NsfUwuKg6lu+MWL8iu8gJJRgZspxE2IDU3RPcln1LMITIuwoCIMuV19q4/iiYiE6qLVw5DQbpFNYBlEgg+289/I82t9RnXm01rdcp1Vj3NQ51NnDyIGXM2hoKOA2GTXh9941J50fXln3MuTdAC52LYQUXGhZro6AvJWDItaYIOnWUFwDLGkMhHqsMTUSTRNwlCraEJBkw3Nz8ps4t01e6KBLMVDGVjih6xcY06Ns/CPiu2EAbqa9Sx90t+SKHjdZ/1cdoKJnkqFfq/Rn7yqxbwAREJIoPGYsHzE+O2fPEjbn/CqVhtOVEw2ACdIuCqQbbCzpeVPgTItPlFgw2SUhwlF1FFQJM6LnEOCt3KBrQy6esDZJLgg0hZP/zIWPorHTEZb6NjKQ8B+VVILjTy0yVrSuj8l1btNPcRn+BK/fDLR+T6w9RBKFq1njFoccgDYmD1NT//S4JVSks79IcZM6qt/3M//47EiNG2RlO2tJJCfWfSRTGT8TDO5Bgt01JfXttpu6QxcGWhl0AtpqqdsIniHNyyiwu8FX9tjH/F1QBr8w59lOvTmweoToZ9ps9UBApgOi1a1fS4CkkPsS2WpDB7GpCptNtYgE57lC/rm4Rx6a8gzAFyce+NSWFQ3s2xger8iHU9ibVCiPb/hM78c2KAxt0Ci6sbUnEkPIVKwGBQnsUNeEbytBYpxM plWkpSvk xcefHSUWESkeXoK4Z4oKmwvrPNpBRLH0QY273e3s6uG9QSgtEOnqSCcs0I6KqOSTEegHMthp2TlG/E3dI8VCZqUrFTJVqfMcJ4ANwVQMPOM+leVbJq1+yp+2ubTDNK4XdGd8DvkpOYeAEHGc7Qewvy+eAmPg7+84M6VBB64XEt6qprh6InPoX2TP0L/DleD2yPZZwyfoIg9HfRaeH8ULQPWhwiA== 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 This patch 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 --- 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; }