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 41D22C77B7F for ; Tue, 24 Jun 2025 13:04:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5E9D6B009F; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A36666B00BC; 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 8FC436B00BE; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 614E76B00BC for ; Tue, 24 Jun 2025 09:04:02 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1D211BB9A9 for ; Tue, 24 Jun 2025 13:04:02 +0000 (UTC) X-FDA: 83590311924.30.EB5394A Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf02.hostedemail.com (Postfix) with ESMTP id BCF5280016 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=nhpnuEHx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=9kqWb2+i; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nhpnuEHx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=9kqWb2+i; spf=pass (imf02.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 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=FEinpjmKZWAP/U2IPt3FFLFbmlK4f2nRzBeCNHX9Ky4=; b=sQcnwWt/ykTXkltm4tp0/bBhwMVptsV0B3nZQCQgf+c/dvWpKtgeIHUBjsa0YUAckkxDM0 APL/4CJDNkC7euebgb1slr7kJ6N48YuhVwpY9oKFgiQeKGGq/wev17vwV6MUYbViI2gYv5 0KuqAGU+Ni2oCGrv9fuzSAt7gJoffsQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750770240; a=rsa-sha256; cv=none; b=UIVVylzcA2J/VCsCQ8IEG5+zxPzpiyvRsIFyo/4gptlGO/XcW4q/0dSAKuFAeIoWOT31Vu lx2Bp1J5GZ8vo82C6RSo4NnKcPhVZOltbzpNDeowxKoqnLOW3w4yPY0mRXPN6VXhraXR3p zd9MeFBrPFjkp/Sv+5Y5ChD8Ox7/miI= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nhpnuEHx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=9kqWb2+i; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=nhpnuEHx; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=9kqWb2+i; spf=pass (imf02.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none 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== 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 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BCF5280016 X-Stat-Signature: 698b6kfg9epubb86bcay5wjy8wde88k1 X-Rspam-User: X-HE-Tag: 1750770239-822826 X-HE-Meta: U2FsdGVkX18m/nPojb3ffroNQBBlanlS3bVkqrGt+9Htz1MKOoZFGnKXKGJrIZBL4sE7opExaOFLHCBwPzTco22bYcj0tYzRvSWxhFe6Tjvj/ZPtuHruJSgm548ZN7fyzv8tu0eziTxiYDDic3wDKKA/lT4nR3Y4ZCj/81CsJKyHCdzwZ4jLJYF1N+zNUFgGEDQNG02tCux36AGfvOXrgZUq4uw6vFvnyEqkJCA7V07ivwpEixIiS8luQUnW+OFGhmwBH+lfr4HIEr8yvkeCasGljmnqQm/V0qDOR0RBeZFmXNB2G5FN/fspAgAEpTB+QXYzySE+lJ5KhJSTIyLL01yOXBRv0Hz+ZvSynR/3/jLZdWX+M6Oc++A2Qfg2eQOq7vN5gFZpsGpN7iUsYSCz9GJB7RDVYkVpMbAeDEBP4sKfp9Lai7ZGrvY6AxXXjyD7LRh8Ig/l4L6EE3kxqn3D3KF8/JAtmQEFsSme5dW2SXAHRM1rGKZB1JvU/ZPHeULM+0R71Q3tBlg6E1SrCV1KU8TQdTvmmPK3WBWZCBmhuwTo4JrPkbdyyshu/yoXxjmj96C1v6mbXw8VAI2wwr6/1Kpr5P9npnfZVq1RM0QaHcr9M3TX1TGoIotV0VBS/47rzWI/MZQffLsRDNNr82zmiAYnpqkHzeBAUylux6BelpcAsyWp/uYQB15fMgEijBp2x/Rph+n2Dfgzfgu/E0/pvEOgB/N+PL/uQ+JCASsgZhCBE62DZpcVycL3ficYdHNguUp5nuHW6bP2Fa2uL9LW0WDJM8B/bq0MUNfPO8fqyJwoJ4Fby7wKgknaq5FB2tKBEJ1aVhxVf7KFWW0UStkE/dS7axxN08ArOk/paRh8Ci0WA8V0d3u6+DDKMvTbd+Vjm7Ag8dFHrlmWzngHKoMYXJBFdV+dyZHCSfz6ZE68/76mQM43GCtUr5q71B9HoyvfFODw0ZJ1zfwMbVBEskw HwPSIM2m j8YWfaMTiWZewG78lH9CrmJiV0Qf6q0VrEMn4vbx+EdrPTIQO2wd5kvlYoF6VeZKxP5E7hy2t5jT6C/cOJONIDPdxdmk+7CGxRMnhNyZ3Q4Ns8F2FEqAghanc01xjtn5z8utsW46OwZLqxVkJqKYE8AIjp26WHebLtYc+OGK04mvUlvaQcJfEEbT8w36RdDqUJsv+hGIT9hEDsi7xJgrlE/Qe3h3yWEyuKRC/i3zpPKTKisGnqBQPdqXkPYLGstdu+WzlHPukO60ejPytOxoqRfYdXcQcNYYm9HYiYC78xCWAdLY= 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: 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 --- 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..ef40f68c1183d4c95016575a4ee0171e12df9ba4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4059,14 +4059,14 @@ unsigned long wp_shared_mapping_range(struct address_space *mapping, #endif #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 diff --git a/kernel/sys.c b/kernel/sys.c index adc0de0aa364aebb23999f621717a5d32599921c..b153fb345ada28ea1a33386a32bcce9cb1b23475 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2343,54 +2343,14 @@ int __weak arch_lock_shadow_stack_status(struct task_struct *t, unsigned long st #define PR_IO_FLUSHER (PF_MEMALLOC_NOIO | PF_LOCAL_THROTTLE) -#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 = current->mm; - const char __user *uname; - struct anon_vma_name *anon_name = NULL; int error; switch (opt) { case PR_SET_VMA_ANON_NAME: - uname = (const char __user *)arg; - if (uname) { - char *name, *pch; - - name = strndup_user(uname, ANON_VMA_NAME_MAX_LEN); - if (IS_ERR(name)) - return PTR_ERR(name); - - for (pch = name; *pch != '\0'; pch++) { - if (!is_valid_name_char(*pch)) { - kfree(name); - return -EINVAL; - } - } - /* anon_vma has its own copy */ - anon_name = anon_vma_name_alloc(name); - kfree(name); - if (!anon_name) - 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); + error = set_anon_vma_name(addr, size, (const char __user *)arg); break; default: error = -EINVAL; @@ -2399,14 +2359,6 @@ static int prctl_set_vma(unsigned long opt, unsigned long addr, return error; } -#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 = 0; diff --git a/mm/madvise.c b/mm/madvise.c index fca0e9b3e844ad766e83ac04cc0d7f4099c74005..7e8819b5e9a0f183213ffe19d7e52bd5fda5f49d 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; } -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 struct 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 = NULL; + struct mm_struct *mm = current->mm; + int error; + + if (uname) { + char *name, *pch; + + name = strndup_user(uname, ANON_VMA_NAME_MAX_LEN); + if (IS_ERR(name)) + return PTR_ERR(name); + + for (pch = name; *pch != '\0'; pch++) { + if (!is_valid_name_char(*pch)) { + kfree(name); + return -EINVAL; + } + } + /* anon_vma has its own copy */ + anon_name = anon_vma_name_alloc(name); + kfree(name); + if (!anon_name) + 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; +} +#endif -- 2.50.0