From nobody Sat Apr 4 06:08:30 2026 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 E48EC3ED119 for ; Fri, 20 Mar 2026 18:24:02 +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=1774031044; cv=none; b=CdYB61Pwj/mTa2aWigwa0DL7q/caRpdswLX6Kyp11ofqMPnOZGEgWeLqXmT7QynlMFmzeg2AWPwHl0fD9f/AL7tGHJ4iSii8S3XAJnGgUh2MxAEBVQTbxyh/u3kYhBb2NJRcroZQ+X8P5KixslKWRLyKoipQWcaq2SW6WX94ddw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774031044; c=relaxed/simple; bh=6NF+oa0l4g2MgiuE+KqSEE3Uu1UyWxYnQSEtv5J1WHM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=MHBGAZ3C0wP1qOzAjq7lbr36EjJyOIUxmJ3kb5BDsNCZTWMQCAo5YZypzQPVe2XIy3Le8YHhwoQWmKQb1JD+Hes6rR6+nIUjmK3+GVTYyCyEOwR1rr2xkqQuYTGh/R3Yre/GgI1E/ErpeACwT+DzoT3n8h5335Smq1tJUbfrW/s= 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=j8oRCIKq; 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="j8oRCIKq" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4839fc4cef6so33609835e9.0 for ; Fri, 20 Mar 2026 11:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774031041; x=1774635841; 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=wEQbyAdpH4wcaIvB7qivO6yBcfRik0FOdijG8dCPMoQ=; b=j8oRCIKqCPhK9m+84/+p8R0+j6f8VgQPRiW+ClDzeQpfyQPRAMdQASX3j7C4gMFuC7 wB3g4S6RiqxfBaZxDU28yt7VWbGncfki1x7rc+k1OKlICUI8htoza+MsZkjGTA4l153T 1O0wKKME7RI9yfkpQIFA/Pbdl0g6H/zcL0c3bzNnXJEnxiRA+2rx63vUWenpAhumLl2G BM3o7rNC7mZDxTClvFz5Sa5Bxjq5LRBksfzONcf0VxKJ0NUi2BU5HletiLf6ZmCVssXy jYw8kjIzzsWFXZumaqpc3eNlwbSJr3z31nlJz5caf8uUs2r44RM1z+nc+JE0YMZ7H7Gi aEVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774031041; x=1774635841; 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=wEQbyAdpH4wcaIvB7qivO6yBcfRik0FOdijG8dCPMoQ=; b=QwLzSNQ648WvjBWSlkxn0eUPa/eU4OtEDM7n0ZN4ZT3oS+M6GAjAhrn8ZkQFCU260K MPxmJbMI1ip9yvphQskcGO3L0SjGH/MRZSPjV624Ao1AwUIATDYphka3wQYlL9fW+rY2 1hApENjJ70ddES63IG/IRad+DCZqb9IrgPWYboIxGcuH1kE2HwLT2ju0i4oMBejOTgvG CNDv0VgmddFIwCb+LzIUWvqJWZNfQYObkY1xpmIRFVczetCp4oLN2CjftClz3rXp4WS7 nTbLBGE+y1Mon/4oa7mY46BnTelye5csWxLdoUE+PHH95X3CLCqUBt1J4ipOlg46bTRK 6jdQ== X-Forwarded-Encrypted: i=1; AJvYcCWUz5w6FW9k4M101rzOByregsxu1S3R4RowinoUqgjnOdyjBQ9Ta22K/eNRb+Y5Q2pcIElX7b57MDpzDXk=@vger.kernel.org X-Gm-Message-State: AOJu0Yws54REbNMm3QGiiY8MmgDQw9z23cA1zRDm8h6PVr7qwmokqZdJ 0xV5zeJcLOxJ6Bf2Ljj9Zba4souReP0Lnb1WHypq0wueJQw1u4/bmHfY7ngyNmwvw6XW5MXrn0V GwOD5nVWlxksNgQ== X-Received: from wmlu26.prod.google.com ([2002:a05:600c:211a:b0:486:f89b:7f29]) (user=jackmanb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:3e10:b0:485:3428:774c with SMTP id 5b1f17b1804b1-486fe8b0073mr69538015e9.4.1774031041300; Fri, 20 Mar 2026 11:24:01 -0700 (PDT) Date: Fri, 20 Mar 2026 18:23:39 +0000 In-Reply-To: <20260320-page_alloc-unmapped-v2-0-28bf1bd54f41@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260320-page_alloc-unmapped-v2-0-28bf1bd54f41@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260320-page_alloc-unmapped-v2-15-28bf1bd54f41@google.com> Subject: [PATCH v2 15/22] mm/page_alloc: remove ifdefs from pindex helpers From: Brendan Jackman To: Borislav Petkov , Dave Hansen , Peter Zijlstra , Andrew Morton , David Hildenbrand , Vlastimil Babka , Wei Xu , Johannes Weiner , Zi Yan , Lorenzo Stoakes 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" Content-Transfer-Encoding: quoted-printable 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 994ddcb132aed..f125eae790f73 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -696,19 +696,17 @@ static void bad_page(struct page *page, const char *r= eason) =20 static inline unsigned int order_to_pindex(int migratetype, int order) { + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { + bool movable =3D migratetype =3D=3D MIGRATE_MOVABLE; =20 -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - bool movable; - if (order > PAGE_ALLOC_COSTLY_ORDER) { - VM_BUG_ON(!is_pmd_order(order)); + if (order > PAGE_ALLOC_COSTLY_ORDER) { + VM_BUG_ON(!is_pmd_order(order)); =20 - movable =3D migratetype =3D=3D 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 =20 return (MIGRATE_PCPTYPES * order) + migratetype; } @@ -717,12 +715,12 @@ static inline int pindex_to_order(unsigned int pindex) { int order =3D pindex / MIGRATE_PCPTYPES; =20 -#ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (pindex >=3D NR_LOWORDER_PCP_LISTS) - order =3D HPAGE_PMD_ORDER; -#else - VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); -#endif + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) { + if (pindex >=3D NR_LOWORDER_PCP_LISTS) + order =3D HPAGE_PMD_ORDER; + } else { + VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); + } =20 return order; } --=20 2.51.2