From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94AEA22FAF8; Mon, 10 Mar 2025 17:43:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628624; cv=none; b=RW6C2yxBZcrSi+G80XHk4LPoLbY9kENkUjw8QUvXfgizJLCQ8KonXn3TR6PKzppjkRuGuUx2rlG8HpUdSzA9UtALd4pzchLPv+QQEMQmGbOdfRRcesNZNVH9ado8Awogdzn+pcNEqi4TpblhKXhZ/TzWMM4B8caBxqachoGER8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628624; c=relaxed/simple; bh=yQ+/Lc7LoxOdO5omlRrXIKaHNsP8w5MuE32QOFtFWpc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WeLGO/ycZRWsNijxZlLd1C0FlQ9HjB9iuQInNtAGoXvE+gw7OP2QcA3A9lwFDTylPP8pK8o10Roi2YimaYDBANTuUpb9jr1ljdlLqmYI9cgujwON2SGJ2rDrUjZYjqXjsDwgCFSH3qPDCkWVI+XW8uKa94A5LfAl7kkY1xAno5U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Xi93d2EW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Xi93d2EW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E215DC4CEE5; Mon, 10 Mar 2025 17:43:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628624; bh=yQ+/Lc7LoxOdO5omlRrXIKaHNsP8w5MuE32QOFtFWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xi93d2EWxMuH6Db0sHNKBqsnGXlOqKf2OMlcPWt/ciQs6XAaV+7FN0Ux5k9MGy3Hf v6khZK0b/cCeFaRskII55vYdNwWPEADj5LlPd0Sosaq54SvCq5yxGMjm95ACpDXu3N FxR0fixQXJG70so4CEh0uVlw7oD1Z47pMdPYnUfo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luis Chamberlain , Al Viro , Amir Goldstein , Andy Shevchenko , Antti Palosaari , Arnd Bergmann , Benjamin Herrenschmidt , Benjamin LaHaise , Clemens Ladisch , David Airlie , Douglas Gilbert , Eric Biederman , Iurii Zaikin , "James E.J. Bottomley" , Jani Nikula , Jani Nikula , Jan Kara , Joel Becker , John Ogness , Joonas Lahtinen , Joseph Qi , Julia Lawall , Kees Cook , Lukas Middendorf , Mark Fasheh , "Martin K. Petersen" , Paul Turner , Peter Zijlstra , Petr Mladek , Phillip Potter , Qing Wang , "Rafael J. Wysocki" , Rodrigo Vivi , Sebastian Reichel , Sergey Senozhatsky , Stephen Kitt , "Steven Rostedt (VMware)" , Suren Baghdasaryan , Tetsuo Handa , "Theodore Tso" , Xiaoming Ni , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH 5.15 005/620] sysctl: share unsigned long const values Date: Mon, 10 Mar 2025 17:57:31 +0100 Message-ID: <20250310170545.784334390@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170545.553361750@linuxfoundation.org> References: <20250310170545.553361750@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luis Chamberlain [ Upstream commit b1f2aff888af54a057c2c3c0d88a13ef5d37b52a ] Provide a way to share unsigned long values. This will allow others to not have to re-invent these values. Link: https://lkml.kernel.org/r/20211124231435.1445213-9-mcgrof@kernel.org Signed-off-by: Luis Chamberlain Cc: Al Viro Cc: Amir Goldstein Cc: Andy Shevchenko Cc: Antti Palosaari Cc: Arnd Bergmann Cc: Benjamin Herrenschmidt Cc: Benjamin LaHaise Cc: Clemens Ladisch Cc: David Airlie Cc: Douglas Gilbert Cc: Eric Biederman Cc: Greg Kroah-Hartman Cc: Iurii Zaikin Cc: James E.J. Bottomley Cc: Jani Nikula Cc: Jani Nikula Cc: Jan Kara Cc: Joel Becker Cc: John Ogness Cc: Joonas Lahtinen Cc: Joseph Qi Cc: Julia Lawall Cc: Kees Cook Cc: Lukas Middendorf Cc: Mark Fasheh Cc: Martin K. Petersen Cc: Paul Turner Cc: Peter Zijlstra Cc: Petr Mladek Cc: Phillip Potter Cc: Qing Wang Cc: "Rafael J. Wysocki" Cc: Rodrigo Vivi Cc: Sebastian Reichel Cc: Sergey Senozhatsky Cc: Stephen Kitt Cc: Steven Rostedt (VMware) Cc: Suren Baghdasaryan Cc: Tetsuo Handa Cc: "Theodore Ts'o" Cc: Xiaoming Ni Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Stable-dep-of: d727935cad9f ("fs: fix proc_handler for sysctl_nr_open") Signed-off-by: Sasha Levin --- fs/proc/proc_sysctl.c | 3 +++ include/linux/sysctl.h | 6 ++++++ kernel/sysctl.c | 9 +++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 213ea008fe2db..7c5d472b193f8 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -29,6 +29,9 @@ static const struct inode_operations proc_sys_dir_operations; const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX }; EXPORT_SYMBOL(sysctl_vals); +const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX }; +EXPORT_SYMBOL_GPL(sysctl_long_vals); + /* Support for permanently empty directories */ struct ctl_table sysctl_mount_point[] = { diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 32d79ef906e51..3fa5e2713aace 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -51,6 +51,12 @@ struct ctl_dir; extern const int sysctl_vals[]; +#define SYSCTL_LONG_ZERO ((void *)&sysctl_long_vals[0]) +#define SYSCTL_LONG_ONE ((void *)&sysctl_long_vals[1]) +#define SYSCTL_LONG_MAX ((void *)&sysctl_long_vals[2]) + +extern const unsigned long sysctl_long_vals[]; + typedef int proc_handler(struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 48eb4e7b72dea..05853e7681512 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -113,9 +113,6 @@ static int sixty = 60; #endif -static const unsigned long zero_ul; -static const unsigned long one_ul = 1; -static const unsigned long long_max = LONG_MAX; #ifdef CONFIG_PRINTK static const int ten_thousand = 10000; #endif @@ -2726,7 +2723,7 @@ static struct ctl_table vm_table[] = { .maxlen = sizeof(dirty_background_bytes), .mode = 0644, .proc_handler = dirty_background_bytes_handler, - .extra1 = (void *)&one_ul, + .extra1 = SYSCTL_LONG_ONE, }, { .procname = "dirty_ratio", @@ -3146,8 +3143,8 @@ static struct ctl_table fs_table[] = { .maxlen = sizeof(files_stat.max_files), .mode = 0644, .proc_handler = proc_doulongvec_minmax, - .extra1 = (void *)&zero_ul, - .extra2 = (void *)&long_max, + .extra1 = SYSCTL_LONG_ZERO, + .extra2 = SYSCTL_LONG_MAX, }, { .procname = "nr_open", -- 2.39.5