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 DA6DCE7718B for ; Mon, 30 Dec 2024 03:02:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3841B6B0085; Sun, 29 Dec 2024 22:02:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 30F066B0088; Sun, 29 Dec 2024 22:02:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1878B6B0089; Sun, 29 Dec 2024 22:02:50 -0500 (EST) 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 EF5BC6B0085 for ; Sun, 29 Dec 2024 22:02:49 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 97EACA0335 for ; Mon, 30 Dec 2024 03:02:49 +0000 (UTC) X-FDA: 82950127050.18.E6B9A1C Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf19.hostedemail.com (Postfix) with ESMTP id 262D01A000E for ; Mon, 30 Dec 2024 03:01:58 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735527719; 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; bh=oxw3HdcEAB7sSAOLmpsgxWATxvYyvmgKlT0kNzn/n7U=; b=1PP4tEczOUMUuEIitLF9MUVHAK9xvH3BGjq9rwYogH6z3Xkh3gQ/0qBgEsocc/OCdRGJz/ F9PfZosPmfsWXgt0rAvWPHVk/ZqIA7jhH0trnrXm1Fbbtjv3+2HdB1iDibJbRc81983Mev XHn2VubI84U0CwyqaE/4dpSidhhjrKs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; spf=pass (imf19.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735527719; a=rsa-sha256; cv=none; b=RiVNZoyKJZSb7uRPNC3Ife+SA9ctI5E7xRzA6UNy08GzpnAVaEMXUS5hE/Fb0Qk4OOjcau KHbXZGlI2FJq9YyiPn0J9QpyqqOKWf/oa1IU0i4MldD6NyF2znmmrCZ8IKdUBG+Cqsm1LZ 00stdkwJ155WMiY3lhDNikiQMhk/Y44= Received: from mail.maildlp.com (unknown [172.19.163.174]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4YM15r5LzBz11NZQ; Mon, 30 Dec 2024 10:59:12 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id BDF2714022E; Mon, 30 Dec 2024 11:02:42 +0800 (CST) Received: from [10.174.179.93] (10.174.179.93) by kwepemh100016.china.huawei.com (7.202.181.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Mon, 30 Dec 2024 11:02:38 +0800 Subject: Re: [PATCH v4 -next 13/15] x86: vdso: move the sysctl to arch/x86/entry/vdso/vdso32-setup.c To: Brian Gerst References: <20241228145746.2783627-1-yukaixiong@huawei.com> <20241228145746.2783627-14-yukaixiong@huawei.com> CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , From: yukaixiong Message-ID: <5b7530d9-a593-4365-718f-afdd46bdcb31@huawei.com> Date: Mon, 30 Dec 2024 11:02:38 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.179.93] X-ClientProxiedBy: dggpeml100007.china.huawei.com (7.185.36.28) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 262D01A000E X-Rspam-User: X-Stat-Signature: uu7omgkwr6ptgj7n9qppdmk46q91frnc X-HE-Tag: 1735527718-360658 X-HE-Meta: U2FsdGVkX19j7DaDM3Z3IUljQaDQuKHPUesXzzDBu2ThZphvmyI6VpyDoxaV+3tugAk2mUXk0v1uKMxtGppGv1ueRr8TBwTxXbOoNEKNFbPfJperVnUMY9Ug5L3WS05AR2h5XQagSLdpL7mrSmuVVtJpGO6QKddtKYuilILTx6fErx0HU0WBR1zXi2+hDE2R3KvNQalscPJCJPtreemqrlwk6sDsVvNGxgTk8iY3EcMCy1mYKaDQZR6hMysyS7h9NiWk26RtOcWX+y9zKPKIdXjW9vdPgHwJMItPJgyKghAcBhItXax5mshbwpvQt0KYIYNmPBXiUccVJPxp5vco5qD0X/SdSBCrYdYj4oTLb94JlOYawneQlH5bu4SJDAiou2agIG1ooUUfpjHJK88FkzA+h6fqcAz3UJaEI7YqPH09lkTSwnF6GVElOvlZbP0xWYBJvETLOxvfrX4V2eRTDDOoKljhcHpnJHhvNxq4TQ3k+6Es6VvaSN/IEoTWr/lbfpFf2eOFBzIvWXLXGlq79sXaBpTqXtG4Msf82Vobi03US+TPKh9TqsBtRZ76ISaiPvpnmclTBF2OQLFGXe8nIBtguD7kOSt5fZPIiT3wuWI0JQR49aeoKItTnyUWjfVsaiB9RoGe3F81r52w3C6xaBoG9c6kUEZi5lExGEF9c1d3iGR+QFavCODpfWn2tVWEamlEkLGdwbeqM8edFiEqL1GoX/sCi1HOoXVEgMHuUd1TyJOXv2Rdv+vKKhQFs9zM+XInaeLqVA+dj0Tn3okO8qoFHb9yHqXgNwmK47Qjtv+XavVWXU0eJMCPWJQj/zTDv7yE7FcNFtjnjfYy4iV1fSN6euYvYFkd86Mu0jI4aoOSCrcmAQt5tUAq4xK2y37K9d2LOlaY2p9cxCDHAvxIGbY0nDJvuO3UnencKB171WYtAdITbYPlOXagXiKV6pwt6BmtM4ecQrg6n0mvw+U tpD0mUNA kO52filUeEkIHKVRKedMSFmo0jryzPq+GGAM3KxunwyvOd+8o1xggKenmeNUUEuGThGoSIBAKkQi4Gtqmj3oMrrUC+ICvY1imMYitgUgvfG5DDO/OvlfT2a1HxLledWXBLvonpK1BqHBfrHPBabptfjqzxADv3CKDzobIoTJDYb7/0zS3jpRN1KgUlJPKebrGTUoVZ97y6oPbA4k= 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: On 2024/12/30 7:05, Brian Gerst wrote: > On Sat, Dec 28, 2024 at 10:17 AM Kaixiong Yu wrote: >> When CONFIG_X86_32 is defined and CONFIG_UML is not defined, >> vdso_enabled belongs to arch/x86/entry/vdso/vdso32-setup.c. >> So, move it into its own file. >> >> Before this patch, vdso_enabled was allowed to be set to >> a value exceeding 1 on x86_32 architecture. After this patch is >> applied, vdso_enabled is not permitted to set the value more than 1. >> It does not matter, because according to the function load_vdso32(), >> only vdso_enabled is set to 1, VDSO would be enabled. Other values >> all mean "disabled". The same limitation could be seen in the >> function vdso32_setup(). >> >> Signed-off-by: Kaixiong Yu >> Reviewed-by: Kees Cook >> --- >> v4: >> - const qualify struct ctl_table vdso_table >> --- >> --- >> arch/x86/entry/vdso/vdso32-setup.c | 16 +++++++++++----- >> kernel/sysctl.c | 8 +------- >> 2 files changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c >> index 76e4e74f35b5..f71625f99bf9 100644 >> --- a/arch/x86/entry/vdso/vdso32-setup.c >> +++ b/arch/x86/entry/vdso/vdso32-setup.c >> @@ -51,15 +51,17 @@ __setup("vdso32=", vdso32_setup); >> __setup_param("vdso=", vdso_setup, vdso32_setup, 0); >> #endif >> >> -#ifdef CONFIG_X86_64 >> >> #ifdef CONFIG_SYSCTL >> -/* Register vsyscall32 into the ABI table */ >> #include >> >> -static struct ctl_table abi_table2[] = { >> +static const struct ctl_table vdso_table[] = { >> { >> +#ifdef CONFIG_X86_64 >> .procname = "vsyscall32", >> +#elif (defined(CONFIG_X86_32) && !defined(CONFIG_UML)) > vdso32-setup,.c is not used when building UML, so this can be reduced > to "#else". I will take your advice. Thanks. >> + .procname = "vdso_enabled", >> +#endif >> .data = &vdso32_enabled, >> .maxlen = sizeof(int), >> .mode = 0644, >> @@ -71,10 +73,14 @@ static struct ctl_table abi_table2[] = { >> >> static __init int ia32_binfmt_init(void) >> { >> - register_sysctl("abi", abi_table2); >> +#ifdef CONFIG_X86_64 >> + /* Register vsyscall32 into the ABI table */ >> + register_sysctl("abi", vdso_table); >> +#elif (defined(CONFIG_X86_32) && !defined(CONFIG_UML)) > Same as above. > > I will take your advice. Thanks. >> + register_sysctl_init("vm", vdso_table); >> +#endif >> return 0; >> } >> __initcall(ia32_binfmt_init); >> #endif /* CONFIG_SYSCTL */ >> >> -#endif /* CONFIG_X86_64 */ > > Brian Gerst > . >