• Ryan Roberts's avatar
    mm: hugetlb: add huge page size param to set_huge_pte_at() · 935d4f0c
    Ryan Roberts authored
    Patch series "Fix set_huge_pte_at() panic on arm64", v2.
    
    This series fixes a bug in arm64's implementation of set_huge_pte_at(),
    which can result in an unprivileged user causing a kernel panic.  The
    problem was triggered when running the new uffd poison mm selftest for
    HUGETLB memory.  This test (and the uffd poison feature) was merged for
    v6.5-rc7.
    
    Ideally, I'd like to get this fix in for v6.6 and I've cc'ed stable
    (correctly this time) to get it backported to v6.5, where the issue first
    showed up.
    
    
    Description of Bug
    ==================
    
    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
    99aa7721 ("selftests/mm: add uffd unit test for UFFDIO_POISON"), which
    causes a PTE_MARKER_POISONED swap entry to be set, coutesey of commit
    8a13897f ("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.
    
    If CONFIG_DEBUG_VM is enabled, we do at least get a BUG(), but otherwise,
    it will dereference a bad pointer in page_folio():
    
        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)));
        }
    
    
    Fix
    ===
    
    The simplest fix would have been to revert the dodgy cleanup commit
    18f39629 ("mm: hugetlb: kill set_huge_swap_pte_at()"), but since
    things have moved on, this would have required an audit of all the new
    set_huge_pte_at() call sites to see if they should be converted to
    set_huge_swap_pte_at().  As per the original intent of the change, it
    would also leave us open to future bugs when people invariably get it
    wrong and call the wrong helper.
    
    So instead, I've added a huge page size parameter to set_huge_pte_at(). 
    This means that the arm64 code has the size in all cases.  It's a bigger
    change, due to needing to touch the arches that implement the function,
    but it is entirely mechanical, so in my view, low risk.
    
    I've compile-tested all touched arches; arm64, parisc, powerpc, riscv,
    s390, sparc (and additionally x86_64).  I've additionally booted and run
    mm selftests against arm64, where I observe the uffd poison test is fixed,
    and there are no other regressions.
    
    
    This patch (of 2):
    
    In order to fix a bug, arm64 needs to be told the size of the huge page
    for which the pte is being set in set_huge_pte_at().  Provide for this by
    adding an `unsigned long sz` parameter to the function.  This follows the
    same pattern as huge_pte_clear().
    
    This commit makes the required interface modifications to the core mm as
    well as all arches that implement this function (arm64, parisc, powerpc,
    riscv, s390, sparc).  The actual arm64 bug will be fixed in a separate
    commit.
    
    No behavioral changes intended.
    
    Link: https://lkml.kernel.org/r/20230922115804.2043771-1-ryan.roberts@arm.com
    Link: https://lkml.kernel.org/r/20230922115804.2043771-2-ryan.roberts@arm.com
    Fixes: 8a13897f ("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs")
    Signed-off-by: default avatarRyan Roberts <ryan.roberts@arm.com>
    Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>	[powerpc 8xx]
    Reviewed-by: Lorenzo Stoakes <lstoakes@gmail.com>	[vmalloc change]
    Cc: Alexandre Ghiti <alex@ghiti.fr>
    Cc: Albert Ou <aou@eecs.berkeley.edu>
    Cc: Alexander Gordeev <agordeev@linux.ibm.com>
    Cc: Anshuman Khandual <anshuman.khandual@arm.com>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Cc: Axel Rasmussen <axelrasmussen@google.com>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
    Cc: Christoph Hellwig <hch@infradead.org>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
    Cc: Heiko Carstens <hca@linux.ibm.com>
    Cc: Helge Deller <deller@gmx.de>
    Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
    Cc: Mike Kravetz <mike.kravetz@oracle.com>
    Cc: Muchun Song <muchun.song@linux.dev>
    Cc: Nicholas Piggin <npiggin@gmail.com>
    Cc: Palmer Dabbelt <palmer@dabbelt.com>
    Cc: Paul Walmsley <paul.walmsley@sifive.com>
    Cc: Peter Xu <peterx@redhat.com>
    Cc: Qi Zheng <zhengqi.arch@bytedance.com>
    Cc: Ryan Roberts <ryan.roberts@arm.com>
    Cc: SeongJae Park <sj@kernel.org>
    Cc: Sven Schnelle <svens@linux.ibm.com>
    Cc: Uladzislau Rezki (Sony) <urezki@gmail.com>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Cc: Will Deacon <will@kernel.org>
    Cc: <stable@vger.kernel.org>	[6.5+]
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    935d4f0c
hugetlbpage.c 13.4 KB