From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61158481B1 for ; Wed, 14 Jan 2026 21:59:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768427954; cv=none; b=eGrn9zPAfimgNSc6IX5j/k0BEXzsAorCXCdKCYZtDkVqblz/xNJyFlkBkjzUgLqDKdqfc/lQY8WAHVs1Oi774ZT4Hq2StczunJ07zjxyzQ5tl9HTU0HLcFBr8AaHXER+Dn0Gegl182fa4Uy850ydZoJodkDOA3OCue0yWS0sfXc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768427954; c=relaxed/simple; bh=SXebcg9o/uP6bArR+TzUpWvUCrf2pKPfYJVQVsTWlpo=; h=Date:From:To:Cc:Subject:Message-Id:In-Reply-To:References: Mime-Version:Content-Type; b=a8YhXCSAhJD8DNshg3kKD227K6JHGee1yM3y1WM8Vt33yCGqHHccANZ7S1tudq1jw6C2wTUxd+gUeIZr5EucZf7qo5IdO5th/TR6gAr27Lvsi0s0kumSYIQ+Y8Nb5t7lbMTO2rlMCGaN4jh/WF9Fgw+Ol4hVVurdulsfw6IJJPM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=wET43oyI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="wET43oyI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D43EC4CEF7; Wed, 14 Jan 2026 21:59:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1768427952; bh=SXebcg9o/uP6bArR+TzUpWvUCrf2pKPfYJVQVsTWlpo=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=wET43oyIVu+GL4MY407GXNoKFFDmkgYfRtDfmG+hwEBny0m51L6i+vz1f5QDkpR+d Zj4oj/w8jmz/wv9D2OoY1xLdK+4truo8UO5DVdb4b51nX8QUw1QLWaJZBJoyoLjvuz KWP5LzVUXoIG0amPxCpBGxvwEqWMAetJLVsG/lFs= Date: Wed, 14 Jan 2026 13:59:11 -0800 From: Andrew Morton To: Lorenzo Stoakes Cc: Suren Baghdasaryan , "Liam R . Howlett" , Vlastimil Babka , Shakeel Butt , David Hildenbrand , Rik van Riel , Harry Yoo , Jann Horn , Mike Rapoport , Michal Hocko , Pedro Falcato , Chris Li , Barry Song , linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/8] mm/rmap: improve anon_vma_clone(), unlink_anon_vmas() comments, add asserts Message-Id: <20260114135911.ed54bc17bf1e467ad96f5b4f@linux-foundation.org> In-Reply-To: <6fb9d6b4-ad39-41de-8db0-aa41a6406378@lucifer.local> References: <5f55507a877028add5fdf8f207f5e333c7a3fc85.1767711638.git.lorenzo.stoakes@oracle.com> <6fb9d6b4-ad39-41de-8db0-aa41a6406378@lucifer.local> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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=US-ASCII Content-Transfer-Encoding: 7bit On Wed, 14 Jan 2026 19:02:20 +0000 Lorenzo Stoakes wrote: > Can you apply the below fix-patch to this to fix up a rather silly > failure-to-unlock mistake that Suren picked up on? > > Luckily this partial unmap function is unlikely to ever be triggerable in real > life, AND more to the point - a later patch completely eliminates the locking - > but to avoid bisection hazard let's fix this. > > Note that there is a conflict at 'mm/rmap: allocate anon_vma_chain objects > unlocked when possible', please resolve it by just taking that patch and > dropping _everything_ from this one _including_ the trailing 'if (root) ...' > code. No probs. mm-rmap-allocate-anon_vma_chain-objects-unlocked-when-possible.patch is now --- a/mm/rmap.c~mm-rmap-allocate-anon_vma_chain-objects-unlocked-when-possible +++ a/mm/rmap.c @@ -147,14 +147,13 @@ static void anon_vma_chain_free(struct a kmem_cache_free(anon_vma_chain_cachep, anon_vma_chain); } -static void anon_vma_chain_link(struct vm_area_struct *vma, - struct anon_vma_chain *avc, - struct anon_vma *anon_vma) +static void anon_vma_chain_assign(struct vm_area_struct *vma, + struct anon_vma_chain *avc, + struct anon_vma *anon_vma) { avc->vma = vma; avc->anon_vma = anon_vma; list_add(&avc->same_vma, &vma->anon_vma_chain); - anon_vma_interval_tree_insert(avc, &anon_vma->rb_root); } /** @@ -211,7 +210,8 @@ int __anon_vma_prepare(struct vm_area_st spin_lock(&mm->page_table_lock); if (likely(!vma->anon_vma)) { vma->anon_vma = anon_vma; - anon_vma_chain_link(vma, avc, anon_vma); + anon_vma_chain_assign(vma, avc, anon_vma); + anon_vma_interval_tree_insert(avc, &anon_vma->rb_root); anon_vma->num_active_vmas++; allocated = NULL; avc = NULL; @@ -292,21 +292,31 @@ int anon_vma_clone(struct vm_area_struct check_anon_vma_clone(dst, src); - /* All anon_vma's share the same root. */ + /* + * Allocate AVCs. We don't need an anon_vma lock for this as we + * are not updating the anon_vma rbtree nor are we changing + * anon_vma statistics. + * + * We hold the exclusive mmap write lock so there's no possibliity of + * the unlinked AVC's being observed yet. + */ + list_for_each_entry(pavc, &src->anon_vma_chain, same_vma) { + avc = anon_vma_chain_alloc(GFP_KERNEL); + if (!avc) + goto enomem_failure; + + anon_vma_chain_assign(dst, avc, pavc->anon_vma); + } + + /* + * Now link the anon_vma's back to the newly inserted AVCs. + * Note that all anon_vma's share the same root. + */ anon_vma_lock_write(src->anon_vma); - list_for_each_entry_reverse(pavc, &src->anon_vma_chain, same_vma) { - struct anon_vma *anon_vma; + list_for_each_entry_reverse(avc, &dst->anon_vma_chain, same_vma) { + struct anon_vma *anon_vma = avc->anon_vma; - avc = anon_vma_chain_alloc(GFP_NOWAIT); - if (unlikely(!avc)) { - anon_vma_unlock_write(src->anon_vma); - avc = anon_vma_chain_alloc(GFP_KERNEL); - if (!avc) - goto enomem_failure; - anon_vma_lock_write(src->anon_vma); - } - anon_vma = pavc->anon_vma; - anon_vma_chain_link(dst, avc, anon_vma); + anon_vma_interval_tree_insert(avc, &anon_vma->rb_root); /* * Reuse existing anon_vma if it has no vma and only one @@ -322,7 +332,6 @@ int anon_vma_clone(struct vm_area_struct } if (dst->anon_vma) dst->anon_vma->num_active_vmas++; - anon_vma_unlock_write(src->anon_vma); return 0; @@ -384,8 +393,10 @@ int anon_vma_fork(struct vm_area_struct get_anon_vma(anon_vma->root); /* Mark this anon_vma as the one where our new (COWed) pages go. */ vma->anon_vma = anon_vma; + anon_vma_chain_assign(vma, avc, anon_vma); + /* Now let rmap see it. */ anon_vma_lock_write(anon_vma); - anon_vma_chain_link(vma, avc, anon_vma); + anon_vma_interval_tree_insert(avc, &anon_vma->rb_root); anon_vma->parent->num_children++; anon_vma_unlock_write(anon_vma); @@ -402,40 +413,18 @@ int anon_vma_fork(struct vm_area_struct * In the unfortunate case of anon_vma_clone() failing to allocate memory we * have to clean things up. * - * On clone we hold the exclusive mmap write lock, so we can't race - * unlink_anon_vmas(). Since we're cloning, we know we can't have empty - * anon_vma's, since existing anon_vma's are what we're cloning from. - * - * So this function needs only traverse the anon_vma_chain and free each - * allocated anon_vma_chain. + * Since we allocate anon_vma_chain's before we insert them into the interval + * trees, we simply have to free up the AVC's and remove the entries from the + * VMA's anon_vma_chain. */ static void cleanup_partial_anon_vmas(struct vm_area_struct *vma) { struct anon_vma_chain *avc, *next; - struct anon_vma *root = NULL; - - /* - * We exclude everybody else from being able to modify anon_vma's - * underneath us. - */ - mmap_assert_locked(vma->vm_mm); list_for_each_entry_safe(avc, next, &vma->anon_vma_chain, same_vma) { - struct anon_vma *anon_vma = avc->anon_vma; - - /* All anon_vma's share the same root. */ - if (!root) { - root = anon_vma->root; - anon_vma_lock_write(root); - } - - anon_vma_interval_tree_remove(avc, &anon_vma->rb_root); list_del(&avc->same_vma); anon_vma_chain_free(avc); } - - if (root) - anon_vma_unlock_write(root); } /** _