From patchwork Wed Feb 19 03:46:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ge Yang X-Patchwork-Id: 13981464 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 E96E3C021AA for ; Wed, 19 Feb 2025 03:46:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 74A9A6B00AB; Tue, 18 Feb 2025 22:46:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6F9EF6B00AD; Tue, 18 Feb 2025 22:46:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5C1982801D7; Tue, 18 Feb 2025 22:46:56 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3FA826B00AB for ; Tue, 18 Feb 2025 22:46:56 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E75A11408CE for ; Wed, 19 Feb 2025 03:46:55 +0000 (UTC) X-FDA: 83135307990.01.09E6EBC Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.8]) by imf03.hostedemail.com (Postfix) with ESMTP id 8C79A20003 for ; Wed, 19 Feb 2025 03:46:53 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=Qb8paGPI; spf=pass (imf03.hostedemail.com: domain of yangge1116@126.com designates 220.197.31.8 as permitted sender) smtp.mailfrom=yangge1116@126.com; dmarc=pass (policy=none) header.from=126.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739936814; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:dkim-signature; bh=utRnI7mxe7cuiyM4AoQk1z9cSwN4I0+H9J0WiTjyXgQ=; b=6ZjosaSJfta0zoHsx/0P7FjLMJGRcIXUpRfogXjkNe7aXtWTM3sNLSSmDK1JvRi4kGCbyZ 57xXddOZB9bG0yxdBWv7E4BTizr3aHYKrxrd0zHXoYTwI5pDAsrGrk0fibOLpMHPq+CaVA zr0Djd1X7Tp7qQeTsciaghTJYghSbEM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=126.com header.s=s110527 header.b=Qb8paGPI; spf=pass (imf03.hostedemail.com: domain of yangge1116@126.com designates 220.197.31.8 as permitted sender) smtp.mailfrom=yangge1116@126.com; dmarc=pass (policy=none) header.from=126.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739936814; a=rsa-sha256; cv=none; b=IuNzuaXQKJFS4/UybTt9v7k9/izI7WxwWXESLiH6BfeLFzlEM7ljYnXgSRjxdxb0RW5VJ8 IFHStq9IAHe/8ZskpsLfEHZxYLt1LgUq5a2WZC1I02oIrkqoHZ2j0Ms4Gdk3uYcwt6yfhc aM1qK+tlGtQRCPjw5EVfTonm3BEWZMc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=utRnI7mxe7cuiyM4Ao Qk1z9cSwN4I0+H9J0WiTjyXgQ=; b=Qb8paGPI2Eu5Hp0hj/r6CS6JFpiDObAueA Cmhgvlq/jg8w70UjZbBXP6Zo7XPhwn6OCE8qyMwOQahjch4la3E7NlUOiISNQs3/ rUOFkGaYZ2yy+BXo9WckvIKCw7iqVCouVPAj+FFfCprVovs76g5Dh/NqPg6BDvkd jrzjGAC+Y= Received: from hg-OptiPlex-7040.hygon.cn (unknown []) by gzsmtp1 (Coremail) with SMTP id PCkvCgBXTkQlVLVnVARgAw--.36018S2; Wed, 19 Feb 2025 11:46:46 +0800 (CST) From: yangge1116@126.com To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, 21cnbao@gmail.com, david@redhat.com, baolin.wang@linux.alibaba.com, muchun.song@linux.dev, osalvador@suse.de, liuzixing@hygon.cn, Ge Yang Subject: [PATCH V4] mm/hugetlb: wait for hugetlb folios to be freed Date: Wed, 19 Feb 2025 11:46:44 +0800 Message-Id: <1739936804-18199-1-git-send-email-yangge1116@126.com> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: PCkvCgBXTkQlVLVnVARgAw--.36018S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxXryrZr43Gw13Cw48Cw45KFg_yoWrtry8pF yUKr13GayDJr9akrn7AwsYyr1SyrWkXFW2krWIqw45ZFnxJa4kKFy2vwn0q3yrAr93CFWI vrWqqrWDuF1UZaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR1SoAUUUUU= X-Originating-IP: [112.64.138.194] X-CM-SenderInfo: 51dqwwjhrrila6rslhhfrp/1tbifgL4G2e1Un4BNgABsX X-Rspam-User: X-Stat-Signature: hi5zu1dj6p6f84wkfetwc7n11zw5mpaq X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8C79A20003 X-HE-Tag: 1739936813-313575 X-HE-Meta: U2FsdGVkX19pCxLRWL8iMYJ5a1NpAM6NhVmNb/7GDggqwwYijEleeusX2BjTiKXXgU0GLvgD4YAnu1Ul0bNxmCcg4u6dy0u/WQx9jwvp447t/4zsLUIHwC8He3dg/yHpbMFZGf3G1tt5m1P2A4oUMDQ2YUwAL3JuYqlQmHjGuOJ+OHE18vicYMSInFeQjQwfTGuu6yzcxmPqZQmtTfs4wGtU5pcnG6HIjfPl14SceoLUeJndaB8hCmlBXiX176H45skBH/CWHHUNPMDuJkDXymNoKwXWbYsGXay4MOB0kiC9N8skBatVBUqktiMy14pCWaTzBJGXjiGPmhcj+noARXYMg+/tFsTRYGDE3hU+DDko/G+qQ1JzbyTX2Omj9FZrQKUBzO7OUAdZBfTsy3eSSAdgsWDlIoLfrePRQtYHzS+jb9DM+Ja6pOtRmnZq3olD7EPxs/alMSrhlwt0IhLrKngIfoaD4GZAsd5VFRNHkPPvS86XODdCpbMktMQ39KmcLgS/Uz2W2MNHAO80tCcIipjWu+diJ72VtkW2obaDNrR9rLxxjiKTDZcRnzXNEJTrDmCvQdOyPDOsNeA6DH7dVIcR4Ld2Wq5lRbwCnLboI+Q+Ot4J1nW9YS2xLnjK7w9Ujcn+rM1Jfi+vbtPbSlHDbFjR8Bpnkk3pPKJaTSjnLDBD9YsgnzEZjZWW+2GernC2My0rIjK/npUM2aMX64DpIE1NdVMETT1rAjNt3CqPlEIo1FnsWOe3W4rs38bt4r7TSIxOKLCXqdQzom/u6/Qixz3X+dNrN54kko0iyQ8u43Ud4dzQDc3RuGmhSbnwyHYZmpWZZQQmr33B1+BkloZKKEu4aKTORY1zvp4kghJ5lGv5j2h0pNxVuyQa3Z5NE3caI1gRNbleL55umuLJrWZvYtR057SQ2aQGWd0R9VrTfFl+U7zcGnAV6pIQLzq/BEoqK1jdgIF8xWw6psbzt+8 UJXlRvF+ ZRT+EGu5Ll/6jLRNGY8cL+I4UNpgdgI0yBiD1NPt3LPtA9IYBNb29Xqc/xf/xQMxXwOwfMPKtpSi2brDYSBOdB7XyWCel8tE88TaoW3iqmLdFnFkaom0aJWWqvk6czBvpyt1VSvE5A6jbTLwa8qOV9o8yMx2LlbsC7klg7wACwZHkIL7Gaw1R0cxteRaCZXrX27IS72uvGsaenXYpl7u866Rht9APVNw7Ec4sqdgMs+1QfEgV2s137SODZHs04e2+hHD7fCT96/tpiBIXXGV4TSpqrtXhgALaMJN4JC0/pQ0Xtoo= 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: From: Ge Yang Since the introduction of commit c77c0a8ac4c52 ("mm/hugetlb: defer freeing of huge pages if in non-task context"), which supports deferring the freeing of hugetlb pages, the allocation of contiguous memory through cma_alloc() may fail probabilistically. In the CMA allocation process, if it is found that the CMA area is occupied by in-use hugetlb folios, these in-use hugetlb folios need to be migrated to another location. When there are no available hugetlb folios in the free hugetlb pool during the migration of in-use hugetlb folios, new folios are allocated from the buddy system. A temporary state is set on the newly allocated folio. Upon completion of the hugetlb folio migration, the temporary state is transferred from the new folios to the old folios. Normally, when the old folios with the temporary state are freed, it is directly released back to the buddy system. However, due to the deferred freeing of hugetlb pages, the PageBuddy() check fails, ultimately leading to the failure of cma_alloc(). Here is a simplified call trace illustrating the process: cma_alloc() ->__alloc_contig_migrate_range() // Migrate in-use hugetlb folios ->unmap_and_move_huge_page() ->folio_putback_hugetlb() // Free old folios ->test_pages_isolated() ->__test_page_isolated_in_pageblock() ->PageBuddy(page) // Check if the page is in buddy To resolve this issue, we have implemented a function named wait_for_freed_hugetlb_folios(). This function ensures that the hugetlb folios are properly released back to the buddy system after their migration is completed. By invoking wait_for_freed_hugetlb_folios() before calling PageBuddy(), we ensure that PageBuddy() will succeed. Fixes: c77c0a8ac4c52 ("mm/hugetlb: defer freeing of huge pages if in non-task context") Signed-off-by: Ge Yang Cc: Reviewed-by: Muchun Song Acked-by: David Hildenbrand --- V4: - add a check to determine if hpage_freelist is empty suggested by David V3: - adjust code and message suggested by Muchun and David V2: - flush all folios at once suggested by David include/linux/hugetlb.h | 5 +++++ mm/hugetlb.c | 8 ++++++++ mm/page_isolation.c | 10 ++++++++++ 3 files changed, 23 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 6c6546b..0c54b3a 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -697,6 +697,7 @@ bool hugetlb_bootmem_page_zones_valid(int nid, struct huge_bootmem_page *m); int isolate_or_dissolve_huge_page(struct page *page, struct list_head *list); int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn); +void wait_for_freed_hugetlb_folios(void); struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, unsigned long addr, bool cow_from_owner); struct folio *alloc_hugetlb_folio_nodemask(struct hstate *h, int preferred_nid, @@ -1092,6 +1093,10 @@ static inline int replace_free_hugepage_folios(unsigned long start_pfn, return 0; } +static inline void wait_for_freed_hugetlb_folios(void) +{ +} + static inline struct folio *alloc_hugetlb_folio(struct vm_area_struct *vma, unsigned long addr, bool cow_from_owner) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 30bc34d..8801dbc 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2955,6 +2955,14 @@ int replace_free_hugepage_folios(unsigned long start_pfn, unsigned long end_pfn) return ret; } +void wait_for_freed_hugetlb_folios(void) +{ + if (llist_empty(&hpage_freelist)) + return; + + flush_work(&free_hpage_work); +} + typedef enum { /* * For either 0/1: we checked the per-vma resv map, and one resv diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 8ed53ee0..b2fc526 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -615,6 +615,16 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, int ret; /* + * Due to the deferred freeing of hugetlb folios, the hugepage folios may + * not immediately release to the buddy system. This can cause PageBuddy() + * to fail in __test_page_isolated_in_pageblock(). To ensure that the + * hugetlb folios are properly released back to the buddy system, we + * invoke the wait_for_freed_hugetlb_folios() function to wait for the + * release to complete. + */ + wait_for_freed_hugetlb_folios(); + + /* * Note: pageblock_nr_pages != MAX_PAGE_ORDER. Then, chunks of free * pages are not aligned to pageblock_nr_pages. * Then we just check migratetype first.