Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Message-ID: <70cc29f2-6018-4794-ace9-d96077cfed6a@intel.com>
Date:   Wed, 6 Dec 2023 09:22:37 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH RFC 03/39] mm/rmap: introduce and use
 hugetlb_add_file_rmap()
Content-Language: en-US
To:     David Hildenbrand <david@redhat.com>,
        <linux-kernel@vger.kernel.org>
CC:     <linux-mm@kvack.org>, Andrew Morton <akpm@linux-foundation.org>,
        "Matthew Wilcox (Oracle)" <willy@infradead.org>,
        Hugh Dickins <hughd@google.com>,
        "Ryan Roberts" <ryan.roberts@arm.com>,
        Mike Kravetz <mike.kravetz@oracle.com>,
        Muchun Song <muchun.song@linux.dev>,
        Peter Xu <peterx@redhat.com>
References: <20231204142146.91437-1-david@redhat.com>
 <20231204142146.91437-4-david@redhat.com>
From:   Yin Fengwei <fengwei.yin@intel.com>
In-Reply-To: <20231204142146.91437-4-david@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NE9PaWtjZ3ZCVHFTRUdzRzFYRk1HUlIyaG5IcTByMnh5Tm1wVXBycUhuTnlt?=
 =?utf-8?B?bjNwQ0cvcTFQbzAvcE5xTjJ6bkZhZ3dTZ1RtYU05SisvNDVCOGxwQm1YZnhC?=
 =?utf-8?B?V1VvSG1KVlRCTDZ2c3g5ODViUmgxVm5la2RZMGN1RGd1RTVkNlV5MTZKaEVz?=
 =?utf-8?B?YVVicEFSNUV5bEpRZTUrcHNtVjhwNmxCM0kwQ3l0VTY3TENwVXFGTEtXOVRC?=
 =?utf-8?B?UElDM0FsWVpJaUNmQ3BYQTFLcnFXWm10QjhsUSs0M0p3c3hJU1ErQmV5Mk5C?=
 =?utf-8?B?K2VSb2FtSTRnNlBpUTBIOVkvc2xKOEMzSHRsYmkvNDUwK3RiMkI4ajNHM3pa?=
 =?utf-8?B?b2NOcUcvaVFseGpPWElRelhWdDhTM1JqOXc0UmJxbHFsTjJ5Umxqb0xUQVpX?=
 =?utf-8?B?bmMrZFRhbmROWDVoMVBiR1oxT1VpNE5kUVYvOXE5Y092KzdPM2dGZXJGcVNU?=
 =?utf-8?B?SnhObHZMNEJMZHNtdDVvdmdhalZNekNTaXFQT05mQW1qais5ekhLbTlqd0JQ?=
 =?utf-8?B?WWkwc1NIUEhMK1hVak9xdnYrVXh6ZmF4VUFlMExZbGJyUTdObzhkOFRDMEl4?=
 =?utf-8?B?L2E5aW90TVp6ZHpRR2FTQ2Q5OXR5UEdJUWZWenlWa01LRjY2ckoyQWViTmNH?=
 =?utf-8?B?dTh1SGwweUxhOTZqUmVLY0t2b3ZMMW5QY25SSXMyRkFyTWJHSFh2ZzA1YXpp?=
 =?utf-8?B?OC94YXRYMzB4RFZ6OHlzOVFvVlJ1Y3lvcGNkSDc5UTFqRmQ1Q3hBdUgxQjBO?=
 =?utf-8?B?NnF2MjZ0K2ZRcDJOSEtjZkF2OXd2eENDbGpWWTJQdzNRQlhFRW1NRmNIdm95?=
 =?utf-8?B?b04yN0g4aTNPVHR1UjBpNzRQbzZha2Zpam9QVU1MWFAxczRISFVBd0hrR1dx?=
 =?utf-8?B?NGNFYjdMUGRPUmlTa2hybjR4NGxIVy9TbUdVWm5waVp2dkpLUFdoRkU0WmNv?=
 =?utf-8?B?M055VlFhU1Jjb3lRQVVEL3d6anhrMm5ZeEtGM2xFTlpyUXNYb2Ira0hNRHhl?=
 =?utf-8?B?QWtmVXpLSEcxa3RVbUxhek1UYjl0dXY0SE1xaVhvYWxyUE9PclFVckVyRjlm?=
 =?utf-8?B?ZEFwZGdGVWFKK2NQRUdEbEtzVmZyRG5BalFDWDNQYzdxUE9tYXJJeDZtenl1?=
 =?utf-8?B?SVMyTjZ6MzF6Skl3ZXE2LzN0bWpEc0dPbG43V3JrcWRrS0d4Tlo2N09hOUNU?=
 =?utf-8?B?REk2L0c3V0JJRG1VeC9Ycjh1V2VwY1k3WHovUFpyRjU2amM4Rm5pdERldkdS?=
 =?utf-8?B?OGlqNEhDOVVTMUtYTVdaWE02ZHhVeGNDazBKbkc3ZGZobDQwb3dwWk4vMzZZ?=
 =?utf-8?B?M2tpY0E1dUUxbmVYZXN6cVhqR0daUmxKd1pHNndSVElhRWlUK2RQRnNEK2xx?=
 =?utf-8?B?alkybTkxUTl5VjdZT1RyTlIvZjVyaG1EaFJoM1hOd3hGcXpjVUluN21GQTk0?=
 =?utf-8?B?VDBEOE5DaDVhU1lYUEdqQ25GajVSdExjUzJLVEIrTVh2SXZTdGJwVFI3TkVL?=
 =?utf-8?B?ZTU2eXE3V0dwUkxLRjFTWjk4L1B1QmJIbkVyOUVJb0ZMVkNaa0t0U01LMnVE?=
 =?utf-8?B?TXZCN3NSQnJiK28xZ1k3cklrMGRqVStsV0tucFhlQVNIdHB1eWFaVWIrTXJy?=
 =?utf-8?B?VTJZRTNiRlFVUDJLMXRIRmlVRHdiRC9hdDJjT3BUdStzLzlrUXVwTkc5K0VN?=
 =?utf-8?B?VlhBZmpsbU1UV3VJbGM1NlN0UURLR2pYTG1IZFpTcWM5c3hmYllFMnF0Uk53?=
 =?utf-8?B?SEQxdGVxeEJ4UDNpMDBocTlVNCtMYkNwS09XNS8wdVRRRDJYTGhzaS9KOEQr?=
 =?utf-8?B?RmhWUXNQRGVzQUQyM0dPeHk4UW9IYzRFWkw1RG5nS2loNHEvVkl6WXoramg5?=
 =?utf-8?B?QURJV3pYYzlvZzRYNjBxUUYzZUwrQjZFL21reExVWXV6LzRtdExwb1IraXJ6?=
 =?utf-8?B?ZDdyNXM4WW1UYlFiOGFDNlpidjFHNUhKY3hhSFYwVHpSb1ltMURRMHRyaHNh?=
 =?utf-8?B?R2I0RFdvOTFCVVdHZ3RRZzRUMyt0dnNQYTE2WExCSlNnMlBEY2VEbm0yNDY4?=
 =?utf-8?B?RFpETkg4UkdHY0FwVGplUHhpbzVRdnRJUTlrMTJyRlh5SjA1WCtTVlo4aDhG?=
 =?utf-8?B?endyRWc1S3ViaHlydUJmVTBlNTk5UkF0WWVWY2NYamROY1F4UFR6SE9IbDRv?=
 =?utf-8?B?aFE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: ec681715-86d2-49e0-39eb-08dbf5fa2365
