License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 */
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
* sysctl.h: General linux system control interface
|
|
|
|
*
|
|
|
|
* Begun 24 March 1995, Stephen Tweedie
|
|
|
|
*
|
|
|
|
****************************************************************
|
|
|
|
****************************************************************
|
|
|
|
**
|
2006-11-06 15:52:13 +08:00
|
|
|
** WARNING:
|
2005-04-17 06:20:36 +08:00
|
|
|
** The values in this file are exported to user space via
|
2006-11-06 15:52:13 +08:00
|
|
|
** the sysctl() binary interface. Do *NOT* change the
|
|
|
|
** numbering of any existing values here, and do not change
|
|
|
|
** any numbers within any one set of values. If you have to
|
2006-12-13 02:23:02 +08:00
|
|
|
** redefine an existing interface, use a new number for it.
|
2006-11-06 15:52:13 +08:00
|
|
|
** The kernel will then return -ENOTDIR to any application using
|
|
|
|
** the old binary interface.
|
|
|
|
**
|
2005-04-17 06:20:36 +08:00
|
|
|
****************************************************************
|
|
|
|
****************************************************************
|
|
|
|
*/
|
|
|
|
#ifndef _LINUX_SYSCTL_H
|
|
|
|
#define _LINUX_SYSCTL_H
|
|
|
|
|
2005-11-15 16:09:06 +08:00
|
|
|
#include <linux/list.h>
|
2011-03-10 08:14:17 +08:00
|
|
|
#include <linux/rcupdate.h>
|
2011-11-03 04:39:22 +08:00
|
|
|
#include <linux/wait.h>
|
2012-01-10 09:24:30 +08:00
|
|
|
#include <linux/rbtree.h>
|
2016-08-11 05:36:02 +08:00
|
|
|
#include <linux/uidgid.h>
|
2012-10-13 17:46:48 +08:00
|
|
|
#include <uapi/linux/sysctl.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2007-02-14 16:34:11 +08:00
|
|
|
/* For the /proc/sys support */
|
2016-08-03 05:03:36 +08:00
|
|
|
struct completion;
|
2007-02-14 16:34:11 +08:00
|
|
|
struct ctl_table;
|
2007-11-30 20:54:00 +08:00
|
|
|
struct nsproxy;
|
2008-04-29 16:02:44 +08:00
|
|
|
struct ctl_table_root;
|
2008-07-15 13:44:23 +08:00
|
|
|
struct ctl_table_header;
|
2011-12-30 00:24:29 +08:00
|
|
|
struct ctl_dir;
|
2008-07-15 13:44:23 +08:00
|
|
|
|
proc/sysctl: add shared variables for range check
In the sysctl code the proc_dointvec_minmax() function is often used to
validate the user supplied value between an allowed range. This
function uses the extra1 and extra2 members from struct ctl_table as
minimum and maximum allowed value.
On sysctl handler declaration, in every source file there are some
readonly variables containing just an integer which address is assigned
to the extra1 and extra2 members, so the sysctl range is enforced.
The special values 0, 1 and INT_MAX are very often used as range
boundary, leading duplication of variables like zero=0, one=1,
int_max=INT_MAX in different source files:
$ git grep -E '\.extra[12].*&(zero|one|int_max)' |wc -l
248
Add a const int array containing the most commonly used values, some
macros to refer more easily to the correct array member, and use them
instead of creating a local one for every object file.
This is the bloat-o-meter output comparing the old and new binary
compiled with the default Fedora config:
# scripts/bloat-o-meter -d vmlinux.o.old vmlinux.o
add/remove: 2/2 grow/shrink: 0/2 up/down: 24/-188 (-164)
Data old new delta
sysctl_vals - 12 +12
__kstrtab_sysctl_vals - 12 +12
max 14 10 -4
int_max 16 - -16
one 68 - -68
zero 128 28 -100
Total: Before=20583249, After=20583085, chg -0.00%
[mcroce@redhat.com: tipc: remove two unused variables]
Link: http://lkml.kernel.org/r/20190530091952.4108-1-mcroce@redhat.com
[akpm@linux-foundation.org: fix net/ipv6/sysctl_net_ipv6.c]
[arnd@arndb.de: proc/sysctl: make firmware loader table conditional]
Link: http://lkml.kernel.org/r/20190617130014.1713870-1-arnd@arndb.de
[akpm@linux-foundation.org: fix fs/eventpoll.c]
Link: http://lkml.kernel.org/r/20190430180111.10688-1-mcroce@redhat.com
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-07-19 06:58:50 +08:00
|
|
|
/* Keep the same order as in fs/proc/proc_sysctl.c */
|
2022-01-22 14:10:55 +08:00
|
|
|
#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[0])
|
|
|
|
#define SYSCTL_ZERO ((void *)&sysctl_vals[1])
|
|
|
|
#define SYSCTL_ONE ((void *)&sysctl_vals[2])
|
|
|
|
#define SYSCTL_TWO ((void *)&sysctl_vals[3])
|
|
|
|
#define SYSCTL_FOUR ((void *)&sysctl_vals[4])
|
|
|
|
#define SYSCTL_ONE_HUNDRED ((void *)&sysctl_vals[5])
|
|
|
|
#define SYSCTL_TWO_HUNDRED ((void *)&sysctl_vals[6])
|
|
|
|
#define SYSCTL_ONE_THOUSAND ((void *)&sysctl_vals[7])
|
|
|
|
#define SYSCTL_THREE_THOUSAND ((void *)&sysctl_vals[8])
|
|
|
|
#define SYSCTL_INT_MAX ((void *)&sysctl_vals[9])
|
proc/sysctl: add shared variables for range check
In the sysctl code the proc_dointvec_minmax() function is often used to
validate the user supplied value between an allowed range. This
function uses the extra1 and extra2 members from struct ctl_table as
minimum and maximum allowed value.
On sysctl handler declaration, in every source file there are some
readonly variables containing just an integer which address is assigned
to the extra1 and extra2 members, so the sysctl range is enforced.
The special values 0, 1 and INT_MAX are very often used as range
boundary, leading duplication of variables like zero=0, one=1,
int_max=INT_MAX in different source files:
$ git grep -E '\.extra[12].*&(zero|one|int_max)' |wc -l
248
Add a const int array containing the most commonly used values, some
macros to refer more easily to the correct array member, and use them
instead of creating a local one for every object file.
This is the bloat-o-meter output comparing the old and new binary
compiled with the default Fedora config:
# scripts/bloat-o-meter -d vmlinux.o.old vmlinux.o
add/remove: 2/2 grow/shrink: 0/2 up/down: 24/-188 (-164)
Data old new delta
sysctl_vals - 12 +12
__kstrtab_sysctl_vals - 12 +12
max 14 10 -4
int_max 16 - -16
one 68 - -68
zero 128 28 -100
Total: Before=20583249, After=20583085, chg -0.00%
[mcroce@redhat.com: tipc: remove two unused variables]
Link: http://lkml.kernel.org/r/20190530091952.4108-1-mcroce@redhat.com
[akpm@linux-foundation.org: fix net/ipv6/sysctl_net_ipv6.c]
[arnd@arndb.de: proc/sysctl: make firmware loader table conditional]
Link: http://lkml.kernel.org/r/20190617130014.1713870-1-arnd@arndb.de
[akpm@linux-foundation.org: fix fs/eventpoll.c]
Link: http://lkml.kernel.org/r/20190430180111.10688-1-mcroce@redhat.com
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-07-19 06:58:50 +08:00
|
|
|
|
2022-01-22 14:13:03 +08:00
|
|
|
/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
|
|
|
|
#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10])
|
|
|
|
|
proc/sysctl: add shared variables for range check
In the sysctl code the proc_dointvec_minmax() function is often used to
validate the user supplied value between an allowed range. This
function uses the extra1 and extra2 members from struct ctl_table as
minimum and maximum allowed value.
On sysctl handler declaration, in every source file there are some
readonly variables containing just an integer which address is assigned
to the extra1 and extra2 members, so the sysctl range is enforced.
The special values 0, 1 and INT_MAX are very often used as range
boundary, leading duplication of variables like zero=0, one=1,
int_max=INT_MAX in different source files:
$ git grep -E '\.extra[12].*&(zero|one|int_max)' |wc -l
248
Add a const int array containing the most commonly used values, some
macros to refer more easily to the correct array member, and use them
instead of creating a local one for every object file.
This is the bloat-o-meter output comparing the old and new binary
compiled with the default Fedora config:
# scripts/bloat-o-meter -d vmlinux.o.old vmlinux.o
add/remove: 2/2 grow/shrink: 0/2 up/down: 24/-188 (-164)
Data old new delta
sysctl_vals - 12 +12
__kstrtab_sysctl_vals - 12 +12
max 14 10 -4
int_max 16 - -16
one 68 - -68
zero 128 28 -100
Total: Before=20583249, After=20583085, chg -0.00%
[mcroce@redhat.com: tipc: remove two unused variables]
Link: http://lkml.kernel.org/r/20190530091952.4108-1-mcroce@redhat.com
[akpm@linux-foundation.org: fix net/ipv6/sysctl_net_ipv6.c]
[arnd@arndb.de: proc/sysctl: make firmware loader table conditional]
Link: http://lkml.kernel.org/r/20190617130014.1713870-1-arnd@arndb.de
[akpm@linux-foundation.org: fix fs/eventpoll.c]
Link: http://lkml.kernel.org/r/20190430180111.10688-1-mcroce@redhat.com
Signed-off-by: Matteo Croce <mcroce@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Aaron Tomlin <atomlin@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-07-19 06:58:50 +08:00
|
|
|
extern const int sysctl_vals[];
|
|
|
|
|
2022-01-22 14:12:48 +08:00
|
|
|
#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[];
|
|
|
|
|
2020-04-24 14:43:38 +08:00
|
|
|
typedef int proc_handler(struct ctl_table *ctl, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
|
|
|
|
|
|
|
int proc_dostring(struct ctl_table *, int, void *, size_t *, loff_t *);
|
2021-08-03 18:59:36 +08:00
|
|
|
int proc_dobool(struct ctl_table *table, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
2020-04-24 14:43:38 +08:00
|
|
|
int proc_dointvec(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_douintvec(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_dointvec_minmax(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_douintvec_minmax(struct ctl_table *table, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
2021-03-26 02:08:13 +08:00
|
|
|
int proc_dou8vec_minmax(struct ctl_table *table, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
2020-04-24 14:43:38 +08:00
|
|
|
int proc_dointvec_jiffies(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_dointvec_userhz_jiffies(struct ctl_table *, int, void *, size_t *,
|
|
|
|
loff_t *);
|
|
|
|
int proc_dointvec_ms_jiffies(struct ctl_table *, int, void *, size_t *,
|
|
|
|
loff_t *);
|
|
|
|
int proc_doulongvec_minmax(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_doulongvec_ms_jiffies_minmax(struct ctl_table *table, int, void *,
|
|
|
|
size_t *, loff_t *);
|
|
|
|
int proc_do_large_bitmap(struct ctl_table *, int, void *, size_t *, loff_t *);
|
|
|
|
int proc_do_static_key(struct ctl_table *table, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Register a set of sysctl names by calling register_sysctl_table
|
2009-04-03 18:18:02 +08:00
|
|
|
* with an initialised array of struct ctl_table's. An entry with
|
|
|
|
* NULL procname terminates the table. table->de will be
|
2006-11-06 15:52:12 +08:00
|
|
|
* set up by the registration and need not be initialised in advance.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* sysctl names can be mirrored automatically under /proc/sys. The
|
|
|
|
* procname supplied controls /proc naming.
|
|
|
|
*
|
2020-08-15 08:31:07 +08:00
|
|
|
* The table's mode will be honoured for proc-fs access.
|
2005-04-17 06:20:36 +08:00
|
|
|
*
|
|
|
|
* Leaf nodes in the sysctl tree will be represented by a single file
|
|
|
|
* under /proc; non-leaf nodes will be represented by directories. A
|
|
|
|
* null procname disables /proc mirroring at this node.
|
2006-11-06 15:52:12 +08:00
|
|
|
*
|
2020-08-15 08:31:07 +08:00
|
|
|
* The data and maxlen fields of the ctl_table
|
2005-04-17 06:20:36 +08:00
|
|
|
* struct enable minimal validation of the values being written to be
|
|
|
|
* performed, and the mode field allows minimal authentication.
|
|
|
|
*
|
|
|
|
* There must be a proc_handler routine for any terminal nodes
|
|
|
|
* mirrored under /proc/sys (non-terminals are handled by a built-in
|
|
|
|
* directory handler). Several default handlers are available to
|
|
|
|
* cover common cases.
|
|
|
|
*/
|
|
|
|
|
2011-11-03 04:39:22 +08:00
|
|
|
/* Support for userspace poll() to watch for changes */
|
|
|
|
struct ctl_table_poll {
|
|
|
|
atomic_t event;
|
|
|
|
wait_queue_head_t wait;
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline void *proc_sys_poll_event(struct ctl_table_poll *poll)
|
|
|
|
{
|
|
|
|
return (void *)(unsigned long)atomic_read(&poll->event);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define __CTL_TABLE_POLL_INITIALIZER(name) { \
|
|
|
|
.event = ATOMIC_INIT(0), \
|
|
|
|
.wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait) }
|
|
|
|
|
|
|
|
#define DEFINE_CTL_TABLE_POLL(name) \
|
|
|
|
struct ctl_table_poll name = __CTL_TABLE_POLL_INITIALIZER(name)
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* A sysctl table is an array of struct ctl_table: */
|
2019-12-05 08:50:14 +08:00
|
|
|
struct ctl_table {
|
2005-04-17 06:20:36 +08:00
|
|
|
const char *procname; /* Text ID for /proc/sys, or zero */
|
|
|
|
void *data;
|
|
|
|
int maxlen;
|
2011-07-26 15:47:31 +08:00
|
|
|
umode_t mode;
|
2012-01-23 10:22:05 +08:00
|
|
|
struct ctl_table *child; /* Deprecated */
|
2005-04-17 06:20:36 +08:00
|
|
|
proc_handler *proc_handler; /* Callback for text formatting */
|
2011-11-03 04:39:22 +08:00
|
|
|
struct ctl_table_poll *poll;
|
2005-04-17 06:20:36 +08:00
|
|
|
void *extra1;
|
|
|
|
void *extra2;
|
2016-10-28 16:22:25 +08:00
|
|
|
} __randomize_layout;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2012-01-10 09:24:30 +08:00
|
|
|
struct ctl_node {
|
|
|
|
struct rb_node node;
|
|
|
|
struct ctl_table_header *header;
|
|
|
|
};
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* struct ctl_table_header is used to maintain dynamic lists of
|
2007-10-18 18:05:22 +08:00
|
|
|
struct ctl_table trees. */
|
2019-12-05 08:50:14 +08:00
|
|
|
struct ctl_table_header {
|
2011-03-08 14:25:28 +08:00
|
|
|
union {
|
|
|
|
struct {
|
|
|
|
struct ctl_table *ctl_table;
|
|
|
|
int used;
|
|
|
|
int count;
|
2012-01-10 09:24:30 +08:00
|
|
|
int nreg;
|
2011-03-08 14:25:28 +08:00
|
|
|
};
|
|
|
|
struct rcu_head rcu;
|
|
|
|
};
|
2005-11-04 18:18:40 +08:00
|
|
|
struct completion *unregistering;
|
2007-11-30 20:52:10 +08:00
|
|
|
struct ctl_table *ctl_table_arg;
|
2007-11-30 20:54:00 +08:00
|
|
|
struct ctl_table_root *root;
|
2008-07-15 09:22:20 +08:00
|
|
|
struct ctl_table_set *set;
|
2011-12-30 00:24:29 +08:00
|
|
|
struct ctl_dir *parent;
|
2012-01-10 09:24:30 +08:00
|
|
|
struct ctl_node *node;
|
2017-07-06 21:41:06 +08:00
|
|
|
struct hlist_head inodes; /* head for proc_inode->sysctl_inodes */
|
2011-12-30 00:24:29 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ctl_dir {
|
|
|
|
/* Header must be at the start of ctl_dir */
|
|
|
|
struct ctl_table_header header;
|
2012-01-10 09:24:30 +08:00
|
|
|
struct rb_root root;
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
2012-01-06 19:13:27 +08:00
|
|
|
struct ctl_table_set {
|
|
|
|
int (*is_seen)(struct ctl_table_set *);
|
2012-01-08 15:24:30 +08:00
|
|
|
struct ctl_dir dir;
|
2012-01-06 19:13:27 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ctl_table_root {
|
|
|
|
struct ctl_table_set default_set;
|
2016-07-17 04:22:55 +08:00
|
|
|
struct ctl_table_set *(*lookup)(struct ctl_table_root *root);
|
2016-08-11 05:36:02 +08:00
|
|
|
void (*set_ownership)(struct ctl_table_header *head,
|
|
|
|
struct ctl_table *table,
|
|
|
|
kuid_t *uid, kgid_t *gid);
|
2012-11-16 11:02:58 +08:00
|
|
|
int (*permissions)(struct ctl_table_header *head, struct ctl_table *table);
|
2012-01-06 19:13:27 +08:00
|
|
|
};
|
|
|
|
|
2007-11-30 20:50:18 +08:00
|
|
|
/* struct ctl_path describes where in the hierarchy a table is added */
|
|
|
|
struct ctl_path {
|
|
|
|
const char *procname;
|
|
|
|
};
|
|
|
|
|
2012-01-06 19:13:27 +08:00
|
|
|
#ifdef CONFIG_SYSCTL
|
|
|
|
|
|
|
|
void proc_sys_poll_notify(struct ctl_table_poll *poll);
|
|
|
|
|
|
|
|
extern void setup_sysctl_set(struct ctl_table_set *p,
|
2012-01-23 13:26:00 +08:00
|
|
|
struct ctl_table_root *root,
|
2012-01-06 19:13:27 +08:00
|
|
|
int (*is_seen)(struct ctl_table_set *));
|
2012-01-10 14:19:13 +08:00
|
|
|
extern void retire_sysctl_set(struct ctl_table_set *set);
|
2012-01-06 19:13:27 +08:00
|
|
|
|
2012-01-22 02:26:26 +08:00
|
|
|
struct ctl_table_header *__register_sysctl_table(
|
2012-01-08 16:02:37 +08:00
|
|
|
struct ctl_table_set *set,
|
2012-01-22 02:26:26 +08:00
|
|
|
const char *path, struct ctl_table *table);
|
2007-11-30 20:54:00 +08:00
|
|
|
struct ctl_table_header *__register_sysctl_paths(
|
2012-01-08 16:02:37 +08:00
|
|
|
struct ctl_table_set *set,
|
2007-11-30 20:54:00 +08:00
|
|
|
const struct ctl_path *path, struct ctl_table *table);
|
2012-01-21 13:47:03 +08:00
|
|
|
struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table);
|
2007-10-18 18:05:22 +08:00
|
|
|
struct ctl_table_header *register_sysctl_table(struct ctl_table * table);
|
2007-11-30 20:50:18 +08:00
|
|
|
struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path,
|
|
|
|
struct ctl_table *table);
|
2007-02-14 16:34:09 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
void unregister_sysctl_table(struct ctl_table_header * table);
|
|
|
|
|
2012-01-06 19:34:20 +08:00
|
|
|
extern int sysctl_init(void);
|
2022-01-22 14:10:50 +08:00
|
|
|
extern void __register_sysctl_init(const char *path, struct ctl_table *table,
|
|
|
|
const char *table_name);
|
|
|
|
#define register_sysctl_init(path, table) __register_sysctl_init(path, table, #table)
|
2022-01-22 14:12:23 +08:00
|
|
|
extern struct ctl_table_header *register_sysctl_mount_point(const char *path);
|
|
|
|
|
kernel/sysctl: support setting sysctl parameters from kernel command line
Patch series "support setting sysctl parameters from kernel command line", v3.
This series adds support for something that seems like many people
always wanted but nobody added it yet, so here's the ability to set
sysctl parameters via kernel command line options in the form of
sysctl.vm.something=1
The important part is Patch 1. The second, not so important part is an
attempt to clean up legacy one-off parameters that do the same thing as
a sysctl. I don't want to remove them completely for compatibility
reasons, but with generic sysctl support the idea is to remove the
one-off param handlers and treat the parameters as aliases for the
sysctl variants.
I have identified several parameters that mention sysctl counterparts in
Documentation/admin-guide/kernel-parameters.txt but there might be more.
The conversion also has varying level of success:
- numa_zonelist_order is converted in Patch 2 together with adding the
necessary infrastructure. It's easy as it doesn't really do anything
but warn on deprecated value these days.
- hung_task_panic is converted in Patch 3, but there's a downside that
now it only accepts 0 and 1, while previously it was any integer
value
- nmi_watchdog maps to two sysctls nmi_watchdog and hardlockup_panic,
so there's no straighforward conversion possible
- traceoff_on_warning is a flag without value and it would be required
to handle that somehow in the conversion infractructure, which seems
pointless for a single flag
This patch (of 5):
A recently proposed patch to add vm_swappiness command line parameter in
addition to existing sysctl [1] made me wonder why we don't have a
general support for passing sysctl parameters via command line.
Googling found only somebody else wondering the same [2], but I haven't
found any prior discussion with reasons why not to do this.
Settings the vm_swappiness issue aside (the underlying issue might be
solved in a different way), quick search of kernel-parameters.txt shows
there are already some that exist as both sysctl and kernel parameter -
hung_task_panic, nmi_watchdog, numa_zonelist_order, traceoff_on_warning.
A general mechanism would remove the need to add more of those one-offs
and might be handy in situations where configuration by e.g.
/etc/sysctl.d/ is impractical.
Hence, this patch adds a new parse_args() pass that looks for parameters
prefixed by 'sysctl.' and tries to interpret them as writes to the
corresponding sys/ files using an temporary in-kernel procfs mount.
This mechanism was suggested by Eric W. Biederman [3], as it handles
all dynamically registered sysctl tables, even though we don't handle
modular sysctls. Errors due to e.g. invalid parameter name or value
are reported in the kernel log.
The processing is hooked right before the init process is loaded, as
some handlers might be more complicated than simple setters and might
need some subsystems to be initialized. At the moment the init process
can be started and eventually execute a process writing to /proc/sys/
then it should be also fine to do that from the kernel.
Sysctls registered later on module load time are not set by this
mechanism - it's expected that in such scenarios, setting sysctl values
from userspace is practical enough.
[1] https://lore.kernel.org/r/BL0PR02MB560167492CA4094C91589930E9FC0@BL0PR02MB5601.namprd02.prod.outlook.com/
[2] https://unix.stackexchange.com/questions/558802/how-to-set-sysctl-using-kernel-command-line-parameter
[3] https://lore.kernel.org/r/87bloj2skm.fsf@x220.int.ebiederm.org/
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Ivan Teterevkov <ivan.teterevkov@nutanix.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: "Guilherme G . Piccoli" <gpiccoli@canonical.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Link: http://lkml.kernel.org/r/20200427180433.7029-1-vbabka@suse.cz
Link: http://lkml.kernel.org/r/20200427180433.7029-2-vbabka@suse.cz
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-06-08 12:40:24 +08:00
|
|
|
void do_sysctl_args(void);
|
2015-05-10 11:09:14 +08:00
|
|
|
|
2020-04-24 14:43:36 +08:00
|
|
|
extern int pwrsw_enabled;
|
|
|
|
extern int unaligned_enabled;
|
|
|
|
extern int unaligned_dump_stack;
|
|
|
|
extern int no_unaligned_warning;
|
|
|
|
|
2015-05-10 11:09:14 +08:00
|
|
|
extern struct ctl_table sysctl_mount_point[];
|
|
|
|
|
2012-01-06 19:13:27 +08:00
|
|
|
#else /* CONFIG_SYSCTL */
|
|
|
|
static inline struct ctl_table_header *register_sysctl_table(struct ctl_table * table)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2022-01-22 14:12:23 +08:00
|
|
|
static inline struct sysctl_header *register_sysctl_mount_point(const char *path)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-01-06 19:13:27 +08:00
|
|
|
static inline struct ctl_table_header *register_sysctl_paths(
|
|
|
|
const struct ctl_path *path, struct ctl_table *table)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-11-10 05:38:18 +08:00
|
|
|
static inline struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *table)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-01-06 19:13:27 +08:00
|
|
|
static inline void unregister_sysctl_table(struct ctl_table_header * table)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void setup_sysctl_set(struct ctl_table_set *p,
|
2012-01-23 13:26:00 +08:00
|
|
|
struct ctl_table_root *root,
|
2012-01-06 19:13:27 +08:00
|
|
|
int (*is_seen)(struct ctl_table_set *))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
kernel/sysctl: support setting sysctl parameters from kernel command line
Patch series "support setting sysctl parameters from kernel command line", v3.
This series adds support for something that seems like many people
always wanted but nobody added it yet, so here's the ability to set
sysctl parameters via kernel command line options in the form of
sysctl.vm.something=1
The important part is Patch 1. The second, not so important part is an
attempt to clean up legacy one-off parameters that do the same thing as
a sysctl. I don't want to remove them completely for compatibility
reasons, but with generic sysctl support the idea is to remove the
one-off param handlers and treat the parameters as aliases for the
sysctl variants.
I have identified several parameters that mention sysctl counterparts in
Documentation/admin-guide/kernel-parameters.txt but there might be more.
The conversion also has varying level of success:
- numa_zonelist_order is converted in Patch 2 together with adding the
necessary infrastructure. It's easy as it doesn't really do anything
but warn on deprecated value these days.
- hung_task_panic is converted in Patch 3, but there's a downside that
now it only accepts 0 and 1, while previously it was any integer
value
- nmi_watchdog maps to two sysctls nmi_watchdog and hardlockup_panic,
so there's no straighforward conversion possible
- traceoff_on_warning is a flag without value and it would be required
to handle that somehow in the conversion infractructure, which seems
pointless for a single flag
This patch (of 5):
A recently proposed patch to add vm_swappiness command line parameter in
addition to existing sysctl [1] made me wonder why we don't have a
general support for passing sysctl parameters via command line.
Googling found only somebody else wondering the same [2], but I haven't
found any prior discussion with reasons why not to do this.
Settings the vm_swappiness issue aside (the underlying issue might be
solved in a different way), quick search of kernel-parameters.txt shows
there are already some that exist as both sysctl and kernel parameter -
hung_task_panic, nmi_watchdog, numa_zonelist_order, traceoff_on_warning.
A general mechanism would remove the need to add more of those one-offs
and might be handy in situations where configuration by e.g.
/etc/sysctl.d/ is impractical.
Hence, this patch adds a new parse_args() pass that looks for parameters
prefixed by 'sysctl.' and tries to interpret them as writes to the
corresponding sys/ files using an temporary in-kernel procfs mount.
This mechanism was suggested by Eric W. Biederman [3], as it handles
all dynamically registered sysctl tables, even though we don't handle
modular sysctls. Errors due to e.g. invalid parameter name or value
are reported in the kernel log.
The processing is hooked right before the init process is loaded, as
some handlers might be more complicated than simple setters and might
need some subsystems to be initialized. At the moment the init process
can be started and eventually execute a process writing to /proc/sys/
then it should be also fine to do that from the kernel.
Sysctls registered later on module load time are not set by this
mechanism - it's expected that in such scenarios, setting sysctl values
from userspace is practical enough.
[1] https://lore.kernel.org/r/BL0PR02MB560167492CA4094C91589930E9FC0@BL0PR02MB5601.namprd02.prod.outlook.com/
[2] https://unix.stackexchange.com/questions/558802/how-to-set-sysctl-using-kernel-command-line-parameter
[3] https://lore.kernel.org/r/87bloj2skm.fsf@x220.int.ebiederm.org/
Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: Ivan Teterevkov <ivan.teterevkov@nutanix.com>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: "Guilherme G . Piccoli" <gpiccoli@canonical.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Link: http://lkml.kernel.org/r/20200427180433.7029-1-vbabka@suse.cz
Link: http://lkml.kernel.org/r/20200427180433.7029-2-vbabka@suse.cz
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2020-06-08 12:40:24 +08:00
|
|
|
static inline void do_sysctl_args(void)
|
|
|
|
{
|
|
|
|
}
|
2012-01-06 19:13:27 +08:00
|
|
|
#endif /* CONFIG_SYSCTL */
|
|
|
|
|
2020-04-24 14:43:38 +08:00
|
|
|
int sysctl_max_threads(struct ctl_table *table, int write, void *buffer,
|
|
|
|
size_t *lenp, loff_t *ppos);
|
2015-04-17 03:47:50 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#endif /* _LINUX_SYSCTL_H */
|