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 061B2E77188 for ; Mon, 30 Dec 2024 06:43:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0824A6B007B; Mon, 30 Dec 2024 01:43:26 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00B436B0083; Mon, 30 Dec 2024 01:43:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC6F26B0085; Mon, 30 Dec 2024 01:43:25 -0500 (EST) 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 BB4F86B007B for ; Mon, 30 Dec 2024 01:43:25 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 3BBC51C72D9 for ; Mon, 30 Dec 2024 06:43:25 +0000 (UTC) X-FDA: 82950683550.29.E9E1388 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf16.hostedemail.com (Postfix) with ESMTP id 3E39518000F for ; Mon, 30 Dec 2024 06:42:34 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.255 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=1735540981; 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=gXB4v3HW4K0qhkHex+q07TeLF+qaLvUPgg83vT5cq6g=; b=dOSLg027fr6uPK8FIAic8KbB5INgIgPdQQN/sb7JsghzSI1DmjxHbv8jiiT0zDm+24tVBo 7jTZoVwejos3/8tVXto1e52XUCh23PdSP/Cvj6XCdw0oUtlrb1ezNiPy83EGw8wXcbPByB jezgdfIWFLLN/Ylk3RvPF3jTUA4NcmE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735540981; a=rsa-sha256; cv=none; b=xL3yeMf2veex/wBQI1iGaiyXop26RUiRC9BqwZBXVq2TDOn9FGsur/iF+e4KnSdI5DXwDm 6udWbHEkWlgN24fHnYrSaBBSPQAMuEGNH8VY+0QhqVqrIWpREzJwWLmec/C4A9cXdD2SC+ J0mYRDEaS14UtE4f0lrPOYkaVT7X3AM= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of yukaixiong@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=yukaixiong@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4YM60M4PbVz1W3F6; Mon, 30 Dec 2024 14:39:47 +0800 (CST) Received: from kwepemh100016.china.huawei.com (unknown [7.202.181.102]) by mail.maildlp.com (Postfix) with ESMTPS id 7F47D140382; Mon, 30 Dec 2024 14:43:17 +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 14:43:13 +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: <3ed73b8d-1080-941b-ce6a-2d742b078193@huawei.com> Date: Mon, 30 Dec 2024 14:43:12 +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: dggpeml100003.china.huawei.com (7.185.36.120) To kwepemh100016.china.huawei.com (7.202.181.102) X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 3E39518000F X-Stat-Signature: djp8u3uxmjpqj9i88tygdje6jk5esiaq X-Rspam-User: X-HE-Tag: 1735540954-483083 X-HE-Meta: U2FsdGVkX19E4bYEVuYg5nWbmFzTg9nRvsHYC8tlFSwM1gaYZnqoN2Uo4pfub0V5hZ/CKtvrhzp58CvWqdKdcMhaEJZJsTKYMit6UWk4/5BM6GRGj21E1BYIVzv/N3MbnfeK3sgqE46AWlfDWrKmDBUSdBsrr0jcY+fAVQsfKo4GJz2wxQoL101S8RTi/QjX3lPTYPhwshFeBr0R5ZpdN4K+bwOmwoWrlq9okSeEYuNUH3aUxBsV8CSrt6InrRc1DhDZmvu2K2QXPAjiAjAy6Gmv3rmEnmd3LtWMfcEqhC6+0njwSyCZhIM2eFVssFE9N2I8Kt0ihvtBycDTIzQ3XD1nw0nQr0liHIKL6ZcT0dX2zPYLCHaY1snY3TltMoctiV1FEYfhdJy49qfidc9uPLnsaHP8U6wBOOYFkisdhOQNNod2TxJPu/rp0mMJW28HatuK0JNzgMELWIvSyOzUoBoIlTZvak4yu3R4GzVsG1nPqRnZj+dHaHkdLIcA88YswsCIV1xvJpCBgbzabp3/gIRgcixfR/fZ9PKW88LBElT0IDZvJKNwybuel8P72hGPwrnZtjctPsawTXH9ld5yXgOtQPQKWuch1W4IYVCt7zoHSzZCTPZjnjEtdcENKalFBOHs5P+qvk85mMZ5u1/6h/wh6eez+245w6tb6eVbX1sVKlGiCN7bwjlwZKYS4fE9wYllnkUvmvRfAtD/JCAjjGHjpo89KWff01kue197KKZ+lr0GP13uu2JCi/NqVKhQkfh1U5MZs6ia5m0QvwJwfLM9mMT8AJ7wti8+H7HMNdzwaJyao/Lp6C0Gl/aoRH0F4E3BZMsCaDi3BEL4ZDFA/8wL4YvQMFVm3PgSMs0nUVTkFcO0G1Z7RZW3hYOELUsDEs5QFUFyTNWnZhZPBKt6isXKuE3Vca5p9CcF+rfOj3bwVVAM+5OCrNBz36X6yR4FJcCM62Uz9qfp+ontze1 UMcEQhA3 Na7n2g/uiJ/MQYt/AroOfNJtRkXTexMrIyJnv85dK6yBnqnL3HpsUeX7C+zJlFumKEN09cMjXPOtizd8ESgTH8g8EiacAghTn7qUtJV3bYK5gfocm3QAaT7WNVhABeE4KvQmmSTv5u2SQiFJBDU4UPeETMKsszTaD8PEfqNe9Md5GIwIIiKFDwukifiSc//jhmfKpWGIs6LNWX1E= 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". > >> + .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. > > > >> + register_sysctl_init("vm", vdso_table); >> +#endif >> return 0; >> } >> __initcall(ia32_binfmt_init); >> #endif /* CONFIG_SYSCTL */ >> >> -#endif /* CONFIG_X86_64 */ > > Brian Gerst > . Hello all; I want to confirm that I should send a new patch series, such as "PATCH v5 -next", or just modify this patch by "git send-email -in-reply-to xxxxx",or the maintainer will fix this issue ?