From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) (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 673E6277CA0 for ; Thu, 17 Jul 2025 08:03:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=115.124.30.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752739403; cv=none; b=CA4GJtYDVVTubtdqjCmodxwcrxwtT8KoXRzW5ZKiHTGT+NRH9z7IMHddc3wZm5erCZdxgdAuMnxKfDTRJF6fKuLiXQPmRuRAF1nZCtG279+3VZcsVrHod1AcjiBZnBE4AEtp/aqqv/b1mzji/dGBiRysK+LTiEqkR/Q6Q9wZDEg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752739403; c=relaxed/simple; bh=VmMkPlsgXMXWs8Jl3pJMvLk/cZ4DuM6SPpw9RKhgyTA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mcGt1f6oXlzaApSp+155QQqWsgTrw4/Q5lnzsIn3sUqQaudB97ezIjo1bMicvt5M7BqtHCGFEOTvXOA5WB69RgY+AZ+WqrB7u/sseB4tVtYNF+NVd7GbxB9euXgcDt/wwo8zd2CDONcZNNDQDPFn2DlkqhES/pguo++08+bWSVs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com; spf=pass smtp.mailfrom=linux.alibaba.com; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b=mQEr2T5l; arc=none smtp.client-ip=115.124.30.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.alibaba.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.alibaba.com header.i=@linux.alibaba.com header.b="mQEr2T5l" DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1752739398; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=UX7hFbh/TK6YVLzfx5QtF9bfxIcBhjU5F7WclYEe4sE=; b=mQEr2T5l51qJF/dAwbwO4/txadQtPkgY+eoRc5BdtIzip4XCa7/vd8KLYnprDzpFZyboUpG8/ndn4U7xvjHtv1gCo7rf4uOhoVugqpyRbYEC7HG+kJ4WjpkwXgWyZkVuJjj53JFeU+xXx9b+Zm5mnuuJKFdVzwHaGLFnJWMZLiY= Received: from 30.74.144.120(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Wj7QQKs_1752739396 cluster:ay36) by smtp.aliyun-inc.com; Thu, 17 Jul 2025 16:03:17 +0800 Message-ID: <9ba7c5bd-cb7f-498a-b829-43d26993bc73@linux.alibaba.com> Date: Thu, 17 Jul 2025 16:03:16 +0800 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 2/2] mm/huge_memory: use folio_expected_ref_count() to calculate ref_count. To: Zi Yan , Balbir Singh , David Hildenbrand , linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Kirill Shutemov , Lorenzo Stoakes , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Dev Jain , Barry Song , linux-kernel@vger.kernel.org References: <20250714171823.3626213-1-ziy@nvidia.com> <20250714171823.3626213-3-ziy@nvidia.com> From: Baolin Wang In-Reply-To: <20250714171823.3626213-3-ziy@nvidia.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2025/7/15 01:18, Zi Yan wrote: > Instead of open coding the ref_count calculation, use > folio_expected_ref_count(). > > Suggested-by: David Hildenbrand > Signed-off-by: Zi Yan > Acked-by: Balbir Singh > Acked-by: David Hildenbrand > --- Looks more readable. Thanks. Reviewed-by: Baolin Wang > mm/huge_memory.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index a7ee731f974f..31b5c4e61a57 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -3735,6 +3735,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, > if (folio_ref_freeze(folio, 1 + extra_pins)) { > struct address_space *swap_cache = NULL; > struct lruvec *lruvec; > + int expected_refs; > > if (folio_order(folio) > 1 && > !list_empty(&folio->_deferred_list)) { > @@ -3805,11 +3806,8 @@ static int __folio_split(struct folio *folio, unsigned int new_order, > new_folio = next) { > next = folio_next(new_folio); > > - folio_ref_unfreeze( > - new_folio, > - 1 + ((mapping || swap_cache) ? > - folio_nr_pages(new_folio) : > - 0)); > + expected_refs = folio_expected_ref_count(new_folio) + 1; > + folio_ref_unfreeze(new_folio, expected_refs); > > lru_add_split_folio(folio, new_folio, lruvec, list); > > @@ -3839,8 +3837,8 @@ static int __folio_split(struct folio *folio, unsigned int new_order, > * Otherwise, a parallel folio_try_get() can grab origin_folio > * and its caller can see stale page cache entries. > */ > - folio_ref_unfreeze(folio, 1 + > - ((mapping || swap_cache) ? folio_nr_pages(folio) : 0)); > + expected_refs = folio_expected_ref_count(folio) + 1; > + folio_ref_unfreeze(folio, expected_refs); > > unlock_page_lruvec(lruvec); >