* [PATCH v3 0/2] use standard sysctl macro
@ 2022-04-15 16:39 xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 1/2] net: sysctl: use shared " xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE xiangxia.m.yue
0 siblings, 2 replies; 6+ messages in thread
From: xiangxia.m.yue @ 2022-04-15 16:39 UTC (permalink / raw)
To: netdev
Cc: Tonghao Zhang, Luis Chamberlain, Kees Cook, Iurii Zaikin,
David S. Miller, Jakub Kicinski, Hideaki YOSHIFUJI, David Ahern,
Simon Horman, Julian Anastasov, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, Dmitry Vyukov,
Alexei Starovoitov, Eric Dumazet, Marc Kleine-Budde,
Lorenz Bauer, Akhmat Karakotov
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
This patchset introduce sysctl macro or replace var
with macro.
Tonghao Zhang (2):
net: sysctl: use shared sysctl macro
net: sysctl: introduce sysctl SYSCTL_THREE
fs/proc/proc_sysctl.c | 2 +-
include/linux/sysctl.h | 9 +++++----
net/core/sysctl_net_core.c | 13 +++++--------
net/ipv4/sysctl_net_ipv4.c | 16 ++++++----------
net/ipv6/sysctl_net_ipv6.c | 6 ++----
net/netfilter/ipvs/ip_vs_ctl.c | 4 +---
6 files changed, 20 insertions(+), 30 deletions(-)
--
v3: split v2 to 2 patches
https://patchwork.kernel.org/project/netdevbpf/patch/20220406124208.3485-1-xiangxia.m.yue@gmail.com/
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: David Ahern <dsahern@kernel.org>
Cc: Simon Horman <horms@verge.net.au>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Cc: Akhmat Karakotov <hmukos@yandex-team.ru>
--
2.27.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3 1/2] net: sysctl: use shared sysctl macro
2022-04-15 16:39 [PATCH v3 0/2] use standard sysctl macro xiangxia.m.yue
@ 2022-04-15 16:39 ` xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE xiangxia.m.yue
1 sibling, 0 replies; 6+ messages in thread
From: xiangxia.m.yue @ 2022-04-15 16:39 UTC (permalink / raw)
To: netdev
Cc: Tonghao Zhang, Luis Chamberlain, Kees Cook, Iurii Zaikin,
David S. Miller, Jakub Kicinski, Hideaki YOSHIFUJI, David Ahern,
Simon Horman, Julian Anastasov, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, Dmitry Vyukov,
Alexei Starovoitov, Eric Dumazet, Marc Kleine-Budde,
Lorenz Bauer, Akhmat Karakotov
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
This patch replace two, four and long_one to SYSCTL_XXX.
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: David Ahern <dsahern@kernel.org>
Cc: Simon Horman <horms@verge.net.au>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Cc: Akhmat Karakotov <hmukos@yandex-team.ru>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
net/core/sysctl_net_core.c | 10 ++++------
net/ipv4/sysctl_net_ipv4.c | 13 +++++--------
net/ipv6/sysctl_net_ipv6.c | 3 +--
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 8295e5877eb3..3a0ce309ffcd 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -25,13 +25,11 @@
#include "dev.h"
-static int two = 2;
static int three = 3;
static int int_3600 = 3600;
static int min_sndbuf = SOCK_MIN_SNDBUF;
static int min_rcvbuf = SOCK_MIN_RCVBUF;
static int max_skb_frags = MAX_SKB_FRAGS;
-static long long_one __maybe_unused = 1;
static long long_max __maybe_unused = LONG_MAX;
static int net_msg_warn; /* Unused, but still a sysctl */
@@ -390,7 +388,7 @@ static struct ctl_table net_core_table[] = {
.extra2 = SYSCTL_ONE,
# else
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
# endif
},
# ifdef CONFIG_HAVE_EBPF_JIT
@@ -401,7 +399,7 @@ static struct ctl_table net_core_table[] = {
.mode = 0600,
.proc_handler = proc_dointvec_minmax_bpf_restricted,
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
},
{
.procname = "bpf_jit_kallsyms",
@@ -419,7 +417,7 @@ static struct ctl_table net_core_table[] = {
.maxlen = sizeof(long),
.mode = 0600,
.proc_handler = proc_dolongvec_minmax_bpf_restricted,
- .extra1 = &long_one,
+ .extra1 = SYSCTL_LONG_ONE,
.extra2 = &bpf_jit_limit_max,
},
#endif
@@ -546,7 +544,7 @@ static struct ctl_table net_core_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
},
{
.procname = "devconf_inherit_init_net",
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index ad80d180b60b..9ff60a389cd0 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -20,10 +20,7 @@
#include <net/protocol.h>
#include <net/netevent.h>
-static int two = 2;
static int three __maybe_unused = 3;
-static int four = 4;
-static int thousand = 1000;
static int tcp_retr1_max = 255;
static int ip_local_port_range_min[] = { 1, 1 };
static int ip_local_port_range_max[] = { 65535, 65535 };
@@ -1006,7 +1003,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
},
{
.procname = "tcp_max_syn_backlog",
@@ -1117,7 +1114,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &four,
+ .extra2 = SYSCTL_FOUR,
},
{
.procname = "tcp_recovery",
@@ -1310,7 +1307,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &thousand,
+ .extra2 = SYSCTL_ONE_THOUSAND,
},
{
.procname = "tcp_pacing_ca_ratio",
@@ -1319,7 +1316,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &thousand,
+ .extra2 = SYSCTL_ONE_THOUSAND,
},
{
.procname = "tcp_wmem",
@@ -1391,7 +1388,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
},
{ }
};
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index d53dd142bf87..560c48d0ddb7 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -23,7 +23,6 @@
#endif
#include <linux/ioam6.h>
-static int two = 2;
static int three = 3;
static int flowlabel_reflect_max = 0x7;
static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
@@ -197,7 +196,7 @@ static struct ctl_table ipv6_table_template[] = {
.mode = 0644,
.proc_handler = proc_dou8vec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &two,
+ .extra2 = SYSCTL_TWO,
},
{
.procname = "ioam6_id",
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE
2022-04-15 16:39 [PATCH v3 0/2] use standard sysctl macro xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 1/2] net: sysctl: use shared " xiangxia.m.yue
@ 2022-04-15 16:39 ` xiangxia.m.yue
2022-04-19 9:05 ` Simon Horman
2022-04-20 12:43 ` Tonghao Zhang
1 sibling, 2 replies; 6+ messages in thread
From: xiangxia.m.yue @ 2022-04-15 16:39 UTC (permalink / raw)
To: netdev
Cc: Tonghao Zhang, Luis Chamberlain, Kees Cook, Iurii Zaikin,
David S. Miller, Jakub Kicinski, Hideaki YOSHIFUJI, David Ahern,
Simon Horman, Julian Anastasov, Pablo Neira Ayuso,
Jozsef Kadlecsik, Florian Westphal, Dmitry Vyukov,
Alexei Starovoitov, Eric Dumazet, Marc Kleine-Budde,
Lorenz Bauer, Akhmat Karakotov
From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
This patch introdues the SYSCTL_THREE.
KUnit:
[00:10:14] ================ sysctl_test (10 subtests) =================
[00:10:14] [PASSED] sysctl_test_api_dointvec_null_tbl_data
[00:10:14] [PASSED] sysctl_test_api_dointvec_table_maxlen_unset
[00:10:14] [PASSED] sysctl_test_api_dointvec_table_len_is_zero
[00:10:14] [PASSED] sysctl_test_api_dointvec_table_read_but_position_set
[00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_positive
[00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_negative
[00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_positive
[00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_negative
[00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_less_int_min
[00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_greater_int_max
[00:10:14] =================== [PASSED] sysctl_test ===================
./run_kselftest.sh -c sysctl
...
ok 1 selftests: sysctl: sysctl.sh
Cc: Luis Chamberlain <mcgrof@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Iurii Zaikin <yzaikin@google.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Cc: David Ahern <dsahern@kernel.org>
Cc: Simon Horman <horms@verge.net.au>
Cc: Julian Anastasov <ja@ssi.bg>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
Cc: Florian Westphal <fw@strlen.de>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Cc: Akhmat Karakotov <hmukos@yandex-team.ru>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
---
fs/proc/proc_sysctl.c | 2 +-
include/linux/sysctl.h | 9 +++++----
net/core/sysctl_net_core.c | 3 +--
net/ipv4/sysctl_net_ipv4.c | 3 +--
net/ipv6/sysctl_net_ipv6.c | 3 +--
net/netfilter/ipvs/ip_vs_ctl.c | 4 +---
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 7d9cfc730bd4..5851c2a92c0d 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;
static const struct inode_operations proc_sys_dir_operations;
/* shared constants to be used in various sysctls */
-const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 };
+const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
EXPORT_SYMBOL(sysctl_vals);
const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 6353d6db69b2..80263f7cdb77 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -38,10 +38,10 @@ struct ctl_table_header;
struct ctl_dir;
/* Keep the same order as in fs/proc/proc_sysctl.c */
-#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_ZERO ((void *)&sysctl_vals[0])
+#define SYSCTL_ONE ((void *)&sysctl_vals[1])
+#define SYSCTL_TWO ((void *)&sysctl_vals[2])
+#define SYSCTL_THREE ((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])
@@ -51,6 +51,7 @@ struct ctl_dir;
/* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
#define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10])
+#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[11])
extern const int sysctl_vals[];
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
index 3a0ce309ffcd..195ca5c28771 100644
--- a/net/core/sysctl_net_core.c
+++ b/net/core/sysctl_net_core.c
@@ -25,7 +25,6 @@
#include "dev.h"
-static int three = 3;
static int int_3600 = 3600;
static int min_sndbuf = SOCK_MIN_SNDBUF;
static int min_rcvbuf = SOCK_MIN_RCVBUF;
@@ -553,7 +552,7 @@ static struct ctl_table net_core_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &three,
+ .extra2 = SYSCTL_THREE,
},
{
.procname = "high_order_alloc_disable",
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
index 9ff60a389cd0..cd448cdd3b38 100644
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@ -20,7 +20,6 @@
#include <net/protocol.h>
#include <net/netevent.h>
-static int three __maybe_unused = 3;
static int tcp_retr1_max = 255;
static int ip_local_port_range_min[] = { 1, 1 };
static int ip_local_port_range_max[] = { 65535, 65535 };
@@ -1056,7 +1055,7 @@ static struct ctl_table ipv4_net_table[] = {
.mode = 0644,
.proc_handler = proc_fib_multipath_hash_policy,
.extra1 = SYSCTL_ZERO,
- .extra2 = &three,
+ .extra2 = SYSCTL_THREE,
},
{
.procname = "fib_multipath_hash_fields",
diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 560c48d0ddb7..94a0a294c6a1 100644
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -23,7 +23,6 @@
#endif
#include <linux/ioam6.h>
-static int three = 3;
static int flowlabel_reflect_max = 0x7;
static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
static u32 rt6_multipath_hash_fields_all_mask =
@@ -171,7 +170,7 @@ static struct ctl_table ipv6_table_template[] = {
.mode = 0644,
.proc_handler = proc_rt6_multipath_hash_policy,
.extra1 = SYSCTL_ZERO,
- .extra2 = &three,
+ .extra2 = SYSCTL_THREE,
},
{
.procname = "fib_multipath_hash_fields",
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 7f645328b47f..efab2b06d373 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1767,8 +1767,6 @@ static int ip_vs_zero_all(struct netns_ipvs *ipvs)
#ifdef CONFIG_SYSCTL
-static int three = 3;
-
static int
proc_do_defense_mode(struct ctl_table *table, int write,
void *buffer, size_t *lenp, loff_t *ppos)
@@ -1977,7 +1975,7 @@ static struct ctl_table vs_vars[] = {
.mode = 0644,
.proc_handler = proc_dointvec_minmax,
.extra1 = SYSCTL_ZERO,
- .extra2 = &three,
+ .extra2 = SYSCTL_THREE,
},
{
.procname = "nat_icmp_send",
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE
2022-04-15 16:39 ` [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE xiangxia.m.yue
@ 2022-04-19 9:05 ` Simon Horman
2022-04-20 12:43 ` Tonghao Zhang
1 sibling, 0 replies; 6+ messages in thread
From: Simon Horman @ 2022-04-19 9:05 UTC (permalink / raw)
To: xiangxia.m.yue
Cc: netdev, Luis Chamberlain, Kees Cook, Iurii Zaikin,
David S. Miller, Jakub Kicinski, Hideaki YOSHIFUJI, David Ahern,
Julian Anastasov, Pablo Neira Ayuso, Jozsef Kadlecsik,
Florian Westphal, Dmitry Vyukov, Alexei Starovoitov,
Eric Dumazet, Marc Kleine-Budde, Lorenz Bauer, Akhmat Karakotov
On Sat, Apr 16, 2022 at 12:39:12AM +0800, xiangxia.m.yue@gmail.com wrote:
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> This patch introdues the SYSCTL_THREE.
...
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 7d9cfc730bd4..5851c2a92c0d 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;
> static const struct inode_operations proc_sys_dir_operations;
>
> /* shared constants to be used in various sysctls */
> -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 };
> +const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
> EXPORT_SYMBOL(sysctl_vals);
>
> const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
> index 6353d6db69b2..80263f7cdb77 100644
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -38,10 +38,10 @@ struct ctl_table_header;
> struct ctl_dir;
>
> /* Keep the same order as in fs/proc/proc_sysctl.c */
> -#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_ZERO ((void *)&sysctl_vals[0])
> +#define SYSCTL_ONE ((void *)&sysctl_vals[1])
> +#define SYSCTL_TWO ((void *)&sysctl_vals[2])
> +#define SYSCTL_THREE ((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])
> @@ -51,6 +51,7 @@ struct ctl_dir;
>
> /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
> #define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10])
> +#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[11])
>
> extern const int sysctl_vals[];
...
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 7f645328b47f..efab2b06d373 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -1767,8 +1767,6 @@ static int ip_vs_zero_all(struct netns_ipvs *ipvs)
>
> #ifdef CONFIG_SYSCTL
>
> -static int three = 3;
> -
> static int
> proc_do_defense_mode(struct ctl_table *table, int write,
> void *buffer, size_t *lenp, loff_t *ppos)
> @@ -1977,7 +1975,7 @@ static struct ctl_table vs_vars[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec_minmax,
> .extra1 = SYSCTL_ZERO,
> - .extra2 = &three,
> + .extra2 = SYSCTL_THREE,
> },
> {
> .procname = "nat_icmp_send",
Subjectively, I'm ambivalent towards the merit of this patchset,
perhaps there is some justification for it that I missed.
Objectively, I don't see anything here that would break IPVS.
IPVS portion:
Reviewed-by: Simon Horman <horms@verge.net.au>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE
2022-04-15 16:39 ` [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE xiangxia.m.yue
2022-04-19 9:05 ` Simon Horman
@ 2022-04-20 12:43 ` Tonghao Zhang
2022-04-20 19:56 ` Luis Chamberlain
1 sibling, 1 reply; 6+ messages in thread
From: Tonghao Zhang @ 2022-04-20 12:43 UTC (permalink / raw)
To: Luis Chamberlain, Jakub Kicinski
Cc: Kees Cook, Iurii Zaikin, David S. Miller, Hideaki YOSHIFUJI,
David Ahern, Simon Horman, Julian Anastasov, Pablo Neira Ayuso,
Jozsef Kadlecsik, Linux Kernel Network Developers,
Florian Westphal, Dmitry Vyukov, Alexei Starovoitov,
Eric Dumazet, Marc Kleine-Budde, Lorenz Bauer, Akhmat Karakotov
On Sat, Apr 16, 2022 at 12:40 AM <xiangxia.m.yue@gmail.com> wrote:
>
> From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
>
> This patch introdues the SYSCTL_THREE.
Hi Luis, Jakub
any thoughts? I have fixed v2.
> KUnit:
> [00:10:14] ================ sysctl_test (10 subtests) =================
> [00:10:14] [PASSED] sysctl_test_api_dointvec_null_tbl_data
> [00:10:14] [PASSED] sysctl_test_api_dointvec_table_maxlen_unset
> [00:10:14] [PASSED] sysctl_test_api_dointvec_table_len_is_zero
> [00:10:14] [PASSED] sysctl_test_api_dointvec_table_read_but_position_set
> [00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_positive
> [00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_negative
> [00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_positive
> [00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_negative
> [00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_less_int_min
> [00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_greater_int_max
> [00:10:14] =================== [PASSED] sysctl_test ===================
>
> ./run_kselftest.sh -c sysctl
> ...
> ok 1 selftests: sysctl: sysctl.sh
>
> Cc: Luis Chamberlain <mcgrof@kernel.org>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Iurii Zaikin <yzaikin@google.com>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
> Cc: David Ahern <dsahern@kernel.org>
> Cc: Simon Horman <horms@verge.net.au>
> Cc: Julian Anastasov <ja@ssi.bg>
> Cc: Pablo Neira Ayuso <pablo@netfilter.org>
> Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
> Cc: Florian Westphal <fw@strlen.de>
> Cc: Dmitry Vyukov <dvyukov@google.com>
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> Cc: Lorenz Bauer <lmb@cloudflare.com>
> Cc: Akhmat Karakotov <hmukos@yandex-team.ru>
> Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> ---
> fs/proc/proc_sysctl.c | 2 +-
> include/linux/sysctl.h | 9 +++++----
> net/core/sysctl_net_core.c | 3 +--
> net/ipv4/sysctl_net_ipv4.c | 3 +--
> net/ipv6/sysctl_net_ipv6.c | 3 +--
> net/netfilter/ipvs/ip_vs_ctl.c | 4 +---
> 6 files changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
> index 7d9cfc730bd4..5851c2a92c0d 100644
> --- a/fs/proc/proc_sysctl.c
> +++ b/fs/proc/proc_sysctl.c
> @@ -26,7 +26,7 @@ static const struct file_operations proc_sys_dir_file_operations;
> static const struct inode_operations proc_sys_dir_operations;
>
> /* shared constants to be used in various sysctls */
> -const int sysctl_vals[] = { -1, 0, 1, 2, 4, 100, 200, 1000, 3000, INT_MAX, 65535 };
> +const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
> EXPORT_SYMBOL(sysctl_vals);
>
> const unsigned long sysctl_long_vals[] = { 0, 1, LONG_MAX };
> diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
> index 6353d6db69b2..80263f7cdb77 100644
> --- a/include/linux/sysctl.h
> +++ b/include/linux/sysctl.h
> @@ -38,10 +38,10 @@ struct ctl_table_header;
> struct ctl_dir;
>
> /* Keep the same order as in fs/proc/proc_sysctl.c */
> -#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_ZERO ((void *)&sysctl_vals[0])
> +#define SYSCTL_ONE ((void *)&sysctl_vals[1])
> +#define SYSCTL_TWO ((void *)&sysctl_vals[2])
> +#define SYSCTL_THREE ((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])
> @@ -51,6 +51,7 @@ struct ctl_dir;
>
> /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
> #define SYSCTL_MAXOLDUID ((void *)&sysctl_vals[10])
> +#define SYSCTL_NEG_ONE ((void *)&sysctl_vals[11])
>
> extern const int sysctl_vals[];
>
> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> index 3a0ce309ffcd..195ca5c28771 100644
> --- a/net/core/sysctl_net_core.c
> +++ b/net/core/sysctl_net_core.c
> @@ -25,7 +25,6 @@
>
> #include "dev.h"
>
> -static int three = 3;
> static int int_3600 = 3600;
> static int min_sndbuf = SOCK_MIN_SNDBUF;
> static int min_rcvbuf = SOCK_MIN_RCVBUF;
> @@ -553,7 +552,7 @@ static struct ctl_table net_core_table[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec_minmax,
> .extra1 = SYSCTL_ZERO,
> - .extra2 = &three,
> + .extra2 = SYSCTL_THREE,
> },
> {
> .procname = "high_order_alloc_disable",
> diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
> index 9ff60a389cd0..cd448cdd3b38 100644
> --- a/net/ipv4/sysctl_net_ipv4.c
> +++ b/net/ipv4/sysctl_net_ipv4.c
> @@ -20,7 +20,6 @@
> #include <net/protocol.h>
> #include <net/netevent.h>
>
> -static int three __maybe_unused = 3;
> static int tcp_retr1_max = 255;
> static int ip_local_port_range_min[] = { 1, 1 };
> static int ip_local_port_range_max[] = { 65535, 65535 };
> @@ -1056,7 +1055,7 @@ static struct ctl_table ipv4_net_table[] = {
> .mode = 0644,
> .proc_handler = proc_fib_multipath_hash_policy,
> .extra1 = SYSCTL_ZERO,
> - .extra2 = &three,
> + .extra2 = SYSCTL_THREE,
> },
> {
> .procname = "fib_multipath_hash_fields",
> diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
> index 560c48d0ddb7..94a0a294c6a1 100644
> --- a/net/ipv6/sysctl_net_ipv6.c
> +++ b/net/ipv6/sysctl_net_ipv6.c
> @@ -23,7 +23,6 @@
> #endif
> #include <linux/ioam6.h>
>
> -static int three = 3;
> static int flowlabel_reflect_max = 0x7;
> static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;
> static u32 rt6_multipath_hash_fields_all_mask =
> @@ -171,7 +170,7 @@ static struct ctl_table ipv6_table_template[] = {
> .mode = 0644,
> .proc_handler = proc_rt6_multipath_hash_policy,
> .extra1 = SYSCTL_ZERO,
> - .extra2 = &three,
> + .extra2 = SYSCTL_THREE,
> },
> {
> .procname = "fib_multipath_hash_fields",
> diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
> index 7f645328b47f..efab2b06d373 100644
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@ -1767,8 +1767,6 @@ static int ip_vs_zero_all(struct netns_ipvs *ipvs)
>
> #ifdef CONFIG_SYSCTL
>
> -static int three = 3;
> -
> static int
> proc_do_defense_mode(struct ctl_table *table, int write,
> void *buffer, size_t *lenp, loff_t *ppos)
> @@ -1977,7 +1975,7 @@ static struct ctl_table vs_vars[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec_minmax,
> .extra1 = SYSCTL_ZERO,
> - .extra2 = &three,
> + .extra2 = SYSCTL_THREE,
> },
> {
> .procname = "nat_icmp_send",
> --
> 2.27.0
>
--
Best regards, Tonghao
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE
2022-04-20 12:43 ` Tonghao Zhang
@ 2022-04-20 19:56 ` Luis Chamberlain
0 siblings, 0 replies; 6+ messages in thread
From: Luis Chamberlain @ 2022-04-20 19:56 UTC (permalink / raw)
To: Tonghao Zhang
Cc: Jakub Kicinski, Kees Cook, Iurii Zaikin, David S. Miller,
Hideaki YOSHIFUJI, David Ahern, Simon Horman, Julian Anastasov,
Pablo Neira Ayuso, Jozsef Kadlecsik,
Linux Kernel Network Developers, Florian Westphal, Dmitry Vyukov,
Alexei Starovoitov, Eric Dumazet, Marc Kleine-Budde,
Lorenz Bauer, Akhmat Karakotov
On Wed, Apr 20, 2022 at 08:43:14PM +0800, Tonghao Zhang wrote:
> On Sat, Apr 16, 2022 at 12:40 AM <xiangxia.m.yue@gmail.com> wrote:
> >
> > From: Tonghao Zhang <xiangxia.m.yue@gmail.com>
> >
> > This patch introdues the SYSCTL_THREE.
> Hi Luis, Jakub
> any thoughts? I have fixed v2.
> > KUnit:
> > [00:10:14] ================ sysctl_test (10 subtests) =================
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_null_tbl_data
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_table_maxlen_unset
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_table_len_is_zero
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_table_read_but_position_set
> > [00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_positive
> > [00:10:14] [PASSED] sysctl_test_dointvec_read_happy_single_negative
> > [00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_positive
> > [00:10:14] [PASSED] sysctl_test_dointvec_write_happy_single_negative
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_less_int_min
> > [00:10:14] [PASSED] sysctl_test_api_dointvec_write_single_greater_int_max
> > [00:10:14] =================== [PASSED] sysctl_test ===================
> >
> > ./run_kselftest.sh -c sysctl
> > ...
> > ok 1 selftests: sysctl: sysctl.sh
> >
> > Cc: Luis Chamberlain <mcgrof@kernel.org>
> > Cc: Kees Cook <keescook@chromium.org>
> > Cc: Iurii Zaikin <yzaikin@google.com>
> > Cc: "David S. Miller" <davem@davemloft.net>
> > Cc: Jakub Kicinski <kuba@kernel.org>
> > Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
> > Cc: David Ahern <dsahern@kernel.org>
> > Cc: Simon Horman <horms@verge.net.au>
> > Cc: Julian Anastasov <ja@ssi.bg>
> > Cc: Pablo Neira Ayuso <pablo@netfilter.org>
> > Cc: Jozsef Kadlecsik <kadlec@netfilter.org>
> > Cc: Florian Westphal <fw@strlen.de>
> > Cc: Dmitry Vyukov <dvyukov@google.com>
> > Cc: Alexei Starovoitov <ast@kernel.org>
> > Cc: Eric Dumazet <edumazet@google.com>
> > Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> > Cc: Lorenz Bauer <lmb@cloudflare.com>
> > Cc: Akhmat Karakotov <hmukos@yandex-team.ru>
> > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com>
It would be good for you to also have a separate patch which extends
the selftest for sysctl which tests that each of the values always
matches, I thought we had that test already, if not one needs to be
added for this. That should be the first patch. The second one would
add this as you are here in this patch, and the last one adds the new
SYSCTL_THREE to the selftest.
Otherwise looks good to me.
Happy to route this via sysclt-next if Jacub is OK with that.
Luis
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-20 19:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-15 16:39 [PATCH v3 0/2] use standard sysctl macro xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 1/2] net: sysctl: use shared " xiangxia.m.yue
2022-04-15 16:39 ` [PATCH v3 2/2] net: sysctl: introduce sysctl SYSCTL_THREE xiangxia.m.yue
2022-04-19 9:05 ` Simon Horman
2022-04-20 12:43 ` Tonghao Zhang
2022-04-20 19:56 ` Luis Chamberlain
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.