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 AB90BE7718B for ; Sun, 29 Dec 2024 23:05:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B07EC6B0082; Sun, 29 Dec 2024 18:05:49 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A90BD6B0083; Sun, 29 Dec 2024 18:05:49 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90A876B0085; Sun, 29 Dec 2024 18:05:49 -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 726356B0082 for ; Sun, 29 Dec 2024 18:05:49 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C662714176A for ; Sun, 29 Dec 2024 23:05:48 +0000 (UTC) X-FDA: 82949529012.07.AFAD8EC Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf09.hostedemail.com (Postfix) with ESMTP id 627D8140010 for ; Sun, 29 Dec 2024 23:05:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="CQglqd/b"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of brgerst@gmail.com designates 209.85.167.52 as permitted sender) smtp.mailfrom=brgerst@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735513503; a=rsa-sha256; cv=none; b=UTsvFBSs3DcBXcpRk3VZfrf2bdrsyMFuDoCIgSBVRt1n+2aFn39VfbKn0e8T/ip275OY9M 86DF/Jc5vdbNZl6Se/JDwryB0Uune8PUUjxeAyq5msJi3GPOI75YXZhEP9V6MvSJQm0AyN ybs/dlldeWuWGFr/7DbDC49GuH5u3to= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="CQglqd/b"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf09.hostedemail.com: domain of brgerst@gmail.com designates 209.85.167.52 as permitted sender) smtp.mailfrom=brgerst@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735513503; 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=Gg0gBOstbiPfT/5CIxqA5lZAaBxe9roGqwYSHcuJUK4=; b=BT5ceQWpifx4A/uS+F8KynjSkn3HcbuBYoH5gI12hC391LQfa175z860NsyGnh8yGKnoTl G2ui5N1LkqR6nCxkpGvMFmjd3rWW4yUGZV/0yFi2frPnEpucFwXafePxWi4MReeI6VIG23 kivXBLIYnDENbpW42HA2DeYT3YTBjX8= Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-53e384e3481so8394852e87.2 for ; Sun, 29 Dec 2024 15:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1735513545; x=1736118345; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Gg0gBOstbiPfT/5CIxqA5lZAaBxe9roGqwYSHcuJUK4=; b=CQglqd/bxQPMb7/8kCJTiwqRrlBQJ/2v4pknI/fpn1ydjzHd/cSe3xLDvYVcDuJzzO dPQlP+iS8jS5+f4HYFQPEGWiRmqrcLd10aP8U65nLh8GROWjp8vvFvxyhDPgIBo8vX0R fHXFBla/vgz/l6Nqk7UqGSiDj/lRGhquLk9lAWCF9qUBCD698ly5+tdTzDUBvpQ3JMUL E6w0vFLyKYEEIf7hzbIWVIeNzI4sqnKcTjA/6833ncQUNb01ae2BgFmA6noo2k9Vrh8U 51yyjJbENBE7ReoVfoZgIci95P4Z7HXopQwClG8VugJbAj/kjQHLYWHfyDpx9Ed13Sx6 F5JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735513545; x=1736118345; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gg0gBOstbiPfT/5CIxqA5lZAaBxe9roGqwYSHcuJUK4=; b=BmJOTcBiMLObPKzJxDz4ddGG1HJ6ETbPUrs56VsUJbtAUJGa0spuoPZONA4+RLmup7 g1ai0kCr1eBElY/0p8XTkf7yL14eUhOJKXfC0FuUKj86ya16wcwnWgQwCzD/qqPs/CP2 mhXSbLzTN6YflJ2xa3QzsWvjqZ7UFUrQnrjw+REIFX4b06qb23Td6IjrDr+NDhhBrbAy zsWWmJBItm+EByA7GeqNw1b/32n/uF9KJtZbg6bK3UXlZx0dL4DWG3QHQC8VD0X8Tpcm vqe06Givz4e6c1YcHHs0MG6ReTd2421WRr+zxRWODZStvfq3Gzimwb0nT5b4nzJMzvjB 0aTA== X-Forwarded-Encrypted: i=1; AJvYcCWjCAd+egyRt2N4i7OMoudnOu5Eanf2EoRAoleM0a2YCdPE2P7SJhz5Ya5V8o5iDH+qvov5+tATmA==@kvack.org X-Gm-Message-State: AOJu0YwaYJjFIbKZKsK7e3Dfdl1nK5frHDZXXlQyLPrBEpE2Ik3wG54K Lz+XCG6JgPTAoPNthJ4IbjC7Pazdt1isfiSRD8r7+z9baXuqrZDuNv9on/jmzLqPWRpAxyJU+5m JDWeWlOdNmp7+3LECgY6RwYB92w== X-Gm-Gg: ASbGnctmB4o/rWQPrSvm1f2tNnczfDxcj3xJw3O/Qtf8aBQLfbYFtvb8feR3YxQrw/i eMppgywIVKtxPYI84g0bkksuOIR9bVy+XuMs20A== X-Google-Smtp-Source: AGHT+IEqt5j8jsdpOLwCDaRHScqgd6KbKAOWycEuMfIL3JIo/6bnO8p8bFE/88tfVUmxNoyeU1ENzzZ00bSHOpuSCp4= X-Received: by 2002:a05:6512:e89:b0:540:2201:57d2 with SMTP id 2adb3069b0e04-5422956f2c8mr12005165e87.49.1735513544454; Sun, 29 Dec 2024 15:05:44 -0800 (PST) MIME-Version: 1.0 References: <20241228145746.2783627-1-yukaixiong@huawei.com> <20241228145746.2783627-14-yukaixiong@huawei.com> In-Reply-To: <20241228145746.2783627-14-yukaixiong@huawei.com> From: Brian Gerst Date: Sun, 29 Dec 2024 18:05:32 -0500 Message-ID: Subject: Re: [PATCH v4 -next 13/15] x86: vdso: move the sysctl to arch/x86/entry/vdso/vdso32-setup.c To: Kaixiong Yu Cc: akpm@linux-foundation.org, mcgrof@kernel.org, ysato@users.sourceforge.jp, dalias@libc.org, glaubitz@physik.fu-berlin.de, luto@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, kees@kernel.org, j.granados@samsung.com, willy@infradead.org, Liam.Howlett@oracle.com, vbabka@suse.cz, lorenzo.stoakes@oracle.com, trondmy@kernel.org, anna@kernel.org, chuck.lever@oracle.com, jlayton@kernel.org, neilb@suse.de, okorniev@redhat.com, Dai.Ngo@oracle.com, tom@talpey.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, paul@paul-moore.com, jmorris@namei.org, linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-security-module@vger.kernel.org, dhowells@redhat.com, haifeng.xu@shopee.com, baolin.wang@linux.alibaba.com, shikemeng@huaweicloud.com, dchinner@redhat.com, bfoster@redhat.com, souravpanda@google.com, hannes@cmpxchg.org, rientjes@google.com, pasha.tatashin@soleen.com, david@redhat.com, ryan.roberts@arm.com, ying.huang@intel.com, yang@os.amperecomputing.com, zev@bewilderbeest.net, serge@hallyn.com, vegard.nossum@oracle.com, wangkefeng.wang@huawei.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 627D8140010 X-Stat-Signature: di8zifetau796q5pqdt7s4kejrgz1ecz X-Rspam-User: X-HE-Tag: 1735513515-412828 X-HE-Meta: U2FsdGVkX1/pjY0shtY6M3zkX+doIxREM+D2OZEUymbyVRc2SarG6O1MxTgErGrrd7A2JTHKeg3pM27iMEokLBb0RVYUTKaqZU9iVG/9UGZlnV4KfFu3URsfntX27qWByfpRK88z3yAJ3WrKRcxsHBv5kvjpFW65TJx6x1O6ePBt6fuG5i/0dAH5wybaU2z1Tm8Fj+3/MzDaLZVDNxIpNVdgsxtYmcToo2Sc12Qwt4VD0L+AUmdWK/yqN9Uop+GktOmnrXMjabz/+FV7o8B+L9Oki01TYBwmbDOErZGhVN759xQwWyAuKbDZ3U24gkldXQ0+D3zwEeYDQoGmr9AYZ4q+26IzRooYs73p4ZjL0ljciKbehZdh9qo4C3lQstymbVR7Be/mDWpwTohgNb16akvDVEwHYz8tL/2uJ1GAME3N9S8H5d9YkQ5h5wHc1v2lZSgYYe3S7a5j2zwOP09qiksFCoaU8jcpE5bCux5dZL4lxFdVzT2gPoAJHx1pGkRTT8oyvKh27Ly9mDNANroLeMAfNsd1BynL/LKkmWm2LrD4feIMlBccE2Lh85lBJjhUfsfcbvitExq1YablJCh8wIzt3eCbsOwflRwyIQRlkWgxX863a/kCyvPBZMuig3+CL36+SClAGU0hgrca8iRXAjavwV9nEQgRgrPOfGNKyIPr4IbqkWb7wUNe8gt/jGV0q4iGUKIwId6zmf8/8hEG1yfUnyU5887lHGXsX9GQ/3pKYeMStHKVQTUrvYOQiwfBVEoQfyTJCxLBcJunkqVptZs+xKnVpeCCTqKKU80KF/rVfjxT4WguXTAgkcxagdJ61U2Wq0nHNVKyAdKlUBBuHTKvAxAPA6Te94jxUR8RQc+PZB9ASeZj62lIDT1exbZqlPSVcVm+WAWHMyY+WXnBlB2pJsoaVDeV7/6KO88iEr2byRnmT5BvsIGuunCbjZvu1JpvHQZ8srtXiT1fKpn yJisBY+0 663ruGOS9zpkVVpNcttkVpbkG7vzfl4J0vQ6lLWUS7NqQeiZnhcnAFXKhnwzWGP9aO7CjoM67AV5CYJa4SKRTmXUI3RhZc8QpZzpYU1NFf08Re0mmzUrP/+KlNMR4FtLhF8mO0Gz1E4zmHC7PSnKOM48UNujDF+XUBgmKEdRuD4iz5JvXIZ2prpL+3J042wjBKQkTNHgq9ucTVriZLMNHWWDnHuXe3oycmTmv4AVih8sBgcA5mdGLrPeotqXZxkiaEDAeZn6ZWcdbLkRmzPpsTEEi7M9Jd4FPhbfIVi9fDuabb0Js7e4PQBGJZ6OoCY2DR2nz7RwCBMemtrVTkQXZTYXKMRtm5frWMhBuxdArUxBbwsndZ0KFYV4/sw== 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 Sat, Dec 28, 2024 at 10:17=E2=80=AFAM 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/vds= o32-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=3D", vdso32_setup); > __setup_param("vdso=3D", 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[] =3D { > +static const struct ctl_table vdso_table[] =3D { > { > +#ifdef CONFIG_X86_64 > .procname =3D "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 =3D "vdso_enabled", > +#endif > .data =3D &vdso32_enabled, > .maxlen =3D sizeof(int), > .mode =3D 0644, > @@ -71,10 +73,14 @@ static struct ctl_table abi_table2[] =3D { > > 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