Received-SPF: pass (google.com: domain of linux-kernel+bounces-134231-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Content-Type: text/plain;
	charset=us-ascii
Precedence: bulk
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\))
Subject: Re: [PATCH 2/2] mm/hugetlb: pass correct order_per_bit to
 cma_declare_contiguous_nid
From: Muchun Song <muchun.song@linux.dev>
In-Reply-To: <20240404162515.527802-2-fvdl@google.com>
Date: Sun, 7 Apr 2024 16:02:35 +0800
Cc: Linux-MM <linux-mm@kvack.org>,
 Andrew Morton <akpm@linux-foundation.org>,
 linux-kernel@vger.kernel.org,
 Roman Gushchin <roman.gushchin@linux.dev>
Content-Transfer-Encoding: quoted-printable
Message-Id: <5037C21B-92A9-4125-B644-02CC6EBD7B08@linux.dev>
References: <20240404162515.527802-1-fvdl@google.com>
 <20240404162515.527802-2-fvdl@google.com>
To: Frank van der Linden <fvdl@google.com>


> On Apr 5, 2024, at 00:25, Frank van der Linden <fvdl@google.com> =
wrote:
>=20
> The hugetlb_cma code passes 0 in the order_per_bit argument to
> cma_declare_contiguous_nid (the alignment, computed using the
> page order, is correctly passed in).
>=20
> This causes a bit in the cma allocation bitmap to always represent
> a 4k page, making the bitmaps potentially very large, and slower.
>=20
> So, correctly pass in the order instead.
>=20
> Signed-off-by: Frank van der Linden <fvdl@google.com>
> Cc: Roman Gushchin <roman.gushchin@linux.dev>
> Fixes: cf11e85fc08c ("mm: hugetlb: optionally allocate gigantic =
hugepages using cma")
> ---
> mm/hugetlb.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 23ef240ba48a..6dc62d8b2a3a 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -7873,9 +7873,9 @@ void __init hugetlb_cma_reserve(int order)
> 		* huge page demotion.
> 		*/
> 		res =3D cma_declare_contiguous_nid(0, size, 0,
> - 						PAGE_SIZE << =
HUGETLB_PAGE_ORDER,
> - 						0, false, name,
> - 						&hugetlb_cma[nid], nid);
> +						PAGE_SIZE << =
HUGETLB_PAGE_ORDER,
> +						HUGETLB_PAGE_ORDER, =
false, name,

IIUC, we could make the optimization further to change order_per_bit to
'MAX_PAGE_ORDER + 1' since only gigantic hugetlb pages could allocated =
from
the CMA pool meaning any gigantic page is greater than or equal to the
size of two to the power of 'MAX_PAGE_ORDER + 1'.

Thanks.

> +						&hugetlb_cma[nid], nid);
> 		if (res) {
> 			pr_warn("hugetlb_cma: reservation failed: err =
%d, node %d",
> 				res, nid);
> --=20
> 2.44.0.478.gd926399ef9-goog
>=20