Re: [ 059/143] sysctl net: Keep tcp_syn_retries inside the boundary

Willy Tarreau
2014-06-14T17:50:59Z

Hi Luis,

On Thu, Jun 12, 2014 at 01:55:53PM +0100, Luis Henriques wrote:
> I was finally able to spend some more time with this and tried (a
> modified) Tyler's patch on top of 2.6.32.62, and it seems to work.
> Although I haven't done any extended testing, I don't see the two
> stack traces and the /proc/sys/net/ipv4/ directory seems to be
> correctly populated.
>
> I'm attaching the patch I've used, based on Tyler's.

Would any of you or Tyler please kindly pass me a signed-off-by with
a commit message ? That would be great. Alternately I'd do it myself
and mention you authored them.

> Cheers,
> --
> Luís

Thanks,
Willy

> diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
> index e2eaf29..e6bf72c 100644
> --- a/net/core/sysctl_net_core.c
> +++ b/net/core/sysctl_net_core.c
> @@ -121,7 +121,8 @@ static struct ctl_table netns_core_table[] = {
> .mode = 0644,
> .extra1 = &zero,
> .extra2 = &ushort_max,
> - .proc_handler = proc_dointvec_minmax
> + .proc_handler = proc_dointvec_minmax,
> + .strategy = &sysctl_intvec
> },
> { .ctl_name = 0 }
> };
> diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
> index 910fa54..d957371 100644
> --- a/net/ipv4/sysctl_net_ipv4.c
> +++ b/net/ipv4/sysctl_net_ipv4.c
> @@ -241,7 +241,8 @@ static struct ctl_table ipv4_table[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec_minmax,
> .extra1 = &tcp_syn_retries_min,
> - .extra2 = &tcp_syn_retries_max
> + .extra2 = &tcp_syn_retries_max,
> + .strategy = &sysctl_intvec
> },
> {
> .ctl_name = NET_IPV4_NONLOCAL_BIND,