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]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18C47C77B7C for ; Tue, 24 Jun 2025 13:04:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C5F06B009E; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 776236B009F; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B3CF6B00BD; Tue, 24 Jun 2025 09:04:02 -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 4F9686B009E for ; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 0CC63C0814 for ; Tue, 24 Jun 2025 13:04:02 +0000 (UTC) X-FDA: 83590311924.01.8DDC80C Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf02.hostedemail.com (Postfix) with ESMTP id A87D580010 for ; Tue, 24 Jun 2025 13:03:59 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=OnTBERMi; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=31gfkjTw; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=OnTBERMi; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=31gfkjTw; spf=pass (imf02.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750770240; 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=2v6v5+BvY+B1K5nIDIeewe2c1YreYO69aop0s8USUaA=; b=og8+v4qSvvw8xIoYG+Ky+gH33xFhiCron3TH79cweoBk6sXBUpMF2BmNj41T/iP48/RJz0 u9zy+PFkX1R1lNL0kv81bsGRcTtmZs85DqEHNDqp7GaF3az5OS4kFsi9M7q0vlv0OsFR0r kz9gW8fLNxhs+0kxHgxmz8I18P49ZmI= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=OnTBERMi; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=31gfkjTw; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=OnTBERMi; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=31gfkjTw; spf=pass (imf02.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750770240; a=rsa-sha256; cv=none; b=kfJnY1GcO1Vlc9XYvCxUvmzDI8oGx0T7o4mw3u6bDpwaEVUHPXhJ33wOYugpzYiGdyf0W6 ksf7Sf77KbW6foII9aOEhBRchA5e/eEXvOURDNCf92Czr1PPl7tHYnRy4ny2xlNLni0lp7 QmFJs/KPkrmWWshU3xEzNnXW0DBnNfI= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0FEA11F45F; Tue, 24 Jun 2025 13:03:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750770238; h=from:from:reply-to: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; bh=2v6v5+BvY+B1K5nIDIeewe2c1YreYO69aop0s8USUaA=; b=OnTBERMiagKgL9XhfAbv49QeE7mzaeaYso2cAxCly+1yuhp2jGpMhg94n8K5yKg7YsXx9y ATXwdp8fHov4F3hIhT2QPVpL2YsrLz+rpHxNemZtG41UqMaR2PjekEjF5gNk+uAcBjZrF0 R68TX9x/8iDohCZ390rDJ2n9tOi6YwY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750770238; h=from:from:reply-to: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; bh=2v6v5+BvY+B1K5nIDIeewe2c1YreYO69aop0s8USUaA=; b=31gfkjTwatQpCNGJncOFN1rbOBGYaSooNrYb1zeM5NS34c0A4f/Un/z9tBTarRlCYtDdYx nLdJqeQMY4RZUiBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750770238; h=from:from:reply-to: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; bh=2v6v5+BvY+B1K5nIDIeewe2c1YreYO69aop0s8USUaA=; b=OnTBERMiagKgL9XhfAbv49QeE7mzaeaYso2cAxCly+1yuhp2jGpMhg94n8K5yKg7YsXx9y ATXwdp8fHov4F3hIhT2QPVpL2YsrLz+rpHxNemZtG41UqMaR2PjekEjF5gNk+uAcBjZrF0 R68TX9x/8iDohCZ390rDJ2n9tOi6YwY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750770238; h=from:from:reply-to: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; bh=2v6v5+BvY+B1K5nIDIeewe2c1YreYO69aop0s8USUaA=; b=31gfkjTwatQpCNGJncOFN1rbOBGYaSooNrYb1zeM5NS34c0A4f/Un/z9tBTarRlCYtDdYx nLdJqeQMY4RZUiBA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id ED19B13A96; Tue, 24 Jun 2025 13:03:57 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2BKVOT2iWmjqYQAAD6G6ig (envelope-from ); Tue, 24 Jun 2025 13:03:57 +0000 From: Vlastimil Babka Date: Tue, 24 Jun 2025 15:03:45 +0200 Subject: [PATCH v2 1/4] mm, madvise: simplify anon_name handling MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250624-anon_name_cleanup-v2-1-600075462a11@suse.cz> References: <20250624-anon_name_cleanup-v2-0-600075462a11@suse.cz> In-Reply-To: <20250624-anon_name_cleanup-v2-0-600075462a11@suse.cz> To: Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , David Hildenbrand , Jann Horn , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Colin Cross Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Vlastimil Babka X-Mailer: b4 0.14.2 X-Rspamd-Server: rspam11 X-Rspam-User: X-Rspamd-Queue-Id: A87D580010 X-Stat-Signature: 4uuzojx9d8wn4dtxyjf4gh3angk55gh4 X-HE-Tag: 1750770239-174554 X-HE-Meta: U2FsdGVkX1+KrcPsEbvnsEH+++wswKrVs9VIUfaRA03qCZOcUQd2nd159qfailne7bHfyLrIt+kyevrF5+kod5PzwQjYWTV67xPuuccZjHANedxCp6W3HPfNmu85o0W+Au0L8F3WWy2+D3MnfP4Xe1KgKxIfiKXZ+Y4XcUO2lgcKhDYQqtsWQ6WbIGANIetv8sdn2byZ8mdOG/r1x2oF+MV78ocinb+0yVML0oK2u29GNDOdnZ391omB74RGt5TLs9BXFwIFkkwPQBUGcXDBOrvLspyvynuKwL0eIdYPpUP5KQr6GwAU8s6tY/2dx8aSaBgYus4Sj1FNJjXGu2c1QHiCiJAj4pjAbH8dsIrPnS8mY5wnfQkV+h05Qs3VD2Rp2nZ1l7pXpVWHmMXVGMEATg5hwacbCgbyqLK0CQr+qcAuVLs5DtnoCbHK4bJ1FAbVh21rSwisv3vBjxkDiOrkwAsKROXxjeV486Xn1PryjU3yIPOOxZEzOjtNGs9+VpFI010Uuo09tcBUNRadtWhRKLA7cIv+wMCVrf6qDUx1ShJHU+xuhEgU6wMMKby3Wmzdd/ZCHMkr9YnaSlgnh/tnaRu4zAK/rd8SFo9Mf6J1hxWtt9ht1Sb6vTXFbG1vaDEIQupxE0BT+e5+m/eWG7XlS+mOep+gPntM7PG6VSu0Ccjgu6ApVQ+UK3e7+K4cB0KDCnDEDnHJnx8Fr2KqakilsAcnF4gZgK9cPBH/g6rdI4HVAvOI4+2QzHSByW+khazeC6hDWiWosEu7q6UA71hDSTSkDYaDP97/DcKpTKKtFODNzIoKXgwSaVbey+ng0v0BdjJozr1Rz4+LtsOr2agFIzW3bg07AAoZ+e6nrco9eXNZ9FXAvanTqwG/35xIUIg4jfBsfTE4UI4BOzgbGbBwJ28EOxjftp89XvOHcOF+oCkF+epHX4028eMIlSCTJUgr3r+SP3aC9gArQfPXPjm xZjWJBVc lYS89VYnSmwSwOMdDzvZ7rc9NacrntBFpAbd3ZhHAGpYgl29rSxsMC3k/abkQvjkVGSpp3Rv4Kl+YoI/FXCFQZeea/z221Zv6MPVweYUNQksRCKR+35aNg6AV9isUgE5362n0CGlqqs0TBV53+6OnxhGf7m+DTLY279ZnAxk7I3YMnlIKVbMN5Vyq0MM1fpmgDdvpHq7TnTBGjcOUn/iEAn/3xBW7punu+UTO2YyTvHyVSH8KQudXLzG1WaGp8BkeUrL0qhmTq/J91TtKaXcL3xcDO9d+z2+LNBB10zSMhkU8GCI= 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: List-Subscribe: List-Unsubscribe: Since the introduction in 9a10064f5625 ("mm: add a field to store names for private anonymous memory") the code to set anon_name on a vma has been using madvise_update_vma() to call replace_anon_vma_name(). Since the former is called also by a number of other madvise behaviours that do not set a new anon_name, they have been passing the existing anon_name of the vma to make replace_vma_anon_name() a no-op. This is rather wasteful as it needs anon_vma_name_eq() to determine the no-op situations, and checks for when replace_vma_anon_name() is allowed (the vma is anon/shmem) duplicate the checks already done earlier in madvise_vma_behavior(). It has also lead to commit 942341dcc574 ("mm: fix use-after-free when anon vma name is used after vma is freed") adding anon_name refcount get/put operations exactly to the cases that actually do not change anon_name - just so the replace_vma_anon_name() can keep safely determining it has nothing to do. The recent madvise cleanups made this suboptimal handling very obvious, but happily also allow for an easy fix. madvise_update_vma() now has the complete information whether it's been called to set a new anon_name, so stop passing it the existing vma's name and doing the refcount get/put in its only caller madvise_vma_behavior(). In madvise_update_vma() itself, limit calling of replace_anon_vma_name() only to cases where we are setting a new name, otherwise we know it's a no-op. We can rely solely on the __MADV_SET_ANON_VMA_NAME behaviour and can remove the duplicate checks for vma being anon/shmem that were done already in madvise_vma_behavior(). Additionally, by using vma_modify_flags() when not modifying the anon_name, avoid explicitly passing the existing vma's anon_name and storing a pointer to it in struct madv_behavior or a local variable. This prevents the danger of accessing a freed anon_name after vma merging, previously fixed by commit 942341dcc574. Signed-off-by: Vlastimil Babka --- mm/madvise.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 4491bf080f55d6d1aeffb2ff0b8fdd28904af950..fca0e9b3e844ad766e83ac04cc0d7f4099c74005 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -176,25 +176,29 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, } #endif /* CONFIG_ANON_VMA_NAME */ /* - * Update the vm_flags on region of a vma, splitting it or merging it as - * necessary. Must be called with mmap_lock held for writing; - * Caller should ensure anon_name stability by raising its refcount even when - * anon_name belongs to a valid vma because this function might free that vma. + * Update the vm_flags and/or anon_name on region of a vma, splitting it or + * merging it as necessary. Must be called with mmap_lock held for writing. */ static int madvise_update_vma(vm_flags_t new_flags, struct madvise_behavior *madv_behavior) { - int error; struct vm_area_struct *vma = madv_behavior->vma; struct madvise_behavior_range *range = &madv_behavior->range; struct anon_vma_name *anon_name = madv_behavior->anon_name; + bool set_new_anon_name = madv_behavior->behavior == __MADV_SET_ANON_VMA_NAME; VMA_ITERATOR(vmi, madv_behavior->mm, range->start); - if (new_flags == vma->vm_flags && anon_vma_name_eq(anon_vma_name(vma), anon_name)) + if (new_flags == vma->vm_flags && (!set_new_anon_name || + anon_vma_name_eq(anon_vma_name(vma), anon_name))) return 0; - vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, + if (set_new_anon_name) + vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, range->start, range->end, new_flags, anon_name); + else + vma = vma_modify_flags(&vmi, madv_behavior->prev, vma, + range->start, range->end, new_flags); + if (IS_ERR(vma)) return PTR_ERR(vma); @@ -203,11 +207,8 @@ static int madvise_update_vma(vm_flags_t new_flags, /* vm_flags is protected by the mmap_lock held in write mode. */ vma_start_write(vma); vm_flags_reset(vma, new_flags); - if (!vma->vm_file || vma_is_anon_shmem(vma)) { - error = replace_anon_vma_name(vma, anon_name); - if (error) - return error; - } + if (set_new_anon_name) + return replace_anon_vma_name(vma, anon_name); return 0; } @@ -1313,7 +1314,6 @@ static int madvise_vma_behavior(struct madvise_behavior *madv_behavior) int behavior = madv_behavior->behavior; struct vm_area_struct *vma = madv_behavior->vma; vm_flags_t new_flags = vma->vm_flags; - bool set_new_anon_name = behavior == __MADV_SET_ANON_VMA_NAME; struct madvise_behavior_range *range = &madv_behavior->range; int error; @@ -1403,18 +1403,7 @@ static int madvise_vma_behavior(struct madvise_behavior *madv_behavior) /* This is a write operation.*/ VM_WARN_ON_ONCE(madv_behavior->lock_mode != MADVISE_MMAP_WRITE_LOCK); - /* - * madvise_update_vma() might cause a VMA merge which could put an - * anon_vma_name, so we must hold an additional reference on the - * anon_vma_name so it doesn't disappear from under us. - */ - if (!set_new_anon_name) { - madv_behavior->anon_name = anon_vma_name(vma); - anon_vma_name_get(madv_behavior->anon_name); - } error = madvise_update_vma(new_flags, madv_behavior); - if (!set_new_anon_name) - anon_vma_name_put(madv_behavior->anon_name); out: /* * madvise() returns EAGAIN if kernel resources, such as -- 2.50.0