From mboxrd@z Thu Jan 1 00:00:00 1970 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33935CA600A for ; Thu, 8 Oct 2026 08:08:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC18D6B0095; Thu, 8 Oct 2026 04:08:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E988B6B0096; Thu, 8 Oct 2026 04:08:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD5FC6B0098; Thu, 8 Oct 2026 04:08:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id BC5856B0095 for ; Thu, 8 Oct 2026 04:08:56 -0400 (EDT) Received: from smtpin14.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 255381204B1 for ; Thu, 8 Oct 2026 08:08:56 +0000 (UTC) X-FDA: 85298733072.14.BB62B83 Received: from mta0.migadu.com (out-109.mta0.migadu.com [91.218.175.109]) by imf01.hostedemail.com (Postfix) with ESMTP id 632EF40007 for ; Thu, 8 Oct 2026 08:08:52 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=MYvdfg28; spf=pass (imf01.hostedemail.com: domain of hao.ge@linux.dev designates 91.218.175.109 as permitted sender) smtp.mailfrom=hao.ge@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1791446934; b=Ms9umm0XJKQ1HQW/KL2yGLIgAoq2cF0Dwd7EF9kDZ7HJzc9ovjhCbkRqONQoAHE1gkgz3N kPLuv6h4zg/76UH/P8zX2DNklL8RcbtoofFSuMxFZk6WMGwk8d0tNPSKb/wsofapAk2cA3 iGnJYndvQrPHP4tAEurbfruytr/u53U= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=MYvdfg28; spf=pass (imf01.hostedemail.com: domain of hao.ge@linux.dev designates 91.218.175.109 as permitted sender) smtp.mailfrom=hao.ge@linux.dev; dmarc=pass (policy=none) header.from=linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1791446934; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=oVQ+hGoGiq8aJrNUXs9rHmf3/t1TtTgq6sE8od2xUuU=; b=j1FGSoZm8wyBVR5uBj0LIExa/dgwXQs8EqDgEFkvxPpNuxSZZnAvMR/VPgD54ESqD7K323 o4B0fnH7ckkua7RyZbiz6zNkwHvDnzPgWe6zFxhS6lJCIU1K4ieB5JeoxcDixlm2LFgiPv HcjBMQGGtLEG2nTt2+t2mQKHxZVwMjU= X-Envelope-To: linux-mm@kvack.org DKIM-Signature: a=rsa-sha256; bh=Yhnnial9CyXjQfMJe0x/bX884j72gzHkQhTCBK9VwN4=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1791446929; v=1; x=1792051729; b=MYvdfg28EDDZxHLrbIMD8LSFd2V6WESK+O+0i94XAs8hY0qrmW42FaDC2R3O58GV0LOKy/E7 JIVlOecD3PJedK8YS74Vj7myc9+i3YqthNLrwXLvk6PLJOy3pJjfaNmDXnnpCui7qNxLZ7jGKls SHw9KB7EZpnzCMu6gFVQDLTw= X-Envelope-To: linux-mm@kvack.org Received: by smtp.migadu.com with ESMTPS id ef9c66e098076910; Thu, 08 Oct 2026 08:08:38 +0000 X-Mizu-Trace-ID: ef9c66e098076910 X-Migadu-Flow: FLOW_OUT Message-ID: Date: Thu, 8 Oct 2026 16:09:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v11 2/7] mm/vmalloc: undo partial mappings inside the mapping functions From: Hao Ge To: Uladzislau Rezki Cc: Suren Baghdasaryan , Kent Overstreet , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Andrew Morton , Alexander Potapenko , Marco Elver , Dmitry Vyukov , Vlastimil Babka , Michal Hocko , Brendan Jackman , Johannes Weiner , Zi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, Sashiko , stable@vger.kernel.org References: <20260929082014.160587-1-hao.ge@linux.dev> <20260929082014.160587-3-hao.ge@linux.dev> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Stat-Signature: sma1m6nb8ir1zfzqcmq9qt5jifpjb4xs X-Rspamd-Queue-Id: 632EF40007 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1791446932-603292 X-HE-Meta: U2FsdGVkX18uqPltQljDiNJiCBgFLtlEuK2uJE6pz7PjLT6tmQyYnKKVOeEbrocMlYrbd3uuVokDZTJpcp+uudXnJjM9UbeyNS0uB5U11nL39LtrTtudalIpvLrr0iOIVk35b1gVQQSoCR/fLuoM9FQaW367lBNSxtOWFGvqW3de1+Y0SC6f4qpWlF2VCye9/RJY2r5/1LoDsQ1o6dNVm9e7BlcBIsb5tWWhF/zzAnedngQpJMqrSCTUY+qbopM60s25i193NRBhKh8Xle8uWXTfd5gE4lPIMsfHOVDnKfx/MKJ6Lc1xWsiGARC7pPFiJslj3VePnb/dqaOqrJV4/nHQ6HN4V49vTZOoDDD8UiIEyrtswzUI3bVTllTCoFo/0rDAcRZcM5oJR2rUvOU45WU1yw4IdgIIPDqZCx25Af7RpiaezVVKQRaqLMLwv8ojPRt4uhGZMF/Pex7uBKhSaMc/P103wX0J9gdyjkXFffO/OJ03vkUyEW4BnRqmGzK76gmL/4w/bvPw8/ZDELbx9peMCj2UySWi3YOshRrK8yRO2PNR/q0Q+++tQClIPjx5TNoWtPW96OAtnIyPQ/mBqW29MTLOygSC0T4dfXrKmYZ+xMxZiXAO/31sWuFeI6Sl7AKEfGUQS8fEPGFS8nAixA8obKCW8aNygDgMNCnoRfTYitbdgZLh7nY+oKY5EPQhI38kr/7Y+7GZ9qxVgWgffF2tovbtxrId5v9ofBjn60Pb3mrxFVXLL68OMNNsPHHpI9IZH8dEyKL10hOR4YvBX3hlLefv1Cor9Y+RqQ+Ng1ABGw5jyUPb0YrhA/sYFcJDSu9mUkJ2FZe5ev+TOlW8zihVfPwu273iM6VU0+aAImPYLJ2xX8hgqERjLUigoH7zbezObDL2ead/TPXEJwnPBEnhlcA6O9ECPhGUnvkp3fItpvrfbVJljLzhVqpwRKi2G+O4h9CBnp+9itIx9xd lCoLWzD/ XFqOlzZ/Mt6lL/Z7WKJW97CIUIiZ422oLjWP0qGckl5gI9DIEHNVLZYZ6zqoqdYzto5bIwGub5YYXVYU/t/ltOwAHHyuAW1Phfm/6aHinDbF2DlfPAfF5uNJDqHWsUax3izdovIkilzCGygufF0SlYkq3P5OStWPQjd1wzJ1mgvrPMbqP5XvghW/AqQWbSGgXrxVfWIQzbDtYnpT5PUWPkdqdqoIdOlF05p1vcZmcZlcC+V3Gw00hDxI0WWnxL4c4fg85mqPYYQhV/o2z2IU3dsON6rKla8F0+n36+8WYqkiZW+lS/GigKrp9BQ95eYVjn+H90VPPXDYtMB0FzssSaLXBWCncfJdL7NoSq8Gh0iIDa+gSF0PrDx0gvOJZb2S2HrR5 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On 2026/10/8 14:53, Hao Ge wrote: > Hi Uladzislau > > > On 2026/9/30 18:12, Uladzislau Rezki wrote: >> On Tue, Sep 29, 2026 at 04:20:09PM +0800, Hao Ge wrote: >>> __vmap_pages_range_noflush() and friends can install some PTEs before >>> failing and leave them mapped, and the kernel callers do not agree on >>> who cleans them up. For example, pcpu_map_pages() and >>> kmsan_ioremap_page_range() unmap the leftovers themselves, while >>> vm_module_tags_populate() and the __GFP_NOFAIL retry loop in >>> __vmalloc_area_node() relied on the mapping functions cleaning up and >>> did not call anything like vunmap_range() themselves. When the same >>> range is mapped again, the attempt hits the leftovers and fails, with >>> BUG() in vmap_pte_range() for huge mappings. >>> >>> After discussing with Suren and Ulad, we decided the cleanup belongs >>> to __vmap_pages_range_noflush() and friends, so the callers no longer >>> need to unmap the partial mappings themselves. Each function now >>> undoes the PTEs it installed itself. >>> >>> The rollback calls the low-level __vunmap_range_noflush(), it just >>> clears the PTEs of the range it is given, which is all a rollback >>> needs. It cannot use vunmap_range_noflush() because these mapping >>> functions also map the KMSAN shadow and origin, and for a metadata >>> range its hook would look up the metadata of the metadata, get 0 >>> and BUG() on addr >= end. The failed mappings were never accessed, >>> no TLB flush needed. >>> >>> Fixes: 9376130c390a ("mm/vmalloc: add support for __GFP_NOFAIL") >>> Fixes: 0f9b685626da ("alloc_tag: populate memory for module tags as needed") >>> Reported-by: Sashiko >>> Cc: stable@vger.kernel.org >>> Signed-off-by: Hao Ge >>> --- >>> mm/kmsan/shadow.c | 4 ++++ >>> mm/vmalloc.c | 31 +++++++++++++++++++++++++++++-- >>> 2 files changed, 33 insertions(+), 2 deletions(-) >>> >>> diff --git a/mm/kmsan/shadow.c b/mm/kmsan/shadow.c >>> index 0c88d89bf0d6..2166086d3dc3 100644 >>> --- a/mm/kmsan/shadow.c >>> +++ b/mm/kmsan/shadow.c >>> @@ -258,6 +258,10 @@ int kmsan_vmap_pages_range_noflush(unsigned long start, unsigned long end, >>> o_pages, page_shift); >>> kmsan_leave_runtime(); >>> if (mapped) { >>> + /* Undo the shadow mapping set up above. */ >>> + kmsan_enter_runtime(); >>> + __vunmap_range_noflush(shadow_start, shadow_end); >>> + kmsan_leave_runtime(); >>> err = mapped; >>> goto ret; >>> } >>> >> Can we just do that inside the vmalloc? For example in the >> __vmap_pages_range_noflush() as entry function for all(?) helpers? >> So we do not need do it manually? >> > The hunk was for the failure path in kmsan_vmap_pages_range_noflush(). > Shadow and origin are mapped there as two separate calls, and when > the origin one fails the shadow is already up. __vmap_pages_range_noflush() > cannot do that undo, it only sees its own range. > > kmsan_vmap_pages_range_noflush() has a single caller, so if we were to move this > logic into vmalloc, it would require some modifications as follows: > > @@ -712,9 +724,14 @@ int vmap_pages_range_noflush(unsigned long addr, unsigned long end, > int ret = kmsan_vmap_pages_range_noflush(addr, end, prot, pages, > page_shift, gfp_mask); > > + if (!ret) > + ret = __vmap_pages_range_noflush(addr, end, prot, pages, > + page_shift); > + /* Undo whatever was mapped before the failure. */ > if (ret) > - return ret; > - return __vmap_pages_range_noflush(addr, end, prot, pages, page_shift); > + kmsan_vunmap_range_noflush(addr, end); > + > + return ret; > } > I'd rather put this logic inside kmsan_vmap_pages_range_noflush This function should clean things up on its own, not depend on the caller to do it, just like kmsan_ioremap_page_range. https://elixir.bootlin.com/linux/v7.3-rc5/source/mm/kmsan/hooks.c#L185 Uladzislau，WDYT? Thanks Best Regards Hao >>> diff --git a/mm/vmalloc.c b/mm/vmalloc.c >>> index 859e6d2d57a3..9bbf75706627 100644 >>> --- a/mm/vmalloc.c >>> +++ b/mm/vmalloc.c >>> @@ -349,6 +349,10 @@ static int vmap_range_noflush(unsigned long addr, unsigned long end, >>> if (mask & ARCH_PAGE_TABLE_SYNC_MASK) >>> arch_sync_kernel_mappings(start, end); >>> >>> + /* Undo the PTEs installed before the failure. */ >>> + if (err) >>> + __vunmap_range_noflush(start, end); >>> + >>> return err; >>> } >>> >>> @@ -363,6 +367,9 @@ int vmap_page_range(unsigned long addr, unsigned long end, >>> if (!err) >>> err = kmsan_ioremap_page_range(addr, end, phys_addr, prot, >>> ioremap_max_page_shift); >>> + if (err) >>> + __vunmap_range_noflush(addr, end); >>> + >>> return err; >>> } >>> >>> @@ -667,6 +674,10 @@ static int vmap_small_pages_range_noflush(unsigned long addr, unsigned long end, >>> if (mask & ARCH_PAGE_TABLE_SYNC_MASK) >>> arch_sync_kernel_mappings(start, end); >>> >>> + /* Undo the PTEs installed before the failure. */ >>> + if (err) >>> + __vunmap_range_noflush(start, end); >>> + >>> return err; >>> } >>> >> The only one user of that function is __vmap_pages_range_noflush() >> so we can cover both cases there small and huge path. >> >> Is that enough just to do unroll in the below: >> >> __vmap_pages_range_noflush() >> vmap_page_range() >> >> functions? It will also fix NOFAIL case: >> > > I see. right, __vmap_pages_range_noflush() is just above the > actual page‑table mapping, so it's low‑level enough. > Thanks a lot for your prototype. > > I'm tidying up the code and will post a REF patch afterwards. > > Thanks > Best Regards > Hao > >> >> diff --git a/mm/vmalloc.c b/mm/vmalloc.c >> index 89c327a6ce7d..fa1f357ecf3f 100644 >> --- a/mm/vmalloc.c >> +++ b/mm/vmalloc.c >> @@ -359,10 +359,19 @@ int vmap_page_range(unsigned long addr, unsigned long end, >> >> err = vmap_range_noflush(addr, end, phys_addr, pgprot_nx(prot), >> ioremap_max_page_shift); >> + if (err) >> + goto error_cleanup_range; >> + >> flush_cache_vmap(addr, end); >> - if (!err) >> - err = kmsan_ioremap_page_range(addr, end, phys_addr, prot, >> + err = kmsan_ioremap_page_range(addr, end, phys_addr, prot, >> ioremap_max_page_shift); >> + if (err) >> + goto error_cleanup_range; >> + >> + return 0; >> + >> +error_cleanup_range: >> + __vunmap_range_noflush(addr, end); >> return err; >> } >> >> @@ -683,26 +692,35 @@ int __vmap_pages_range_noflush(unsigned long addr, unsigned long end, >> pgprot_t prot, struct page **pages, unsigned int page_shift) >> { >> unsigned int i, nr = (end - addr) >> PAGE_SHIFT; >> + unsigned long start = addr; >> + int err; >> >> - WARN_ON(page_shift < PAGE_SHIFT); >> - >> - if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC) || >> - page_shift == PAGE_SHIFT) >> - return vmap_small_pages_range_noflush(addr, end, prot, pages); >> + if (WARN_ON(addr >= end)) >> + return -EINVAL; >> >> - for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { >> - int err; >> + if (WARN_ON(page_shift < PAGE_SHIFT)) >> + return -EINVAL; >> >> - err = vmap_range_noflush(addr, addr + (1UL << page_shift), >> + if (!IS_ENABLED(CONFIG_HAVE_ARCH_HUGE_VMALLOC) || >> + page_shift == PAGE_SHIFT) { >> + err = vmap_small_pages_range_noflush(addr, end, prot, pages); >> + } else { >> + for (i = 0; i < nr; i += 1U << (page_shift - PAGE_SHIFT)) { >> + err = vmap_range_noflush(addr, addr + (1UL << page_shift), >> page_to_phys(pages[i]), prot, >> page_shift); >> - if (err) >> - return err; >> + if (err) >> + break; >> >> - addr += 1UL << page_shift; >> + addr += 1UL << page_shift; >> + } >> } >> >> - return 0; >> + if (err) >> + __vunmap_range_noflush(start, end); >> + >> + /* 0 on success. */ >> + return err; >> } >> >> int vmap_pages_range_noflush(unsigned long addr, unsigned long end, >> @@ -714,7 +732,13 @@ int vmap_pages_range_noflush(unsigned long addr, unsigned long end, >> >> if (ret) >> return ret; >> - return __vmap_pages_range_noflush(addr, end, prot, pages, page_shift); >> + >> + ret = __vmap_pages_range_noflush(addr, end, prot, pages, page_shift); >> + if (ret) >> + /* Cleanup KMSAN metadata. */ >> + kmsan_vunmap_range_noflush(addr, end); >> + >> + return ret; >> } >> >> static int __vmap_pages_range(unsigned long addr, unsigned long end, >> >> >> -- >> Uladzislau Rezki