From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1A6BC54E4A for ; Fri, 8 Mar 2024 08:33:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 443626B034B; Fri, 8 Mar 2024 03:33:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CBEC6B034D; Fri, 8 Mar 2024 03:33:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2BB436B034E; Fri, 8 Mar 2024 03:33:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1AC2B6B034B for ; Fri, 8 Mar 2024 03:33:15 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id EA3C01A14C2 for ; Fri, 8 Mar 2024 08:33:14 +0000 (UTC) X-FDA: 81873207108.04.69072D6 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf07.hostedemail.com (Postfix) with ESMTP id C5D8F4001C for ; Fri, 8 Mar 2024 08:33:11 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1709886793; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WugwbbZuJ0zSU3jlcFheYs1iOiIhEwh1N3unV9H9vPc=; b=cIJhbB7wUwdXnlWAL9tNejl0be/ZRquaaOSGThA35BSVB0HRXM2/8LrhxCZ1FpqHQYbpoc huETQZnzK6NmKBMdFGL/yi9dzUDZsv5ZYnVJTliWlqo123Fy5Myy3ryVZd/ARaygSR0TEB 9zc0t2GGW+LSeiQvY0UAQgXGyrm5nXw= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=pass (imf07.hostedemail.com: domain of linmiaohe@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=linmiaohe@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1709886793; a=rsa-sha256; cv=none; b=F3+AErz5JMomDaS4pUdWXGXB2x/55T6/f2HDaGg5Q+5nzZdLkmztXAKYcrePt24/AxKCFk N+vIfUwyDJwiAYg2DrX9WPfjyd5D5TOWklHixHvWJIWKKtM+hdlr4I09afS7Iz0Vn7J6aS QRp8jLCKD85cjBZT9rSAP8xPTYhGb5A= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4TrfWX4m5VzXhr5; Fri, 8 Mar 2024 16:30:48 +0800 (CST) Received: from canpemm500002.china.huawei.com (unknown [7.192.104.244]) by mail.maildlp.com (Postfix) with ESMTPS id 0C67A140134; Fri, 8 Mar 2024 16:33:07 +0800 (CST) Received: from [10.173.135.154] (10.173.135.154) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Fri, 8 Mar 2024 16:33:06 +0800 Subject: Re: [PATCH 5/8] mm: Convert hugetlb_page_mapping_lock_write to folio To: "Matthew Wilcox (Oracle)" CC: , Naoya Horiguchi , Andrew Morton References: <20240229212036.2160900-1-willy@infradead.org> <20240229212036.2160900-6-willy@infradead.org> From: Miaohe Lin Message-ID: Date: Fri, 8 Mar 2024 16:33:05 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20240229212036.2160900-6-willy@infradead.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.173.135.154] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To canpemm500002.china.huawei.com (7.192.104.244) X-Rspamd-Queue-Id: C5D8F4001C X-Rspam-User: X-Stat-Signature: kzxe3kikaqj1chd4w1mwtrrdr4f5kynt X-Rspamd-Server: rspam01 X-HE-Tag: 1709886791-153809 X-HE-Meta: U2FsdGVkX1+goxBwYc4YKJoW+v3syYjVE/whgSj9CkYts6pn/cVRIL6J/gj7Avrr5RdRmzivgkKm4uE205gBkB2zh4m6ItBSO6ZJoczioa14SQYkexYNGDV5rEaziYFl5cadyqW+xvePGg8DYMu1selZwRi5VNaf7dV66xHSq2Cd7NLyYxnZIvuSZlK4KW/JusOtN5jslHQLBTMinTdpwu7EvCVNHgZefaWwzUHWxkoVTLsthjjuK2Dw+3jIlAxMudDl4oXLety3QtcTSW6F8rvxcWSSAD0RBwrGOBpWJTUgU+7ZP6UTyPQTD8Ba+ivmnrLA08q68KXubol8Alc1QGDQxALeQ3g1lGlL1xp3tiQbr4VtFpUmuBBlbaXsMLKD+R0Xt3UCMmvZPGY6mkiwiuUZMAX5Nrf7/n5yfu/UtW311aIwagnXknkpsNKBHg8qZ+QiHYuAqBo+tQm230cmxBzYBc54LsK9j3QGV13EbgwsTlRVgn4oD483tsioagcfxDZn0ksOOCdjeTw7C0MpBzKmn6VytshozcFfE6ak26HsdYDM9qJUyshiVkINffOyMtLeg2gihJy+nmC3PNUT6UZej0yBYwnKPHzJnjoKHjfFdp3VmpPaFa2l/hWxvBZAH7S+eyjy0EMXXDK0l5agI83tcBdbkg9FBgFw+XWJSwhhDHxKfpKxZnWWw9Z+aSv0TmgOIjcaKQBMpuQV4jUhkkiTfZ8NMQccSPwxG6WYg/3iO7I6FgSUJscXGQHwM77aZXiz2L5FM/Iykyb5J4nAN67CgO9oP2TZTovdg/4Sbr72qdIGrnHHr1T5LEYu4aEUVsIj1mYF82X9rf4qmoOt0OaLBVv/c/nzEwJ1c0LczJg7CVwNfmD1o1t35OS4akIbdQXym34nGrvvppeIXOFdxrX16wkdDxNqrUrCparBS+t0+uRj6c0Zkkn388mvtPhBOE2llrro/b/SckmVJnM Q9LKzs3f MbNeq8rjrbmr5uoMrCkzfPaRhnjk8F3vNSmnoJvoASS6LbA5SOEY0PnvlHNb/0aPjQ8UelhwCjlQdxtrJFelz7Vo2u8piubPG4RxV7ygyTt27zWVM50soEiua2EgP7Rd0w9vPDaEWe4waFvkxbwG+5XP9y8e6j77OrSCkid7dUsX2RnUEkmBHl32TiIBkNHYmR9DNupdux8REPC01+hnIN/zx6gPegEqajCJ48pu7W8yTt2hViwz6kPi1QkqhVgnLGykRCz2k50JWdIQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2024/3/1 5:20, Matthew Wilcox (Oracle) wrote: > The page is only used to get the mapping, so the folio will do just > as well. Both callers already have a folio available, so this saves > a call to compound_head(). > > Signed-off-by: Matthew Wilcox (Oracle) Looks good to me. Thanks. Acked-by: Miaohe Lin > --- > include/linux/hugetlb.h | 6 +++--- > mm/hugetlb.c | 6 +++--- > mm/memory-failure.c | 2 +- > mm/migrate.c | 2 +- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h > index 77b30a8c6076..acb1096ecdaa 100644 > --- a/include/linux/hugetlb.h > +++ b/include/linux/hugetlb.h > @@ -175,7 +175,7 @@ u32 hugetlb_fault_mutex_hash(struct address_space *mapping, pgoff_t idx); > pte_t *huge_pmd_share(struct mm_struct *mm, struct vm_area_struct *vma, > unsigned long addr, pud_t *pud); > > -struct address_space *hugetlb_page_mapping_lock_write(struct page *hpage); > +struct address_space *hugetlb_folio_mapping_lock_write(struct folio *folio); > > extern int sysctl_hugetlb_shm_group; > extern struct list_head huge_boot_pages[MAX_NUMNODES]; > @@ -298,8 +298,8 @@ static inline unsigned long hugetlb_total_pages(void) > return 0; > } > > -static inline struct address_space *hugetlb_page_mapping_lock_write( > - struct page *hpage) > +static inline struct address_space *hugetlb_folio_mapping_lock_write( > + struct folio *folio) > { > return NULL; > } > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index bb17e5c22759..0e464a8f1aa9 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -2178,13 +2178,13 @@ EXPORT_SYMBOL_GPL(PageHuge); > /* > * Find and lock address space (mapping) in write mode. > * > - * Upon entry, the page is locked which means that page_mapping() is > + * Upon entry, the folio is locked which means that folio_mapping() is > * stable. Due to locking order, we can only trylock_write. If we can > * not get the lock, simply return NULL to caller. > */ > -struct address_space *hugetlb_page_mapping_lock_write(struct page *hpage) > +struct address_space *hugetlb_folio_mapping_lock_write(struct folio *folio) > { > - struct address_space *mapping = page_mapping(hpage); > + struct address_space *mapping = folio_mapping(folio); > > if (!mapping) > return mapping; > diff --git a/mm/memory-failure.c b/mm/memory-failure.c > index 27dc21063552..fe4959e994d0 100644 > --- a/mm/memory-failure.c > +++ b/mm/memory-failure.c > @@ -1624,7 +1624,7 @@ static bool hwpoison_user_mappings(struct page *p, unsigned long pfn, > * TTU_RMAP_LOCKED to indicate we have taken the lock > * at this higher level. > */ > - mapping = hugetlb_page_mapping_lock_write(hpage); > + mapping = hugetlb_folio_mapping_lock_write(folio); > if (mapping) { > try_to_unmap(folio, ttu|TTU_RMAP_LOCKED); > i_mmap_unlock_write(mapping); > diff --git a/mm/migrate.c b/mm/migrate.c > index 73a052a382f1..0aef867d600b 100644 > --- a/mm/migrate.c > +++ b/mm/migrate.c > @@ -1425,7 +1425,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, > * semaphore in write mode here and set TTU_RMAP_LOCKED > * to let lower levels know we have taken the lock. > */ > - mapping = hugetlb_page_mapping_lock_write(&src->page); > + mapping = hugetlb_folio_mapping_lock_write(src); > if (unlikely(!mapping)) > goto unlock_put_anon; > >