Received-SPF: pass (google.com: domain of linux-kernel+bounces-59050-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <75803311-29fc-42ab-9c39-0b18cf875347@oracle.com>
Date: Thu, 8 Feb 2024 22:41:23 -0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] mm/hugetlb: Move page order check inside
 hugetlb_cma_reserve()
Content-Language: en-US
To: Anshuman Khandual <anshuman.khandual@arm.com>, linux-mm@kvack.org
Cc: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Nicholas Piggin <npiggin@gmail.com>,
        linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org,
        linux-kernel@vger.kernel.org
References: <20240209054221.1403364-1-anshuman.khandual@arm.com>
From: Jane Chu <jane.chu@oracle.com>
In-Reply-To: <20240209054221.1403364-1-anshuman.khandual@arm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?utf-8?B?bERBRjhaWGgzbEFVSVhBTHdTSFlaYjFMREZMN0k3dTRQREczMjhDU29YUnov?=
 =?utf-8?B?ZWpNSkxNc21tVGJvT1RsdVVSd0ovMjZZdWZCSjhGd3JmZlhKdUxhLzByK3FH?=
 =?utf-8?B?MmhWUzB6K0hZSUdHeTRUcXFlc0l0TnVMMkpaZFlIRHBqTmhRbm1hcW83aFFW?=
 =?utf-8?B?WWVoUHJ3MVFram9UREhxUXhoeVlNdzlsbGR3akpvRlNCeVdmcWM3MFJOakhw?=
 =?utf-8?B?ZWt3TGF1Q1RYaUp5dkNlS1VPSitLeDJBcytlSkpwclBCMmgzbkpiZE5VM28x?=
 =?utf-8?B?TjNyalpDNUVkbC9YOEp4Z2pKbGFqdHZ4RisybGh0RXF3TnlCWEFvbkJOVVBU?=
 =?utf-8?B?c2hQcDl0M2lRTkNjbFptRFpoN2RSMXVjVXFFMTkxZzFiemtlZGN6ZTdPUzhq?=
 =?utf-8?B?QlF6SXZoMkxrS1RhTDE5cERINnFBRFZxZG8xUjdYK1BJZ3A1cXRpNmpZdEl1?=
 =?utf-8?B?dEFkRTRLUFppUE9BVjZtNGlUZ3JWaXNiblJ6QksrV2k3SkwwUUlYM05MUDNz?=
 =?utf-8?B?NTI5SzJaTXFMbGw2UGh4NmE5bTVRUEh6ZmNFMTVFRk92ZnZLZDZIMm12V09o?=
 =?utf-8?B?SGFFWHlGT21YWjZITkdsWXVGWm8wLzliYm41cUpTMmRDMHdyWHdSaEkzbTJy?=
 =?utf-8?B?WUdJbUF1SnpJQ0VENzRwZFJ3SGh1NjlsbkpmaVhHYU5ScVliekNvWm9xQzFv?=
 =?utf-8?B?U2NCMDV2L0pVYXN3UGVrU0MyOENRRWxQcHNhV0dibm5CSnVLT2dUckh3Vnl6?=
 =?utf-8?B?VlZoSWFiSm82ZVRVaVNHZjN6bHVmMkp0cWlpbUhodllqTURwUklCamNrcVVK?=
 =?utf-8?B?SlBHaVVLbUY2VHpiTmVhd3RKajFxc1VBdzV6VXRSMkduRzJOMm9saXdJcURl?=
 =?utf-8?B?YVE2UjUyalhTNHJ1MDRCeDZZTWJYL0lJc2FFWjMxYVBBWlZLTEUxYVhjM3lv?=
 =?utf-8?B?T3kwUm9rWHQ5akZ4YitsbTBnekRUcDJ2WVZPSUsveExPZFR4ZDNUenArSzhS?=
 =?utf-8?B?c2o2dTVSd0p5UXEwaE1qUVJ5cDVuR01mSUZRQUt5ZG50dGhUcnFnV3VyYzBK?=
 =?utf-8?B?K0VmOElrUldZOEtTZzNJYVlvTXU5K3EvMkRheVI1NmRIMUR1VkxJVTNkdCtM?=
 =?utf-8?B?Mno3NmtZdVFkWlV4a2haK3FrbmVLNEdWK0VrUUhYQkhHcklOa293MGVNWFZZ?=
 =?utf-8?B?ZTZFZnlVVmwyQTdsZWZnV3VqV3VGemFFUFo2WkYrY01QaVZoUGRBblhITUpL?=
 =?utf-8?B?OENFUFMyVnhxTVFhYytuWUl5eEd4RWlXUWhJRFg5TnRENER0bWFTcHBHSzJG?=
 =?utf-8?B?eG5uV3ZzN1Q2ZlVhK1hJdkxDejdpUlZ2RkV2cjNSNnRiMFVRbUI1VDFCT0VK?=
 =?utf-8?B?VmN0bHdqNndvM0haT2FSaTVmMm5nTVFNZGRUY3UrZFU3aTdsMnpXd3hxUGRy?=
 =?utf-8?B?TnlIL0xoWTRxSkFGM0dESkJpRUtoTkg0dHhiMlhTVTk3WDlheVlibFg0TGl3?=
 =?utf-8?B?R2ptZHh0azVwRmRMM2pBSHd3eWJHSFVqN1dSN0dKWEUrekZtQVdPZXlxd2lI?=
 =?utf-8?B?b1VIa3pMSXJqMk5OZW1LaGh0a0dzUjdrL2VRRUdDcm1GVVkzeTFEWUF6QmRz?=
 =?utf-8?B?cGFEc3ZxUEI2M29xajVMNHBJcVF6VW5rdUgzUmVTU0pjelEyRXB4VWhrcW9k?=
 =?utf-8?B?QU1jbTBqTVlUS1ppQ0pIcWJ2S2Y4ekZXMmZuM3dOUU1TcXUwbkF3U2Q0WnZv?=
 =?utf-8?B?NVlTOGh4V1F2bEFBcGpsSjdGTVpCR3pwY24xQjZTWlVoV2V4dnR6bENvV0R5?=
 =?utf-8?B?alhZMWpFRURsbGx1TlAzcnBMbkJ2b3A5cDh1Q3FxaXgyZXl6L3lkNEluN1dF?=
 =?utf-8?B?dy9YQ0N0RUJDeGtEa3luanVOWDF6NzFOTmxsVXcvMm4zNDE3TUphclV5WDJm?=
 =?utf-8?B?U2V6KzAycXl6S1ZZN2dmZk9mS0tRakdyRWIyZm1tZ21pVGc4YkhaRUtnTFFL?=
 =?utf-8?B?TlE4VHFrb3A4dTBhdWhSbEJud0F6L2JmVnhDQ2FiSm14WHBQQnQwdXNHb0Fv?=
 =?utf-8?B?SDZxYTZJaXdtWnNIUDNkNXNnKzhQNlpsRDkxOS8rV3NCaHdvZUxub0NGNFBE?=
 =?utf-8?Q?3DO/cljtPO9mpzzSa0tOxfZro?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	2p8gB8VFNMY94u1vVu0m0sgVvct0ybNBom5jqgk9gN/wZ95b3EmFb4Pxn0Xb8CM6jD/vvrNHCA2KlW1RCmIWt7qa+utWdBef5w88HW9HcjF0IskPT6rkq/u54epQP9ZYR4paf0p5a2+m55nXH5qVj0qYAbFYtsOzDXmn2w0DFVIRPCB8xFYSlTiVGhZtP5rdCSxJhrK1W6/ZjkspoWIMSyq06aELGSz2kO+p9hLhHvLho8v2ysBnYp9iAd7jpFmD4pmcJsm9AxSzDFpYlTwPLgFfB/mvZy4iGFs78Jcaj1zWxYvC9N9kFQVEASOsha/iddsfXmk0fdfASOH9tfNlrIosw5YsQF/jmoqkSEg6PWHBFZw06hz9O8+AjZT4uGXfe/Y1iweo706UcTdobjfSZHRnuja2XgqaEsQ65dgQfWLg1ziYLYcXuXqguFMXwCCR6rWvTig/cVjhFHgEeuLYCS3M1h25To5yYFEg7YK4LwNb06DlrhRfYSLkmRC1n8Rd4J0ZjmICArKt9wbTsZz9dRyo0dWnVPzWlV4jA+uG0wD25/lGLGoGqknocYjgDsF8k4wi94WchNAkTxgAL2bncEfNjXhK0Pf7VykF1DslZSI=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f76c8ca8-f50b-49f6-7543-08dc293a24ef
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR10MB4429.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Feb 2024 06:41:28.6198
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: aBmzcVYYzm4FsJkoWaCGc776tV9AtSJ01/kazn9xBn7bKyVzgr1yZeBlmzeN1NREgxgAf65LuiAELTuBXR3JSA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4207
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-02-09_04,2024-02-08_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0
 mlxlogscore=999 phishscore=0 spamscore=0 mlxscore=0 adultscore=0
 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2311290000 definitions=main-2402090047
