From nobody Fri Dec 19 18:41:49 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A5AF32D0E2 for ; Mon, 15 Dec 2025 21:17:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765833441; cv=none; b=K68W2+sqsHNn7xYRscRoXitYuIGrXDFaOPQ2CtxzqmaMgqgDntT4DNQsMGWHTtTtYWCmU5LgZAnaYLoDFoZtwauqSzNyjPaoXHzJUWizE1nAB+c6VyVBzW7KaPAu8xBrsBUyk/kDuxqybOjmygEP8q1IEltu/UsIIflIDHm0vGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765833441; c=relaxed/simple; bh=MOt1kL5ZYAINY4icXUjj5fWioUf9EaivjOrLZ5C/Zlw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tSW+ifBwqhT8MCZ/JC/GHLLRrkzxGMadl55kO28gqfVk7yZCaSQPkXKw1vIWzyOUHALGlTVpP41EyLpQwuyZZ3Jq1qTPCmBM+QQnoylYhDKyYEjwlZXzcKRfLdzkB4seETve+IuSapUBDxwDEoUCfOwGntUMIoRVqIx3Wi6U68w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=g6MfL0Ke; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="g6MfL0Ke" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765833438; 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: in-reply-to:in-reply-to:references:references; bh=/P6T6Sq8RPkTGNp6xWLfjTt61PWY4uHSCHmLz/Yexss=; b=g6MfL0KeBsa4174cdm4LoUQYdz+tmyZzfO+LRg/y7722mgHAyLg90i6RozATP3tO38HtPQ ipe8Jri4nu9WAX8ue9EUiXMo2N5EB3gB/lDCej1eNMQJaBo7hF6sipd1dQTSoAKPfUipwt KtY00v7ln6HvtcYS53JnBXD1L3QMuEQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-367-7CB2-qNcP6KvMrnotPf8uw-1; Mon, 15 Dec 2025 16:17:14 -0500 X-MC-Unique: 7CB2-qNcP6KvMrnotPf8uw-1 X-Mimecast-MFC-AGG-ID: 7CB2-qNcP6KvMrnotPf8uw_1765833433 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C4EE11800621; Mon, 15 Dec 2025 21:17:12 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.80.180]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B12F51956056; Mon, 15 Dec 2025 21:17:11 +0000 (UTC) From: Luiz Capitulino To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, david@kernel.org Cc: ryan.roberts@arm.com, akpm@linux-foundation.org, lorenzo.stoakes@oracle.com Subject: [PATCH 05/11] drivers: nvdimm: use pgtable_has_pmd_leaves() Date: Mon, 15 Dec 2025 16:16:47 -0500 Message-ID: <25350b6525e887f1938f54cad30df96be7364a2c.1765833318.git.luizcap@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" nd_pfn_supported_alignments() and nd_pfn_default_alignment() use has_transparent_hugepage() to check if PMD-sized pages are supported, use pgtable_has_pmd_leaves() instead. Since both functions want to use PMD-sized pages with THP, also check if THP is built-in with IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE). Signed-off-by: Luiz Capitulino --- drivers/nvdimm/pfn_devs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index 42b172fc5576..7ee8ec50e72d 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -94,7 +94,8 @@ static unsigned long *nd_pfn_supported_alignments(unsigne= d long *alignments) =20 alignments[0] =3D PAGE_SIZE; =20 - if (has_transparent_hugepage()) { + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && + pgtable_has_pmd_leaves()) { alignments[1] =3D HPAGE_PMD_SIZE; if (has_transparent_pud_hugepage()) alignments[2] =3D HPAGE_PUD_SIZE; @@ -109,7 +110,8 @@ static unsigned long *nd_pfn_supported_alignments(unsig= ned long *alignments) static unsigned long nd_pfn_default_alignment(void) { =20 - if (has_transparent_hugepage()) + if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE) && + pgtable_has_pmd_leaves()) return HPAGE_PMD_SIZE; return PAGE_SIZE; } --=20 2.52.0