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 A457FC77B7F for ; Tue, 24 Jun 2025 13:04:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D2DC6B00BE; Tue, 24 Jun 2025 09:04:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37EC36B00C0; Tue, 24 Jun 2025 09:04:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 246D56B00C1; Tue, 24 Jun 2025 09:04:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0BCA56B00BE for ; Tue, 24 Jun 2025 09:04:14 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B9168121609 for ; Tue, 24 Jun 2025 13:04:13 +0000 (UTC) X-FDA: 83590312386.19.557DC8A Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf06.hostedemail.com (Postfix) with ESMTP id 564C3180004 for ; Tue, 24 Jun 2025 13:04:11 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=sFg8rAI7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ct7iXai7; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=sFg8rAI7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ct7iXai7; dmarc=none; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750770251; a=rsa-sha256; cv=none; b=ORvmFlKfb0g8lQcaxn5yudTHzqg1FmiRzXedNO9wzr2iJ16rharddG3+vrIlmLwJrIgOOM 4q+WngAStX/CAHi7VawX2o/IJn64gxdFESG17NE2L1JEk/xkWPvCc/UkCXlb0UtLDdDdUG d3wEHsK2r+xDuccGMtT4N2D8bY9A0zY= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=sFg8rAI7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ct7iXai7; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=sFg8rAI7; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=Ct7iXai7; dmarc=none; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.131 as permitted sender) smtp.mailfrom=vbabka@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750770251; 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=4xVVugloGygpGatajnAlg5Wq+hCv948n+P1il18F82E=; b=grGPMFByPB+e4NNHd7mHmQkL119JXMz0lOmli5qIN/QuEQT3UWevDYQWpXL2uEtJc4u8wQ eJVhwojCQDgC90Fj6hz+U9yvX8niaPpbbM9blIukHu7l4it8jsgK9doi7/vtIDeE6lMpoN +PzPuwuqZNZ3P19uhHHhIAp1iClN/Xs= 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== 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() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-Rspam-User: X-Rspamd-Queue-Id: 564C3180004 X-Rspamd-Server: rspam10 X-Stat-Signature: o9rpno8m4cjp7tz3byph3oaq1kabp661 X-HE-Tag: 1750770251-699930 X-HE-Meta: U2FsdGVkX1/C13/eu6LUHHVnZqUzGALO+X/oOejayrAJZsDlhwjsJU5tcaO3ycnr4Qmf5hxlcjCY67823sgrGOtUx4PVeMBT5c7xa2ldSKpeCVSl7Uj7bUVZdqji9ErspzKpUNuLCEWMcQtpaGK6aUalmjbCEn8JiBOB2Ab5tmHVtCJ7U+lYXgx7jP0eHJQNqU1tmEc1S8MPgiSwopnHYb+GujG+hrVQpOGDg8JshhdoKl2kN2pBOL59vFFECFIAcSdi2T5X5O7YbOJe+LRqALfIc9w7x4ODUZsjXpOsBuO3WSGllR1uWZ7XKnt3nss2v9hF7tv7LqsqR0FIZvLRp0MB8ZX44ldcSTdXHKie/4IPXBbTgrl0reD5NNcuA+rK4vQbfno5W1iuTyaA9Sc2CZwuVLsyTiclCTSMAMkMUqKFSwfgAUOKQJV2KxobAqYGs8uhvBwr24kZCe74FN5iFWyNKWVjmngerSriSnLvxG0QB7gbvSczSnxVvlAcPF8TguX6KQM2LvWSln70YZnaAEtmpRUvE1nIcf8pCUWdT9mIvyaNkKjkBSbZFyaVGX0aJHvOWIS9QspR8N/Ol7cwMerS0MTj+vLAteHcLdZOd+wMa83KZU/lnCCERNUOhuPR3Pre9f1EY5zwAPNhxZXUpcfIs6KZd+VoKX5GAO0xnzcM3NQVk2EycJBUOI3JDevZzTdT/1O8pagktiejDzjcAHadBweKoBJ/hRCjTzLeYL5weSDvUAv+CvMzKpnoeFUUk0bgvGCPIhr+hv3SK0GEyFFX6Zu7ak3nUt1tgZMTgxU1Z+zKSNmU2veptNLfTdpGXP/vYm2bMoT+UjG/awpspUK1izda+CuOVOZERWbz9/oDsoPKO5o5ixuKSuuaUrn6t1vbGjfT2eCdAuzs5EUQm3ggtr2X/7GdLfBNs6fmD2ceIS67AnQZfAoqRQpq1nbCt+YD5hq5MT0bb26f3Ip IdcRxwZ+ UjFN0hhFH4NCX+teFgWubwOGdkCX+GJW5UR5RXmokbS2ecL12gDPpef3mqaKCb/qfWRqVlr3ZqzbBsQE6nzMqBt3l5Rjc4MZlDvJznGhsvQXBQDYQ9Ienpd1RoY+ZgXyc449BmkYnxrg2NUYsbxpnHgTDvO+oVGynEm78wJbxvMhJqylDMix8R0iNTRP+VvQ+Ub59g2pHsTOezbRzLL+x3Hpm9RzpDb6zv4RhRW5xDXqRMxHX29v0cpwwxlBprRz2IXMqpWZZXrY/MNDqG890pFR8sxQcn7/lV8gB/oKvh4kgRRA= 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: 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 --- mm/madvise.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index cae064479cdf908707c45b941bd03d43d095eab6..ee02ccd0315a146cdb3001cd189e03be9e48a2ea 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 = { .mm = mm, .behavior = __MADV_SET_ANON_VMA_NAME, - .lock_mode = MADVISE_MMAP_WRITE_LOCK, .anon_name = anon_name, }; @@ -2106,7 +2106,14 @@ static int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, madv_behavior.range.start = start; madv_behavior.range.end = end; - return madvise_walk_vmas(&madv_behavior); + + error = madvise_lock(&madv_behavior); + if (error) + return error; + error = madvise_walk_vmas(&madv_behavior); + madvise_unlock(&madv_behavior); + + return error; } int set_anon_vma_name(unsigned long addr, unsigned long size, @@ -2136,9 +2143,7 @@ int set_anon_vma_name(unsigned long addr, unsigned long size, return -ENOMEM; } - mmap_write_lock(mm); error = madvise_set_anon_name(mm, addr, size, anon_name); - mmap_write_unlock(mm); anon_vma_name_put(anon_name); return error; -- 2.50.0