From patchwork Tue Jul 30 20:03:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 13747846 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 72F74C3DA49 for ; Tue, 30 Jul 2024 20:03:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 100566B0083; Tue, 30 Jul 2024 16:03:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0B0466B0085; Tue, 30 Jul 2024 16:03:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F085F6B0089; Tue, 30 Jul 2024 16:03:52 -0400 (EDT) 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 D208D6B0083 for ; Tue, 30 Jul 2024 16:03:52 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 8C45014047B for ; Tue, 30 Jul 2024 20:03:52 +0000 (UTC) X-FDA: 82397494704.21.E690762 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf15.hostedemail.com (Postfix) with ESMTP id E060CA001B for ; Tue, 30 Jul 2024 20:03:50 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=b6geQ0cl; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722369769; 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-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=/gxfuKJD8hnhbSrwyVXjwcDnAiiLt3on755V01mHK1c=; b=cW71d+JkSi3Zj35A2DpUY6PddBO5/GhpMeFOx3bmD2qNtglZAXvgZ6b9fdxkNZh6sD4jjl PdxWreGSwjiIX0Ovkd0rSUbK+SHPRtGZmodhW62bBNmk1ZOzjHG4uiFZ6xuyf/lQWSXe6W LOZz8KC+L1b52Tcu2yHZl7xQska3S2g= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722369769; a=rsa-sha256; cv=none; b=iNrUVrCzBZ3+t2wBUNDSfFw2QKzxeQr5pJHrzmirFcUvMFWjTCntRwoPltxAtuac5X8ohy AXxV/Xd+4etTSZpy7eZrXFujWuLM3ttENxmQmG8VtqU6XF0GioXnASHLqBn9hHhxtpRtub ENu53Fdp6ZeDkR7Z5wKaHYsbnDppoyg= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=b6geQ0cl; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722369830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=/gxfuKJD8hnhbSrwyVXjwcDnAiiLt3on755V01mHK1c=; b=b6geQ0cljWR7PN3T9dGvuAsiHUeyFUocWUzoShMj9Jmmqsw02yhCc/u0ac86A8uuw/Fccc LPNSZX06kmWOqwpyY/OVZEG9oBimFwJP5yWKDcGGCpOrrksLw4PJbVUYtouzmzvhDIiPda 5kYdRqCjhBrt5yGHuVWPfN0l3iF3ODE= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-301-FOQSop7AOc-pGjbXLkFAxw-1; Tue, 30 Jul 2024 16:03:48 -0400 X-MC-Unique: FOQSop7AOc-pGjbXLkFAxw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DB0C1955D4A; Tue, 30 Jul 2024 20:03:47 +0000 (UTC) Received: from t14s.redhat.com (unknown [10.39.192.21]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 87FF41955F3B; Tue, 30 Jul 2024 20:03:43 +0000 (UTC) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, David Hildenbrand , stable@vger.kernel.org, Peter Xu , Oscar Salvador , Muchun Song , Baolin Wang Subject: [PATCH v2] mm/hugetlb: fix hugetlb vs. core-mm PT locking Date: Tue, 30 Jul 2024 22:03:41 +0200 Message-ID: <20240730200341.1642904-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E060CA001B X-Stat-Signature: uwyhqqkiiix6s5qxfrkkhjow3snkmmag X-Rspam-User: X-HE-Tag: 1722369830-331985 X-HE-Meta: U2FsdGVkX1+f8Ftp4ZmrXWM7P+ElwwACi5IuoohyWZgRx67iVW+pnLnFzyAej083fIYQCU6Xy9Wg+Mbgkvqxyc3RX3dHppZTFA5I06PXYT7y2+XfbJMG4vB+L0T8xyQ0Fewo/kA2vhBK3gdytFMoI0lxCYo7b45KR/WNxbJE9edNNUiCaBCUVNT/nhrz+o2qQYuV9yDo7G+JYcWDo5xZFi9eoGOOajchlZac5zFVtL2jjTKLSfQTpL5wWsaFS7K66d4/oQblxWH278C1Ayxp/9ywowPZckJj/T1CDEnzYt37YeumZ8I17HQdH4YxNdyD3Y+gFmcBvwOktYMptJe8KH2L2ZDVJMYi1ZHPwIEZF2vKFETg9qB1ogp7PI0ATbANfmnHUTEnjEcdMJz6mutgN/F2sz/J3T7FIr0d/4Q2fjprEmUbwWqUQ9REQathCVthLrnolm70QqVWFCIkZLNS8L4ZPWqY7k4NOWgfjdKj8uXywwQDUI0maeboDa3m+gQbsLT8c+6BDt23zYdG8bpP3pz4RMeoCOkoSlGL/CwSTZU73kue+OBjhvqpV8TgdTqtiX2FSH2XTqvFFb5Bws/MQDRj9pgImP8nxhlyectsLOzdtcaB7E5eveoxmYoHG7pRfdSg9pX7Gb++sGelTJ1tHl0R2S7tTp9qXOP1glX6a1/G5nEO7JxuNwXkxaodoz3h5WRVPn7NDeWCW+gBFGGidTvVBIJK/EoB83TK2bUHewmJRXMckmx5vKaF2QOvlH5f3PfU3kPInf4O5sOyBasBvyc4/fqk9Pavtc+K7VNTLtD/BE1LhlggOFnq3BD6f37ts3PuetkIEaX55HJXAGnQsY2LxQym8wQZjEmlFRAxg3hBg+uUzGY+spAq47wb0k/s1qU7eBQthwjTENElNdShpA7Lb3hxRV8UroflxyHk8OrPpBpzLBixnVO+JLPlMwhYMG554NsPVFrpk8m1I5h 61op+XNa vsykLa3HtdiFXS5L1ICUSkI+J1di71FgBXd6QJKj2KgJ2oWxcvzU6GFGEf20NBNuh1CM26h0Nd3AwLVIi5Iv5DxhBQljUJvKY9hxFHbE8Mo7Ku/ta3MoSRy6zcp7bKBSedfftYY6qhfSH6OfX0IXC4AAw6bCqAWCG1Mb0HgUBMV5T0oHCh7SU3oPcjD+4gcdaR+zWJ0CdjqUGF1jEAaXZFKHKPOX8MQnyUTdk4qPfdh2KiWLnDCyFnHRAJV+0FdcQlUlj4kb7HQWfldhhu4C/1tpuIhJ9rpAcE09bmqTCLbHrX5xx64eIaVWDE4x4bMUdwTXiU59f9GVIfRRys3WhZXjW9RjYA/XtH55VoEfWgpByHvwLK4fd2IsAmP6vHsMXLv9S 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: We recently made GUP's common page table walking code to also walk hugetlb VMAs without most hugetlb special-casing, preparing for the future of having less hugetlb-specific page table walking code in the codebase. Turns out that we missed one page table locking detail: page table locking for hugetlb folios that are not mapped using a single PMD/PUD. Assume we have hugetlb folio that spans multiple PTEs (e.g., 64 KiB hugetlb folios on arm64 with 4 KiB base page size). GUP, as it walks the page tables, will perform a pte_offset_map_lock() to grab the PTE table lock. However, hugetlb that concurrently modifies these page tables would actually grab the mm->page_table_lock: with USE_SPLIT_PTE_PTLOCKS, the locks would differ. Something similar can happen right now with hugetlb folios that span multiple PMDs when USE_SPLIT_PMD_PTLOCKS. This issue can be reproduced [1], for example triggering: [ 3105.936100] ------------[ cut here ]------------ [ 3105.939323] WARNING: CPU: 31 PID: 2732 at mm/gup.c:142 try_grab_folio+0x11c/0x188 [ 3105.944634] Modules linked in: [...] [ 3105.974841] CPU: 31 PID: 2732 Comm: reproducer Not tainted 6.10.0-64.eln141.aarch64 #1 [ 3105.980406] Hardware name: QEMU KVM Virtual Machine, BIOS edk2-20240524-4.fc40 05/24/2024 [ 3105.986185] pstate: 60000005 (nZCv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 3105.991108] pc : try_grab_folio+0x11c/0x188 [ 3105.994013] lr : follow_page_pte+0xd8/0x430 [ 3105.996986] sp : ffff80008eafb8f0 [ 3105.999346] x29: ffff80008eafb900 x28: ffffffe8d481f380 x27: 00f80001207cff43 [ 3106.004414] x26: 0000000000000001 x25: 0000000000000000 x24: ffff80008eafba48 [ 3106.009520] x23: 0000ffff9372f000 x22: ffff7a54459e2000 x21: ffff7a546c1aa978 [ 3106.014529] x20: ffffffe8d481f3c0 x19: 0000000000610041 x18: 0000000000000001 [ 3106.019506] x17: 0000000000000001 x16: ffffffffffffffff x15: 0000000000000000 [ 3106.024494] x14: ffffb85477fdfe08 x13: 0000ffff9372ffff x12: 0000000000000000 [ 3106.029469] x11: 1fffef4a88a96be1 x10: ffff7a54454b5f0c x9 : ffffb854771b12f0 [ 3106.034324] x8 : 0008000000000000 x7 : ffff7a546c1aa980 x6 : 0008000000000080 [ 3106.038902] x5 : 00000000001207cf x4 : 0000ffff9372f000 x3 : ffffffe8d481f000 [ 3106.043420] x2 : 0000000000610041 x1 : 0000000000000001 x0 : 0000000000000000 [ 3106.047957] Call trace: [ 3106.049522] try_grab_folio+0x11c/0x188 [ 3106.051996] follow_pmd_mask.constprop.0.isra.0+0x150/0x2e0 [ 3106.055527] follow_page_mask+0x1a0/0x2b8 [ 3106.058118] __get_user_pages+0xf0/0x348 [ 3106.060647] faultin_page_range+0xb0/0x360 [ 3106.063651] do_madvise+0x340/0x598 Let's make huge_pte_lockptr() effectively uses the same PT locks as any core-mm page table walker would. Add ptep_lockptr() to obtain the PTE page table lock using a pte pointer -- unfortunately we cannot convert pte_lockptr() because virt_to_page() doesn't work with kmap'ed page tables we can have with CONFIG_HIGHPTE. There is one ugly case: powerpc 8xx, whereby we have an 8 MiB hugetlb folio being mapped using two PTE page tables. While hugetlb wants to take the PMD table lock, core-mm would grab the PTE table lock of one of both PTE page tables. In such corner cases, we have to make sure that both locks match, which is (fortunately!) currently guaranteed for 8xx as it does not support SMP and consequently doesn't use split PT locks. [1] https://lore.kernel.org/all/1bbfcc7f-f222-45a5-ac44-c5a1381c596d@redhat.com/ Fixes: 9cb28da54643 ("mm/gup: handle hugetlb in the generic follow_page_mask code") Cc: Cc: Peter Xu Cc: Oscar Salvador Cc: Muchun Song Cc: Baolin Wang Signed-off-by: David Hildenbrand Reviewed-by: James Houghton --- Still busy runtime-testing of this version -- have to set up my ARM environment again. Dropped the RB's/ACKs because there was significant change in the pte_lockptr() handling. v1 -> 2: * Extend patch description * Drop "mm: let pte_lockptr() consume a pte_t pointer" * Introduce ptep_lockptr() in this patch I wish there was a nicer way to avoid messing with CONFIG_HIGHPTE ... --- include/linux/hugetlb.h | 26 +++++++++++++++++++++++--- include/linux/mm.h | 10 ++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index c9bf68c239a01..dd6d4ee5ee59c 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -944,10 +944,30 @@ static inline bool htlb_allow_alloc_fallback(int reason) static inline spinlock_t *huge_pte_lockptr(struct hstate *h, struct mm_struct *mm, pte_t *pte) { - if (huge_page_size(h) == PMD_SIZE) + VM_WARN_ON(huge_page_size(h) == PAGE_SIZE); + VM_WARN_ON(huge_page_size(h) >= P4D_SIZE); + + /* + * hugetlb must use the exact same PT locks as core-mm page table + * walkers would. When modifying a PTE table, hugetlb must take the + * PTE PT lock, when modifying a PMD table, hugetlb must take the PMD + * PT lock etc. + * + * The expectation is that any hugetlb folio smaller than a PMD is + * always mapped into a single PTE table and that any hugetlb folio + * smaller than a PUD (but at least as big as a PMD) is always mapped + * into a single PMD table. + * + * If that does not hold for an architecture, then that architecture + * must disable split PT locks such that all *_lockptr() functions + * will give us the same result: the per-MM PT lock. + */ + if (huge_page_size(h) < PMD_SIZE && !IS_ENABLED(CONFIG_HIGHPTE)) + /* pte_alloc_huge() only applies with !CONFIG_HIGHPTE */ + return ptep_lockptr(mm, pte); + else if (huge_page_size(h) < PUD_SIZE) return pmd_lockptr(mm, (pmd_t *) pte); - VM_BUG_ON(huge_page_size(h) == PAGE_SIZE); - return &mm->page_table_lock; + return pud_lockptr(mm, (pud_t *) pte); } #ifndef hugepages_supported diff --git a/include/linux/mm.h b/include/linux/mm.h index b100df8cb5857..1b1f40ff00b7d 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2926,6 +2926,12 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) return ptlock_ptr(page_ptdesc(pmd_page(*pmd))); } +static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte) +{ + BUILD_BUG_ON(IS_ENABLED(CONFIG_HIGHPTE)); + return ptlock_ptr(virt_to_ptdesc(pte)); +} + static inline bool ptlock_init(struct ptdesc *ptdesc) { /* @@ -2950,6 +2956,10 @@ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) { return &mm->page_table_lock; } +static inline spinlock_t *ptep_lockptr(struct mm_struct *mm, pte_t *pte) +{ + return &mm->page_table_lock; +} static inline void ptlock_cache_init(void) {} static inline bool ptlock_init(struct ptdesc *ptdesc) { return true; } static inline void ptlock_free(struct ptdesc *ptdesc) {}