From patchwork Tue Sep 26 03:10:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 13398616 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 5DB9FE81816 for ; Tue, 26 Sep 2023 03:13:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D897D6B011D; Mon, 25 Sep 2023 23:13:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D38D66B011F; Mon, 25 Sep 2023 23:13:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C27866B0120; Mon, 25 Sep 2023 23:13:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id B5B1D6B011D for ; Mon, 25 Sep 2023 23:13:41 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 7FE5A1A0C69 for ; Tue, 26 Sep 2023 03:13:41 +0000 (UTC) X-FDA: 81277278642.28.879AA31 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by imf10.hostedemail.com (Postfix) with ESMTP id E0C01C0002 for ; Tue, 26 Sep 2023 03:13:39 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=none; spf=none (imf10.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695698020; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7A0YQGM1pT77jPvugLxJDapLDVvHr1FFT0U4Jwbio2U=; b=jqUwJE0RQtahixrtJ/6AOcuz11creCH3CvopCn9IYvUFHnS3F33Akx7z5PuTudXIlt1QM1 ba8gyEM3/a9a1vJhVePnbSPrQWP8YFqS64pIrDI/Te0iP197iHoxA+cDwplKv0y4R1euhT hmfYlFnw/ZykEweVczwRzomurr0fGAk= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=none; spf=none (imf10.hostedemail.com: domain of riel@shelob.surriel.com has no SPF policy when checking 96.67.55.147) smtp.mailfrom=riel@shelob.surriel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695698020; a=rsa-sha256; cv=none; b=e0QcD+O3hRWnIMp44M7A6zURfpinYc/0BbCDMPR9UjLzxniS8GAK2Ix1ZfNI/KARH2oC1q m9/wR1ri2tRPJxGGekQT9pGRxrz6SFyN6cTLFHOeEvt1p9eZTwZddaiCVDTfe2VrMEcMm9 1aUaMuzNMIOXGKlmuj3fQmRwuzlg360= Received: from imladris.home.surriel.com ([10.0.13.28] helo=imladris.surriel.com) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1qkyVD-00025y-16; Mon, 25 Sep 2023 23:12:47 -0400 From: riel@surriel.com To: linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, linux-mm@kvack.org, akpm@linux-foundation.org, muchun.song@linux.dev, mike.kravetz@oracle.com, leit@meta.com, willy@infradead.org, Rik van Riel Subject: [PATCH 2/3] hugetlbfs: close race between MADV_DONTNEED and page fault Date: Mon, 25 Sep 2023 23:10:51 -0400 Message-ID: <20230926031245.795759-3-riel@surriel.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230926031245.795759-1-riel@surriel.com> References: <20230926031245.795759-1-riel@surriel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: E0C01C0002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: fnjc9dyyz3y7oeqyn4sybdryzmhfpk31 X-HE-Tag: 1695698019-684372 X-HE-Meta: U2FsdGVkX1/Z3AogBv4nJ3HmFSwEQwFn9tbTS7I1UMvaMT1pfe78WEfXnCeP79Xo2G38W+0SlCuTkFVewv+CUc+4QQ0qOBIKvwsKM20lQ12H1tqVFhVJG3nNxfRDlnkwbWvxQkWs3FqQB6GF9l22xAFQrikW08j4DS3pGR9hdSY3IK0yaygNqVpPUD23paWRanyCWcQbFgGJqf23JW9xeO4QhLcUaiufvu9hIobCEjyn5YHTzDU/89hi5E+hJsRCAncyC8pPp/UudKdZfcO5AHKUuzBNHwkST7hDI6DGOv3ixF0PR6mBc4i15+i4mwfBhe28hIGaSB++d5z0gOQs3/TzRRLh/5cZzHsnYXjwPBIT6Unqwh9Xy9b6U7o3ksTPNrncjT9hKw8n118ribpe9hKXJzo8rlfIBKGFQkveB1LBGHFKIz1ZO9EyfN6vOOfc+JfZXFSmWXkNkjxaWnbJmYzbQmXy5wLYYoMH8lPsgWw0alXL1Cv57JdtdwxbBa3ZsYIi/+MrY88f20twLw5q+hvZl+6i1JOi1kv7FhQzUFwbT578LLtyn0CtjfsnQAYYjXuy/gNxCHoKkQTLJl7G7aPqV/d84lytHFOq/9aDczhCv58TfQRKTFmHqKk61qC+IzkLBMm63TT57o1LPrUY1Q1RL1AyEjC+dvoFRv7py63NirD1j/OhI6eifnR8MhYDj9OtsGN5H7xyCFLiR/RnnsEOlMdcZ2PGEoEHKnE4hXp8rOI9vQfXSJrEQjMW6JhmBzfW6dBc+ZAUqGnN4zY6Socpe31c+/gDG+1ugX2DSJVtrEUV0hnQ/ULf/LoFKQWKXvSB2LJkI//+AooPFjaXDNRMqBTCYCcQWPT0p+/x4ufzIyF8Kf467gWdnCWHp88gF3qGKByIn6QuyKKkFWyJtoX9PQct79QzjQJJf3K+uw2Q2jOCmR9kByBal7h/CtplBP1qq+hTiXySdp3c1KD bdHOth4C GhccOgOgvmVzRF5QKRoLHWtns/E3YkYP0rYev+29O5DQSyzKmMYrir9hLebh173pB97JThunfewr2z8+2bL07NI9r68bvBMTYwT7WI3F/HpQTHDBXFnf77v/pNXQtsZbVShuLylA2z0gEC5WFDmLp45nzVodS5xgrzerFjiWqQqMApKfPoLwyQL71RyiAEYDFcbtVyWs9W+kRyHoaUdzmV5kbAg6S7LnBtshIXiFWCrMfzFOKR6YGx431v7iQRv55Zs3jMKqlJUuXqjcTer3IHau5ztvGq2vhaLEHWTREhOX90GAzNyHPQLDNimk6iNLBcXKPKk5y+mfXvk4RjP8suvpmzA== 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: From: Rik van Riel Malloc libraries, like jemalloc and tcalloc, take decisions on when to call madvise independently from the code in the main application. This sometimes results in the application page faulting on an address, right after the malloc library has shot down the backing memory with MADV_DONTNEED. Usually this is harmless, because we always have some 4kB pages sitting around to satisfy a page fault. However, with hugetlbfs systems often allocate only the exact number of huge pages that the application wants. Due to TLB batching, hugetlbfs MADV_DONTNEED will free pages outside of any lock taken on the page fault path, which can open up the following race condition: CPU 1 CPU 2 MADV_DONTNEED unmap page shoot down TLB entry page fault fail to allocate a huge page killed with SIGBUS free page Fix that race by pulling the locking from __unmap_hugepage_final_range into helper functions called from zap_page_range_single. This ensures page faults stay locked out of the MADV_DONTNEED VMA until the huge pages have actually been freed. Signed-off-by: Rik van Riel --- include/linux/hugetlb.h | 35 +++++++++++++++++++++++++++++++++-- mm/hugetlb.c | 20 +++++++++++--------- mm/memory.c | 13 ++++++++----- 3 files changed, 52 insertions(+), 16 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 694928fa06a3..d9ec500cfef9 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -139,7 +139,7 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma, void unmap_hugepage_range(struct vm_area_struct *, unsigned long, unsigned long, struct page *, zap_flags_t); -void __unmap_hugepage_range_final(struct mmu_gather *tlb, +void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags); @@ -246,6 +246,25 @@ int huge_pmd_unshare(struct mm_struct *mm, struct vm_area_struct *vma, void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma, unsigned long *start, unsigned long *end); +extern void __hugetlb_zap_begin(struct vm_area_struct *vma, + unsigned long *begin, unsigned long *end); +extern void __hugetlb_zap_end(struct vm_area_struct *vma, + struct zap_details *details); + +static inline void hugetlb_zap_begin(struct vm_area_struct *vma, + unsigned long *start, unsigned long *end) +{ + if (is_vm_hugetlb_page(vma)) + __hugetlb_zap_begin(vma, start, end); +} + +static inline void hugetlb_zap_end(struct vm_area_struct *vma, + struct zap_details *details) +{ + if (is_vm_hugetlb_page(vma)) + __hugetlb_zap_end(vma, details); +} + void hugetlb_vma_lock_read(struct vm_area_struct *vma); void hugetlb_vma_unlock_read(struct vm_area_struct *vma); void hugetlb_vma_lock_write(struct vm_area_struct *vma); @@ -297,6 +316,18 @@ static inline void adjust_range_if_pmd_sharing_possible( { } +static inline void hugetlb_zap_begin( + struct vm_area_struct *vma, + unsigned long *start, unsigned long *end) +{ +} + +static inline void hugetlb_zap_end( + struct vm_area_struct *vma, + struct zap_details *details) +{ +} + static inline struct page *hugetlb_follow_page_mask( struct vm_area_struct *vma, unsigned long address, unsigned int flags, unsigned int *page_mask) @@ -442,7 +473,7 @@ static inline long hugetlb_change_protection( return 0; } -static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb, +static inline void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, unsigned long start, unsigned long end, struct page *ref_page, zap_flags_t zap_flags) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index e859fba5bc7d..5f8b82e902a8 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5306,9 +5306,9 @@ int move_hugetlb_page_tables(struct vm_area_struct *vma, return len + old_addr - old_end; } -static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, - unsigned long start, unsigned long end, - struct page *ref_page, zap_flags_t zap_flags) +void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma, + unsigned long start, unsigned long end, + struct page *ref_page, zap_flags_t zap_flags) { struct mm_struct *mm = vma->vm_mm; unsigned long address; @@ -5435,16 +5435,18 @@ static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct tlb_flush_mmu_tlbonly(tlb); } -void __unmap_hugepage_range_final(struct mmu_gather *tlb, - struct vm_area_struct *vma, unsigned long start, - unsigned long end, struct page *ref_page, - zap_flags_t zap_flags) +void __hugetlb_zap_begin(struct vm_area_struct *vma, + unsigned long *start, unsigned long *end) { + adjust_range_if_pmd_sharing_possible(vma, start, end); hugetlb_vma_lock_write(vma); i_mmap_lock_write(vma->vm_file->f_mapping); +} - /* mmu notification performed in caller */ - __unmap_hugepage_range(tlb, vma, start, end, ref_page, zap_flags); +void __hugetlb_zap_end(struct vm_area_struct *vma, + struct zap_details *details) +{ + zap_flags_t zap_flags = details ? details->zap_flags : 0; if (zap_flags & ZAP_FLAG_UNMAP) { /* final unmap */ /* diff --git a/mm/memory.c b/mm/memory.c index 6c264d2f969c..517221f01303 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1683,7 +1683,7 @@ static void unmap_single_vma(struct mmu_gather *tlb, if (vma->vm_file) { zap_flags_t zap_flags = details ? details->zap_flags : 0; - __unmap_hugepage_range_final(tlb, vma, start, end, + __unmap_hugepage_range(tlb, vma, start, end, NULL, zap_flags); } } else @@ -1728,8 +1728,12 @@ void unmap_vmas(struct mmu_gather *tlb, struct ma_state *mas, start_addr, end_addr); mmu_notifier_invalidate_range_start(&range); do { - unmap_single_vma(tlb, vma, start_addr, end_addr, &details, + unsigned long start = start_addr; + unsigned long end = end_addr; + hugetlb_zap_begin(vma, &start, &end); + unmap_single_vma(tlb, vma, start, end, &details, mm_wr_locked); + hugetlb_zap_end(vma, &details); } while ((vma = mas_find(mas, tree_end - 1)) != NULL); mmu_notifier_invalidate_range_end(&range); } @@ -1753,9 +1757,7 @@ void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, lru_add_drain(); mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, address, end); - if (is_vm_hugetlb_page(vma)) - adjust_range_if_pmd_sharing_possible(vma, &range.start, - &range.end); + hugetlb_zap_begin(vma, &range.start, &range.end); tlb_gather_mmu(&tlb, vma->vm_mm); update_hiwater_rss(vma->vm_mm); mmu_notifier_invalidate_range_start(&range); @@ -1766,6 +1768,7 @@ void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, unmap_single_vma(&tlb, vma, address, end, details, false); mmu_notifier_invalidate_range_end(&range); tlb_finish_mmu(&tlb); + hugetlb_zap_end(vma, details); } /**