From: Shan Wei <shanwei88@gmail.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: David Miller <davem@davemloft.net>, netdev <netdev@vger.kernel.org>
Subject: Re: [PATCH net-next] net: remove sk_init() helper
Date: Wed, 26 Sep 2012 10:07:42 +0800 [thread overview]
Message-ID: <5062636E.2060200@gmail.com> (raw)
In-Reply-To: <1348608733.26828.3492.camel@edumazet-glaptop>
Eric Dumazet said, at 2012/9/26 5:32:
> From: Eric Dumazet <edumazet@google.com>
>
> It seems sk_init() has no value today and even does strange things :
>
> # grep . /proc/sys/net/core/?mem_*
> /proc/sys/net/core/rmem_default:212992
> /proc/sys/net/core/rmem_max:131071
> /proc/sys/net/core/wmem_default:212992
> /proc/sys/net/core/wmem_max:131071
>
> We can remove it completely.
Ye, I have reported this problem.
http://lists.openwall.net/netdev/2012/04/27/49
How about for small RAM ~16M?
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> ---
> include/net/sock.h | 2 --
> net/core/sock.c | 13 -------------
> net/socket.c | 6 ------
> 3 files changed, 21 deletions(-)
>
> diff --git a/include/net/sock.h b/include/net/sock.h
> index 42053759..02456b6 100644
> --- a/include/net/sock.h
> +++ b/include/net/sock.h
> @@ -2229,8 +2229,6 @@ extern int net_msg_warn;
> extern __u32 sysctl_wmem_max;
> extern __u32 sysctl_rmem_max;
>
> -extern void sk_init(void);
> -
> extern int sysctl_optmem_max;
>
> extern __u32 sysctl_wmem_default;
> diff --git a/net/core/sock.c b/net/core/sock.c
> index 727114c..f5a4260 100644
> --- a/net/core/sock.c
> +++ b/net/core/sock.c
> @@ -1464,19 +1464,6 @@ void sk_setup_caps(struct sock *sk, struct dst_entry *dst)
> }
> EXPORT_SYMBOL_GPL(sk_setup_caps);
>
> -void __init sk_init(void)
> -{
> - if (totalram_pages <= 4096) {
> - sysctl_wmem_max = 32767;
> - sysctl_rmem_max = 32767;
> - sysctl_wmem_default = 32767;
> - sysctl_rmem_default = 32767;
> - } else if (totalram_pages >= 131072) {
> - sysctl_wmem_max = 131071;
> - sysctl_rmem_max = 131071;
> - }
> -}
> -
> /*
> * Simple resource managers for sockets.
> */
> diff --git a/net/socket.c b/net/socket.c
> index c641549..80dc7e8 100644
> --- a/net/socket.c
> +++ b/net/socket.c
> @@ -2601,12 +2601,6 @@ static int __init sock_init(void)
> goto out;
>
> /*
> - * Initialize sock SLAB cache.
> - */
> -
> - sk_init();
> -
> - /*
> * Initialize skbuff SLAB cache
> */
> skb_init();
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
next prev parent reply other threads:[~2012-09-26 2:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 21:32 [PATCH net-next] net: remove sk_init() helper Eric Dumazet
2012-09-26 2:07 ` Shan Wei [this message]
2012-09-26 2:23 ` Eric Dumazet
2012-09-26 3:51 ` Shan Wei
2012-09-27 22:42 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5062636E.2060200@gmail.com \
--to=shanwei88@gmail.com \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).