X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4820.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2023 01:24:48.8862
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: C63fS+VgvEuebgMNya2RRGMb7id13kLbh7ayr84peeNyjcHFc4MCU81Rr+M5PLYIH+oNYJ2HnbrCEbc9BjKRlw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6440
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 05 Dec 2023 17:25:34 -0800 (PST)


On 12/4/23 22:21, David Hildenbrand wrote:
> hugetlb rmap handling differs quite a lot from "ordinary" rmap code.
> For example, hugetlb currently only supports entire mappings, and treats
> any mapping as mapped using a single "logical PTE". Let's move it out
> of the way so we can overhaul our "ordinary" rmap.
> implementation/interface.
> 
> Right now we're using page_dup_file_rmap() in some cases where "ordinary"
> rmap code would have used page_add_file_rmap(). So let's introduce and
> use hugetlb_add_file_rmap() instead. We won't be adding a
> "hugetlb_dup_file_rmap()" functon for the fork() case, as it would be
> doing the same: "dup" is just an optimization for "add".
> 
> What remains is a single page_dup_file_rmap() call in fork() code.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>

Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>

> ---
>  include/linux/rmap.h | 7 +++++++
>  mm/hugetlb.c         | 6 +++---
>  mm/migrate.c         | 2 +-
>  3 files changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/include/linux/rmap.h b/include/linux/rmap.h
> index e8d1dc1d5361f..0a81e8420a961 100644
> --- a/include/linux/rmap.h
> +++ b/include/linux/rmap.h
> @@ -208,6 +208,13 @@ void hugetlb_add_anon_rmap(struct folio *, struct vm_area_struct *,
>  void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *,
>  		unsigned long address);
>  
> +static inline void hugetlb_add_file_rmap(struct folio *folio)
> +{
> +	VM_WARN_ON_FOLIO(folio_test_anon(folio), folio);
> +
> +	atomic_inc(&folio->_entire_mapcount);
> +}
> +
>  static inline void hugetlb_remove_rmap(struct folio *folio)
>  {
>  	atomic_dec(&folio->_entire_mapcount);
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index d17bb53b19ff2..541a8f38cfdc7 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -5401,7 +5401,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
>  			 * sleep during the process.
>  			 */
>  			if (!folio_test_anon(pte_folio)) {
> -				page_dup_file_rmap(&pte_folio->page, true);
> +				hugetlb_add_file_rmap(pte_folio);
>  			} else if (page_try_dup_anon_rmap(&pte_folio->page,
>  							  true, src_vma)) {
>  				pte_t src_pte_old = entry;
> @@ -6272,7 +6272,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm,
>  	if (anon_rmap)
>  		hugetlb_add_new_anon_rmap(folio, vma, haddr);
>  	else
> -		page_dup_file_rmap(&folio->page, true);
> +		hugetlb_add_file_rmap(folio);
>  	new_pte = make_huge_pte(vma, &folio->page, ((vma->vm_flags & VM_WRITE)
>  				&& (vma->vm_flags & VM_SHARED)));
>  	/*
> @@ -6723,7 +6723,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_pte,
>  		goto out_release_unlock;
>  
>  	if (folio_in_pagecache)
> -		page_dup_file_rmap(&folio->page, true);
> +		hugetlb_add_file_rmap(folio);
>  	else
>  		hugetlb_add_new_anon_rmap(folio, dst_vma, dst_addr);
>  
> diff --git a/mm/migrate.c b/mm/migrate.c
> index 4cb849fa0dd2c..de9d94b99ab78 100644
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@ -252,7 +252,7 @@ static bool remove_migration_pte(struct folio *folio,
>  				hugetlb_add_anon_rmap(folio, vma, pvmw.address,
>  						      rmap_flags);
>  			else
> -				page_dup_file_rmap(new, true);
> +				hugetlb_add_file_rmap(folio);
>  			set_huge_pte_at(vma->vm_mm, pvmw.address, pvmw.pte, pte,
>  					psize);
>  		} else