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 00FCCC77B7C for ; Mon, 23 Jun 2025 15:00:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 911CE6B00AC; Mon, 23 Jun 2025 11:00:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E9566B00D5; Mon, 23 Jun 2025 11:00:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D80D6B00D6; Mon, 23 Jun 2025 11:00:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 69C6C6B00AC for ; Mon, 23 Jun 2025 11:00:24 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CDB5C120A8E for ; Mon, 23 Jun 2025 15:00:23 +0000 (UTC) X-FDA: 83586976326.23.8F19643 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf06.hostedemail.com (Postfix) with ESMTP id 90B07180018 for ; Mon, 23 Jun 2025 15:00:21 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=FiADIVtw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=1nhomz7w; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=XfZYKIYa; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="q/6dYMq5"; spf=pass (imf06.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=1750690821; 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=SakuvdSrh15qJf2+NPBVuCwkmOu0Lr50m1E+QXgt7sQ=; b=0iYbHIsFdK3+dl0oT+5p8B5rx/hxPz5JYaRzgwRiHhknUWJsJ9gNlgtYe7USXzm+S5L0Pu sUGxTXfn1oyuI5kPlgQf3NowK8NAKGjcB6Bss/uOyMEVWhq1iVd4UTQ4nz8LcBb83Sy+qM qZ3hxuLuf/5ax+4JndguS+B3isJsBIU= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=FiADIVtw; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=1nhomz7w; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=XfZYKIYa; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b="q/6dYMq5"; spf=pass (imf06.hostedemail.com: domain of vbabka@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=vbabka@suse.cz; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750690821; a=rsa-sha256; cv=none; b=1chlu6K2ajhhSyhhJ8M/M2XVzlwJl7JEhiMGhGfGlGsWXeGudaCiXKPfJpil+0UXy/N3E/ t5sIEkAysHzuULYunG+erPbFvgnFnB8fffTjNlJN5jXjSWUblfP76uZZCs6K5TYu2D4DwY QJTdzRuz0J+e5SlwCLbNevPY0jVTNXQ= 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 F0BC221182; Mon, 23 Jun 2025 15:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750690808; 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=SakuvdSrh15qJf2+NPBVuCwkmOu0Lr50m1E+QXgt7sQ=; b=FiADIVtwGqMUe0P+Xi47Fpl7eXaYk+2szOI4urofCcxds6R/V+09heXi8JKMGVAhuCgnn7 Z2PkzXipR2+2vvV9OzH1KwqmWXl7vs8syZyQNGB3j4kInqyt43M7zzRlNw+ljzO62guXEP p0bf+IY27oG4uG94tvYNhaqJdBRDPtk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750690808; 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=SakuvdSrh15qJf2+NPBVuCwkmOu0Lr50m1E+QXgt7sQ=; b=1nhomz7wb7klnP/cNZjhmG3Q2w8ut2nPlCVupztIW2zyoZg6+A1m7N3cmBgL2F78xGvI+W pK/bcMPQgs6iGrDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1750690807; 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=SakuvdSrh15qJf2+NPBVuCwkmOu0Lr50m1E+QXgt7sQ=; b=XfZYKIYaqnDs20YYpUVXO12KsMRqL9E8mMmORRnMxHr0HD6DNUGnG7m9XzzDIIJtnNsz2I 2XyU5pbhyjWwAxxgSGhWnunsllHzP8fddL91JcZGO7eCb5O86Z0vGN/Nkq1YmxcIEEyW8V imAeYg21FKZLfHg/S0LXMBUrQQ9ml2U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1750690807; 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=SakuvdSrh15qJf2+NPBVuCwkmOu0Lr50m1E+QXgt7sQ=; b=q/6dYMq54I/Pe6U1B64gJvnDlwA7D2/AHyQ7JaLgaOA3psEGP43OFO0M0UFXfR7fdYVO3F ciIXiHghzPg/DJBg== 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 D8B1013AC9; Mon, 23 Jun 2025 15:00:07 +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 uEKeNPdrWWi8cQAAD6G6ig (envelope-from ); Mon, 23 Jun 2025 15:00:07 +0000 From: Vlastimil Babka Date: Mon, 23 Jun 2025 16:59:51 +0200 Subject: [PATCH RFC 2/2] mm, madvise: move prctl_set_vma() to mm/madvise.c MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250623-anon_name_cleanup-v1-2-04c94384046f@suse.cz> References: <20250623-anon_name_cleanup-v1-0-04c94384046f@suse.cz> In-Reply-To: <20250623-anon_name_cleanup-v1-0-04c94384046f@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-Developer-Signature: v=1; a=openpgp-sha256; l=6289; i=vbabka@suse.cz; h=from:subject:message-id; bh=GgJ5kuwAujTWdPeQXdF9NpyEneY/99+HBlR3VaCg5ms=; b=owEBbQGS/pANAwAIAbvgsHXSRYiaAcsmYgBoWWv1X4uIKLtSIYHzYzzLjhrnC6u70kUE6f2g/ lcYXseHi62JATMEAAEIAB0WIQR7u8hBFZkjSJZITfG74LB10kWImgUCaFlr9QAKCRC74LB10kWI mvEACACVfDRHAB8UmKGXxmGoefFUbulsxeXJ+OuGoIL5echXIcfuJ8Edpbt9B0/E0/H0TsEj8ym CrqxdoEtbjqf0kaGm0aeo/HUMYTta5pPqahyv8ihouVWBJGcq/Ehxrr90O1TuGJslrqGPthoDYl 2vvVgEsaGGKVYhD4ftF+vQMyo3DHvB/ng+1FvECw3WD3E0qH9e40JlDMncR+Too20VsHsqeSL7b WpCdHexp2rLiCB9wLIAcqZV8t8Sqt/6txea4CaVWM0OzRBB3yTYS7B6j4HdFy5wpKRW0AuL0Kiw wLC/J/1VN2RlhBT4Vx+fl8Z031UiGMMGsUNXSDN3vFxi9DPq X-Developer-Key: i=vbabka@suse.cz; a=openpgp; fpr=A940D434992C2E8E99103D50224FA7E7CC82A664 X-Rspamd-Queue-Id: 90B07180018 X-Stat-Signature: 8rz4bwq1i79k9ebogczqx4sa1n1645tb X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1750690821-137210 X-HE-Meta: U2FsdGVkX1/XmdMRL0ICTXoLTZ7HvPQBKTUdbbmFMzVUgR4tHxZRk8nuGfqyd8r94kgCF14VcIcxhF8tN4P16roUuS3QaUjOWdGbnlFALFqtur3WfxZvSJL4oD/IK506buscg98v7X6pHILxjaNC1sHpevyF75m+va8Z/Rz6x3oM9iozF54tmL6F8ran2J1by881GlK8u0S5wEFSUoipNldDH9CleR7PLpYdFmoDE9G8L7+pWwUJBp9Gi1uI2RWlxsdFvS2coJ3DNp1/8YgyaySCbEugX5kRV9F6gZnjVUi4rpUoprzhJVmNa7TC+mlgDkfRgo2qpBaYoblJ+IIoe2zTbOSe44mGgYW66bNcxsBWR2Mgs5b/B95A7RUm9r2d0Z6pmaJLo/cIzwKrknytL/+6M94qsLu/xJ9w2OyfflOwBR0xjlZlvukFcJ7ScEOSl7YB7y7encji1z6QbV720nGKyJapgd1Kbd/meNIg9WbFlPxA3OP81mCX6iPTjnRggj+vh8Nn4UjO//0Y4A5Wx2dsvAKro+cpPhbbgYfzuhitty72HPHfK2ymPPcvVPCUurM7PTjmecF8UbcxR0ashT1wS8+nPwKUkjpTNIup42rF/P/YavS6GU6AvRWCTt52fZ2etHnyn2ks9hTMSLYUZRl+cZb4d4xeNDrn9MtByAtsz0Zn7tCLXy8uwhNu3oDMGs5DfBrCOZLB1xvkl1SEI2MaTnIRWEqnAFO+mPEIlmUqlWlc7ET6IIBexBBhmqBdRrFj2l/RIv54QcWDZWh80uzS2BfPtnZ9s4La2T1/kxxck34DhA9Hb+MC297W+1n35kwJyDNUYi2INmfgXnEev++t5ZosucN+WqqyqInPMY/UZ22tkmZh36V4jnLUmRcTiMUImQt/8PHa1LxcE5bFQ4bpU8Eqd1zNQiEKWoxYOsAFtTbynNS6fX3EJas0uFWhf0vNHjCTEsOsxVVLupF o1KNEm3n +IRv5cwv6bcitEWnorgnhSgKNypa7YZpObKTHwc2JGzpgE/KgiAW6QwtPCI2km2BmwfBnehj4ax0moH8O5rTDINxAqRsLYVCkf4Ur7gKu6egROGOg5b1BWYnYngCEMmFuv46QQE88wQqYfOBE0/U2E3suYouNV5kEHjtS2fGYrOemyeCe3/7BCu/xhAx6EsaNTR89nc0FFAbsTdEw9K/CHwrjev043bjtJvbJ334hLph/taXyihNQSymlbUpObXpYBiL3xs1f2xLKq8QF8O0PDLBxmMoI6RWoZVOVyhjd3Tihyak= 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 it's mm code so move it under mm. mm/madvise.c seems to be the most straightforward place as that's where madvise_set_anon_name() lives, so we can stop declaring the latter in the header and instead declare prctl_set_vma(). It's not ideal as prctl is not madvise, but that's the reality we live in, as described above. Signed-off-by: Vlastimil Babka --- include/linux/mm.h | 13 +++++------ kernel/sys.c | 64 ------------------------------------------------------ mm/madvise.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 73 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 0e0549f3d681f6c7a78e8dfa341a810e5a8f96c1..1f8c2561c8cf77e9bb695094325401c09c15f3e6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4059,14 +4059,13 @@ 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 prctl_set_vma(unsigned long opt, unsigned long start, + unsigned long size, unsigned long arg); #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 prctl_set_vma(unsigned long opt, unsigned long start, + unsigned long size, unsigned long arg) +{ + return -EINVAL; } #endif diff --git a/kernel/sys.c b/kernel/sys.c index adc0de0aa364aebb23999f621717a5d32599921c..247d8925daa6fc86134504042832c2164b5d8277 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -2343,70 +2343,6 @@ 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); - break; - default: - error = -EINVAL; - } - - 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 ae29395b4fc7f65a449c5772b1901a90f4195885..4a8e61e2c5025726bc2ce1f323768c5b25cef2c9 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -134,8 +135,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; @@ -165,6 +166,60 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, madv_behavior.range.end = end; return madvise_walk_vmas(&madv_behavior); } + +#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 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); + break; + default: + error = -EINVAL; + } + + return error; +} #else /* CONFIG_ANON_VMA_NAME */ static int replace_anon_vma_name(struct vm_area_struct *vma, struct anon_vma_name *anon_name) -- 2.50.0