mirror of
https://github.com/torvalds/linux.git
synced 2024-12-25 04:11:49 +00:00
eec4844fae
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>
156 lines
4.1 KiB
C
156 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/* sysctls for configuring RxRPC operating parameters
|
|
*
|
|
* Copyright (C) 2014 Red Hat, Inc. All Rights Reserved.
|
|
* Written by David Howells (dhowells@redhat.com)
|
|
*/
|
|
|
|
#include <linux/sysctl.h>
|
|
#include <net/sock.h>
|
|
#include <net/af_rxrpc.h>
|
|
#include "ar-internal.h"
|
|
|
|
static struct ctl_table_header *rxrpc_sysctl_reg_table;
|
|
static const unsigned int four = 4;
|
|
static const unsigned int thirtytwo = 32;
|
|
static const unsigned int n_65535 = 65535;
|
|
static const unsigned int n_max_acks = RXRPC_RXTX_BUFF_SIZE - 1;
|
|
static const unsigned long one_jiffy = 1;
|
|
static const unsigned long max_jiffies = MAX_JIFFY_OFFSET;
|
|
|
|
/*
|
|
* RxRPC operating parameters.
|
|
*
|
|
* See Documentation/networking/rxrpc.txt and the variable definitions for more
|
|
* information on the individual parameters.
|
|
*/
|
|
static struct ctl_table rxrpc_sysctl_table[] = {
|
|
/* Values measured in milliseconds but used in jiffies */
|
|
{
|
|
.procname = "req_ack_delay",
|
|
.data = &rxrpc_requested_ack_delay,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
{
|
|
.procname = "soft_ack_delay",
|
|
.data = &rxrpc_soft_ack_delay,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
{
|
|
.procname = "idle_ack_delay",
|
|
.data = &rxrpc_idle_ack_delay,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
{
|
|
.procname = "idle_conn_expiry",
|
|
.data = &rxrpc_conn_idle_client_expiry,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
{
|
|
.procname = "idle_conn_fast_expiry",
|
|
.data = &rxrpc_conn_idle_client_fast_expiry,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
{
|
|
.procname = "resend_timeout",
|
|
.data = &rxrpc_resend_timeout,
|
|
.maxlen = sizeof(unsigned long),
|
|
.mode = 0644,
|
|
.proc_handler = proc_doulongvec_ms_jiffies_minmax,
|
|
.extra1 = (void *)&one_jiffy,
|
|
.extra2 = (void *)&max_jiffies,
|
|
},
|
|
|
|
/* Non-time values */
|
|
{
|
|
.procname = "max_client_conns",
|
|
.data = &rxrpc_max_client_connections,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)&rxrpc_reap_client_connections,
|
|
},
|
|
{
|
|
.procname = "reap_client_conns",
|
|
.data = &rxrpc_reap_client_connections,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)SYSCTL_ONE,
|
|
.extra2 = (void *)&rxrpc_max_client_connections,
|
|
},
|
|
{
|
|
.procname = "max_backlog",
|
|
.data = &rxrpc_max_backlog,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)&four,
|
|
.extra2 = (void *)&thirtytwo,
|
|
},
|
|
{
|
|
.procname = "rx_window_size",
|
|
.data = &rxrpc_rx_window_size,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)SYSCTL_ONE,
|
|
.extra2 = (void *)&n_max_acks,
|
|
},
|
|
{
|
|
.procname = "rx_mtu",
|
|
.data = &rxrpc_rx_mtu,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)SYSCTL_ONE,
|
|
.extra2 = (void *)&n_65535,
|
|
},
|
|
{
|
|
.procname = "rx_jumbo_max",
|
|
.data = &rxrpc_rx_jumbo_max,
|
|
.maxlen = sizeof(unsigned int),
|
|
.mode = 0644,
|
|
.proc_handler = proc_dointvec_minmax,
|
|
.extra1 = (void *)SYSCTL_ONE,
|
|
.extra2 = (void *)&four,
|
|
},
|
|
|
|
{ }
|
|
};
|
|
|
|
int __init rxrpc_sysctl_init(void)
|
|
{
|
|
rxrpc_sysctl_reg_table = register_net_sysctl(&init_net, "net/rxrpc",
|
|
rxrpc_sysctl_table);
|
|
if (!rxrpc_sysctl_reg_table)
|
|
return -ENOMEM;
|
|
return 0;
|
|
}
|
|
|
|
void rxrpc_sysctl_exit(void)
|
|
{
|
|
if (rxrpc_sysctl_reg_table)
|
|
unregister_net_sysctl_table(rxrpc_sysctl_reg_table);
|
|
}
|