Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 19 Sep 2022 16:58:53 -0700
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     Xin Hao <xhao@linux.alibaba.com>
Cc:     songmuchun@bytedance.com, akpm@linux-foundation.org,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH V3] mm/hugetlb: add available_huge_pages() func
Message-ID: <YykCPfGkMwNksqCs@monkey>
References: <20220917011528.11331-1-xhao@linux.alibaba.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220917011528.11331-1-xhao@linux.alibaba.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DvGh1bevVW5sDTzkJwO1TZ+rgoVU5yJwqOb96V8+ShKfaD6GUEtjAvZdywYb?=
 =?us-ascii?Q?nXoPzmSPmubd9SgiYtgr+gSGBcxH7lJOC6QRuWlxTiXNg1/CWhGlfD9dg1Ae?=
 =?us-ascii?Q?CwaNgEVahlgrsrYy00M/ZobamEaYlP9zBuVbxgZx4OAkjdqttsmJrm5bdd4h?=
 =?us-ascii?Q?+To+F7hLGW8f3TGJYj90ujuZynGwY6jGYadFySGDpUgga6WdLM3tIqi53FKJ?=
 =?us-ascii?Q?h0J1rbf9DNZP5jtJ40+6jqkGJYeWjZxbVzGGfXGvVw5wS8Yc+g/tSVw4Oq0y?=
 =?us-ascii?Q?vGrIsu0sLpLExa8P5g1Nwu92ZHSYla00PyrABQoqbtFtCOG1LbKmh4l3HTbx?=
 =?us-ascii?Q?BTEl23S2UvY/uZ/h4ZsYZbHnx0Eiu8cny2TYIOzxuYNEiR68DjUqYHhRTaUV?=
 =?us-ascii?Q?gtA0yVO+iO3Fsuqwl5MtwvsLDIV8C/1zZRsz7HN2VHBNFFmqVesZJuiJnm4q?=
 =?us-ascii?Q?a+edDeUBxQt84VLAHx5Tt7YQ+2BfnlXHjCfeayiPEhPGd6uTZkdIeflAGdhe?=
 =?us-ascii?Q?Fe+9Msl2k5xTr8r/V4cC9QI56l42GLoG8/I4ErGxkLu4CNqZKrEZbDiyO3dU?=
 =?us-ascii?Q?Zbid7jzRS7eKu15QJe2wpI5saKE4Ah9an9Kc5HcC4emJR57K9lsFf6clzCk9?=
 =?us-ascii?Q?aPIqH4uev5ZNzxvN/210pviUw77KeNBolmZTwK43nvs+L7CQtw6kLyhsGTUu?=
 =?us-ascii?Q?apGNXUApFyntSToTJMtz2FHdUWQgaon1eBDDs64q8sbd/XLiL76OY93ozYcQ?=
 =?us-ascii?Q?xoNDTsciCxn+dMTzmZZmn8XP2iq9F6NccTcCISzZJnJOROscehcvU//TlITV?=
 =?us-ascii?Q?Y6VgFPfHDCpRB5LzDMcPrLJuLLYo6AglNEp5/AyuOitb5zl+GadxBjDlTg3H?=
 =?us-ascii?Q?rnnA0pAsjE2VBlju3D6UYgoyoCXx1O3FMq/DmuQcMoHCLW59u+0NSGrScwtN?=
 =?us-ascii?Q?sYTSwjjBtieYnEOQ8CvjJk6iyIRDF81UNsAkEYPRmhhEIdWD65DWRBAsOlDS?=
 =?us-ascii?Q?UQ6j715jRHsygXJvP7+CePDqOZbvfahbdm3qFIubxrnfpjMbpdOc66WuhApw?=
 =?us-ascii?Q?3WRbpvuTu+06z2tVisDhlFE8CYQc0OfCvrEEqUqYwprlw4+m+Q/34xnD47So?=
 =?us-ascii?Q?hQKCG/awozdzdkvp3o5zzTiImzOu8GIYYFH1D+FSuMsteD/oL2lpSJvcpd4j?=
 =?us-ascii?Q?7AARYUdbgTrmZz8kqD7F+YNwVA71V/sESXoj/wr2a2i2yhufLkRXNclTUOCQ?=
 =?us-ascii?Q?Jq2zbef1TffvPLvAyigllhciOMiO4ueVyEr/1jVIBahwReNHHu96HubtOYyA?=
 =?us-ascii?Q?l4CbAyWAKSL8EUObdcduaxUbu9oMptO9gt+h8kVSmsecdB7XOGFRvdQ/4xIe?=
 =?us-ascii?Q?ZaxE1mFCVohF3cWtmbbFQIG4L0rV+9kjhKsdqmihcRLDgCt13mCBc0Fk5/z/?=
 =?us-ascii?Q?PInmBzGRZNJUCq+UW35oX7nJIdMOM8h+wLoryDqqJgZDLurX4VD/nXK03Aqk?=
 =?us-ascii?Q?KiAfluGFTJLy4+t06dBm9fbVhW8OQKOmwZFAouSVshAjCgs5s+AbwEXCdz1N?=
 =?us-ascii?Q?UmOg+UU/9LyPvnPYSLYFS9uQB/0Ias5MI8csFvYFiDpa1TYA3vJiXoh6oXc6?=
 =?us-ascii?Q?cA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 40b2af09-f5c5-4f5c-c9ad-08da9a9ae997
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2022 23:58:56.4775
 (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: dQmikBEsIGVxpbD3w16cJGCjxImKBvtH8CVkopycmsosalP67ppravtYQTQHyJGtrlBCjz2L345/ytuUpIeAug==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6552
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-19_05,2022-09-16_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 malwarescore=0
 spamscore=0 mlxscore=0 adultscore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000
 definitions=main-2209190159
X-Proofpoint-GUID: p3Ijsbt6JSQfRSiBOlyye5_O2xlkxhrr
X-Proofpoint-ORIG-GUID: p3Ijsbt6JSQfRSiBOlyye5_O2xlkxhrr
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 09/17/22 09:15, Xin Hao wrote:
> In hugetlb.c file, there are several places to compare the values of
> 'h->free_huge_pages' and 'h->resv_huge_pages', it looks a bit messy, so
> there add a new available_huge_pages() func to do these.

Thanks, I think the code looks a little better with this change.

> 
> Signed-off-by: Xin Hao <xhao@linux.alibaba.com>
> Changes from v2
> https://lore.kernel.org/linux-mm/20220916064127.1904-1-xhao@linux.alibaba.com/
> - Convert is_resv_equal_free() to available_huge_pages()

I believe the above 'Changes from v2' information should be below the marker
'---' as it will not be included in the changelog.

> ---
>  mm/hugetlb.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)

