From nobody Wed Oct 8 20:55:44 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 DC0EE23A58B for ; Tue, 24 Jun 2025 13:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770241; cv=none; b=oNkUyOf67OUrus2WctAqy+jQmd6CaGJhH9ejOxjUN2/Ram62/cJgwa5XaIMFpz5/p3EyuXUS/9NDbl1Xl2ICssxuXXmykZ4AAldZFMn1xKVmgrD/asR1EDk/c13130BETy7RcEhN4bg7XRaNryXQZHkAss4R+tuSbrNwZ4+wrtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770241; c=relaxed/simple; bh=O0v3zy9h53nrdU6xpyXTFsCZQCpRbBEsVqLNjLyT+k4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=tMCp7oakyd6W04DkhYKzw0SHihOP5k5bskG2k4Rqeh4lsEiIGuSd+iLNxlAFqFIbwPro8xgKhwFo0TWJvjV2FDMTH1tk5MEcFZ6dO4rcxDizR3BIb8TlMEszxaWybYrSNYCckNFgQkPNaR32QIZE3NtgKBSMzM/9zqGQeM9WPgY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=OnTBERMi; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=31gfkjTw; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=OnTBERMi; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=31gfkjTw; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="OnTBERMi"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="31gfkjTw"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="OnTBERMi"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="31gfkjTw" 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== Authentication-Results: smtp-out2.suse.de; none 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 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-Transfer-Encoding: quoted-printable 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-Spamd-Result: default: False [-8.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL7wgbib1ih6q11z93xiyrfhpt)]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email,suse.cz:mid] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -8.30 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 Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/madvise.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 4491bf080f55d6d1aeffb2ff0b8fdd28904af950..fca0e9b3e844ad766e83ac04cc0= d7f4099c74005 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -176,25 +176,29 @@ static int replace_anon_vma_name(struct vm_area_struc= t *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 w= hen - * 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 =3D madv_behavior->vma; struct madvise_behavior_range *range =3D &madv_behavior->range; struct anon_vma_name *anon_name =3D madv_behavior->anon_name; + bool set_new_anon_name =3D madv_behavior->behavior =3D=3D __MADV_SET_ANON= _VMA_NAME; VMA_ITERATOR(vmi, madv_behavior->mm, range->start); =20 - if (new_flags =3D=3D vma->vm_flags && anon_vma_name_eq(anon_vma_name(vma)= , anon_name)) + if (new_flags =3D=3D vma->vm_flags && (!set_new_anon_name || + anon_vma_name_eq(anon_vma_name(vma), anon_name))) return 0; =20 - vma =3D vma_modify_flags_name(&vmi, madv_behavior->prev, vma, + if (set_new_anon_name) + vma =3D vma_modify_flags_name(&vmi, madv_behavior->prev, vma, range->start, range->end, new_flags, anon_name); + else + vma =3D vma_modify_flags(&vmi, madv_behavior->prev, vma, + range->start, range->end, new_flags); + if (IS_ERR(vma)) return PTR_ERR(vma); =20 @@ -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 =3D replace_anon_vma_name(vma, anon_name); - if (error) - return error; - } + if (set_new_anon_name) + return replace_anon_vma_name(vma, anon_name); =20 return 0; } @@ -1313,7 +1314,6 @@ static int madvise_vma_behavior(struct madvise_behavi= or *madv_behavior) int behavior =3D madv_behavior->behavior; struct vm_area_struct *vma =3D madv_behavior->vma; vm_flags_t new_flags =3D vma->vm_flags; - bool set_new_anon_name =3D behavior =3D=3D __MADV_SET_ANON_VMA_NAME; struct madvise_behavior_range *range =3D &madv_behavior->range; int error; =20 @@ -1403,18 +1403,7 @@ static int madvise_vma_behavior(struct madvise_behav= ior *madv_behavior) /* This is a write operation.*/ VM_WARN_ON_ONCE(madv_behavior->lock_mode !=3D MADVISE_MMAP_WRITE_LOCK); =20 - /* - * 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 =3D anon_vma_name(vma); - anon_vma_name_get(madv_behavior->anon_name); - } error =3D 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 --=20 2.50.0 From nobody Wed Oct 8 20:55:44 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 F315F257435 for ; Tue, 24 Jun 2025 13:03:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770241; cv=none; b=hlqZiyAsIF2vX0s6U+yOgw5lmi6v0MNMhdO6408Eg3tdQ+hgb5tWn6wDg0VKs9CXvOCu4VR3jj2maSy6rZNoWfDjJHuvk2Vj78thAZ4bHofMW4BXxHTnAcD/egDNiy4yjCTSYPfYdRpYa5ACWSzebufIQkEH2cuJOs4C5Ts7/Bg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770241; c=relaxed/simple; bh=3h/ph20k++I5dPz3kaymEl6QE8gDSqptCfqr2WJUnXg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CU2JHpw+whBRhkseWEBV8GXGp5XNcFUC/JNBE3+1KM/ego90ysRmR5rLOV4rpQIXA37Ng/dfp0la9WgsQ2RT/W0HvJxsd4aswgXWcH5eCKjxU1qU7yCOS+2hNRw2wWiqQGgthK8WFp18NWOv050wV0Mh1WyWIkJLMHm0g6FtxVs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=nhpnuEHx; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=9kqWb2+i; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=nhpnuEHx; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=9kqWb2+i; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="nhpnuEHx"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="9kqWb2+i"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="nhpnuEHx"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="9kqWb2+i" 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-out1.suse.de (Postfix) with ESMTPS id 25DB5211D1; 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=FEinpjmKZWAP/U2IPt3FFLFbmlK4f2nRzBeCNHX9Ky4=; b=nhpnuEHxg5cJiWEgo0GhyS45mUaHc9glYnA/jwTQ+hisFN9ezVD3OJgD20RQwe/agfmMLe CHXGW5qbtJm5HqhpEJFddPIPRtS1zkOYupy1aquCsc/jBDFCrJgxOAuScl0E93RlkMq42h 663sejndkicbqEsy3xiOF4QBYZ4XrOs= 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=FEinpjmKZWAP/U2IPt3FFLFbmlK4f2nRzBeCNHX9Ky4=; b=9kqWb2+iT+0y0FrxScaSnragr9ORw1piHtsw5SvkWpye0OCBZI0FAK9SSOKYOSqlg+559n boumZYHyQ5bzYyAw== Authentication-Results: smtp-out1.suse.de; none 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=FEinpjmKZWAP/U2IPt3FFLFbmlK4f2nRzBeCNHX9Ky4=; b=nhpnuEHxg5cJiWEgo0GhyS45mUaHc9glYnA/jwTQ+hisFN9ezVD3OJgD20RQwe/agfmMLe CHXGW5qbtJm5HqhpEJFddPIPRtS1zkOYupy1aquCsc/jBDFCrJgxOAuScl0E93RlkMq42h 663sejndkicbqEsy3xiOF4QBYZ4XrOs= 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=FEinpjmKZWAP/U2IPt3FFLFbmlK4f2nRzBeCNHX9Ky4=; b=9kqWb2+iT+0y0FrxScaSnragr9ORw1piHtsw5SvkWpye0OCBZI0FAK9SSOKYOSqlg+559n boumZYHyQ5bzYyAw== 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 0DAF213A9C; Tue, 24 Jun 2025 13:03:58 +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 6K4QAz6iWmjqYQAAD6G6ig (envelope-from ); Tue, 24 Jun 2025 13:03:58 +0000 From: Vlastimil Babka Date: Tue, 24 Jun 2025 15:03:46 +0200 Subject: [PATCH v2 2/4] mm, madvise: extract mm code from prctl_set_vma() to mm/madvise.c 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-Transfer-Encoding: quoted-printable Message-Id: <20250624-anon_name_cleanup-v2-2-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-Spam-Flag: NO X-Spam-Score: -8.30 X-Spamd-Result: default: False [-8.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL7wgbib1ih6q11z93xiyrfhpt)]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:mid,suse.cz:email] X-Spam-Level: Setting anon_name is done via madvise_set_anon_name() and behaves a lot of like other madvise operations. However, apparently because madvise() has lacked the 4th argument and prctl() not, the userspace entry point has been implemented via prctl(PR_SET_VMA, ...) and handled first by prctl_set_vma(). Currently prctl_set_vma() lives in kernel/sys.c but setting the vma->anon_name is mm-specific code so extract it to a new set_anon_vma_name() function under mm. mm/madvise.c seems to be the most straightforward place as that's where madvise_set_anon_name() lives. Stop declaring the latter in mm.h and instead declare set_anon_vma_name(). Signed-off-by: Vlastimil Babka Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- include/linux/mm.h | 14 +++++++------- kernel/sys.c | 50 +------------------------------------------------- mm/madvise.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++= -- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0e0549f3d681f6c7a78e8dfa341a810e5a8f96c1..ef40f68c1183d4c95016575a4ee= 0171e12df9ba4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4059,14 +4059,14 @@ unsigned long wp_shared_mapping_range(struct addres= s_space *mapping, #endif =20 #ifdef CONFIG_ANON_VMA_NAME -int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, - unsigned long len_in, - struct anon_vma_name *anon_name); +int set_anon_vma_name(unsigned long addr, unsigned long size, + const char __user *uname); #else -static inline int -madvise_set_anon_name(struct mm_struct *mm, unsigned long start, - unsigned long len_in, struct anon_vma_name *anon_name) { - return 0; +static inline +int set_anon_vma_name(unsigned long addr, unsigned long size, + const char __user *uname) +{ + return -EINVAL; } #endif =20 diff --git a/kernel/sys.c b/kernel/sys.c index adc0de0aa364aebb23999f621717a5d32599921c..b153fb345ada28ea1a33386a32b= cce9cb1b23475 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2343,54 +2343,14 @@ int __weak arch_lock_shadow_stack_status(struct tas= k_struct *t, unsigned long st =20 #define PR_IO_FLUSHER (PF_MEMALLOC_NOIO | PF_LOCAL_THROTTLE) =20 -#ifdef CONFIG_ANON_VMA_NAME - -#define ANON_VMA_NAME_MAX_LEN 80 -#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]" - -static inline bool is_valid_name_char(char ch) -{ - /* printable ascii characters, excluding ANON_VMA_NAME_INVALID_CHARS */ - return ch > 0x1f && ch < 0x7f && - !strchr(ANON_VMA_NAME_INVALID_CHARS, ch); -} - static int prctl_set_vma(unsigned long opt, unsigned long addr, unsigned long size, unsigned long arg) { - struct mm_struct *mm =3D current->mm; - const char __user *uname; - struct anon_vma_name *anon_name =3D NULL; int error; =20 switch (opt) { case PR_SET_VMA_ANON_NAME: - uname =3D (const char __user *)arg; - if (uname) { - char *name, *pch; - - name =3D strndup_user(uname, ANON_VMA_NAME_MAX_LEN); - if (IS_ERR(name)) - return PTR_ERR(name); - - for (pch =3D name; *pch !=3D '\0'; pch++) { - if (!is_valid_name_char(*pch)) { - kfree(name); - return -EINVAL; - } - } - /* anon_vma has its own copy */ - anon_name =3D anon_vma_name_alloc(name); - kfree(name); - if (!anon_name) - return -ENOMEM; - - } - - mmap_write_lock(mm); - error =3D madvise_set_anon_name(mm, addr, size, anon_name); - mmap_write_unlock(mm); - anon_vma_name_put(anon_name); + error =3D set_anon_vma_name(addr, size, (const char __user *)arg); break; default: error =3D -EINVAL; @@ -2399,14 +2359,6 @@ static int prctl_set_vma(unsigned long opt, unsigned= long addr, return error; } =20 -#else /* CONFIG_ANON_VMA_NAME */ -static int prctl_set_vma(unsigned long opt, unsigned long start, - unsigned long size, unsigned long arg) -{ - return -EINVAL; -} -#endif /* CONFIG_ANON_VMA_NAME */ - static inline unsigned long get_current_mdwe(void) { unsigned long ret =3D 0; diff --git a/mm/madvise.c b/mm/madvise.c index fca0e9b3e844ad766e83ac04cc0d7f4099c74005..7e8819b5e9a0f183213ffe19d7e= 52bd5fda5f49d 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -134,8 +134,8 @@ static int replace_anon_vma_name(struct vm_area_struct = *vma, return 0; } =20 -int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, - unsigned long len_in, struct anon_vma_name *anon_name) +static int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, + unsigned long len_in, struct anon_vma_name *anon_name) { unsigned long end; unsigned long len; @@ -2096,3 +2096,51 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const s= truct iovec __user *, vec, out: return ret; } + +#ifdef CONFIG_ANON_VMA_NAME + +#define ANON_VMA_NAME_MAX_LEN 80 +#define ANON_VMA_NAME_INVALID_CHARS "\\`$[]" + +static inline bool is_valid_name_char(char ch) +{ + /* printable ascii characters, excluding ANON_VMA_NAME_INVALID_CHARS */ + return ch > 0x1f && ch < 0x7f && + !strchr(ANON_VMA_NAME_INVALID_CHARS, ch); +} + +int set_anon_vma_name(unsigned long addr, unsigned long size, + const char __user *uname) +{ + struct anon_vma_name *anon_name =3D NULL; + struct mm_struct *mm =3D current->mm; + int error; + + if (uname) { + char *name, *pch; + + name =3D strndup_user(uname, ANON_VMA_NAME_MAX_LEN); + if (IS_ERR(name)) + return PTR_ERR(name); + + for (pch =3D name; *pch !=3D '\0'; pch++) { + if (!is_valid_name_char(*pch)) { + kfree(name); + return -EINVAL; + } + } + /* anon_vma has its own copy */ + anon_name =3D anon_vma_name_alloc(name); + kfree(name); + if (!anon_name) + return -ENOMEM; + } + + mmap_write_lock(mm); + error =3D madvise_set_anon_name(mm, addr, size, anon_name); + mmap_write_unlock(mm); + anon_vma_name_put(anon_name); + + return error; +} +#endif --=20 2.50.0 From nobody Wed Oct 8 20:55:44 2025 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 8C1B3257435 for ; Tue, 24 Jun 2025 13:04:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770248; cv=none; b=eSfWRTkcdXHtM/xDV21fkFnJezy6RDCZUi8HqIsY/qdHurfVDHuxLUgqL4hfkmAkcNuSQKyRVeIBaP+G0nZQF8Qan5VZfjVnuFY3rZRiHmh2tnZJ560iVp7DHpEG3RpzAbW/g4XNbAm9Rl+kS0t8Q8eIwuVGX3IPZ8SKemIsXzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770248; c=relaxed/simple; bh=rRAO5JDl/GFSSyC/skOkwiCLgk5I6TM14uLkwKcXPaA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iUcfzHeTC8i98QCO8lRBU01eHSpl+AWo+l1Ayf+EhdnLCPCA0B346Jmj9Ce7OtWsWglxc04wbKH64mO2jT/sfvdbc1g4+s804RfIQSbkirrq/vEbc1goXtIRla6507nY3+a7t0j/et+ZPQysoggXcu/M0/Na9GS50w8XDWTm2Bw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=ruYd/FUD; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=n3ZF4xdc; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=ruYd/FUD; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=n3ZF4xdc; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="ruYd/FUD"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="n3ZF4xdc"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="ruYd/FUD"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="n3ZF4xdc" 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-out1.suse.de (Postfix) with ESMTPS id 37DA9211E4; 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=8Ch+zCO8SYGhDyPI51jKs0XFTLHSpFudRVEK6OHgTHg=; b=ruYd/FUDPfpI3FqCdM3DfkW10+Y1GSceaVdQJ7//oONLzXmX3KkkXZtYmsKsmIVGhDe2Kg 7dPr0ahTNhJKkgNknFBYFjyZiS0+4feikC7wchFdDs1AxJ2FunHdR/dVF3B8xMSVdJUOzJ G1lbiJ1s1PymzSK1TZhDA/F5QMLp6oc= 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=8Ch+zCO8SYGhDyPI51jKs0XFTLHSpFudRVEK6OHgTHg=; b=n3ZF4xdcktsWGFJYdYoEt0qgrl0uegOmDEt2ex/mM0iA7aktx3GO+7IDdaK0cAeqdC837m n3uKYUElrRVH2BBw== Authentication-Results: smtp-out1.suse.de; none 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=8Ch+zCO8SYGhDyPI51jKs0XFTLHSpFudRVEK6OHgTHg=; b=ruYd/FUDPfpI3FqCdM3DfkW10+Y1GSceaVdQJ7//oONLzXmX3KkkXZtYmsKsmIVGhDe2Kg 7dPr0ahTNhJKkgNknFBYFjyZiS0+4feikC7wchFdDs1AxJ2FunHdR/dVF3B8xMSVdJUOzJ G1lbiJ1s1PymzSK1TZhDA/F5QMLp6oc= 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=8Ch+zCO8SYGhDyPI51jKs0XFTLHSpFudRVEK6OHgTHg=; b=n3ZF4xdcktsWGFJYdYoEt0qgrl0uegOmDEt2ex/mM0iA7aktx3GO+7IDdaK0cAeqdC837m n3uKYUElrRVH2BBw== 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 207A213A9D; Tue, 24 Jun 2025 13:03:58 +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 CFSmBz6iWmjqYQAAD6G6ig (envelope-from ); Tue, 24 Jun 2025 13:03:58 +0000 From: Vlastimil Babka Date: Tue, 24 Jun 2025 15:03:47 +0200 Subject: [PATCH v2 3/4] mm, madvise: move madvise_set_anon_name() down the file 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-Transfer-Encoding: quoted-printable Message-Id: <20250624-anon_name_cleanup-v2-3-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-Spamd-Result: default: False [-8.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL7wgbib1ih6q11z93xiyrfhpt)]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email,suse.cz:mid] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -8.30 Preparatory change so that we can use madvise_lock()/unlock() in the function without forward declarations or more thorough shuffling. Signed-off-by: Vlastimil Babka Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/madvise.c | 64 ++++++++++++++++++++++++++++++--------------------------= ---- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 7e8819b5e9a0f183213ffe19d7e52bd5fda5f49d..cae064479cdf908707c45b941bd= 03d43d095eab6 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -133,38 +133,6 @@ static int replace_anon_vma_name(struct vm_area_struct= *vma, =20 return 0; } - -static int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, - unsigned long len_in, struct anon_vma_name *anon_name) -{ - unsigned long end; - unsigned long len; - struct madvise_behavior madv_behavior =3D { - .mm =3D mm, - .behavior =3D __MADV_SET_ANON_VMA_NAME, - .lock_mode =3D MADVISE_MMAP_WRITE_LOCK, - .anon_name =3D anon_name, - }; - - if (start & ~PAGE_MASK) - return -EINVAL; - len =3D (len_in + ~PAGE_MASK) & PAGE_MASK; - - /* Check to see whether len was rounded up from small -ve to zero */ - if (len_in && !len) - return -EINVAL; - - end =3D start + len; - if (end < start) - return -EINVAL; - - if (end =3D=3D start) - return 0; - - madv_behavior.range.start =3D start; - madv_behavior.range.end =3D end; - return madvise_walk_vmas(&madv_behavior); -} #else /* CONFIG_ANON_VMA_NAME */ static int replace_anon_vma_name(struct vm_area_struct *vma, struct anon_vma_name *anon_name) @@ -2109,6 +2077,38 @@ static inline bool is_valid_name_char(char ch) !strchr(ANON_VMA_NAME_INVALID_CHARS, ch); } =20 +static int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, + unsigned long len_in, struct anon_vma_name *anon_name) +{ + unsigned long end; + unsigned long len; + struct madvise_behavior madv_behavior =3D { + .mm =3D mm, + .behavior =3D __MADV_SET_ANON_VMA_NAME, + .lock_mode =3D MADVISE_MMAP_WRITE_LOCK, + .anon_name =3D anon_name, + }; + + if (start & ~PAGE_MASK) + return -EINVAL; + len =3D (len_in + ~PAGE_MASK) & PAGE_MASK; + + /* Check to see whether len was rounded up from small -ve to zero */ + if (len_in && !len) + return -EINVAL; + + end =3D start + len; + if (end < start) + return -EINVAL; + + if (end =3D=3D start) + return 0; + + madv_behavior.range.start =3D start; + madv_behavior.range.end =3D end; + return madvise_walk_vmas(&madv_behavior); +} + int set_anon_vma_name(unsigned long addr, unsigned long size, const char __user *uname) { --=20 2.50.0 From nobody Wed Oct 8 20:55:44 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 AE0EC2C15B0 for ; Tue, 24 Jun 2025 13:04:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770253; cv=none; b=MN+VbTWS7ZpH4NfFKAvEc59DsseYSe9knB45ePVMiqKSkkQJCGKRqBaSkzXyrU6WuEVhqeb5yA/1ZyAgF2TwnphAWbsaiPM02kQxvL7RdrHPRomkaWaaiAJV00N5X8TlrGzlr9iv17DdicvLkHLLkLk69x8GywAjyOEqmu+pa4I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750770253; c=relaxed/simple; bh=fkOsy+t+qaACcx9sjCgoEdlw5N/duW/gWOdJkLKYnUc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=V7fscJYjZudSt2VoxdVlzjqefr8ZtcMV41j8OFWAI/BRO5SdUWuzUVLF3yobcSd3q3hLH/FOlfNzISqX8pTXEhukeU18TzjzlcpD2jwR2B/UfW/qcBVIQxPrTF11IVJ22CIaBfQ6GOJa1P6H2l2DJF8r2OYlhMcNHJ77Oo4Vrh8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz; spf=pass smtp.mailfrom=suse.cz; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=sFg8rAI7; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=Ct7iXai7; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b=sFg8rAI7; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b=Ct7iXai7; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.cz Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="sFg8rAI7"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="Ct7iXai7"; dkim=pass (1024-bit key) header.d=suse.cz header.i=@suse.cz header.b="sFg8rAI7"; dkim=permerror (0-bit key) header.d=suse.cz header.i=@suse.cz header.b="Ct7iXai7" 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 4B2071F74A; 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=4xVVugloGygpGatajnAlg5Wq+hCv948n+P1il18F82E=; b=sFg8rAI7nDBvs7LWKTvjKpmUl+wpaBSlEAnV5/6mlv4eBYEVr+Fgw7ysfWx8h4+47JQY6j Kl53owziDE61kyVquaLL7TA31joFDYuVLduNxulP0TZG4Xo17KrQVwaksqFXrMvcEQbTc1 gpTajf2cIMFeXI/kzD52bLnvxayURjI= 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=4xVVugloGygpGatajnAlg5Wq+hCv948n+P1il18F82E=; b=Ct7iXai7wbCRYsRsmYN8DwzI4s9dyPzK0Q/56Xldm5ZfTsad4vYKfFigrJ3yGpEVDu0Q4R jZ6DWZfYlSKF1tAw== Authentication-Results: smtp-out2.suse.de; none 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=4xVVugloGygpGatajnAlg5Wq+hCv948n+P1il18F82E=; b=sFg8rAI7nDBvs7LWKTvjKpmUl+wpaBSlEAnV5/6mlv4eBYEVr+Fgw7ysfWx8h4+47JQY6j Kl53owziDE61kyVquaLL7TA31joFDYuVLduNxulP0TZG4Xo17KrQVwaksqFXrMvcEQbTc1 gpTajf2cIMFeXI/kzD52bLnvxayURjI= 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=4xVVugloGygpGatajnAlg5Wq+hCv948n+P1il18F82E=; b=Ct7iXai7wbCRYsRsmYN8DwzI4s9dyPzK0Q/56Xldm5ZfTsad4vYKfFigrJ3yGpEVDu0Q4R jZ6DWZfYlSKF1tAw== 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 339E013ACE; Tue, 24 Jun 2025 13:03:58 +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 aAtTDD6iWmjqYQAAD6G6ig (envelope-from ); Tue, 24 Jun 2025 13:03:58 +0000 From: Vlastimil Babka Date: Tue, 24 Jun 2025 15:03:48 +0200 Subject: [PATCH v2 4/4] mm, madvise: use standard madvise locking in madvise_set_anon_name() 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-Transfer-Encoding: quoted-printable Message-Id: <20250624-anon_name_cleanup-v2-4-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-Spamd-Result: default: False [-8.30 / 50.00]; REPLY(-4.00)[]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_TWELVE(0.00)[12]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_SIGNED(0.00)[suse.cz:s=susede2_rsa,suse.cz:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL7wgbib1ih6q11z93xiyrfhpt)]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.cz:email,suse.cz:mid] X-Spam-Level: X-Spam-Flag: NO X-Spam-Score: -8.30 Use madvise_lock()/madvise_unlock() in madvise_set_anon_name() in the same way as in do_madvise(). This narrows the lock scope a bit and reuses existing functionality. get_lock_mode() already picks the correct MADVISE_MMAP_WRITE_LOCK mode for __MADV_SET_ANON_VMA_NAME so we can just remove the explicit assignment. Signed-off-by: Vlastimil Babka Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Reviewed-by: Suren Baghdasaryan --- mm/madvise.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index cae064479cdf908707c45b941bd03d43d095eab6..ee02ccd0315a146cdb3001cd189= e03be9e48a2ea 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -2082,10 +2082,10 @@ static int madvise_set_anon_name(struct mm_struct *= mm, unsigned long start, { unsigned long end; unsigned long len; + int error; struct madvise_behavior madv_behavior =3D { .mm =3D mm, .behavior =3D __MADV_SET_ANON_VMA_NAME, - .lock_mode =3D MADVISE_MMAP_WRITE_LOCK, .anon_name =3D anon_name, }; =20 @@ -2106,7 +2106,14 @@ static int madvise_set_anon_name(struct mm_struct *m= m, unsigned long start, =20 madv_behavior.range.start =3D start; madv_behavior.range.end =3D end; - return madvise_walk_vmas(&madv_behavior); + + error =3D madvise_lock(&madv_behavior); + if (error) + return error; + error =3D madvise_walk_vmas(&madv_behavior); + madvise_unlock(&madv_behavior); + + return error; } =20 int set_anon_vma_name(unsigned long addr, unsigned long size, @@ -2136,9 +2143,7 @@ int set_anon_vma_name(unsigned long addr, unsigned lo= ng size, return -ENOMEM; } =20 - mmap_write_lock(mm); error =3D madvise_set_anon_name(mm, addr, size, anon_name); - mmap_write_unlock(mm); anon_vma_name_put(anon_name); =20 return error; --=20 2.50.0