Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2;
Message-ID: <17c69db0-a796-4a3f-95df-5f965af35ba6@intel.com>
Date:   Wed, 6 Dec 2023 09:23:34 +0800
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH RFC 06/39] mm/rmap: add hugetlb sanity checks
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-7-david@redhat.com>
From:   Yin Fengwei <fengwei.yin@intel.com>
In-Reply-To: <20231204142146.91437-7-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?aXFBcFlUcERqZzhxMlJ4VHJsWVZNY2VsTVpyaitrTzk3L3FNdWk5TlpudFlt?=
 =?utf-8?B?RFIzL1NkM1lVZ3VoVUNxQmVoMnpIcFhmek4rNFVxbEhsYnhMWHVoRnZFZFIr?=
 =?utf-8?B?cjRvc0s3ckIrK24vSkJ0elVTRklLRzdFMHQ1QXVJWXNNNmxaWUhGSnl0b3ZM?=
 =?utf-8?B?Q3FySzRDN3hkS1hMVmpNeHBEYy9icGZkbmowS2JGSkN6SUdOZEhaOVZSemhp?=
 =?utf-8?B?R1hJVk1VeWM0a0ZjWmlmaGhuK1RaTlVjbjVwbzZHRjVGOUQxZGg4RzdDYVVD?=
 =?utf-8?B?N1BicEtlL3hwZGEyME5nR01BR2RtN2kzMjB6SUxFOUVuOUFPMDBReWJWTjhC?=
 =?utf-8?B?TGpzMmN1WVhzR1d3MGhMM1hCRWZ2Mk9LaFo0VGhERDN2QW8wWWM2TzhFcjNq?=
 =?utf-8?B?L1JhV1VWUFlJVXJIVTg0R0pKWkpjQWJnS1VwVG82dVFKOEJVTTlSeVFEUlpF?=
 =?utf-8?B?VHJnTGMvNm5tRGZkRFRxVElhTTVhQ0xjM2cxM1VXTFpHb3VCb1JUQ1gvUXlD?=
 =?utf-8?B?eVFiWndtQll6TnhCVThNWXZNWkZaaENYTVkvQ0wvbnI3S3gxcEpMbTd3TnhV?=
 =?utf-8?B?a3M5ZCtMU0wxeEdmbjVnWVZJY0FDeEVWeDFzQlgwZmFIZzA1UHltS1NHbVdQ?=
 =?utf-8?B?V0pvZVZvaW13NXFYLzJDL2hHVy9LNFRYaXNjWGp6ZXhUSit4cVVJeDh1ZmNH?=
 =?utf-8?B?eTA4Z3pydWs5VCtEblBFVlpsYm1sSWJjaG1wb3VYWGhOVXowVHhxbEFvU3pu?=
 =?utf-8?B?RkcyWWk2TFNXbHQzQ2gyQktpR2h6MVhHZHZPdnBxaWNxdFBtUDEzdU5HU2tx?=
 =?utf-8?B?dDlQL0V1ZWdKaVBZbFhIbjVuaWdtd3p1ZDZJbjNQWjhKRHMwS1N2d2MweFZL?=
 =?utf-8?B?SUFHTGM4eWgzTmxRTlhFTWZrR3A5dEhVNzJJTXZvdERUS2pOWUo4TnF0Yk9G?=
 =?utf-8?B?Y0Y3Z2JGeHZqU09rMDNrVjE4UkRhOHFRTDJmVjNwS0MybWc3UXNsMnIyOUhS?=
 =?utf-8?B?UHA1ekw0cmMreWt5SW5iclBOR05paFlSTTRVWjIwMGZlbEkrN2ZIMEdRMm1U?=
 =?utf-8?B?Z1p6VXk0UFFaaUdTUnNJdWx0bWxUcXlnU1ZPeVE1ZldWVEtnT2JQN2tVOS9h?=
 =?utf-8?B?YkNOeERkNjBXd1RlMXZQNmxDNkJWUUhVbDAxdUh6S20yWlozTzlRY25PeHZN?=
 =?utf-8?B?aGwvZDhoZ3E4dDZoYVJ3bm92K2I1eDYvc0dCdVZtTFdHZDZBTUJWMlFGa0pt?=
 =?utf-8?B?Y1hsdE4zVytmUE05eUVqYWxHTjE1eXI0clprQjgrNHBYb0lsZllUSjkwVVhV?=
 =?utf-8?B?ZXl6UUExWWRnbnRNU0RxL3dTMEI1TkFJOXNuZlBjb3B3MXc2Nmx6cjQ4c2ly?=
 =?utf-8?B?OFpDWDBYeWtnNzdUMGpEbUhSSjNuUEZzZTZBeUNGd2Q4Y3ovS1IrUkd2enVo?=
 =?utf-8?B?WEFYNnZrbG0raE8yOEtjb0NJMnJoN3JHdWUwWXA2SFlSd3ZVUzVQZFBTSzJE?=
 =?utf-8?B?VUg0UklmUFh4d2FpUk8wV2JwSEdFWEtuWTEwdHBLc0RQUmRoa2tkekFMb3Jr?=
 =?utf-8?B?S29kbTZ2UytTbDZXazhMYlgvZk5SeW81dE9MSG80dTJUVDB4c21QVGw2eGdo?=
 =?utf-8?B?QThKRTRKVEd0ZWtNWkZuQk0vaHRTSHE0cGhseVQwZTFVNEhPbE1hZXArbmRS?=
 =?utf-8?B?MlgwbncyY09hVHRjQ2VaMW96RTRVSzZjT05WaXR0bXNnMU1zbTZmYnJJTlZp?=
 =?utf-8?B?N3R0WEtDQU9oRUtqcGo0QjgxdTRLZVZGbklCaFB1aCtKc1F5dGtRWndhckw4?=
 =?utf-8?B?RVJLK2NZb0VMbjRpekFMajBjUVQwUVVWN0hDTU5EVGFFNWtsNy9rU1pSY3cx?=
 =?utf-8?B?N0FzemphUVhtaUpPZWVxZElLQ1dVekd1eDhjdmE5T3JSVFdsd0p5YkVwWDFS?=
 =?utf-8?B?RzVTbW5walhJd214RkprbSt5RGJZcUV4dzhmSEVxTlNWT3NidGhOcnJDTlJr?=
 =?utf-8?B?UXF4ZDNuN1F6WGZ4cUZMZ05XY1NoYmh5Q0YyZ3Z0THVvZHJPYVlzMXRrT09H?=
 =?utf-8?B?UEhDTTRiOEFQVUlzTDB3ZVhQcEtjVHZCcmxqWUlRM1daWjNlK0VuUzYzNGxj?=
 =?utf-8?B?QzJSMWtKWnh5bnBuMUxmRWcwQS9IYTMrRXR4cTJhN3gwc05uUUpDdXNIRVBL?=
 =?utf-8?B?ZVE9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 9046ace3-3147-4fbb-89e7-08dbf5fa44ec
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:25:45.3362
 (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: P0b1vCBwT5gjilxXVd3r3oOLl/rQdZIWxuzP5nSXbc7pMy0vjSneh3EHi6wi8AOC/kh9NVpy9z2N9xwdqtc45A==
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 agentk.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 (agentk.vger.email [0.0.0.0]); Tue, 05 Dec 2023 17:26:15 -0800 (PST)


On 12/4/23 22:21, David Hildenbrand wrote:
> Let's make sure we end up with the right folios in the right functions.
> 
> Signed-off-by: David Hildenbrand <david@redhat.com>

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

> ---
>  include/linux/rmap.h | 7 +++++++
>  mm/rmap.c            | 6 ++++++
>  2 files changed, 13 insertions(+)
> 
> diff --git a/include/linux/rmap.h b/include/linux/rmap.h
> index 3f38141b53b9d..77e336f86c72d 100644
> --- a/include/linux/rmap.h
> +++ b/include/linux/rmap.h
> @@ -212,6 +212,7 @@ void hugetlb_add_new_anon_rmap(struct folio *, struct vm_area_struct *,
>  static inline int hugetlb_try_dup_anon_rmap(struct folio *folio,
>  		struct vm_area_struct *vma)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
>  	VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio);
>  
>  	if (PageAnonExclusive(&folio->page)) {
> @@ -226,6 +227,7 @@ static inline int hugetlb_try_dup_anon_rmap(struct folio *folio,
>  /* See page_try_share_anon_rmap() */
>  static inline int hugetlb_try_share_anon_rmap(struct folio *folio)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
>  	VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio);
>  	VM_WARN_ON_FOLIO(!PageAnonExclusive(&folio->page), folio);
>  
> @@ -245,6 +247,7 @@ static inline int hugetlb_try_share_anon_rmap(struct folio *folio)
>  
>  static inline void hugetlb_add_file_rmap(struct folio *folio)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
>  	VM_WARN_ON_FOLIO(folio_test_anon(folio), folio);
>  
>  	atomic_inc(&folio->_entire_mapcount);
> @@ -252,11 +255,15 @@ static inline void hugetlb_add_file_rmap(struct folio *folio)
>  
>  static inline void hugetlb_remove_rmap(struct folio *folio)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
> +
>  	atomic_dec(&folio->_entire_mapcount);
>  }
>  
>  static inline void __page_dup_rmap(struct page *page, bool compound)
>  {
> +	VM_WARN_ON(folio_test_hugetlb(page_folio(page)));
> +
>  	if (compound) {
>  		struct folio *folio = (struct folio *)page;
>  
> diff --git a/mm/rmap.c b/mm/rmap.c
> index 2f1af3958e687..a735ecca47a81 100644
> --- a/mm/rmap.c
> +++ b/mm/rmap.c
> @@ -1313,6 +1313,7 @@ void folio_add_new_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
>  {
>  	int nr;
>  
> +	VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio);
>  	VM_BUG_ON_VMA(address < vma->vm_start || address >= vma->vm_end, vma);
>  	__folio_set_swapbacked(folio);
>  
> @@ -1353,6 +1354,7 @@ void folio_add_file_rmap_range(struct folio *folio, struct page *page,
>  	unsigned int nr_pmdmapped = 0, first;
>  	int nr = 0;
>  
> +	VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio);
>  	VM_WARN_ON_FOLIO(compound && !folio_test_pmd_mappable(folio), folio);
>  
>  	/* Is page being mapped by PTE? Is this its first map to be added? */
> @@ -1438,6 +1440,7 @@ void page_remove_rmap(struct page *page, struct vm_area_struct *vma,
>  	bool last;
>  	enum node_stat_item idx;
>  
> +	VM_WARN_ON_FOLIO(folio_test_hugetlb(folio), folio);
>  	VM_BUG_ON_PAGE(compound && !PageHead(page), page);
>  
>  	/* Is page being unmapped by PTE? Is this its last map to be removed? */
> @@ -2590,6 +2593,7 @@ void rmap_walk_locked(struct folio *folio, struct rmap_walk_control *rwc)
>  void hugetlb_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
>  		unsigned long address, rmap_t flags)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
>  	VM_WARN_ON_FOLIO(!folio_test_anon(folio), folio);
>  
>  	atomic_inc(&folio->_entire_mapcount);
> @@ -2602,6 +2606,8 @@ void hugetlb_add_anon_rmap(struct folio *folio, struct vm_area_struct *vma,
>  void hugetlb_add_new_anon_rmap(struct folio *folio,
>  		struct vm_area_struct *vma, unsigned long address)
>  {
> +	VM_WARN_ON_FOLIO(!folio_test_hugetlb(folio), folio);
> +
>  	BUG_ON(address < vma->vm_start || address >= vma->vm_end);
>  	/* increment count (starts at -1) */
>  	atomic_set(&folio->_entire_mapcount, 0);