From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCCBB3E9F7E for ; Wed, 25 Feb 2026 16:34:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772037297; cv=none; b=bsx5xHDgLnaSJzuRcv7O83Vfq+b5mf1cZ0Z6dCUmvfJVHvhJjWnH+/lC/B86cSr9bdfacsIXSmz3MhUzw9MdT8UMzdpCGzJNtj5gr5taFb/Nl7Sep/UIVuqDYlxEXkmFcx6g6O58Ai4GcBjyneTmz3y1cSPYpQBuMg8ON93+3HA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772037297; c=relaxed/simple; bh=QfeM2Fx20dPWAR+hUL3K/g2orRDrg/7RaYflxFLbAvE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qAw+b2P9J1YfzEp32/XJ5SAVDL8W9gRBJoGZ+smjSIOjiC+f2DQvdda4lgYfWo0cuhTvtW/jR67A6/RrKyAZcvXESLi9YGxaAfBP02ByEEoK6SYExrHvyo3LB3lrmaPhvYh89yaGLp+ApmcTLvZ3fQGzQgSa/WfHFjcJ53eBNT8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CLjaJWNQ; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--jackmanb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CLjaJWNQ" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4836bf1a920so72599025e9.3 for ; Wed, 25 Feb 2026 08:34:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1772037294; x=1772642094; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=3TMbZ0g7Oj0OTJpFiuJio0PTSnHyS2DbyRdcs0PvRcU=; b=CLjaJWNQtHRk6kdgrpVU98JAxpywubv46CRem69OegiaTn5FKmNTHDTGIDOK7Fcq6+ eeeSp/aujKkFLItVLeUl4PkZZz5YlT2Z+oAoOBxIKd19MA5/01VwvBFu5/dgZI0cAk7j a9kafBVNhDgYt1CwDtcrSz9dJYnYGK4dwGH2XB+GETZlDTRfCloKcfCMK5GVDPIBEuLf RDhvk56hLuEcy+An8WJSEPY1kiRipsQC1W8/LneOle7Pry4ysudAvEDFgpqtwqjQ/iIx oZc5qPfrVgHvhp3E8wpOe1mVceWc3kVbGSH7a6x+dgUZfLOiwDGiFyZWqNlzHr/8kXEI p7Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772037294; x=1772642094; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3TMbZ0g7Oj0OTJpFiuJio0PTSnHyS2DbyRdcs0PvRcU=; b=lJYraVCIeXMMSqtaU4hcx/afHCc7FwEAsCFmmW+LDffNDYFkcm8BJv80eLom85qvq/ pRVYRLXfSSth4PAAfX69UXCw+KqQtEIaj7U1DddjTHAI0LNDU3kukPfrQ3N+AA0dy75T he6+ETWEZ8+hVvpQZAkm5cmWJXINbURkptCUatApSerLS0fbs1NkTgj0/esix9cKfzW0 qAkIdm9hN/K0zXFwFMuw8EokAqd0bFwAo97cyZdOdm4x7hoW629j9QBCwQHkqfPlgDG+ +H7DVxVOpkx75oXIhB8YJ/DSBAFetUNMLCL8o3CBu7k2/sSCEv0tIpzPUBUQaoWAThTt N9ZQ== X-Forwarded-Encrypted: i=1; AJvYcCXzj3ON3/Z9HgF6qLeH0uxdI72x1yPvrk9/LIxNv8cJ5obQLYtlf7LpLbHzUnE8mjmg7PGdFMB1V7gBtm8=@vger.kernel.org X-Gm-Message-State: AOJu0YwvtvOKIHa8Sx/wuuk9Udb77NJ0y/JrL6Yr2LfA0aj9hz+dAqF1 zSrJlok8Yh8opl2+jbniVt4aLYWVLri3x9Q7ERNSgr131Qld4ElkIvdHgq05Nvpx0P30G/pzahP WpH7n5toCd2JHfg== X-Received: from wmbjj16.prod.google.com ([2002:a05:600c:6a10:b0:483:702a:341c]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d12:b0:483:5310:dc67 with SMTP id 5b1f17b1804b1-483c219b626mr16094975e9.20.1772037294131; Wed, 25 Feb 2026 08:34:54 -0800 (PST) Date: Wed, 25 Feb 2026 16:34:38 +0000 In-Reply-To: <20260225-page_alloc-unmapped-v1-0-e8808a03cd66@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260225-page_alloc-unmapped-v1-0-e8808a03cd66@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260225-page_alloc-unmapped-v1-13-e8808a03cd66@google.com> Subject: [PATCH RFC 13/19] mm/page_alloc: remove ifdefs from pindex helpers From: Brendan Jackman To: Borislav Petkov , Dave Hansen , Peter Zijlstra , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , Vlastimil Babka , Wei Xu , Johannes Weiner , Zi Yan Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, rppt@kernel.org, Sumit Garg , derkling@google.com, reijiw@google.com, Will Deacon , rientjes@google.com, "Kalyazin, Nikita" , patrick.roy@linux.dev, "Itazuri, Takahiro" , Andy Lutomirski , David Kaplan , Thomas Gleixner , Brendan Jackman , Yosry Ahmed Content-Type: text/plain; charset="utf-8" The ifdefs are not technically needed here, everything used here is always defined. They aren't doing much harm right now but a following patch will complicate these functions. Switching to IS_ENABLED() makes the code a bit less tiresome to read. Signed-off-by: Brendan Jackman --- mm/page_alloc.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index b79f81b64d9d7..fa12fff2182c7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -731,19 +731,17 @@ static void bad_page(struct page *page, const char *reason) static inline unsigned int order_to_pindex(int migratetype, int order) { + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { + bool movable = migratetype == MIGRATE_MOVABLE; -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - bool movable; - if (order > PAGE_ALLOC_COSTLY_ORDER) { - VM_BUG_ON(order != HPAGE_PMD_ORDER); + if (order > PAGE_ALLOC_COSTLY_ORDER) { + VM_BUG_ON(order != HPAGE_PMD_ORDER); - movable = migratetype == MIGRATE_MOVABLE; - - return NR_LOWORDER_PCP_LISTS + movable; + return NR_LOWORDER_PCP_LISTS + movable; + } + } else { + VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); } -#else - VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); -#endif return (MIGRATE_PCPTYPES * order) + migratetype; } @@ -752,12 +750,12 @@ static inline int pindex_to_order(unsigned int pindex) { int order = pindex / MIGRATE_PCPTYPES; -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (pindex >= NR_LOWORDER_PCP_LISTS) - order = HPAGE_PMD_ORDER; -#else - VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); -#endif + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { + if (pindex >= NR_LOWORDER_PCP_LISTS) + order = HPAGE_PMD_ORDER; + } else { + VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); + } return order; } -- 2.51.2