From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej2-f42.google.com (mail-ej2-f42.google.com [74.125.228.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 42AFB373BE0 for ; Mon, 28 Sep 2026 17:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790617669; cv=none; b=gjDPfiySQNfUGZxCv0w4zYEyNMmBzED5Kt4o3n0t43oQqKorKWQg5Is85Ly5/tRxqNxOfPCnG80s+Hgohfk69/qeZETCXw9fcrVcCah5z+/VPHtVoJUaP9zVszpJ/16knxYOhxbSTp4KTQZeyUOp8d9+QZdKuw+FvoUC5HMVFNQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790617669; c=relaxed/simple; bh=8ZbCWYrRv1U6jzRO2vHTchWEpgALnUOoMP1moQ6jxiQ=; h=From:Date:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=t8PkZJTkF+Syxi/kUULQApE9jZQEzfXdv57frU+wbLFC+IkrxnSoMXLdOA44231MHFyA53iYoqZVywaAW5x3diKKUbEzwDjR8LfhXftZgXEm24jlEfvZcROM+4qRsVQDT5pr61iZCbjq35U/bxT89ddLI/TXj9wGmy+cplWvlzg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fzDMOctC; arc=none smtp.client-ip=74.125.228.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fzDMOctC" Received: by mail-ej2-f42.google.com with SMTP id a640c23a62f3a-c2afe9fa8e0so325965066b.2 for ; Mon, 28 Sep 2026 10:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790617665; x=1791222465; darn=vger.kernel.org; h=in-reply-to:content-transfer-encoding:content-disposition :content-type:mime-version:references:message-id:subject:cc:to:date :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=6pX5ypE41nzCu788KA/U3/7sCCgsDbiY8nPFhVISf1I=; b=fzDMOctCuxQxWqZLQHC1TCC9xyDJxJXaaUyrIbqPy1YxNSKnsx7xnNpaDMeTn+g3Ki WTam860oSkegtprS0SXCUiY1uBXCnG8pU8820AllVq4fnL2k9VaA48vXR6LgLfsC7OHx /4AU6pVcjRuqaPHlAZE6DqBmaVrVa78yP0E5T9lVk2Zx69p2HQoBf3G09B74WjiE345N 2mJ85T30Pc/SZBc8IKy9Z0IWf70C3noUUktaVoPBMMBVj5G5EQTe8zQk0iJJ9Blr1W3q 7v9wyeWKo9AyP8NGG0wkoIOpsk3ZuYKBXDYeRjzQK0mFwTLUCWVilhnACZS0J/TGJRTd SonQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790617665; x=1791222465; h=in-reply-to:content-transfer-encoding:content-disposition :content-type:mime-version:references:message-id:subject:cc:to:date :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to:content-type; bh=6pX5ypE41nzCu788KA/U3/7sCCgsDbiY8nPFhVISf1I=; b=pvsK/vwk16Ezmp1RxvCPoY/4ekm5LLY7woTjFb6WqlDsiFv5e4pmHPsJ9+RPZAxb2U gXR4hIYqqdKgyqS2F86LEIRtKqJWeWF4dDgFCTpn2KubIfDeMIqNKNiAO2YcsMgzpXIJ 4v1tR3AZa4zGq9AQwlMfUyfUMY/qCOSMfOAODMA2pMpW5iwpSX4UQCF7ZTrjM4Sau9oE wucs7Q/kOK2aTD4/R2MXWGbSeKWjQnmJ6594G0Yle0kwwja8xqnPi7A1cnTaUMM7YzDV 1vkRX29G+tyYayI2sY8ofjGa2bxl1n5GTrI996C8caFzh1Jmglp6fKnrgLRD+di3uQHc MlDw== X-Forwarded-Encrypted: i=1; AKwUvBwqK5KlOV2saAaoREf7Mdj/IhKIptJApIeFCPpe1EoFlxmslYL+/VPPo7B2FWJV1au4GU1HOuFmHbDOinA=@vger.kernel.org X-Gm-Message-State: AFuF++kASW4wcarLOtQnECa88HWOoZMrBothgH4TOZB02iA/lBotBI21 uisuAhSlvfNjL0pcxngGheICzsSl1EkFKgHr7q/0MuTWJUM4xXJjnxu1 X-Gm-Gg: AYBFou2VWBcX6Q5L5vKqcbUuVCdNlMKoGFFbLmMKGnvmnGIq/Fnf7lCOKCBfhslZwqH 9xSdYchzn4Pj9bu2a956aDF6sWVu5Tz+qYmZ2asVuyOkTpwZ49EfDXRwXrvcq42rH9ET38b9pJ7 t6i8OIHiEbNnm6is3dN/cETniS88A9bZJlbpc/5dkO8I6Qn4JGE07hilGtyMoV0/DfkNIrgDANh 6HU6n5UbsntpqnZC9kDakq4c3DWxQ+LlEvMhW4LzRnqfesUt/8ty52lj6AnT5tzebEt7zIYPC9W AuhF88p05ASjGF1z36XiYuVr28hgk8oQ4GYo/ywed/C5fI2ytg7pmGtQZqGxjFZwlVqYETFsgoG 4AyTNrukeK6li+krFsezsXM3xt7XRbux2ifNwbvuQaiSeRzHS5YszpUS4bx2MG1YkLaPIyLZkqr vV6Dg4m8yq7qRJXAiBNt0+WA4CLxd01SIph4s= X-Received: by 2002:a17:907:7215:b0:c2a:ad68:c70e with SMTP id a640c23a62f3a-c2ac2371dc4mr1060338666b.11.1790617665235; Mon, 28 Sep 2026 10:47:45 -0700 (PDT) Received: from milan ([2001:9b1:d5a0:a500::24b]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2de21a6349sm149417066b.21.2026.09.28.10.47.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Sep 2026 10:47:44 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Mon, 28 Sep 2026 19:47:42 +0200 To: Suren Baghdasaryan Cc: Uladzislau Rezki , Hao Ge , "David Hildenbrand (Arm)" , "Lorenzo Stoakes (ARM)" , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , Aaron Tomlin , Kent Overstreet , Andrew Morton , linux-modules@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sashiko , stable@vger.kernel.org Subject: Re: [PATCH v10 2/6] alloc_tag: clean up the populate failure path Message-ID: References: <20260915070001.113559-3-hao.ge@linux.dev> <60642a7f-2949-428a-8290-40d69c989a77@linux.dev> <1dff448c-9cbe-4276-bca1-d91283b0c7b4@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: On Mon, Sep 28, 2026 at 08:16:18AM -0700, Suren Baghdasaryan wrote: > On Mon, Sep 28, 2026 at 8:09 AM Uladzislau Rezki wrote: > > > > On Mon, Sep 28, 2026 at 01:09:13PM +0200, Uladzislau Rezki wrote: > > > On Thu, Sep 17, 2026 at 10:32:48AM +0800, Hao Ge wrote: > > > > Hi Suren、David、Lorenzo > > > > > > > > On 2026/9/17 09:12, Hao Ge wrote: > > > > > Hi Suren > > > > > > > > > > On 2026/9/17 03:07, Suren Baghdasaryan wrote: > > > > >> On Wed, Sep 16, 2026 at 9:31 AM Suren Baghdasaryan wrote: > > > > >>> > > > > >>> On Tue, Sep 15, 2026 at 11:00 PM Hao Ge wrote: > > > > >>>> > > > > >>>> Hi Suren > > > > >>>> > > > > >>>> Thanks for you review. > > > > >>>> > > > > >>>> On 2026/9/16 05:09, Suren Baghdasaryan wrote: > > > > >>>>> On Mon, Sep 14, 2026 at 11:59 PM Hao Ge wrote: > > > > >>>>>> > > > > >>>>>> The reservation is already stored in the maple tree when > > > > >>>>>> vm_module_tags_populate() fails. A failed load never unloads the > > > > >>>>>> module, so nothing releases the entry. Release it and roll > > > > >>>>>> module_tags.size back. Without the rollback a concurrent load that > > > > >>>>>> already passed needs_section_mem() can reuse the freed gap, skip > > > > >>>>>> vm_module_tags_populate() and write to unmapped memory. > > > > >>>>>> > > > > >>>>>> vmap_pages_range() may have installed some PTEs before failing. A > > > > >>>>>> retry to populate the same range would BUG on them, so undo them, > > > > >>>>>> but only if vmap actually ran. > > > > >>>>>> > > > > >>>>>> Fixes: 4835f747d3ed ("alloc_tag: support for page allocation tag compression") > > > > >>>>>> Fixes: 0f9b685626da ("alloc_tag: populate memory for module tags as needed") > > > > >>>>> > > > > >>>>> If a patch fixes two other patches, it likely needs to be split so > > > > >>>>> that each part fixes one patch only. But read on please. I'm not sure > > > > >>>>> if one of the fixes is correct. > > > > >>>>> > > > > >>>> > > > > >>>> Kept them in one patch because they only make sense together. > > > > >>>> > > > > >>>> After a failed populate the reservation is released and the > > > > >>>> size rolled back, so the next load takes the same gap and calls > > > > >>>> vm_module_tags_populate() again, and that retry would trip over > > > > >>>> the PTEs the failed vmap left behind. > > > > >>>> > > > > >>>> Without the rollback a load that already passed needs_section_mem() > > > > >>>> just reuses the gap, skips populate and writes to unmapped memory. > > > > >>>> So splitting them leaves each half broken. > > > > >>> > > > > >>> Yeah, that's why I think vmap_pages_range() cleanup should be a > > > > >>> completely separate patch with vmap_pages_range() doing cleanup > > > > >>> itself. > > > > >>> > > > > > > > > > > I think I get where you're coming from now. > > > > > Thanks for taking the time to explain. > > > > > > > > > >>>> > > > > >>>>>> Reported-by: Sashiko > > > > >>>>>> Cc: stable@vger.kernel.org > > > > >>>>>> Signed-off-by: Hao Ge > > > > >>>>>> --- > > > > >>>>>> mm/alloc_tag.c | 10 ++++++++++ > > > > >>>>>> 1 file changed, 10 insertions(+) > > > > >>>>>> > > > > >>>>>> diff --git a/mm/alloc_tag.c b/mm/alloc_tag.c > > > > >>>>>> index 2070e682fe10..95ddf5b743d0 100644 > > > > >>>>>> --- a/mm/alloc_tag.c > > > > >>>>>> +++ b/mm/alloc_tag.c > > > > >>>>>> @@ -804,6 +804,13 @@ static int vm_module_tags_populate(void) > > > > >>>>>> next_page, PAGE_SHIFT) < 0) { > > > > >>>>>> release_pages_arg arg = { .pages = next_page }; > > > > >>>>>> > > > > >>>>>> + /* > > > > >>>>>> + * vmap_pages_range() only runs once all pages were > > > > >>>>>> + * allocated, and it may have installed some mappings > > > > >>>>>> + * before failing. Undo them. > > > > >>>>> > > > > >>>>> If vmap_pages_range() failed to map the range, why should we need to > > > > >>>>> undo it? If it indeed leaves some partial mapping when failing then I > > > > >>>>> would argue that vmap_pages_range() should be undoing these partial > > > > >>>>> mappings itself before returning the error. > > > > >>>>> > > > > >>>> Yeah it does - none of the paths under vmap_pages_range() undo themselves on error. > > > > >>> > > > > >>> Hmm. I wonder if this behavior is intentional or requires a fix. The > > > > >>> only possible reason I can think of is performance but I can't imagine > > > > >>> a failure to map is a performance-critical case. > > > > >>> > > > > >>> +David Hildenbrand (Red Hat), +Lorenzo Stoakes (Oracle) what do you > > > > >> > > > > >> Huh, my gmail thinks you are still at your previous companies :) > > > > >> > > > > > > > > > > I manually fixed it on the mailing list for this thread. > > > > > > > > > >>> guys think? Shouldn't vmap_pages_range() undo its possible partial > > > > >>> mapping when it fails? > > > > >>> > > > > >>> > > > > >>>> pcpu_map_pages does perform cleanup on its own as well. There may be other similar sites. > > > > >>>> https://elixir.bootlin.com/linux/v7.3-rc3/source/mm/percpu-vm.c#L255 > > > > >>>> so I did the same here. > > > > >>>> > > > > >>>> If we really want vmap_pages_range() to handle this cleanup internally, I believe that would > > > > >>>> be a relatively large change, and we would need to consider many more cases. So I think we keep > > > > >>>> the current behaviour for now. > > > > >>> > > > > >>> Yeah, I understand it would require a deeper cut but if that's the > > > > >>> right way to handle this we might as well do that. Let's see what MM > > > > >>> folks think. > > > > >>> > > > > > > > > > > Sounds good to me. Let's wait and hear what the MM folks say. > > > > > > > > > > > > > I just looked into the call sites for __vmap_pages_range. > > > > And I found there's a bug in one vmalloc caller [1]. > > > > When gfp_mask has __GFP_NOFAIL, the code keeps retrying > > > > __vmap_pages_range. If there are leftover PTE mappings, > > > > this can trigger a BUG(); [2] > > > > https://elixir.bootlin.com/linux/v7.3-rc3/source/mm/vmalloc.c#L3946 [1] > > > > https://elixir.bootlin.com/linux/v7.3-rc3/source/mm/vmalloc.c#L121 [2] > > > > > > > Indeed the below code is incomplete: > > > > > > > > > /* > > > * page tables allocations ignore external gfp mask, enforce it > > > * by the scope API > > > */ > > > flags = memalloc_apply_gfp_scope(gfp_mask); > > > do { > > > ret = __vmap_pages_range(addr, addr + size, prot, area->pages, > > > page_shift, nested_gfp); > > > if (nofail && (ret < 0)) > > > schedule_timeout_uninterruptible(1); > > > } while (nofail && (ret < 0)); > > > memalloc_restore_scope(flags); > > > > > > > > > and it should be fixed. As the __vmap_pages_range() can actually fail > > > and leave some installed mappings, we have to perform some cleanups > > > on failure or on repeat(if nofail is true). > > > > > > Below code: > > > > > > + /* > > > + * vmap_pages_range() only runs once all pages were > > > + * allocated, and it may have installed some mappings > > > + * before failing. Undo them. > > > + */ > > > + if (nr == more_pages) > > > + vunmap_range(phys_end, phys_end + (nr << PAGE_SHIFT)); > > > > > > we can use but we need to check if partially mapped space is not an > > > issue for the vunmap_range(). And it looks like it is not. > > > > > > > > > @@ -3953,8 +3990,15 @@ static void *__vmalloc_area_node(struct vm_struct *area, gfp_t gfp_mask, > > > do { > > > ret = __vmap_pages_range(addr, addr + size, prot, area->pages, > > > page_shift, nested_gfp); > > > - if (nofail && (ret < 0)) > > > - schedule_timeout_uninterruptible(1); > > > + if (ret < 0) { > > > + /* > > > + * __vmap_pages_range() may have installed some mappings > > > + * before failing. Undo them before returning or retrying. > > > + */ > > > + vunmap_range(addr, addr + size); > > > + if (nofail) > > > + schedule_timeout_uninterruptible(1); > > > + } > > > } while (nofail && (ret < 0)); > > > memalloc_restore_scope(flags); > > > > > > > > And looking further. If the __vmap_pages_range()/__vmap_pages_range_noflush() > > and friends fail, a proper cleanups should be done inside, IMO. > > Sounds like we are in agreement. > > > > > But i am checking callers and see that some do some not: > > > > > > __vunmap_range_noflush( > > vmalloc_shadow(start), > > vmalloc_shadow(start + clean * PAGE_SIZE)); > > __vunmap_range_noflush( > > vmalloc_origin(start), > > vmalloc_origin(start + clean * PAGE_SIZE)); > > > > > > kmsan_ioremap_page_range() it does clean ups; > > kmsan_vmap_pages_range_noflush() looks like does not care in shadow.c; > > __vmalloc_area_node() as noted, it is broken as there is a BUG() on next try if nofail; > > pcpu_map_pages() it does cleanups. > > ... > > > > and so on. > > Yeah, the callers that do the cleanup should stop doing that once the > vmap functions handle it themselves. I expect an overall reduction in > code size. > Agree. If mapping API is called and it fails the caller should expect the state as it was before calling that API function, IMO. -- Uladzislau Rezki