From patchwork Fri Sep 22 11:58:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13395669 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 A2FD3E70715 for ; Fri, 22 Sep 2023 11:58:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ED0B66B02C4; Fri, 22 Sep 2023 07:58:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E30BF6B02C5; Fri, 22 Sep 2023 07:58:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CF9086B02C6; Fri, 22 Sep 2023 07:58:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C0DF56B02C4 for ; Fri, 22 Sep 2023 07:58:28 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 92CB414052E for ; Fri, 22 Sep 2023 11:58:28 +0000 (UTC) X-FDA: 81264085896.19.ECCB411 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id CB599A0037 for ; Fri, 22 Sep 2023 11:58:26 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695383906; 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:in-reply-to:references:references; bh=uKNHikKoL/69PLUZ0UilyO+gsLiuu6zxjvuJd+I9ZZ4=; b=QHkJCpiwfhAf64wu4OCjGnBDBiqZWceTA99yUXqsXQ2y2WPuY480g5z8b6ktYdaIKEPzgo GVyD6/RjQenz/E1em7oNx9Fx16wA2gp2Wq7XumJfiUnJ5XIW02K4COJ7jEmMTtTMa02egX TlCuVxJoyCEnNAqribtWjKo6KvV9Kq4= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf15.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695383906; a=rsa-sha256; cv=none; b=eCBrl29iUPYQhJzpcV3iwvrvmOqnz1BzE+7xukIr6pOeAerjqpUW8J2gDoxAXKBRUvSgfO UyL8p601ZV2/dudkWBV9Ijg4y8Lq844A++qJ74+rh49CWgR/IXcTAw9cMPvdpCTkwmzofa 26cMnOMLDvDsv+akTfHx9pt3LWEk1sU= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A520143D; Fri, 22 Sep 2023 04:59:02 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C40783F67D; Fri, 22 Sep 2023 04:58:20 -0700 (PDT) From: Ryan Roberts To: Catalin Marinas , Will Deacon , "James E.J. Bottomley" , Helge Deller , Nicholas Piggin , Christophe Leroy , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Gerald Schaefer , "David S. Miller" , Arnd Bergmann , Mike Kravetz , Muchun Song , SeongJae Park , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , Lorenzo Stoakes , Anshuman Khandual , Peter Xu , Axel Rasmussen , Qi Zheng Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org Subject: [PATCH v2 2/2] arm64: hugetlb: Fix set_huge_pte_at() to work with all swap entries Date: Fri, 22 Sep 2023 12:58:04 +0100 Message-Id: <20230922115804.2043771-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230922115804.2043771-1-ryan.roberts@arm.com> References: <20230922115804.2043771-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 7ohk7mit7hgf7zctj5bjb3xynydu3zn9 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: CB599A0037 X-HE-Tag: 1695383906-418828 X-HE-Meta: U2FsdGVkX1+aY4QMJz0hEugPD9VAXVMn7y22oG9N7HylYSRziKUmSh9RjZ3jVw9kzzuVpV3eaoSfH4W7AEm2556Dq439ZR1RUWQO7cLGNyJAxhUz0Ezzi2q+epJYNUO/sG3AUy5csOl/phKLLTXCF9xeBTJEYDNNT96j8EZW1RdUufCiF0mt3xLU4SYt396J9OTZzFy4NcEsprO64mr/YN1/aNLjg/m9RsVG11xVwfWjOMypLISq0CNGt9tRVpL8hFkAZgbxKspe7WAU8WXgrC0rbXybCLng3/kNJz/Jk8TD1YAZTbqc52/NPgS7YJxX5EF//A1bF2zkKG/MRGXo8mAHGq6oLSM5IkuGvCWPKOumb4vRr44RyjZ8tjso/PnY8D+g2mUb/o97mRUqd8wlpR+0guxW42xf1MoNmVOXphMms/YMRFgLxQvsQOuaYfPDE1dsJ6XRmcGdrV+WRyCHjvr5rWhzc7uOptszboQcrdOZEtT7ly3Qi0Toge3Di2D0KQtgtVWUROXg+xwP2U6WrAdgVBJYhZ45KMPt6+4aDp+Erj158BB4ODx8WbmtuQGWgZZvCkqb2syTKoJAgRruTwLd6/b0WqCYk+IRS93Yv5bT8fWqCQSCCL08dRWoP7J7pO+61ZiEqQWBpwR2YVzBCv7zDXChh+FCGPFiXEHPAUwD/Sv9hcDpr1cx0RhJyc3aSxo9V3PFDtH5sK5nqdgxDsAMIoPc0p98xUYYW0RUnC54jLrVUuMLCwKr2khLRcFEvM95ihxJmx9UEt7OsCEce06d6brR+wctA5ToTBL+1eyX2rc0Kym8vl3HYFW3nprgRQgaIqs23tqLbSfOaYSR6IB9x6vLQeXwN7RXD5jcvDDFNnDdN3tfBvTIjhslLjDLaNwAeNIf9PLZbEGMCO9i5qpyGoF3VUiiwWEUcl+tf6FEII2FqnFbzQpc1lJmrsmojxfVGJBnyKA0M2pi2BY q7FyxZHk B4xKLq6q1uuDE7XsIyfhHEXA3YZB6ize2sBKgXRLd04UYIqXUrD31Wn6HcdFlYNzXPzPU1DBNbHO9XcexogGvZRzrNI3qqxPbC58wOWKJFVnMc9MQZ6OblMfCqQtfjsowxl/uEYTOa9dXAhY8DIsk4jbyEkkFJ2SZn/6NdfXSEXho5sYNiWF9GP8iVe04JSfyxGt52xVj2eERZxWorI8BZypVJGKMbxNIOm3retLeEXOZJNf8g3heYOpILIPzIcFhS2e/wShb/dxO7jE= 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: When called with a swap entry that does not embed a PFN (e.g. PTE_MARKER_POISONED or PTE_MARKER_UFFD_WP), the previous implementation of set_huge_pte_at() would either cause a BUG() to fire (if CONFIG_DEBUG_VM is enabled) or cause a dereference of an invalid address and subsequent panic. arm64's huge pte implementation supports multiple huge page sizes, some of which are implemented in the page table with multiple contiguous entries. So set_huge_pte_at() needs to work out how big the logical pte is, so that it can also work out how many physical ptes (or pmds) need to be written. It previously did this by grabbing the folio out of the pte and querying its size. However, there are cases when the pte being set is actually a swap entry. But this also used to work fine, because for huge ptes, we only ever saw migration entries and hwpoison entries. And both of these types of swap entries have a PFN embedded, so the code would grab that and everything still worked out. But over time, more calls to set_huge_pte_at() have been added that set swap entry types that do not embed a PFN. And this causes the code to go bang. The triggering case is for the uffd poison test, commit 99aa77215ad0 ("selftests/mm: add uffd unit test for UFFDIO_POISON"), which causes a PTE_MARKER_POISONED swap entry to be set, coutesey of commit 8a13897fb0da ("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs") - added in v6.5-rc7. Although review shows that there are other call sites that set PTE_MARKER_UFFD_WP (which also has no PFN), these don't trigger on arm64 because arm64 doesn't support UFFD WP. Arguably, the root cause is really due to commit 18f3962953e4 ("mm: hugetlb: kill set_huge_swap_pte_at()"), which aimed to simplify the interface to the core code by removing set_huge_swap_pte_at() (which took a page size parameter) and replacing it with calls to set_huge_pte_at() where the size was inferred from the folio, as descibed above. While that commit didn't break anything at the time, it did break the interface because it couldn't handle swap entries without PFNs. And since then new callers have come along which rely on this working. But given the brokeness is only observable after commit 8a13897fb0da ("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs"), that one gets the Fixes tag. Now that we have modified the set_huge_pte_at() interface to pass the huge page size in the previous patch, we can trivially fix this issue. Signed-off-by: Ryan Roberts Fixes: 8a13897fb0da ("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs") Cc: # 6.5+ Acked-by: Will Deacon Reviewed-by: Axel Rasmussen --- arch/arm64/mm/hugetlbpage.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index a7f8c8db3425..13fd592228b1 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -241,13 +241,6 @@ static void clear_flush(struct mm_struct *mm, flush_tlb_range(&vma, saddr, addr); } -static inline struct folio *hugetlb_swap_entry_to_folio(swp_entry_t entry) -{ - VM_BUG_ON(!is_migration_entry(entry) && !is_hwpoison_entry(entry)); - - return page_folio(pfn_to_page(swp_offset_pfn(entry))); -} - void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned long sz) { @@ -257,13 +250,10 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, unsigned long pfn, dpfn; pgprot_t hugeprot; - if (!pte_present(pte)) { - struct folio *folio; - - folio = hugetlb_swap_entry_to_folio(pte_to_swp_entry(pte)); - ncontig = num_contig_ptes(folio_size(folio), &pgsize); + ncontig = num_contig_ptes(sz, &pgsize); - for (i = 0; i < ncontig; i++, ptep++) + if (!pte_present(pte)) { + for (i = 0; i < ncontig; i++, ptep++, addr += pgsize) set_pte_at(mm, addr, ptep, pte); return; } @@ -273,7 +263,6 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, return; } - ncontig = find_num_contig(mm, addr, ptep, &pgsize); pfn = pte_pfn(pte); dpfn = pgsize >> PAGE_SHIFT; hugeprot = pte_pgprot(pte);