The changes look fine,

Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
-- 
Mike Kravetz

> 
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 5ea0b1b0d1ab..21d7f2361696 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -1191,6 +1191,11 @@ static struct page *dequeue_huge_page_nodemask(struct hstate *h, gfp_t gfp_mask,
>  	return NULL;
>  }
> 
> +static unsigned long available_huge_pages(struct hstate *h)
> +{
> +	return h->free_huge_pages - h->resv_huge_pages;
> +}
> +
>  static struct page *dequeue_huge_page_vma(struct hstate *h,
>  				struct vm_area_struct *vma,
>  				unsigned long address, int avoid_reserve,
> @@ -1207,12 +1212,11 @@ static struct page *dequeue_huge_page_vma(struct hstate *h,
>  	 * have no page reserves. This check ensures that reservations are
>  	 * not "stolen". The child may still get SIGKILLed
>  	 */
> -	if (!vma_has_reserves(vma, chg) &&
> -			h->free_huge_pages - h->resv_huge_pages == 0)
> +	if (!vma_has_reserves(vma, chg) && !available_huge_pages(h))
>  		goto err;
> 
>  	/* If reserves cannot be used, ensure enough pages are in the pool */
> -	if (avoid_reserve && h->free_huge_pages - h->resv_huge_pages == 0)
> +	if (avoid_reserve && !available_huge_pages(h))
>  		goto err;
> 
>  	gfp_mask = htlb_alloc_mask(h);
> @@ -2105,7 +2109,7 @@ int dissolve_free_huge_page(struct page *page)
>  	if (!page_count(page)) {
>  		struct page *head = compound_head(page);
>  		struct hstate *h = page_hstate(head);
> -		if (h->free_huge_pages - h->resv_huge_pages == 0)
> +		if (!available_huge_pages(h))
>  			goto out;
> 
>  		/*
> @@ -2315,7 +2319,7 @@ struct page *alloc_huge_page_nodemask(struct hstate *h, int preferred_nid,
>  		nodemask_t *nmask, gfp_t gfp_mask)
>  {
>  	spin_lock_irq(&hugetlb_lock);
> -	if (h->free_huge_pages - h->resv_huge_pages > 0) {
> +	if (available_huge_pages(h)) {
>  		struct page *page;
> 
>  		page = dequeue_huge_page_nodemask(h, gfp_mask, preferred_nid, nmask);
> --
> 2.31.0