X-Proofpoint-GUID: DDglHVInCtT8l6KGbMnxd5GL-L408zmD
X-Proofpoint-ORIG-GUID: DDglHVInCtT8l6KGbMnxd5GL-L408zmD

On 2/8/2024 9:42 PM, Anshuman Khandual wrote:

> All platforms could benefit from page order check against MAX_PAGE_ORDER
> before allocating a CMA area for gigantic hugetlb pages. Let's move this
> check from individual platforms to generic hugetlb.
>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Michael Ellerman <mpe@ellerman.id.au>
> Cc: Nicholas Piggin <npiggin@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux-mm@kvack.org
> Cc: linux-kernel@vger.kernel.org
> Signed-off-by: Anshuman Khandual <anshuman.khandual@arm.com>
> ---
> This applies on v6.8-rc3
>   
>   arch/arm64/mm/hugetlbpage.c   | 7 -------
>   arch/powerpc/mm/hugetlbpage.c | 4 +---
>   mm/hugetlb.c                  | 7 +++++++
>   3 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
> index 8116ac599f80..6720ec8d50e7 100644
> --- a/arch/arm64/mm/hugetlbpage.c
> +++ b/arch/arm64/mm/hugetlbpage.c
> @@ -45,13 +45,6 @@ void __init arm64_hugetlb_cma_reserve(void)
>   	else
>   		order = CONT_PMD_SHIFT - PAGE_SHIFT;
>   
> -	/*
> -	 * HugeTLB CMA reservation is required for gigantic
> -	 * huge pages which could not be allocated via the
> -	 * page allocator. Just warn if there is any change
> -	 * breaking this assumption.
> -	 */
> -	WARN_ON(order <= MAX_PAGE_ORDER);
>   	hugetlb_cma_reserve(order);
>   }
>   #endif /* CONFIG_CMA */
> diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
> index 0a540b37aab6..16557d008eef 100644
> --- a/arch/powerpc/mm/hugetlbpage.c
> +++ b/arch/powerpc/mm/hugetlbpage.c
> @@ -614,8 +614,6 @@ void __init gigantic_hugetlb_cma_reserve(void)
>   		 */
>   		order = mmu_psize_to_shift(MMU_PAGE_16G) - PAGE_SHIFT;
>   
> -	if (order) {
> -		VM_WARN_ON(order <= MAX_PAGE_ORDER);
> +	if (order)
>   		hugetlb_cma_reserve(order);
> -	}
>   }
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index cf9c9b2906ea..345b3524df35 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -7699,6 +7699,13 @@ void __init hugetlb_cma_reserve(int order)
>   	bool node_specific_cma_alloc = false;
>   	int nid;
>   
> +	/*
> +	 * HugeTLB CMA reservation is required for gigantic
> +	 * huge pages which could not be allocated via the
> +	 * page allocator. Just warn if there is any change
> +	 * breaking this assumption.
> +	 */
> +	VM_WARN_ON(order <= MAX_PAGE_ORDER);
>   	cma_reserve_called = true;
>   
>   	if (!hugetlb_cma_size)

Looks straight forward to me.

Reviewed-by: Jane Chu <jane.chu@oracle.com>